From a0af0c1230a1dbc93a28977d6d61180319220c88 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Thu, 15 Feb 2024 12:22:25 +0000
Subject: [PATCH 001/183] chore(env vars): Stripe vars moved to the
 Integrations section (#9427)

---
 .env.example | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index be16a7edd47..88cdde703de 100644
--- a/.env.example
+++ b/.env.example
@@ -112,6 +112,9 @@ RETHINKDB_SSL='false'
 # RECALL_AI_KEY=''
 # SLACK_CLIENT_ID='key_SLACK_CLIENT_ID'
 # SLACK_CLIENT_SECRET='key_SLACK_CLIENT_SECRET'
+# STRIPE_SECRET_KEY='sk_test_4eC39HqLyjWDarjtT1zdp7dc'
+# STRIPE_PUBLISHABLE_KEY='pk_test_TYooMQauvdEDq54NiTphI7jx'
+# STRIPE_WEBHOOK_SECRET='sk_test_4eC39HqLyjWDarjtT1zdp7dc'
 
 # MAIL
 # MAIL GLOBALS. PROVIDER: mailgun | google | debug | smtp
@@ -127,9 +130,6 @@ MAIL_PROVIDER='debug'
 # MAIL_SMTP_PASSWORD='key_MAIL_SMTP_PASSWORD'
 # MAIL_SMTP_USE_TLS='1' # set to '0' for false
 # MAIL_SMTP_CIPHERS='HIGH:MEDIUM:!aNULL:!eNULL:@STRENGTH:!DH:!kEDH'
-# STRIPE_SECRET_KEY='sk_test_4eC39HqLyjWDarjtT1zdp7dc'
-# STRIPE_PUBLISHABLE_KEY='pk_test_TYooMQauvdEDq54NiTphI7jx'
-# STRIPE_WEBHOOK_SECRET='sk_test_4eC39HqLyjWDarjtT1zdp7dc'
 
 # DEVELOPER VARIABLES
 # CI='true'

From c0a2fdf8fb3deaa34f7935ae8a87d30f43381ecd Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Fri, 16 Feb 2024 21:08:31 +0100
Subject: [PATCH 002/183] chore: fix misleading `isLead` field name on `Team`
 (#9413)

* chore: fix misleading `isLead` field name on `Team`

The field indicates whether the viewer is the lead, but when used in a
query for a different user, the result could be read wrong.

* Fix Team.isLead dependencies
---
 packages/client/components/ReviewRequestToJoinOrgModal.tsx    | 2 +-
 .../teamDashboard/components/ManageTeam/ManageTeamList.tsx    | 4 ++--
 .../teamDashboard/components/TeamSettings/TeamSettings.tsx    | 2 +-
 packages/client/mutations/PromoteToTeamLeadMutation.ts        | 2 +-
 packages/server/graphql/public/typeDefs/Team.graphql          | 2 +-
 packages/server/graphql/types/Team.ts                         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/client/components/ReviewRequestToJoinOrgModal.tsx b/packages/client/components/ReviewRequestToJoinOrgModal.tsx
index 25c2bde8de0..2604455e6f6 100644
--- a/packages/client/components/ReviewRequestToJoinOrgModal.tsx
+++ b/packages/client/components/ReviewRequestToJoinOrgModal.tsx
@@ -21,7 +21,7 @@ const ReviewRequestToJoinOrgModalViewerFragment = graphql`
       teams {
         id
         name
-        isLead
+        isViewerLead
         teamMembers(sortBy: "preferredName") {
           userId
         }
diff --git a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx
index a8e8933820e..7ed7de48036 100644
--- a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx
+++ b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamList.tsx
@@ -25,7 +25,7 @@ const ManageTeamList = (props: Props) => {
   const team = useFragment(
     graphql`
       fragment ManageTeamList_team on Team {
-        isLead
+        isViewerLead
         isOrgAdmin
         teamMembers(sortBy: "preferredName") {
           id
@@ -36,7 +36,7 @@ const ManageTeamList = (props: Props) => {
     `,
     props.team
   )
-  const {isLead: isViewerLead, isOrgAdmin: isViewerOrgAdmin, teamMembers} = team
+  const {isViewerLead, isOrgAdmin: isViewerOrgAdmin, teamMembers} = team
   return (
     <List>
       {teamMembers.map((teamMember) => {
diff --git a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
index 829308b0006..62ffb8f934f 100644
--- a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
@@ -43,7 +43,7 @@ const query = graphql`
     viewer {
       team(teamId: $teamId) {
         ...ArchiveTeam_team
-        isLead
+        isViewerLead
         id
         name
         tier
diff --git a/packages/client/mutations/PromoteToTeamLeadMutation.ts b/packages/client/mutations/PromoteToTeamLeadMutation.ts
index c47310341c2..af3325b1808 100644
--- a/packages/client/mutations/PromoteToTeamLeadMutation.ts
+++ b/packages/client/mutations/PromoteToTeamLeadMutation.ts
@@ -5,7 +5,7 @@ import {PromoteToTeamLeadMutation as TPromoteToTeamLeadMutation} from '../__gene
 graphql`
   fragment PromoteToTeamLeadMutation_team on PromoteToTeamLeadPayload {
     team {
-      isLead
+      isViewerLead
     }
     oldLeader {
       ...DashboardAvatar_teamMember
diff --git a/packages/server/graphql/public/typeDefs/Team.graphql b/packages/server/graphql/public/typeDefs/Team.graphql
index 6a6d00c4c76..6e95b1c602f 100644
--- a/packages/server/graphql/public/typeDefs/Team.graphql
+++ b/packages/server/graphql/public/typeDefs/Team.graphql
@@ -86,7 +86,7 @@ type Team {
   """
   true if the viewer is the team lead, else false
   """
-  isLead: Boolean!
+  isViewerLead: Boolean!
 
   """
   true if the viewer is an admin for the team's org, else false
diff --git a/packages/server/graphql/types/Team.ts b/packages/server/graphql/types/Team.ts
index 6c161bbcb35..7d737ad98b1 100644
--- a/packages/server/graphql/types/Team.ts
+++ b/packages/server/graphql/types/Team.ts
@@ -142,7 +142,7 @@ const Team: GraphQLObjectType = new GraphQLObjectType<ITeam, GQLContext>({
         return dataLoader.get('teamInvitationsByTeamId').load(teamId)
       }
     },
-    isLead: {
+    isViewerLead: {
       type: new GraphQLNonNull(GraphQLBoolean),
       description: 'true if the viewer is the team lead, else false',
       resolve: async (

From f042628fef5bbdbf566c49bab729f5b9dec058f1 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Mon, 19 Feb 2024 17:51:59 +0000
Subject: [PATCH 003/183] feat: remove team template limit (#9424)

* update error message and increase template limit

* remove max team template limits

* remove canClone prop from CloneTemplate

* remove unused threshold

* remove unused threshold
---
 .../ActivityDetails/TemplateDetails.tsx       |  2 +-
 .../CreateNewActivity/CreateNewActivity.tsx   | 34 +------------------
 .../components/AddNewPokerTemplate.tsx        | 14 +-------
 .../components/AddNewReflectTemplate.tsx      | 11 +-----
 .../meeting/components/CloneTemplate.tsx      |  9 ++---
 .../components/PokerTemplateDetails.tsx       |  7 ++--
 .../components/ReflectTemplateDetails.tsx     |  7 ++--
 packages/client/types/constEnums.ts           |  2 --
 .../graphql/mutations/addPokerTemplate.ts     |  5 +--
 .../graphql/mutations/addReflectTemplate.ts   |  5 +--
 10 files changed, 13 insertions(+), 83 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
index 0c2b77bef15..b86554fb3ef 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
@@ -267,7 +267,7 @@ export const TemplateDetails = (props: Props) => {
                       />
                     </div>
                     <div className='rounded-full border border-solid border-slate-400'>
-                      <CloneTemplate canClone={true} onClick={toggleTeamPickerPortal} />
+                      <CloneTemplate onClick={toggleTeamPickerPortal} />
                     </div>
                   </>
                 )}
diff --git a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
index 2967f5ab866..8346b47a252 100644
--- a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
+++ b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
@@ -4,14 +4,11 @@ import graphql from 'babel-plugin-relay/macro'
 import * as RadioGroup from '@radix-ui/react-radio-group'
 import clsx from 'clsx'
 import {Link} from 'react-router-dom'
-
 import newTemplate from '../../../../../static/images/illustrations/newTemplate.png'
 import estimatedEffortTemplate from '../../../../../static/images/illustrations/estimatedEffortTemplate.png'
-
 import {CreateNewActivityQuery} from '~/__generated__/CreateNewActivityQuery.graphql'
 import {ActivityCard, ActivityCardImage} from '../ActivityCard'
 import {ActivityBadge} from '../ActivityBadge'
-
 import IconLabel from '../../IconLabel'
 import NewMeetingTeamPicker from '../../NewMeetingTeamPicker'
 import sortByTier from '../../../utils/sortByTier'
@@ -20,7 +17,6 @@ import {AddReflectTemplateMutation$data} from '../../../__generated__/AddReflect
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
-import {Threshold} from '../../../types/constEnums'
 import useRouter from '../../../hooks/useRouter'
 import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, DEFAULT_CARD_THEME} from '../Categories'
 import BaseButton from '../../BaseButton'
@@ -111,15 +107,6 @@ const query = graphql`
         ...NewMeetingTeamPicker_selectedTeam
         ...NewMeetingTeamPicker_teams
       }
-      availableTemplates(first: 2000) @connection(key: "ActivityLibrary_availableTemplates") {
-        edges {
-          node {
-            name
-            teamId
-            type
-          }
-        }
-      }
     }
   }
 `
@@ -148,7 +135,7 @@ export const CreateNewActivity = (props: Props) => {
     return selectedActivity
   })
   const {viewer} = data
-  const {teams, availableTemplates, preferredTeamId, featureFlags} = viewer
+  const {teams, preferredTeamId, featureFlags} = viewer
   const [selectedTeam, setSelectedTeam] = useState(
     teams.find((team) => team.id === preferredTeamId) ?? sortByTier(teams)[0]!
   )
@@ -160,16 +147,6 @@ export const CreateNewActivity = (props: Props) => {
       return
     }
 
-    const teamTemplates = availableTemplates.edges.filter(
-      (template) =>
-        template.node.teamId === selectedTeam.id && template.node.type === 'retrospective'
-    )
-
-    if (teamTemplates.length >= Threshold.MAX_RETRO_TEAM_TEMPLATES) {
-      onError(new Error('You may only have 20 templates per team. Please remove one first.'))
-      return
-    }
-
     submitMutation()
     AddReflectTemplateMutation(
       atmosphere,
@@ -195,15 +172,6 @@ export const CreateNewActivity = (props: Props) => {
       return
     }
 
-    const teamTemplates = availableTemplates.edges.filter(
-      (template) => template.node.teamId === selectedTeam.id && template.node.type === 'poker'
-    )
-
-    if (teamTemplates.length >= Threshold.MAX_POKER_TEAM_TEMPLATES) {
-      onError(new Error('You may only have 20 templates per team. Please remove one first.'))
-      return
-    }
-
     submitMutation()
     AddPokerTemplateMutation(
       atmosphere,
diff --git a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
index 766c85dccee..053684315a3 100644
--- a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
+++ b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
@@ -7,7 +7,6 @@ import TooltipStyled from '../../../components/TooltipStyled'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation'
-import {Threshold} from '../../../types/constEnums'
 import {AddNewPokerTemplate_pokerTemplates$key} from '../../../__generated__/AddNewPokerTemplate_pokerTemplates.graphql'
 import {AddNewPokerTemplate_team$key} from '../../../__generated__/AddNewPokerTemplate_team.graphql'
 
@@ -79,17 +78,6 @@ const AddNewPokerTemplate = (props: Props) => {
       displayUpgradeDetails()
       return
     }
-    if (pokerTemplates.length >= Threshold.MAX_RETRO_TEAM_TEMPLATES) {
-      onError(
-        new Error(
-          `You may only have ${Threshold.MAX_RETRO_TEAM_TEMPLATES} templates per team. Please remove one first.`
-        )
-      )
-      errorTimerId.current = window.setTimeout(() => {
-        onCompleted()
-      }, 8000)
-      return
-    }
     if (pokerTemplates.find((template) => template.name.startsWith('*New Template'))) {
       onError(new Error('You already have a new template. Try renaming that one first.'))
       errorTimerId.current = window.setTimeout(() => {
@@ -106,7 +94,7 @@ const AddNewPokerTemplate = (props: Props) => {
     template.name.startsWith('*New Template')
   )
 
-  if (pokerTemplates.length > Threshold.MAX_POKER_TEAM_TEMPLATES || containsNewTemplate) return null
+  if (containsNewTemplate) return null
   return (
     <div>
       {error && <ErrorLine>{error.message}</ErrorLine>}
diff --git a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
index eea0c89ab03..61429332903 100644
--- a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
+++ b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
@@ -7,7 +7,6 @@ import TooltipStyled from '../../../components/TooltipStyled'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
-import {Threshold} from '../../../types/constEnums'
 import {AddNewReflectTemplate_reflectTemplates$key} from '../../../__generated__/AddNewReflectTemplate_reflectTemplates.graphql'
 import {AddNewReflectTemplate_team$key} from '../../../__generated__/AddNewReflectTemplate_team.graphql'
 
@@ -79,13 +78,6 @@ const AddNewReflectTemplate = (props: Props) => {
       displayUpgradeDetails()
       return
     }
-    if (reflectTemplates.length >= Threshold.MAX_RETRO_TEAM_TEMPLATES) {
-      onError(new Error('You may only have 20 templates per team. Please remove one first.'))
-      errorTimerId.current = window.setTimeout(() => {
-        onCompleted()
-      }, 8000)
-      return
-    }
     if (reflectTemplates.find((template) => template.name.startsWith('*New Template'))) {
       onError(new Error('You already have a new template. Try renaming that one first.'))
       errorTimerId.current = window.setTimeout(() => {
@@ -102,8 +94,7 @@ const AddNewReflectTemplate = (props: Props) => {
     template.name.startsWith('*New Template')
   )
 
-  if (reflectTemplates.length > Threshold.MAX_RETRO_TEAM_TEMPLATES || containsNewTemplate)
-    return null
+  if (containsNewTemplate) return null
   return (
     <div>
       {error && <ErrorLine>{error.message}</ErrorLine>}
diff --git a/packages/client/modules/meeting/components/CloneTemplate.tsx b/packages/client/modules/meeting/components/CloneTemplate.tsx
index 66cc6cc7d3e..6fbc5a1460a 100644
--- a/packages/client/modules/meeting/components/CloneTemplate.tsx
+++ b/packages/client/modules/meeting/components/CloneTemplate.tsx
@@ -2,15 +2,12 @@ import React from 'react'
 import DetailAction from '../../../components/DetailAction'
 
 interface Props {
-  canClone: boolean
   onClick: () => void
 }
 
 const CloneTemplate = (props: Props) => {
-  const {canClone, onClick} = props
-  const tooltip = canClone ? 'Clone & Edit Template' : 'Too many team templates! Remove one first'
-  return (
-    <DetailAction disabled={!canClone} icon={'content_copy'} tooltip={tooltip} onClick={onClick} />
-  )
+  const {onClick} = props
+  const tooltip = 'Clone & Edit Template'
+  return <DetailAction icon={'content_copy'} tooltip={tooltip} onClick={onClick} />
 }
 export default CloneTemplate
diff --git a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx b/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
index 3dcb51ec48a..c42794d1508 100644
--- a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
@@ -6,7 +6,6 @@ import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation'
 import {PALETTE} from '../../../styles/paletteV3'
-import {Threshold} from '../../../types/constEnums'
 import getTemplateList from '../../../utils/getTemplateList'
 import useTemplateDescription from '../../../utils/useTemplateDescription'
 import {PokerTemplateDetails_settings$key} from '../../../__generated__/PokerTemplateDetails_settings.graphql'
@@ -108,12 +107,10 @@ const PokerTemplateDetails = (props: Props) => {
   const lowestScope = getTemplateList(teamId, orgId, activeTemplate)
   const isOwner = activeTemplate.teamId === teamId
   const description = useTemplateDescription(lowestScope, activeTemplate, tier)
-  const templateCount = teamTemplates.length
   const atmosphere = useAtmosphere()
   const {onError, onCompleted, submitting, submitMutation} = useMutationProps()
-  const canClone = templateCount < Threshold.MAX_POKER_TEAM_TEMPLATES
   const onClone = () => {
-    if (submitting || !canClone) return
+    if (submitting) return
     submitMutation()
     AddPokerTemplateMutation(
       atmosphere,
@@ -145,7 +142,7 @@ const PokerTemplateDetails = (props: Props) => {
                 type='poker'
               />
             )}
-            {showClone && <CloneTemplate onClick={onClone} canClone={canClone} />}
+            {showClone && <CloneTemplate onClick={onClone} />}
           </FirstLine>
           <Description>{description}</Description>
         </TemplateHeader>
diff --git a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx b/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
index dec65509954..2d45402d52e 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
@@ -6,7 +6,6 @@ import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
 import {PALETTE} from '../../../styles/paletteV3'
-import {Threshold} from '../../../types/constEnums'
 import getTemplateList from '../../../utils/getTemplateList'
 import useTemplateDescription from '../../../utils/useTemplateDescription'
 import {ReflectTemplateDetails_settings$key} from '../../../__generated__/ReflectTemplateDetails_settings.graphql'
@@ -116,12 +115,10 @@ const ReflectTemplateDetails = (props: Props) => {
   const lowestScope = getTemplateList(teamId, orgId, activeTemplate)
   const isOwner = activeTemplate.teamId === teamId
   const description = useTemplateDescription(lowestScope, activeTemplate, tier)
-  const templateCount = teamTemplates.length
   const atmosphere = useAtmosphere()
   const {onError, onCompleted, submitting, submitMutation} = useMutationProps()
-  const canClone = templateCount < Threshold.MAX_RETRO_TEAM_TEMPLATES
   const onClone = () => {
-    if (submitting || !canClone) return
+    if (submitting) return
     submitMutation()
     AddReflectTemplateMutation(
       atmosphere,
@@ -153,7 +150,7 @@ const ReflectTemplateDetails = (props: Props) => {
                 type='retrospective'
               />
             )}
-            {showClone && <CloneTemplate onClick={onClone} canClone={canClone} />}
+            {showClone && <CloneTemplate onClick={onClone} />}
           </FirstLine>
           <Description>{description}</Description>
         </TemplateHeader>
diff --git a/packages/client/types/constEnums.ts b/packages/client/types/constEnums.ts
index fe42a13d6be..28bbd744b85 100644
--- a/packages/client/types/constEnums.ts
+++ b/packages/client/types/constEnums.ts
@@ -397,8 +397,6 @@ export const enum Threshold {
   MAX_POKER_TEMPLATE_SCALES = 12,
   MAX_POKER_SCALE_VALUES = 30,
   POKER_SCALE_VALUE_MAX_LENGTH = 3,
-  MAX_RETRO_TEAM_TEMPLATES = 20,
-  MAX_POKER_TEAM_TEMPLATES = 20,
   MAX_POKER_DIMENSION_NAME = 50,
   MAX_QUAL_AI_MEETINGS = 3,
   MAX_REACTJIS = 12,
diff --git a/packages/server/graphql/mutations/addPokerTemplate.ts b/packages/server/graphql/mutations/addPokerTemplate.ts
index ec470279865..3b4e6dbccc0 100644
--- a/packages/server/graphql/mutations/addPokerTemplate.ts
+++ b/packages/server/graphql/mutations/addPokerTemplate.ts
@@ -1,5 +1,5 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
-import {SprintPokerDefaults, SubscriptionChannel, Threshold} from 'parabol-client/types/constEnums'
+import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
 import PokerTemplate from '../../database/types/PokerTemplate'
 import TemplateDimension from '../../database/types/TemplateDimension'
@@ -45,9 +45,6 @@ const addPokerTemplate = {
       dataLoader.get('teams').load(teamId),
       dataLoader.get('users').loadNonNull(viewerId)
     ])
-    if (allTemplates.length >= Threshold.MAX_RETRO_TEAM_TEMPLATES) {
-      return standardError(new Error('Too many templates'), {userId: viewerId})
-    }
 
     if (!viewerTeam) {
       return standardError(new Error('Team not found'), {userId: viewerId})
diff --git a/packages/server/graphql/mutations/addReflectTemplate.ts b/packages/server/graphql/mutations/addReflectTemplate.ts
index 46c91713490..d4c3825338a 100644
--- a/packages/server/graphql/mutations/addReflectTemplate.ts
+++ b/packages/server/graphql/mutations/addReflectTemplate.ts
@@ -1,5 +1,5 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
-import {SubscriptionChannel, Threshold} from 'parabol-client/types/constEnums'
+import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import {PALETTE} from '../../../client/styles/paletteV3'
 import getRethink from '../../database/rethinkDriver'
 import ReflectTemplate from '../../database/types/ReflectTemplate'
@@ -47,9 +47,6 @@ const addReflectTemplate = {
       dataLoader.get('users').loadNonNull(viewerId)
     ])
 
-    if (allTemplates.length >= Threshold.MAX_RETRO_TEAM_TEMPLATES) {
-      return standardError(new Error('Too many templates'), {userId: viewerId})
-    }
     if (!viewerTeam) {
       return standardError(new Error('Team not found'), {userId: viewerId})
     }

From 02dc6fa6e4687021bb46a6774eb5f0be859e4d3f Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 20 Feb 2024 10:56:57 +0100
Subject: [PATCH 004/183] feat: Add Google calendar meeting series for
 recurrence (#9380)

* feat: Add recurrence to GCal events

* Fun with timezones
---
 .../mutations/helpers/createGcalEvent.ts      | 80 ++++++++++++++++---
 .../public/mutations/startRetrospective.ts    | 18 ++++-
 .../mutations/updateRecurrenceSettings.ts     | 26 ++++++
 packages/server/package.json                  |  1 +
 ...06021181176_addGCalEventToMeetingSeries.ts | 22 +++++
 yarn.lock                                     |  8 +-
 6 files changed, 141 insertions(+), 14 deletions(-)
 create mode 100644 packages/server/postgres/migrations/1706021181176_addGCalEventToMeetingSeries.ts

diff --git a/packages/server/graphql/mutations/helpers/createGcalEvent.ts b/packages/server/graphql/mutations/helpers/createGcalEvent.ts
index 6e936a13cab..4382ca7dedd 100644
--- a/packages/server/graphql/mutations/helpers/createGcalEvent.ts
+++ b/packages/server/graphql/mutations/helpers/createGcalEvent.ts
@@ -3,23 +3,41 @@ import makeAppURL from 'parabol-client/utils/makeAppURL'
 import appOrigin from '../../../appOrigin'
 import {DataLoaderWorker} from '../../graphql'
 import standardError from '../../../utils/standardError'
-import {CreateGcalEventInput} from '../../public/resolverTypes'
+import {CreateGcalEventInput, StandardMutationError} from '../../public/resolverTypes'
+import {RRule} from 'rrule'
+import {pick} from 'lodash'
 
 const emailRemindMinsBeforeMeeting = 24 * 60
 const popupRemindMinsBeforeMeeting = 10
 
+const convertRruleToGcal = (rrule: RRule | null | undefined) => {
+  if (!rrule) {
+    return []
+  }
+
+  // Google does not allow for all fields in rrule. For example DTSTART and DTEND are not allowed.
+  // It also has trouble with BYHOUR, BYMINUTE, and BYSECOND. It's best to stick to fields known to work.
+  // Also strip TZID as google wants the UNTIL field in Z, but rrule only uses that if no TZID is present.
+  const options = pick(rrule.options, 'freq', 'interval', 'byweekday', 'until', 'count')
+  const gcalRule = new RRule(options)
+  return [gcalRule.toString()]
+}
+
 type Input = {
   gcalInput?: CreateGcalEventInput | null
   meetingId: string
   viewerId: string
   teamId: string
+  rrule?: RRule | null
   dataLoader: DataLoaderWorker
 }
 
-const createGcalEvent = async (input: Input) => {
-  const {gcalInput, meetingId, viewerId, dataLoader, teamId} = input
+const createGcalEvent = async (
+  input: Input
+): Promise<{gcalSeriesId?: string; error?: StandardMutationError}> => {
+  const {gcalInput, meetingId, viewerId, dataLoader, teamId, rrule} = input
   if (!gcalInput) {
-    return {error: null}
+    return {}
   }
 
   const {startTimestamp, endTimestamp, title, timeZone, invitees, videoType} = gcalInput
@@ -57,8 +75,9 @@ const createGcalEvent = async (input: Input) => {
           }
         }
       : undefined
+  const recurrence = convertRruleToGcal(rrule)
 
-  const event = {
+  const eventInput = {
     summary: title,
     description,
     start: {
@@ -69,6 +88,7 @@ const createGcalEvent = async (input: Input) => {
       dateTime: endDateTime,
       timeZone
     },
+    recurrence,
     attendees: attendeesWithEmailObjects,
     reminders: {
       useDefault: false,
@@ -81,17 +101,59 @@ const createGcalEvent = async (input: Input) => {
   }
 
   try {
-    await calendar.events.insert({
+    const event = await calendar.events.insert({
       calendarId: 'primary',
-      requestBody: event,
+      requestBody: eventInput,
       conferenceDataVersion: 1
     })
+    return {gcalSeriesId: event.data.id ?? undefined}
   } catch (err) {
     const error = err instanceof Error ? err : new Error('Unable to create event in gcal')
     return standardError(error, {userId: viewerId})
   }
-  return {
-    error: null
+}
+
+export type UpdateGcalSeriesInput = {
+  gcalSeriesId: string
+  title?: string
+  rrule: RRule | null
+  userId: string
+  teamId: string
+  dataLoader: DataLoaderWorker
+}
+export const updateGcalSeries = async (input: UpdateGcalSeriesInput) => {
+  const {gcalSeriesId, title, rrule, userId, teamId, dataLoader} = input
+
+  const gcalAuth = await dataLoader.get('freshGcalAuth').load({teamId, userId})
+  if (!gcalAuth) {
+    return standardError(new Error('Could not retrieve Google Calendar auth'), {userId})
+  }
+  const {accessToken: access_token, refreshToken: refresh_token, expiresAt} = gcalAuth
+  const CLIENT_ID = process.env.GOOGLE_OAUTH_CLIENT_ID
+  const CLIENT_SECRET = process.env.GOOGLE_OAUTH_CLIENT_SECRET
+  const REDIRECT_URI = appOrigin
+
+  const expiry_date = expiresAt ? expiresAt.getTime() : undefined
+
+  const oauth2Client = new google.auth.OAuth2(CLIENT_ID, CLIENT_SECRET, REDIRECT_URI)
+  oauth2Client.setCredentials({access_token, refresh_token, expiry_date})
+  const calendar = google.calendar({version: 'v3', auth: oauth2Client})
+  const recurrence = convertRruleToGcal(rrule)
+
+  try {
+    const event = await calendar.events.patch({
+      calendarId: 'primary',
+      eventId: gcalSeriesId,
+      requestBody: {
+        recurrence,
+        summary: title
+      },
+      conferenceDataVersion: 1
+    })
+    return {gcalSeriesId: event.data.id ?? undefined}
+  } catch (err) {
+    const error = err instanceof Error ? err : new Error('Unable to create event in gcal')
+    return standardError(error, {userId})
   }
 }
 
diff --git a/packages/server/graphql/public/mutations/startRetrospective.ts b/packages/server/graphql/public/mutations/startRetrospective.ts
index 29583f3d755..266664368c1 100644
--- a/packages/server/graphql/public/mutations/startRetrospective.ts
+++ b/packages/server/graphql/public/mutations/startRetrospective.ts
@@ -16,6 +16,7 @@ import {IntegrationNotifier} from '../../mutations/helpers/notifications/Integra
 import {startNewMeetingSeries} from './updateRecurrenceSettings'
 import safeCreateRetrospective from '../../mutations/helpers/safeCreateRetrospective'
 import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle'
+import getKysely from '../../../postgres/getKysely'
 
 const startRetrospective: MutationResolvers['startRetrospective'] = async (
   _source,
@@ -118,7 +119,22 @@ const startRetrospective: MutationResolvers['startRetrospective'] = async (
   }
   IntegrationNotifier.startMeeting(dataLoader, meetingId, teamId)
   analytics.meetingStarted(viewer, meeting, template)
-  const {error} = await createGcalEvent({gcalInput, meetingId, teamId, viewerId, dataLoader})
+  const {error, gcalSeriesId} = await createGcalEvent({
+    gcalInput,
+    meetingId,
+    teamId,
+    viewerId,
+    rrule: recurrenceSettings?.rrule,
+    dataLoader
+  })
+  if (meetingSeries && gcalSeriesId) {
+    const pg = getKysely()
+    await pg
+      .updateTable('MeetingSeries')
+      .set({gcalSeriesId})
+      .where('id', '=', meetingSeries.id)
+      .execute()
+  }
   const data = {teamId, meetingId, hasGcalError: !!error?.message}
   publish(SubscriptionChannel.TEAM, teamId, 'StartRetrospectiveSuccess', data, subOptions)
   return data
diff --git a/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts b/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts
index 335e08a1e84..daee90b7d61 100644
--- a/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts
+++ b/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts
@@ -12,6 +12,7 @@ import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
 import {MutationResolvers} from '../resolverTypes'
 import {MeetingTypeEnum} from '../../../postgres/types/Meeting'
+import {updateGcalSeries} from '../../mutations/helpers/createGcalEvent'
 
 export const startNewMeetingSeries = async (
   meeting: {
@@ -111,6 +112,16 @@ const stopMeetingSeries = async (meetingSeries: MeetingSeries) => {
     .run()
 }
 
+const updateGCalRecurrenceRule = (oldRule: RRule, newRule: RRule | null | undefined) => {
+  if (!newRule) {
+    return new RRule({
+      ...oldRule.options,
+      until: new Date()
+    })
+  }
+  return newRule
+}
+
 const updateRecurrenceSettings: MutationResolvers['updateRecurrenceSettings'] = async (
   _source,
   {meetingId, recurrenceSettings},
@@ -138,6 +149,7 @@ const updateRecurrenceSettings: MutationResolvers['updateRecurrenceSettings'] =
 
   if (meeting.meetingSeriesId) {
     const meetingSeries = await dataLoader.get('meetingSeries').loadNonNull(meeting.meetingSeriesId)
+    const {gcalSeriesId, teamId, facilitatorId, recurrenceRule} = meetingSeries
 
     if (!recurrenceSettings.rrule) {
       await stopMeetingSeries(meetingSeries)
@@ -146,6 +158,20 @@ const updateRecurrenceSettings: MutationResolvers['updateRecurrenceSettings'] =
       await updateMeetingSeries(meetingSeries, recurrenceSettings.rrule)
       analytics.recurrenceStarted(viewer, meetingSeries)
     }
+    if (gcalSeriesId) {
+      const rrule = updateGCalRecurrenceRule(
+        RRule.fromString(recurrenceRule),
+        recurrenceSettings.rrule
+      )
+      await updateGcalSeries({
+        gcalSeriesId,
+        title: recurrenceSettings.name ?? undefined,
+        rrule,
+        teamId,
+        userId: facilitatorId,
+        dataLoader
+      })
+    }
 
     if (recurrenceSettings.name) {
       await updateMeetingSeriesQuery({title: recurrenceSettings.name}, meetingSeries.id)
diff --git a/packages/server/package.json b/packages/server/package.json
index ddd4076d65c..1fdd28cfd74 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -112,6 +112,7 @@
     "ioredis": "^5.2.3",
     "jsdom": "^20.0.0",
     "jsonwebtoken": "^9.0.0",
+    "lodash.pick": "^4.4.0",
     "mailcomposer": "^4.0.1",
     "mailgun.js": "^9.3.0",
     "mime-types": "^2.1.16",
diff --git a/packages/server/postgres/migrations/1706021181176_addGCalEventToMeetingSeries.ts b/packages/server/postgres/migrations/1706021181176_addGCalEventToMeetingSeries.ts
new file mode 100644
index 00000000000..919dda62a87
--- /dev/null
+++ b/packages/server/postgres/migrations/1706021181176_addGCalEventToMeetingSeries.ts
@@ -0,0 +1,22 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    ALTER TABLE "MeetingSeries"
+      ADD COLUMN IF NOT EXISTS "gcalSeriesId" VARCHAR(100);
+  `)
+  await client.end()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    ALTER TABLE "MeetingSeries"
+      DROP COLUMN IF EXISTS "gcalSeriesId";
+  `)
+  await client.end()
+}
diff --git a/yarn.lock b/yarn.lock
index 50e12881143..c08a4168a24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9012,9 +9012,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@~1.0.0:
-  version "1.0.30001584"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001584.tgz#5e3ea0625d048d5467670051687655b1f7bf7dfd"
-  integrity sha512-LOz7CCQ9M1G7OjJOF9/mzmqmj3jE/7VOmrfw6Mgs0E8cjOsbRXQJHsPBfmBOXDskXKrHLyyW3n7kpDW/4BsfpQ==
+  version "1.0.30001587"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz#a0bce920155fa56a1885a69c74e1163fc34b4881"
+  integrity sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -14573,7 +14573,7 @@ lodash.mergewith@4.6.2:
 lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-  integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
+  integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==
 
 lodash.setwith@^4.3.2:
   version "4.3.2"

From b0b76f9f45789f60b55243f78eba7b656c751658 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 20 Feb 2024 10:57:18 +0100
Subject: [PATCH 005/183] fix: Increase the number of projects fetched per
 request from Atlassian (#9435)

We ran into timeouts in `getAllProjects`, presumably because we're doing
too many roundtrips. As a quick fix, increse the number of projects
fetched per request from 50 to 500.
---
 packages/server/utils/AtlassianServerManager.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/utils/AtlassianServerManager.ts b/packages/server/utils/AtlassianServerManager.ts
index d3ed48c166a..dcc29a4a3b9 100644
--- a/packages/server/utils/AtlassianServerManager.ts
+++ b/packages/server/utils/AtlassianServerManager.ts
@@ -387,6 +387,7 @@ class AtlassianServerManager extends AtlassianManager {
         }))
         projects.push(...pagedProjects)
         if (res.nextPage) {
+          log('AtlassianServerManager.getAllProjects fetching more results', res.total)
           return getProjectPage(cloudId, res.nextPage)
         }
       }
@@ -395,7 +396,7 @@ class AtlassianServerManager extends AtlassianManager {
       cloudIds.map((cloudId) =>
         getProjectPage(
           cloudId,
-          `https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/project/search?orderBy=name`
+          `https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/project/search?orderBy=name&maxResults=500`
         )
       )
     )

From c2a31e6b8ef2c4f4d375323f8afbef6874024593 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 10:33:32 -0800
Subject: [PATCH 006/183] chore(deps): bump ip from 1.1.8 to 1.1.9 (#9442)

Bumps [ip](https://github.com/indutny/node-ip) from 1.1.8 to 1.1.9.
- [Commits](https://github.com/indutny/node-ip/compare/v1.1.8...v1.1.9)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c08a4168a24..99d793dc367 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12892,14 +12892,14 @@ ioredis@^5.2.3:
     standard-as-callback "^2.1.0"
 
 ip@^1.1.5, ip@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
-  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396"
+  integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==
 
 ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105"
+  integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

From e4a831ad5e76a16c930ffee7ffe412577040a894 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 17:51:53 +0100
Subject: [PATCH 007/183] chore(release): release v7.17.0 (#9428)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 20 ++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 2dcd7403b8b..0fb11cbd996 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.16.0"
+  ".": "7.17.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3de62f10fbe..fd68e143309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,26 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.17.0](https://github.com/ParabolInc/parabol/compare/v7.16.0...v7.17.0) (2024-02-21)
+
+
+### Added
+
+* Add Google calendar meeting series for recurrence ([#9380](https://github.com/ParabolInc/parabol/issues/9380)) ([02dc6fa](https://github.com/ParabolInc/parabol/commit/02dc6fa6e4687021bb46a6774eb5f0be859e4d3f))
+* remove team template limit ([#9424](https://github.com/ParabolInc/parabol/issues/9424)) ([f042628](https://github.com/ParabolInc/parabol/commit/f042628fef5bbdbf566c49bab729f5b9dec058f1))
+
+
+### Fixed
+
+* Increase the number of projects fetched per request from Atlassian ([#9435](https://github.com/ParabolInc/parabol/issues/9435)) ([b0b76f9](https://github.com/ParabolInc/parabol/commit/b0b76f9f45789f60b55243f78eba7b656c751658))
+
+
+### Changed
+
+* **deps:** bump ip from 1.1.8 to 1.1.9 ([#9442](https://github.com/ParabolInc/parabol/issues/9442)) ([c2a31e6](https://github.com/ParabolInc/parabol/commit/c2a31e6b8ef2c4f4d375323f8afbef6874024593))
+* **env vars:** Stripe vars moved to the Integrations section ([#9427](https://github.com/ParabolInc/parabol/issues/9427)) ([a0af0c1](https://github.com/ParabolInc/parabol/commit/a0af0c1230a1dbc93a28977d6d61180319220c88))
+* fix misleading `isLead` field name on `Team` ([#9413](https://github.com/ParabolInc/parabol/issues/9413)) ([c0a2fdf](https://github.com/ParabolInc/parabol/commit/c0a2fdf8fb3deaa34f7935ae8a87d30f43381ecd))
+
 ## [7.16.0](https://github.com/ParabolInc/parabol/compare/v7.15.2...v7.16.0) (2024-02-14)
 
 
diff --git a/package.json b/package.json
index cc585b841d9..edde1656431 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 1bc7dbf47ef..5295ced9dd0 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.16.0"
+    "parabol-server": "7.17.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 2f4c9cec77d..9faef2216e4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 519e5f91834..1675bcaf5ea 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.16.0",
-    "parabol-server": "7.16.0",
+    "parabol-client": "7.17.0",
+    "parabol-server": "7.17.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 90e1da55dfc..0190f526ea8 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 1fdd28cfd74..c1bde9cbe3f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.16.0",
+    "parabol-client": "7.17.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 61ba015c8310a72b7e89c64be081cd2f399fc721 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Thu, 22 Feb 2024 22:52:30 +0000
Subject: [PATCH 008/183] feat(standalone-deployment): Standalone host
 deployment improved and documented (#9445)

* Docker compose stack improved

* Remove unused containers from docker-compse and add useful comment on .env.example about PGSSLMODE

* Docker compose profiles added. Documentation extended on how to use the profiles to manage the stack.

* README fixed as docker compose up and down commands were not working

* Typo fixed and docker-compose command replaced by docker compose
---
 .../parabol-ubi/docker-host-st/.env.example   |   1 +
 docker/parabol-ubi/docker-host-st/README.md   |  33 +++-
 .../docker-host-st/docker-compose.yaml        | 156 +++++++++++++++---
 .../parabol-ubi/docker-host-st/postgres.conf  |   1 -
 4 files changed, 166 insertions(+), 25 deletions(-)
 delete mode 100644 docker/parabol-ubi/docker-host-st/postgres.conf

diff --git a/docker/parabol-ubi/docker-host-st/.env.example b/docker/parabol-ubi/docker-host-st/.env.example
index 82c7b2b7e29..9eadf7108e5 100644
--- a/docker/parabol-ubi/docker-host-st/.env.example
+++ b/docker/parabol-ubi/docker-host-st/.env.example
@@ -1 +1,2 @@
 # See https://github.com/ParabolInc/parabol/blob/master/.env.example
+# DO NOT SET PGSSLMODE to an empty value. Postgres will not be able to start.
diff --git a/docker/parabol-ubi/docker-host-st/README.md b/docker/parabol-ubi/docker-host-st/README.md
index c743187aa1d..af3a0b244ec 100644
--- a/docker/parabol-ubi/docker-host-st/README.md
+++ b/docker/parabol-ubi/docker-host-st/README.md
@@ -1,15 +1,42 @@
 # Docker Host Single Tenant (ST)
 
-To run the Parabol UBI in single tenant mode (e.g. simple docker-compose on a docker host).
+To run Parabol in single tenant mode (e.g. simple docker-compose on a docker host).
 
 1. Build your Parabol UBI using instructions in `docker/ubi/docker-build/README.md`
 2. Create a working `.env` from `.env.example`
 3. Update docker-compose.yaml `image: #image:tag` with your built image tag from `step (1.)`
-4. Run `docker-compose up -d` to deploy the local stack. You can run `docker-compose down` to terminate the local stack
-5. Check logs via command `docker logs <name>-app-1` and wait for the following output to appear
+4. Run `docker compose --profile databases --profile parabol up -d` to deploy the local stack. You can run `docker compose --profile databases --profile parabol down` to terminate the local stack
+5. Check logs via command `docker logs <name> -f` and wait for the following output to appear
 
 ```shell
 🔥🔥🔥 Server ID: 0. Ready for Sockets: Port 3000 🔥🔥🔥
 💧💧💧 Server ID: 0. Ready for GraphQL Execution 💧💧💧
 💧💧💧 Server ID: 01. Ready for GraphQL Execution 💧💧💧
 ```
+
+## Upgrade Parabol version
+
+1. Edit the `docker-compose.yaml` and change the `#image:tag` changing the tag. Ex: from `v7.15.0` to `v7.15.2`.
+2. (optional) In a different terminal, run `docker compose logs -f` to follow the upgrade.
+3. Run `docker compose --profile databases --profile parabol up -d`. It will start the `pre-deploy` and, once it is done successfully, then it will stop and recreate the `web-server` and `gql-executor` with the new version of the image. **This step implies a downtime**.
+4. Verify the application is still up and running.
+
+## Running Chronos
+
+Chronos isn't started by default. If it needs to run, it must be managed using `docker compose --profile databases --profile parabol --profile chronos up`.
+
+This will run `pre-deploy` and thus it will recreate the `web-server` and the `gql-executor`.
+
+## Database debug
+
+Some tools are available to debug the databases is needed:
+
+- pgadmin
+- redis-commander
+
+To operate them use `docker compose up --profile databases --profile database-debug`.
+
+## Running the whole stack
+
+- Start the whole stack: `docker compose --profile databases --profile parabol --profile database-debug --profile chronos up -d`.
+- Stop the stack: `docker compose --profile databases --profile parabol --profile database-debug --profile chronos down`
diff --git a/docker/parabol-ubi/docker-host-st/docker-compose.yaml b/docker/parabol-ubi/docker-host-st/docker-compose.yaml
index c7ff752a95b..52bb8c76a7d 100644
--- a/docker/parabol-ubi/docker-host-st/docker-compose.yaml
+++ b/docker/parabol-ubi/docker-host-st/docker-compose.yaml
@@ -1,51 +1,165 @@
-version: '3.7'
+version: '3.9'
 
 services:
-  db:
-    image: rethinkdb:latest
+  postgres:
+    container_name: postgres
+    profiles: ["databases"]
+    image: postgres:15.4
+    restart: always
+    env_file: .env
+    environment:
+      - PGUSER=$POSTGRES_USER
+    ports:
+      - '5432:5432'
+    volumes:
+      - './data/postgres/pgdata:/var/lib/postgresql/data'
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready", "-d", "$POSTGRES_DB", "-U", "$POSTGRES_USER"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - parabol-network
+  pgadmin:
+    profiles: ["database-debug"]
+    container_name: pgadmin
+    image: dpage/pgadmin4:8.3
+    depends_on:
+      postgres:
+        condition: service_healthy
+    env_file: .env
+    ports:
+      - "5050:80"
+    networks:
+      - parabol-network
+  rethinkdb:
+    container_name: rethinkdb
+    profiles: ["databases"]
+    image: rethinkdb:2.4.2
     restart: always
     ports:
       - '8080:8080'
       - '29015:29015'
       - '28015:28015'
     volumes:
-      - ./rethink-data:/data
+      - ./data/rethink:/data
     networks:
       - parabol-network
-  postgres:
-    image: postgres:15.4
+  redis:
+    container_name: redis
+    profiles: ["databases"]
+    image: redis:7.0-alpine
+    healthcheck:
+      test: "[ $$(redis-cli ping) = 'PONG' ]"
+      interval: 10s
+      timeout: 5s
+      retries: 5
     restart: always
-    env_file: .env
     ports:
-      - '5432:5432'
+      - '6379:6379'
     volumes:
-      - './postgres.conf:/usr/local/etc/postgres/postgres.conf'
-      - './postgres-data/pgdata:/var/lib/postgresql/data'
-    command: 'postgres -c config_file=/usr/local/etc/postgres/postgres.conf'
+      - ./data/redis:/data
     networks:
       - parabol-network
-  redis:
-    image: redis
+  redis-commander:
+    profiles: ["database-debug"]
+    container_name: redis-commander
+    image: ghcr.io/joeferner/redis-commander:0.8.1
+    depends_on:
+      redis:
+        condition: service_healthy
     restart: always
+    environment:
+      - REDIS_HOSTS=local:redis:6379
     ports:
-      - '6379:6379'
+      - "8081:8081"
+    networks:
+      - parabol-network
+  pre-deploy:
+    container_name: pre-deploy
+    profiles: ["parabol"]
+    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
+    command: bash -c "node dist/preDeploy.js"
+    env_file: .env
+    environment:
+      - SERVER_ID=0
     volumes:
-      - ./redis-data:/data
+      - './.env:/parabol/.env'
+    depends_on:
+      rethinkdb:
+        condition: service_started
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     networks:
       - parabol-network
-  app:
-    image: #image:tag
+  chronos:
+    container_name: chronos
+    profiles: ["chronos"]
+    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
     restart: always
+    command: bash -c "node dist/chronos.js"
     env_file: .env
-    command: bash -c "yarn predeploy && NODE_ENV=production && yarn start"
+    environment:
+      - SERVER_ID=1
+    volumes:
+      - './.env:/parabol/.env'
+    depends_on:
+      pre-deploy:
+        condition: service_completed_successfully
+      rethinkdb:
+        condition: service_started
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - parabol-network
+  web-server:
+    container_name: web-server
+    profiles: ["parabol"]
+    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
+    restart: always
+    command: bash -c "node dist/web.js"
+    env_file: .env
+    environment:
+      - SERVER_ID=5
     ports:
       - '3000:3000'
     volumes:
       - './.env:/parabol/.env'
     depends_on:
-      - db
-      - redis
-      - postgres
+      pre-deploy:
+        condition: service_completed_successfully
+      rethinkdb:
+        condition: service_started
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    networks:
+      - parabol-network
+  gql-executor:
+    container_name: gql-executor
+    profiles: ["parabol"]
+    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
+    restart: always
+    command: bash -c "node dist/gqlExecutor.js"
+    env_file: .env
+    environment:
+      - SERVER_ID=10
+    volumes:
+      - './.env:/parabol/.env'
+    depends_on:
+      pre-deploy:
+        condition: service_completed_successfully
+      rethinkdb:
+        condition: service_started
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     networks:
       - parabol-network
 networks:
diff --git a/docker/parabol-ubi/docker-host-st/postgres.conf b/docker/parabol-ubi/docker-host-st/postgres.conf
deleted file mode 100644
index 3357fd28574..00000000000
--- a/docker/parabol-ubi/docker-host-st/postgres.conf
+++ /dev/null
@@ -1 +0,0 @@
-listen_addresses='*'
\ No newline at end of file

From 92ab5be298ceb19ca8718c67a0c9da8728b6b0bf Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 26 Feb 2024 12:23:28 -0800
Subject: [PATCH 009/183] feat: support env-defined saml issuer for PPMIs
 (#9455)

* feat: support env-defined saml issuer for PPMIs

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* feat: support single SAML for entire tenant

Signed-off-by: Matt Krick <matt.krick@gmail.com>

---------

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .env.example                                  |  2 ++
 .../SAMLHelpers/getURLWithSAMLRequestParam.ts |  3 ++-
 packages/server/utils/getSAMLURLFromEmail.ts  | 20 +++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 88cdde703de..25c9a9c856e 100644
--- a/.env.example
+++ b/.env.example
@@ -14,6 +14,8 @@ SOCKET_PORT='3001'
 # INVITATION_SHORTLINK='example.com'
 # If true, all new orgs will default to being enterprise tier. Use for PPMIs
 # IS_ENTERPRISE=false
+# PPMI single tenant use only. Will set the SAML issuer to this value.
+# SAML_ISSUER=''
 
 # AUTHENTICATION
 # AUTH_INTERNAL_DISABLED='false'
diff --git a/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts b/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts
index bf80ce33ac4..d3fa3b7e98f 100644
--- a/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts
+++ b/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts
@@ -2,13 +2,14 @@ import {v4 as uuid} from 'uuid'
 import zlib from 'zlib'
 
 const getURLWithSAMLRequestParam = (destination: string, slug: string) => {
+  const issuer = process.env.SAML_ISSUER || `https://${process.env.HOST}/saml-metadata/${slug}`
   const template = `
   <samlp:AuthnRequest
       xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
       xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="_${uuid()}" Version="2.0" IssueInstant="${new Date().toISOString()}" Destination="${destination}" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" AssertionConsumerServiceURL="https://${
     process.env.HOST
   }/saml/${slug}">
-  <saml:Issuer>https://${process.env.HOST}/saml-metadata/${slug}</saml:Issuer>
+  <saml:Issuer>${issuer}</saml:Issuer>
       <samlp:NameIDPolicy Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" AllowCreate="false"/>
   </samlp:AuthnRequest>
   `
diff --git a/packages/server/utils/getSAMLURLFromEmail.ts b/packages/server/utils/getSAMLURLFromEmail.ts
index a2e3fc65e11..2c07d74a06d 100644
--- a/packages/server/utils/getSAMLURLFromEmail.ts
+++ b/packages/server/utils/getSAMLURLFromEmail.ts
@@ -2,6 +2,13 @@ import base64url from 'base64url'
 import getSSODomainFromEmail from 'parabol-client/utils/getSSODomainFromEmail'
 import {URL} from 'url'
 import {DataLoaderWorker} from '../graphql/graphql'
+import getKysely from '../postgres/getKysely'
+
+const isSingleTenantSSO =
+  process.env.AUTH_INTERNAL_DISABLED === 'true' &&
+  process.env.AUTH_GOOGLE_DISABLED === 'true' &&
+  process.env.AUTH_MICROSOFT_DISABLED === 'true' &&
+  process.env.AUTH_SSO_DISABLED === 'false'
 
 const urlWithRelayState = (url: string, isInvited?: boolean | null) => {
   if (!isInvited) return url
@@ -18,6 +25,19 @@ const getSAMLURLFromEmail = async (
 ) => {
   const domainName = getSSODomainFromEmail(email)
   if (!domainName) return null
+  if (isSingleTenantSSO) {
+    // For PPMI use
+    const pg = getKysely()
+    const instanceURLres = await pg
+      .selectFrom('SAML')
+      .select('url')
+      .where('url', 'is not', null)
+      .limit(1)
+      .executeTakeFirst()
+    const instanceURL = instanceURLres?.url
+    if (!instanceURL) return null
+    return urlWithRelayState(instanceURL, isInvited)
+  }
   const saml = await dataLoader.get('samlByDomain').load(domainName)
   if (!saml) return null
   const {url} = saml

From c77925b1c0e07afc428022008143b8b7f4002280 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 27 Feb 2024 11:09:26 +0100
Subject: [PATCH 010/183] chore: Associate logs with traces (#9444)

* chore: Associate logs with traces

Add trace information to log output for server side log statements. This
does not include logging from code exclusively used for debugging,
deploying or development.

* Actually add the logger

* Fix DD_LOGS_INJECTION check
---
 .../server/billing/helpers/adjustUserCount.ts |  3 +-
 .../billing/helpers/terminateSubscription.ts  |  3 +-
 .../server/dataloader/azureDevOpsLoaders.ts   | 15 ++++----
 packages/server/fileStorage/GCSManager.ts     |  3 +-
 .../server/graphql/mutations/endCheckIn.ts    |  3 +-
 .../graphql/mutations/endSprintPoker.ts       |  3 +-
 .../helpers/activatePrevSlackAuth.ts          |  3 +-
 .../mutations/helpers/generateGroups.ts       |  5 +--
 .../mutations/helpers/getCCFromCustomer.ts    |  3 +-
 .../mutations/helpers/removeFromOrg.ts        |  3 +-
 .../helpers/resolveDowngradeToStarter.ts      |  3 +-
 .../mutations/helpers/safeEndRetrospective.ts |  3 +-
 .../mutations/helpers/safeEndTeamPrompt.ts    |  3 +-
 .../server/graphql/mutations/moveTeamToOrg.ts |  3 +-
 .../graphql/mutations/navigateMeeting.ts      |  3 +-
 .../graphql/mutations/selectTemplate.ts       |  3 +-
 .../updateAzureDevOpsDimensionField.ts        |  5 +--
 .../mutations/updateGitHubDimensionField.ts   |  3 +-
 .../private/mutations/autopauseUsers.ts       |  3 +-
 .../private/mutations/connectSocket.ts        |  3 +-
 .../private/mutations/runScheduledJobs.ts     |  7 ++--
 .../mutations/acceptRequestToJoinDomain.ts    |  3 +-
 .../mutations/updateGitLabDimensionField.ts   |  3 +-
 .../graphql/public/types/TeamHealthStage.ts   |  3 +-
 .../queries/helpers/fetchGitHubRepos.ts       |  3 +-
 .../queries/helpers/fetchGitLabProjects.ts    |  3 +-
 .../server/graphql/types/NewMeetingStage.ts   |  3 +-
 packages/server/graphql/types/PokerMeeting.ts |  3 +-
 .../upsertAzureDevOpsDimensionFieldMap.ts     |  3 +-
 .../safeMutations/acceptTeamInvitation.ts     |  3 +-
 packages/server/safetyPatchRes.ts             | 17 ++++-----
 .../server/utils/AtlassianServerManager.ts    | 28 +++------------
 packages/server/utils/Logger.ts               | 35 +++++++++++++++++++
 packages/server/utils/OpenAIServerManager.ts  |  5 +--
 .../server/utils/RecallAIServerManager.ts     |  3 +-
 packages/server/utils/StaticServer.ts         |  3 +-
 packages/server/utils/publish.ts              |  3 +-
 packages/server/utils/stripe/StripeManager.ts |  3 +-
 38 files changed, 130 insertions(+), 77 deletions(-)
 create mode 100644 packages/server/utils/Logger.ts

diff --git a/packages/server/billing/helpers/adjustUserCount.ts b/packages/server/billing/helpers/adjustUserCount.ts
index b7cf07df1a5..15c440c2834 100644
--- a/packages/server/billing/helpers/adjustUserCount.ts
+++ b/packages/server/billing/helpers/adjustUserCount.ts
@@ -14,6 +14,7 @@ import handleEnterpriseOrgQuantityChanges from './handleEnterpriseOrgQuantityCha
 import handleTeamOrgQuantityChanges from './handleTeamOrgQuantityChanges'
 import {getUserById} from '../../postgres/queries/getUsersByIds'
 import {DataLoaderWorker} from '../../graphql/graphql'
+import {Logger} from '../../utils/Logger'
 
 const maybeUpdateOrganizationActiveDomain = async (
   orgId: string,
@@ -170,5 +171,5 @@ export default async function adjustUserCount(
     .run()
 
   handleEnterpriseOrgQuantityChanges(paidOrgs, dataLoader).catch()
-  handleTeamOrgQuantityChanges(paidOrgs).catch(console.error)
+  handleTeamOrgQuantityChanges(paidOrgs).catch(Logger.error)
 }
diff --git a/packages/server/billing/helpers/terminateSubscription.ts b/packages/server/billing/helpers/terminateSubscription.ts
index b5fdd8a8070..0b1c6d3f4c5 100644
--- a/packages/server/billing/helpers/terminateSubscription.ts
+++ b/packages/server/billing/helpers/terminateSubscription.ts
@@ -1,5 +1,6 @@
 import getRethink from '../../database/rethinkDriver'
 import Organization from '../../database/types/Organization'
+import {Logger} from '../../utils/Logger'
 import {getStripeManager} from '../../utils/stripe'
 
 const terminateSubscription = async (orgId: string) => {
@@ -30,7 +31,7 @@ const terminateSubscription = async (orgId: string) => {
     try {
       await manager.deleteSubscription(stripeSubscriptionId)
     } catch (e) {
-      console.error(`cannot delete subscription ${stripeSubscriptionId}`, e)
+      Logger.error(`cannot delete subscription ${stripeSubscriptionId}`, e)
     }
   }
   return stripeSubscriptionId
diff --git a/packages/server/dataloader/azureDevOpsLoaders.ts b/packages/server/dataloader/azureDevOpsLoaders.ts
index 2c9a2b4617f..7892bce6f13 100644
--- a/packages/server/dataloader/azureDevOpsLoaders.ts
+++ b/packages/server/dataloader/azureDevOpsLoaders.ts
@@ -13,6 +13,7 @@ import AzureDevOpsServerManager, {
   TeamProjectReference,
   WorkItem
 } from '../utils/AzureDevOpsServerManager'
+import {Logger} from '../utils/Logger'
 import sendToSentry from '../utils/sendToSentry'
 import RootDataLoader from './RootDataLoader'
 
@@ -215,7 +216,7 @@ export const azureDevOpsAllWorkItems = (
 
           const {error, workItems} = restResult
           if (error !== undefined || workItems === undefined) {
-            console.log(error)
+            Logger.log(error)
             return [] as AzureDevOpsWorkItem[]
           }
 
@@ -264,7 +265,7 @@ export const azureDevUserInfo = (
           const restResult = await manager.getMe()
           const {error, azureDevOpsUser} = restResult
           if (error !== undefined || azureDevOpsUser === undefined) {
-            console.log(error)
+            Logger.log(error)
             return undefined
           }
           return {
@@ -303,7 +304,7 @@ export const allAzureDevOpsAccessibleOrgs = (
           const results = await manager.getAccessibleOrgs(id)
           const {error, accessibleOrgs} = results
           // handle error if defined
-          console.log(error)
+          Logger.log(error)
           return accessibleOrgs.map((resource) => ({
             ...resource
           }))
@@ -340,7 +341,7 @@ export const allAzureDevOpsProjects = (
           )
           const {error, projects} = await manager.getAllUserProjects()
           if (error !== undefined) {
-            console.log(error)
+            Logger.log(error)
             return []
           }
           if (projects !== null) resultReferences.push(...projects)
@@ -383,7 +384,7 @@ export const azureDevOpsProject = (
           )
           const projectRes = await manager.getProject(instanceId, projectId)
           if (projectRes instanceof Error) {
-            console.log(projectRes)
+            Logger.log(projectRes)
             return null
           }
           return {
@@ -475,7 +476,7 @@ export const azureDevOpsUserStory = (
           const restResult = await manager.getWorkItemData(instanceId, workItemIds)
           const {error, workItems} = restResult
           if (error !== undefined || workItems.length !== 1 || !workItems[0]) {
-            console.log(error)
+            Logger.log(error)
             return null
           } else {
             const returnedWorkItem: WorkItem = workItems[0]
@@ -637,7 +638,7 @@ export const azureDevOpsWorkItems = (
           const workItemData = await manager.getWorkItemData(instanceId, workItemIds)
           const {error: workItemDataError, workItems: returnedWorkItems} = workItemData
           if (workItemDataError !== undefined) {
-            console.log(error)
+            Logger.log(error)
             return []
           }
 
diff --git a/packages/server/fileStorage/GCSManager.ts b/packages/server/fileStorage/GCSManager.ts
index 0a2a6a2dba9..a3a1cb4d03e 100644
--- a/packages/server/fileStorage/GCSManager.ts
+++ b/packages/server/fileStorage/GCSManager.ts
@@ -1,6 +1,7 @@
 import {sign} from 'jsonwebtoken'
 import mime from 'mime-types'
 import path from 'path'
+import {Logger} from '../utils/Logger'
 import FileStoreManager from './FileStoreManager'
 
 interface CloudKey {
@@ -132,7 +133,7 @@ export default class GCSManager extends FileStoreManager {
       // https://github.com/nodejs/undici/issues/583#issuecomment-1577475664
       // GCS will cause undici to error randomly with `SocketError: other side closed` `code: 'UND_ERR_SOCKET'`
       if ((e as any).cause?.code === 'UND_ERR_SOCKET') {
-        console.log('   Retrying GCS Post:', fullPath)
+        Logger.log('   Retrying GCS Post:', fullPath)
         await this.putFile(file, fullPath)
       }
     }
diff --git a/packages/server/graphql/mutations/endCheckIn.ts b/packages/server/graphql/mutations/endCheckIn.ts
index 53f7a0325c2..e009f7351c2 100644
--- a/packages/server/graphql/mutations/endCheckIn.ts
+++ b/packages/server/graphql/mutations/endCheckIn.ts
@@ -16,6 +16,7 @@ import removeSuggestedAction from '../../safeMutations/removeSuggestedAction'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import getPhase from '../../utils/getPhase'
+import {Logger} from '../../utils/Logger'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {DataLoaderWorker, GQLContext} from '../graphql'
@@ -230,7 +231,7 @@ export default {
     const updatedTaskIds = (result && result.updatedTaskIds) || []
 
     analytics.checkInEnd(completedCheckIn, meetingMembers, team, dataLoader)
-    sendNewMeetingSummary(completedCheckIn, context).catch(console.log)
+    sendNewMeetingSummary(completedCheckIn, context).catch(Logger.log)
     checkTeamsLimit(team.orgId, dataLoader)
 
     const events = teamMembers.map(
diff --git a/packages/server/graphql/mutations/endSprintPoker.ts b/packages/server/graphql/mutations/endSprintPoker.ts
index 220a9d90aa7..21d18816b99 100644
--- a/packages/server/graphql/mutations/endSprintPoker.ts
+++ b/packages/server/graphql/mutations/endSprintPoker.ts
@@ -20,6 +20,7 @@ import sendNewMeetingSummary from './helpers/endMeeting/sendNewMeetingSummary'
 import {IntegrationNotifier} from './helpers/notifications/IntegrationNotifier'
 import removeEmptyTasks from './helpers/removeEmptyTasks'
 import updateTeamInsights from './helpers/updateTeamInsights'
+import {Logger} from '../../utils/Logger'
 
 export default {
   type: new GraphQLNonNull(EndSprintPokerPayload),
@@ -114,7 +115,7 @@ export default {
     analytics.sprintPokerEnd(completedMeeting, meetingMembers, template, dataLoader)
     const isKill = !!(phase && phase.phaseType !== 'ESTIMATE')
     if (!isKill) {
-      sendNewMeetingSummary(completedMeeting, context).catch(console.log)
+      sendNewMeetingSummary(completedMeeting, context).catch(Logger.log)
       checkTeamsLimit(team.orgId, dataLoader)
     }
     const events = teamMembers.map(
diff --git a/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts b/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts
index b2e39709458..030d4a30446 100644
--- a/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts
+++ b/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts
@@ -2,6 +2,7 @@ import ms from 'ms'
 import getRethink from '../../../database/rethinkDriver'
 import SlackServerManager from '../../../utils/SlackServerManager'
 import {upsertNotifications} from '../addSlackAuth'
+import {Logger} from '../../../utils/Logger'
 
 const activatePrevSlackAuth = async (userId: string, teamId: string) => {
   const r = await getRethink()
@@ -29,7 +30,7 @@ const activatePrevSlackAuth = async (userId: string, teamId: string) => {
     const manager = new SlackServerManager(botAccessToken)
     const authRes = await manager.isValidAuthToken(botAccessToken)
     if (!authRes.ok) {
-      console.error(authRes.error)
+      Logger.error(authRes.error)
       return
     }
 
diff --git a/packages/server/graphql/mutations/helpers/generateGroups.ts b/packages/server/graphql/mutations/helpers/generateGroups.ts
index 6d5e972e3b6..f487119ecc0 100644
--- a/packages/server/graphql/mutations/helpers/generateGroups.ts
+++ b/packages/server/graphql/mutations/helpers/generateGroups.ts
@@ -6,6 +6,7 @@ import {AutogroupReflectionGroupType} from '../../../database/types/MeetingRetro
 import {SubscriptionChannel} from '../../../../client/types/constEnums'
 import publish from '../../../utils/publish'
 import {analytics} from '../../../utils/analytics/analytics'
+import {Logger} from '../../../utils/Logger'
 
 const generateGroups = async (
   reflections: Reflection[],
@@ -24,13 +25,13 @@ const generateGroups = async (
 
   const themes = await manager.generateThemes(groupReflectionsInput)
   if (!themes) {
-    console.warn('ChatGPT was unable to generate themes')
+    Logger.warn('ChatGPT was unable to generate themes')
     return
   }
   const groupedReflections = await manager.groupReflections(groupReflectionsInput, themes)
 
   if (!groupedReflections) {
-    console.warn('ChatGPT was unable to group the reflections')
+    Logger.warn('ChatGPT was unable to group the reflections')
     return
   }
   const autogroupReflectionGroups: AutogroupReflectionGroupType[] = []
diff --git a/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts b/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts
index fe6add91d77..de2bdf41696 100644
--- a/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts
+++ b/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts
@@ -1,6 +1,7 @@
 import Stripe from 'stripe'
 import {getStripeManager} from '../../../utils/stripe'
 import {stripeCardToDBCard} from './stripeCardToDBCard'
+import {Logger} from '../../../utils/Logger'
 
 export default async function getCCFromCustomer(
   customer: Stripe.Customer | Stripe.DeletedCustomer
@@ -16,7 +17,7 @@ export default async function getCCFromCustomer(
     // customers that used Stripe Elements have default_payment_method: https://stripe.com/docs/payments/payment-methods/transitioning?locale=en-GB
     const cardRes = await manager.retrieveDefaultCardDetails(customer.id)
     if (cardRes instanceof Error) {
-      console.error(cardRes)
+      Logger.error(cardRes)
       return undefined
     }
     return stripeCardToDBCard(cardRes)
diff --git a/packages/server/graphql/mutations/helpers/removeFromOrg.ts b/packages/server/graphql/mutations/helpers/removeFromOrg.ts
index 3f0efabca2d..6d2747e227b 100644
--- a/packages/server/graphql/mutations/helpers/removeFromOrg.ts
+++ b/packages/server/graphql/mutations/helpers/removeFromOrg.ts
@@ -8,6 +8,7 @@ import {DataLoaderWorker} from '../../graphql'
 import removeTeamMember from './removeTeamMember'
 import resolveDowngradeToStarter from './resolveDowngradeToStarter'
 import {RDatum} from '../../../database/stricterR'
+import {Logger} from '../../../utils/Logger'
 
 const removeFromOrg = async (
   userId: string,
@@ -93,7 +94,7 @@ const removeFromOrg = async (
   try {
     await adjustUserCount(userId, orgId, InvoiceItemType.REMOVE_USER, dataLoader)
   } catch (e) {
-    console.log(e)
+    Logger.log(e)
   }
   await setUserTierForUserIds([userId])
   return {
diff --git a/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts b/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts
index e2ebb39d476..ce82907ecfb 100644
--- a/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts
+++ b/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts
@@ -3,6 +3,7 @@ import Organization from '../../../database/types/Organization'
 import getKysely from '../../../postgres/getKysely'
 import updateTeamByOrgId from '../../../postgres/queries/updateTeamByOrgId'
 import {analytics} from '../../../utils/analytics/analytics'
+import {Logger} from '../../../utils/Logger'
 import setTierForOrgUsers from '../../../utils/setTierForOrgUsers'
 import setUserTierForOrgId from '../../../utils/setUserTierForOrgId'
 import {getStripeManager} from '../../../utils/stripe'
@@ -22,7 +23,7 @@ const resolveDowngradeToStarter = async (
   try {
     await manager.deleteSubscription(stripeSubscriptionId)
   } catch (e) {
-    console.log(e)
+    Logger.log(e)
   }
 
   const [org] = await Promise.all([
diff --git a/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts b/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
index 7890e47ef07..cd116c65ea8 100644
--- a/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
+++ b/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
@@ -29,6 +29,7 @@ import removeEmptyTasks from './removeEmptyTasks'
 import updateQualAIMeetingsCount from './updateQualAIMeetingsCount'
 import gatherInsights from './gatherInsights'
 import NotificationMentioned from '../../../database/types/NotificationMentioned'
+import {Logger} from '../../../utils/Logger'
 
 const getTranscription = async (recallBotId?: string | null) => {
   if (!recallBotId) return
@@ -245,7 +246,7 @@ const summarizeRetroMeeting = async (meeting: MeetingRetrospective, context: Int
 
   dataLoader.get('newMeetings').clear(meetingId)
   // wait for whole meeting summary to be generated before sending summary email and updating qualAIMeetingCount
-  sendNewMeetingSummary(meeting, context).catch(console.log)
+  sendNewMeetingSummary(meeting, context).catch(Logger.log)
   updateQualAIMeetingsCount(meetingId, teamId, dataLoader)
   // wait for meeting stats to be generated before sending Slack notification
   IntegrationNotifier.endMeeting(dataLoader, meetingId, teamId)
diff --git a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
index 5b58f178a87..e8e6f1b6cb5 100644
--- a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
+++ b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
@@ -14,6 +14,7 @@ import updateTeamInsights from './updateTeamInsights'
 import generateStandupMeetingSummary from './generateStandupMeetingSummary'
 import updateQualAIMeetingsCount from './updateQualAIMeetingsCount'
 import gatherInsights from './gatherInsights'
+import {Logger} from '../../../utils/Logger'
 
 const summarizeTeamPrompt = async (meeting: MeetingTeamPrompt, context: InternalContext) => {
   const {dataLoader} = context
@@ -31,7 +32,7 @@ const summarizeTeamPrompt = async (meeting: MeetingTeamPrompt, context: Internal
 
   dataLoader.get('newMeetings').clear(meeting.id)
   // wait for whole meeting summary to be generated before sending summary email and updating qualAIMeetingCount
-  sendNewMeetingSummary(meeting, context).catch(console.log)
+  sendNewMeetingSummary(meeting, context).catch(Logger.log)
   updateQualAIMeetingsCount(meeting.id, meeting.teamId, dataLoader)
   // wait for meeting stats to be generated before sending Slack notification
   IntegrationNotifier.endMeeting(dataLoader, meeting.id, meeting.teamId)
diff --git a/packages/server/graphql/mutations/moveTeamToOrg.ts b/packages/server/graphql/mutations/moveTeamToOrg.ts
index 06be3517417..7fa25b2b41d 100644
--- a/packages/server/graphql/mutations/moveTeamToOrg.ts
+++ b/packages/server/graphql/mutations/moveTeamToOrg.ts
@@ -13,6 +13,7 @@ import standardError from '../../utils/standardError'
 import {DataLoaderWorker, GQLContext} from '../graphql'
 import isValid from '../isValid'
 import getKysely from '../../postgres/getKysely'
+import {Logger} from '../../utils/Logger'
 
 const MAX_NUM_TEAMS = 40
 
@@ -168,7 +169,7 @@ export default {
     const successes = results.filter((result) => typeof result === 'string')
     const failures = results.filter((result) => typeof result !== 'string')
     const successStr = successes.join('\n')
-    console.error('failures', failures)
+    Logger.error('failures', failures)
     return successStr
   }
 }
diff --git a/packages/server/graphql/mutations/navigateMeeting.ts b/packages/server/graphql/mutations/navigateMeeting.ts
index 2f833970921..70340fa2401 100644
--- a/packages/server/graphql/mutations/navigateMeeting.ts
+++ b/packages/server/graphql/mutations/navigateMeeting.ts
@@ -11,6 +11,7 @@ import {GQLContext} from '../graphql'
 import NavigateMeetingPayload from '../types/NavigateMeetingPayload'
 import handleCompletedStage from './helpers/handleCompletedStage'
 import removeScheduledJobs from './helpers/removeScheduledJobs'
+import {Logger} from '../../utils/Logger'
 
 export default {
   type: new GraphQLNonNull(NavigateMeetingPayload),
@@ -84,7 +85,7 @@ export default {
         phaseCompleteData = await handleCompletedStage(stage, meeting, dataLoader)
         if (stage.scheduledEndTime) {
           // not critical, no await needed
-          removeScheduledJobs(stage.scheduledEndTime, {meetingId}).catch(console.error)
+          removeScheduledJobs(stage.scheduledEndTime, {meetingId}).catch(Logger.error)
           stage.scheduledEndTime = null
         }
       }
diff --git a/packages/server/graphql/mutations/selectTemplate.ts b/packages/server/graphql/mutations/selectTemplate.ts
index 5877f848b01..4d0ee10f092 100644
--- a/packages/server/graphql/mutations/selectTemplate.ts
+++ b/packages/server/graphql/mutations/selectTemplate.ts
@@ -8,6 +8,7 @@ import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import SelectTemplatePayload from '../types/SelectTemplatePayload'
 import {getFeatureTier} from '../types/helpers/getFeatureTier'
+import {Logger} from '../../utils/Logger'
 
 const selectTemplate = {
   description: 'Set the selected template for the upcoming retro meeting',
@@ -37,7 +38,7 @@ const selectTemplate = {
     ])
 
     if (!template || !template.isActive) {
-      console.log('no template', selectedTemplateId, template)
+      Logger.log('no template', selectedTemplateId, template)
       return standardError(new Error('Template not found'), {userId: viewerId})
     }
 
diff --git a/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts b/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts
index a366c1afc9e..7e27ad66e14 100644
--- a/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts
+++ b/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts
@@ -5,6 +5,7 @@ import upsertAzureDevOpsDimensionFieldMap, {
   AzureDevOpsFieldMapProps
 } from '../../postgres/queries/upsertAzureDevOpsDimensionFieldMap'
 import {isTeamMember} from '../../utils/authorization'
+import {Logger} from '../../utils/Logger'
 import publish from '../../utils/publish'
 import {GQLContext} from '../graphql'
 import UpdateAzureDevOpsDimensionFieldPayload from '../types/UpdateAzureDevOpsDimensionFieldPayload'
@@ -57,7 +58,7 @@ const updateAzureDevOpsDimensionField = {
     },
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) => {
-    //console.log(`Inside updateAzureDevOpsDimensionField`)
+    //Logger.log(`Inside updateAzureDevOpsDimensionField`)
     const operationId = dataLoader.share()
     const subOptions = {mutatorId, operationId}
 
@@ -91,7 +92,7 @@ const updateAzureDevOpsDimensionField = {
       } as AzureDevOpsFieldMapProps
       await upsertAzureDevOpsDimensionFieldMap(props)
     } catch (e) {
-      console.log(e)
+      Logger.log(e)
     }
 
     const data = {teamId, meetingId}
diff --git a/packages/server/graphql/mutations/updateGitHubDimensionField.ts b/packages/server/graphql/mutations/updateGitHubDimensionField.ts
index d6077e4d01d..703f9e601e9 100644
--- a/packages/server/graphql/mutations/updateGitHubDimensionField.ts
+++ b/packages/server/graphql/mutations/updateGitHubDimensionField.ts
@@ -3,6 +3,7 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import MeetingPoker from '../../database/types/MeetingPoker'
 import upsertGitHubDimensionFieldMap from '../../postgres/queries/upsertGitHubDimensionFieldMap'
 import {isTeamMember} from '../../utils/authorization'
+import {Logger} from '../../utils/Logger'
 import publish from '../../utils/publish'
 import {GQLContext} from '../graphql'
 import UpdateGitHubDimensionFieldPayload from '../types/UpdateGitHubDimensionFieldPayload'
@@ -66,7 +67,7 @@ const updateGitHubDimensionField = {
     try {
       await upsertGitHubDimensionFieldMap(teamId, dimensionName, nameWithOwner, labelTemplate)
     } catch (e) {
-      console.log(e)
+      Logger.log(e)
     }
 
     const data = {meetingId, teamId}
diff --git a/packages/server/graphql/private/mutations/autopauseUsers.ts b/packages/server/graphql/private/mutations/autopauseUsers.ts
index ed92c2e95c9..ba8e3439b0b 100644
--- a/packages/server/graphql/private/mutations/autopauseUsers.ts
+++ b/packages/server/graphql/private/mutations/autopauseUsers.ts
@@ -3,6 +3,7 @@ import adjustUserCount from '../../../billing/helpers/adjustUserCount'
 import getRethink from '../../../database/rethinkDriver'
 import getUserIdsToPause from '../../../postgres/queries/getUserIdsToPause'
 import {MutationResolvers} from '../resolverTypes'
+import {Logger} from '../../../utils/Logger'
 
 const autopauseUsers: MutationResolvers['autopauseUsers'] = async (
   _source,
@@ -32,7 +33,7 @@ const autopauseUsers: MutationResolvers['autopauseUsers'] = async (
         try {
           return await adjustUserCount(userId, orgIds, InvoiceItemType.AUTO_PAUSE_USER, dataLoader)
         } catch (e) {
-          console.warn(`Error adjusting user count`)
+          Logger.warn(`Error adjusting user count`)
         }
         return undefined
       })
diff --git a/packages/server/graphql/private/mutations/connectSocket.ts b/packages/server/graphql/private/mutations/connectSocket.ts
index c105d0ef180..4461a506f27 100644
--- a/packages/server/graphql/private/mutations/connectSocket.ts
+++ b/packages/server/graphql/private/mutations/connectSocket.ts
@@ -6,6 +6,7 @@ import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId} from '../../../utils/authorization'
 import getListeningUserIds, {RedisCommand} from '../../../utils/getListeningUserIds'
 import getRedis from '../../../utils/getRedis'
+import {Logger} from '../../../utils/Logger'
 import publish from '../../../utils/publish'
 import {MutationResolvers} from '../resolverTypes'
 
@@ -44,7 +45,7 @@ const connectSocket: MutationResolvers['connectSocket'] = async (
       .getAll(userId, {index: 'userId'})
       .filter({removedAt: null, inactive: true})('orgId')
       .run()
-    adjustUserCount(userId, orgIds, InvoiceItemType.UNPAUSE_USER, dataLoader).catch(console.log)
+    adjustUserCount(userId, orgIds, InvoiceItemType.UNPAUSE_USER, dataLoader).catch(Logger.log)
     // TODO: re-identify
   }
   const datesAreOnSameDay = now.toDateString() === lastSeenAt.toDateString()
diff --git a/packages/server/graphql/private/mutations/runScheduledJobs.ts b/packages/server/graphql/private/mutations/runScheduledJobs.ts
index 923d4617119..faee38517ec 100644
--- a/packages/server/graphql/private/mutations/runScheduledJobs.ts
+++ b/packages/server/graphql/private/mutations/runScheduledJobs.ts
@@ -8,6 +8,7 @@ import publish from '../../../utils/publish'
 import {DataLoaderWorker} from '../../graphql'
 import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
 import {MutationResolvers} from '../resolverTypes'
+import {Logger} from '../../../utils/Logger'
 
 const processMeetingStageTimeLimits = async (
   job: ScheduledJobMeetingStageTimeLimit,
@@ -48,9 +49,9 @@ const processJob = async (job: ScheduledJobUnion, dataLoader: DataLoaderWorker)
     return processMeetingStageTimeLimits(
       job as ScheduledJobMeetingStageTimeLimit,
       dataLoader
-    ).catch(console.error)
+    ).catch(Logger.error)
   } else if (job.type === 'LOCK_ORGANIZATION' || job.type === 'WARN_ORGANIZATION') {
-    return processTeamsLimitsJob(job as ScheduledTeamLimitsJob, dataLoader).catch(console.error)
+    return processTeamsLimitsJob(job as ScheduledTeamLimitsJob, dataLoader).catch(Logger.error)
   }
 }
 
@@ -73,7 +74,7 @@ const runScheduledJobs: MutationResolvers['runScheduledJobs'] = async (
     const {runAt} = job
     const timeout = Math.max(0, runAt.getTime() - now.getTime())
     setTimeout(() => {
-      processJob(job, dataLoader).catch(console.error)
+      processJob(job, dataLoader).catch(Logger.error)
     }, timeout)
   })
 
diff --git a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
index b7920912068..ea12206cdd5 100644
--- a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
+++ b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
@@ -14,6 +14,7 @@ import publish from '../../../utils/publish'
 import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
 import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId'
 import {getUserById} from '../../../postgres/queries/getUsersByIds'
+import {Logger} from '../../../utils/Logger'
 
 // TODO (EXPERIMENT: prompt-to-join-org): some parts are borrowed from acceptTeamInvitation, create generic functions
 const acceptRequestToJoinDomain: MutationResolvers['acceptRequestToJoinDomain'] = async (
@@ -106,7 +107,7 @@ const acceptRequestToJoinDomain: MutationResolvers['acceptRequestToJoinDomain']
       try {
         await adjustUserCount(userId, orgId, InvoiceItemType.ADD_USER, dataLoader)
       } catch (e) {
-        console.log(e)
+        Logger.log(e)
       }
       await setUserTierForUserIds([userId])
     }
diff --git a/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts b/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts
index f03ebde9493..88ca97eb167 100644
--- a/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts
+++ b/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts
@@ -2,6 +2,7 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import MeetingPoker from '../../../database/types/MeetingPoker'
 import upsertGitLabDimensionFieldMap from '../../../postgres/queries/upsertGitLabDimensionFieldMap'
 import {isTeamMember} from '../../../utils/authorization'
+import {Logger} from '../../../utils/Logger'
 import publish from '../../../utils/publish'
 import {MutationResolvers} from '../resolverTypes'
 import {getUserId} from './../../../utils/authorization'
@@ -40,7 +41,7 @@ const updateGitLabDimensionField: MutationResolvers['updateGitLabDimensionField'
     const {providerId} = gitlabAuth
     await upsertGitLabDimensionFieldMap(teamId, dimensionName, projectId, providerId, labelTemplate)
   } catch (e) {
-    console.log(e)
+    Logger.log(e)
   }
 
   const data = {meetingId, teamId}
diff --git a/packages/server/graphql/public/types/TeamHealthStage.ts b/packages/server/graphql/public/types/TeamHealthStage.ts
index 29c7834c877..f98202ae131 100644
--- a/packages/server/graphql/public/types/TeamHealthStage.ts
+++ b/packages/server/graphql/public/types/TeamHealthStage.ts
@@ -2,6 +2,7 @@ import {TeamHealthStageResolvers} from '../resolverTypes'
 import {getUserId} from '../../../utils/authorization'
 import TeamHealthStageDB from '../../../database/types/TeamHealthStage'
 import isValid from '../../isValid'
+import {Logger} from '../../../utils/Logger'
 
 export type TeamHealthStageSource = TeamHealthStageDB & {
   meetingId: string
@@ -21,7 +22,7 @@ const TeamHealthStage: TeamHealthStageResolvers = {
   },
   readyCount: async ({meetingId, readyToAdvance}, _args, {dataLoader}, ref) => {
     if (!readyToAdvance) return 0
-    if (!meetingId) console.log('no meetingid', ref)
+    if (!meetingId) Logger.log('no meetingid', ref)
     const meeting = await dataLoader.get('newMeetings').load(meetingId)
     const {facilitatorUserId} = meeting
     return readyToAdvance.filter((userId) => userId !== facilitatorUserId).length
diff --git a/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts b/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts
index 17fd935ae64..14b951248c0 100644
--- a/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts
+++ b/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts
@@ -4,6 +4,7 @@ import getGitHubRequest from '../../../utils/getGitHubRequest'
 import getRepositories from '../../../utils/githubQueries/getRepositories.graphql'
 import {DataLoaderWorker} from '../../graphql'
 import {GQLContext} from './../../graphql'
+import {Logger} from '../../../utils/Logger'
 
 export interface GitHubRepo {
   id: string
@@ -25,7 +26,7 @@ const fetchGitHubRepos = async (
   const githubRequest = getGitHubRequest(info, context, {accessToken})
   const [data, error] = await githubRequest<GetRepositoriesQuery>(getRepositories)
   if (error) {
-    console.error(error.message)
+    Logger.error(error.message)
     return []
   }
   const {viewer} = data
diff --git a/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts b/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts
index 8ff83e7a8e3..72da38eddb3 100644
--- a/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts
+++ b/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts
@@ -2,6 +2,7 @@ import {GraphQLResolveInfo} from 'graphql'
 import {isNotNull} from 'parabol-client/utils/predicates'
 import GitLabServerManager from '../../../integrations/gitlab/GitLabServerManager'
 import {GQLContext} from '../../graphql'
+import {Logger} from '../../../utils/Logger'
 
 const fetchGitLabProjects = async (
   teamId: string,
@@ -18,7 +19,7 @@ const fetchGitLabProjects = async (
   const manager = new GitLabServerManager(auth, context, info, provider.serverBaseUrl)
   const [data, error] = await manager.getProjects({})
   if (error) {
-    console.error(error.message)
+    Logger.error(error.message)
     return []
   }
   return (
diff --git a/packages/server/graphql/types/NewMeetingStage.ts b/packages/server/graphql/types/NewMeetingStage.ts
index 5eecb36a46f..0247e4ebbf2 100644
--- a/packages/server/graphql/types/NewMeetingStage.ts
+++ b/packages/server/graphql/types/NewMeetingStage.ts
@@ -11,6 +11,7 @@ import GenericMeetingPhase, {
   NewMeetingPhaseTypeEnum as NewMeetingPhaseTypeEnumType
 } from '../../database/types/GenericMeetingPhase'
 import {getUserId} from '../../utils/authorization'
+import {Logger} from '../../utils/Logger'
 import {GQLContext} from '../graphql'
 import GraphQLISO8601Type from './GraphQLISO8601Type'
 import NewMeeting from './NewMeeting'
@@ -112,7 +113,7 @@ export const newMeetingStageFields = () => ({
       ref: any
     ) => {
       if (!readyToAdvance) return 0
-      if (!meetingId) console.log('no meetingid', ref)
+      if (!meetingId) Logger.log('no meetingid', ref)
       const meeting = await dataLoader.get('newMeetings').load(meetingId)
       const {facilitatorUserId} = meeting
       return readyToAdvance.filter((userId: string) => userId !== facilitatorUserId).length
diff --git a/packages/server/graphql/types/PokerMeeting.ts b/packages/server/graphql/types/PokerMeeting.ts
index f9262f8a919..fd0116d26f2 100644
--- a/packages/server/graphql/types/PokerMeeting.ts
+++ b/packages/server/graphql/types/PokerMeeting.ts
@@ -1,6 +1,7 @@
 import {GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
 import {getUserId} from '../../utils/authorization'
+import {Logger} from '../../utils/Logger'
 import {GQLContext} from '../graphql'
 import NewMeeting from './NewMeeting'
 import PokerMeetingMember from './PokerMeetingMember'
@@ -39,7 +40,7 @@ const PokerMeeting = new GraphQLObjectType<any, GQLContext>({
       resolve: async ({id: meetingId}, {storyId: taskId}, {dataLoader}) => {
         const task = await dataLoader.get('tasks').load(taskId)
         if (task.meetingId !== meetingId) {
-          console.log('naughty storyId supplied to PokerMeeting')
+          Logger.log('naughty storyId supplied to PokerMeeting')
           return null
         }
         return task
diff --git a/packages/server/postgres/queries/upsertAzureDevOpsDimensionFieldMap.ts b/packages/server/postgres/queries/upsertAzureDevOpsDimensionFieldMap.ts
index e19e9ad7c83..d5099ed387d 100644
--- a/packages/server/postgres/queries/upsertAzureDevOpsDimensionFieldMap.ts
+++ b/packages/server/postgres/queries/upsertAzureDevOpsDimensionFieldMap.ts
@@ -1,3 +1,4 @@
+import {Logger} from '../../utils/Logger'
 import getPg from '../getPg'
 import {upsertAzureDevOpsDimensionFieldMapQuery} from './generated/upsertAzureDevOpsDimensionFieldMapQuery'
 
@@ -22,7 +23,7 @@ const upsertAzureDevOpsDimensionFieldMap = async (props: AzureDevOpsFieldMapProp
     projectKey,
     workItemType
   } = props
-  console.log(`Inside upsertAzureDevOpsDimensionFieldMap - props:${JSON.stringify(props)}`)
+  Logger.log(`Inside upsertAzureDevOpsDimensionFieldMap - props:${JSON.stringify(props)}`)
   return upsertAzureDevOpsDimensionFieldMapQuery.run(
     {
       fieldMap: {
diff --git a/packages/server/safeMutations/acceptTeamInvitation.ts b/packages/server/safeMutations/acceptTeamInvitation.ts
index 98563d9270f..be5ec868c6d 100644
--- a/packages/server/safeMutations/acceptTeamInvitation.ts
+++ b/packages/server/safeMutations/acceptTeamInvitation.ts
@@ -6,6 +6,7 @@ import generateUID from '../generateUID'
 import {DataLoaderWorker} from '../graphql/graphql'
 import {Team} from '../postgres/queries/getTeamsByIds'
 import getNewTeamLeadUserId from '../safeQueries/getNewTeamLeadUserId'
+import {Logger} from '../utils/Logger'
 import setUserTierForUserIds from '../utils/setUserTierForUserIds'
 import addTeamIdToTMS from './addTeamIdToTMS'
 import insertNewTeamMember from './insertNewTeamMember'
@@ -92,7 +93,7 @@ const acceptTeamInvitation = async (team: Team, userId: string, dataLoader: Data
     try {
       await adjustUserCount(userId, orgId, InvoiceItemType.ADD_USER, dataLoader)
     } catch (e) {
-      console.log(e)
+      Logger.log(e)
     }
     await setUserTierForUserIds([userId])
   }
diff --git a/packages/server/safetyPatchRes.ts b/packages/server/safetyPatchRes.ts
index d48e736b5cf..aa974ebb88f 100644
--- a/packages/server/safetyPatchRes.ts
+++ b/packages/server/safetyPatchRes.ts
@@ -1,4 +1,5 @@
 import {HttpResponse, RecognizedString} from 'uWebSockets.js'
+import {Logger} from './utils/Logger'
 
 type Header = [key: RecognizedString, value: RecognizedString]
 
@@ -36,7 +37,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._end = res.end
   res.end = (body?: RecognizedString) => {
     if (res.done) {
-      console.warn(`uWS: Called end after done`)
+      Logger.warn(`uWS: Called end after done`)
     }
     if (res.done || res.aborted) return res
     res.done = true
@@ -46,7 +47,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._close = res.close
   res.close = () => {
     if (res.done) {
-      console.warn(`uWS: Called close after done`)
+      Logger.warn(`uWS: Called close after done`)
     }
     if (res.done || res.aborted) return res
     res.done = true
@@ -61,7 +62,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._tryEnd = res.tryEnd
   res.tryEnd = (fullBodyOrChunk: RecognizedString, totalSize: number) => {
     if (res.done) {
-      console.warn(`uWS: Called tryEnd after done`)
+      Logger.warn(`uWS: Called tryEnd after done`)
     }
     if (res.done || res.aborted) return [true, true]
     return flush(() => res._tryEnd(fullBodyOrChunk, totalSize))
@@ -70,7 +71,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._write = res.write
   res.write = (chunk: RecognizedString) => {
     if (res.done) {
-      console.warn(`uWS: Called write after done`)
+      Logger.warn(`uWS: Called write after done`)
     }
     if (res.done || res.aborted) return res
     return res._write(chunk)
@@ -79,7 +80,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._writeHeader = res.writeHeader
   res.writeHeader = (key: RecognizedString, value: RecognizedString) => {
     if (res.done) {
-      console.warn(`uWS: Called writeHeader after done`)
+      Logger.warn(`uWS: Called writeHeader after done`)
     }
     res.headers.push([key, value])
     return res
@@ -88,7 +89,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._writeStatus = res.writeStatus
   res.writeStatus = (status: RecognizedString) => {
     if (res.done) {
-      console.error(`uWS: Called writeStatus after done ${status}`)
+      Logger.error(`uWS: Called writeStatus after done ${status}`)
     }
     res.status = status
     return res
@@ -97,7 +98,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._upgrade = res.upgrade
   res.upgrade = (...args) => {
     if (res.done) {
-      console.error(`uWS: Called upgrade after done`)
+      Logger.error(`uWS: Called upgrade after done`)
     }
     if (res.done || res.aborted) return
     return res._cork(() => {
@@ -108,7 +109,7 @@ const safetyPatchRes = (res: HttpResponse) => {
   res._getRemoteAddressAsText = res.getRemoteAddressAsText
   res.getRemoteAddressAsText = () => {
     if (res.done) {
-      console.error(`uWS: Called getRemoteAddressAsText after done`)
+      Logger.error(`uWS: Called getRemoteAddressAsText after done`)
     }
     if (res.done || res.aborted) return Buffer.from('')
     return res._getRemoteAddressAsText()
diff --git a/packages/server/utils/AtlassianServerManager.ts b/packages/server/utils/AtlassianServerManager.ts
index dcc29a4a3b9..d84a448f7be 100644
--- a/packages/server/utils/AtlassianServerManager.ts
+++ b/packages/server/utils/AtlassianServerManager.ts
@@ -11,25 +11,7 @@ import {
   OAuth2AuthorizationParams,
   OAuth2RefreshAuthorizationParams
 } from '../integrations/OAuth2Manager'
-
-import tracer from 'dd-trace'
-import formats from 'dd-trace/ext/formats'
-import util from 'util'
-
-type LogLevel = 'error' | 'warn' | 'info' | 'debug'
-function trace(level: LogLevel, message: any, ...optionalParameters: any[]) {
-  const span = tracer.scope().active()
-  const time = new Date().toISOString()
-  const record = {time, level, message: util.format(message, optionalParameters)}
-
-  if (span) {
-    tracer.inject(span.context(), formats.LOG, record)
-  }
-
-  console.log(JSON.stringify(record))
-}
-
-const log = trace.bind(null, 'info')
+import {Logger} from './Logger'
 
 export interface JiraUser {
   self: string
@@ -343,7 +325,7 @@ class AtlassianServerManager extends AtlassianManager {
     } else {
       callback(null, {cloudId, newProjects: res.values})
       if (res.nextPage) {
-        await this.getPaginatedProjects(cloudId, res.nextPage, callback).catch(console.error)
+        await this.getPaginatedProjects(cloudId, res.nextPage, callback).catch(Logger.error)
       }
     }
   }
@@ -355,7 +337,7 @@ class AtlassianServerManager extends AtlassianManager {
           cloudId,
           `https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/project/search?orderBy=name`,
           callback
-        ).catch(console.error)
+        ).catch(Logger.error)
       })
     )
   }
@@ -387,7 +369,7 @@ class AtlassianServerManager extends AtlassianManager {
         }))
         projects.push(...pagedProjects)
         if (res.nextPage) {
-          log('AtlassianServerManager.getAllProjects fetching more results', res.total)
+          Logger.log('AtlassianServerManager.getAllProjects fetching more results', res.total)
           return getProjectPage(cloudId, res.nextPage)
         }
       }
@@ -402,7 +384,7 @@ class AtlassianServerManager extends AtlassianManager {
     )
 
     if (error) {
-      log('getAllProjects ERROR:', error)
+      Logger.log('getAllProjects ERROR:', error)
     }
     return projects
   }
diff --git a/packages/server/utils/Logger.ts b/packages/server/utils/Logger.ts
new file mode 100644
index 00000000000..3cca7489c69
--- /dev/null
+++ b/packages/server/utils/Logger.ts
@@ -0,0 +1,35 @@
+import tracer from 'dd-trace'
+import formats from 'dd-trace/ext/formats'
+import util from 'util'
+
+type LogLevel = 'error' | 'warn' | 'info' | 'debug'
+const LogFun = {
+  error: console.error,
+  warn: console.warn,
+  info: console.info,
+  debug: console.debug
+} satisfies Record<LogLevel, Console[keyof Console]>
+
+function trace(level: LogLevel, message: any, ...optionalParameters: any[]) {
+  if (process.env.DD_LOGS_INJECTION !== 'true') {
+    return LogFun[level](message, ...optionalParameters)
+  }
+
+  const span = tracer.scope().active()
+  const time = new Date().toISOString()
+  const record = {time, level, message: util.format(message, optionalParameters)}
+
+  if (span) {
+    tracer.inject(span.context(), formats.LOG, record)
+  }
+
+  LogFun[level](JSON.stringify(record))
+}
+
+export const Logger = {
+  log: trace.bind(null, 'info'),
+  error: trace.bind(null, 'error'),
+  warn: trace.bind(null, 'warn'),
+  info: trace.bind(null, 'info'),
+  debug: trace.bind(null, 'debug')
+}
diff --git a/packages/server/utils/OpenAIServerManager.ts b/packages/server/utils/OpenAIServerManager.ts
index 3cc48bb3868..251528770e2 100644
--- a/packages/server/utils/OpenAIServerManager.ts
+++ b/packages/server/utils/OpenAIServerManager.ts
@@ -3,6 +3,7 @@ import JSON5 from 'json5'
 import sendToSentry from './sendToSentry'
 import Reflection from '../database/types/Reflection'
 import {ModifyType} from '../graphql/public/resolverTypes'
+import {Logger} from './Logger'
 
 type Prompt = {
   question: string
@@ -188,7 +189,7 @@ class OpenAIServerManager {
       return themes.split(', ')
     } catch (e) {
       const error = e instanceof Error ? e : new Error('OpenAI failed to generate themes')
-      console.error(error.message)
+      Logger.error(error.message)
       sendToSentry(error)
       return null
     }
@@ -226,7 +227,7 @@ class OpenAIServerManager {
     } catch (e) {
       const error =
         e instanceof Error ? e : new Error('OpenAI failed to generate the suggested template')
-      console.error(error.message)
+      Logger.error(error.message)
       sendToSentry(error)
       return null
     }
diff --git a/packages/server/utils/RecallAIServerManager.ts b/packages/server/utils/RecallAIServerManager.ts
index 5c30cfc1ceb..c5dc8e7f781 100644
--- a/packages/server/utils/RecallAIServerManager.ts
+++ b/packages/server/utils/RecallAIServerManager.ts
@@ -4,6 +4,7 @@ import {ExternalLinks} from '../../client/types/constEnums'
 import appOrigin from '../appOrigin'
 import {TranscriptBlock} from '../database/types/MeetingRetrospective'
 import sendToSentry from './sendToSentry'
+import {Logger} from './Logger'
 
 const sdk = api('@recallai/v1.6#536jnqlf7d6blh')
 
@@ -19,7 +20,7 @@ const getBase64Image = async () => {
     const base64Image = buffer.toString('base64')
     return base64Image
   } catch (error) {
-    console.error(error)
+    Logger.error(error)
     return null
   }
 }
diff --git a/packages/server/utils/StaticServer.ts b/packages/server/utils/StaticServer.ts
index f8cba007f00..2ba0fd3b3b6 100644
--- a/packages/server/utils/StaticServer.ts
+++ b/packages/server/utils/StaticServer.ts
@@ -3,6 +3,7 @@ import mime from 'mime-types'
 import path from 'path'
 import {brotliCompressSync} from 'zlib'
 import isCompressible from './isCompressible'
+import {Logger} from './Logger'
 class StaticFileMeta {
   mtime: string
   size: number
@@ -63,7 +64,7 @@ export default class StaticServer {
         }
         makePathnames(dirname, this.pathnames, '')
       } catch (e) {
-        console.log(e)
+        Logger.log(e)
       }
     })
   }
diff --git a/packages/server/utils/publish.ts b/packages/server/utils/publish.ts
index 5203852257f..b9c7defb2ff 100644
--- a/packages/server/utils/publish.ts
+++ b/packages/server/utils/publish.ts
@@ -1,4 +1,5 @@
 import getPubSub from './getPubSub'
+import {Logger} from './Logger'
 
 export interface SubOptions {
   mutatorId?: string // passing the socket id of the mutator will omit sending a message to that user
@@ -18,7 +19,7 @@ const publish = <T>(
   const rootValue = {[subName]: {fieldName: type, [type]: payload}}
   getPubSub()
     .publish(`${topic}.${channel}`, {rootValue, executorServerId: SERVER_ID!, ...subOptions})
-    .catch(console.error)
+    .catch(Logger.error)
 }
 
 export default publish
diff --git a/packages/server/utils/stripe/StripeManager.ts b/packages/server/utils/stripe/StripeManager.ts
index 0ab72ac35c3..28db42bd437 100644
--- a/packages/server/utils/stripe/StripeManager.ts
+++ b/packages/server/utils/stripe/StripeManager.ts
@@ -1,5 +1,6 @@
 import {InvoiceItemType} from 'parabol-client/types/constEnums'
 import Stripe from 'stripe'
+import {Logger} from '../Logger'
 import sendToSentry from '../sendToSentry'
 
 export default class StripeManager {
@@ -15,7 +16,7 @@ export default class StripeManager {
     try {
       return this.stripe.webhooks.constructEvent(rawBody, signature, StripeManager.WEBHOOK_SECRET)
     } catch (e) {
-      console.log('StripeWebhookError:', e)
+      Logger.log('StripeWebhookError:', e)
       return null
     }
   }

From bd519c93bebe000ebe34dc6ea7eba2db337e2251 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 10:46:36 -0800
Subject: [PATCH 011/183] chore(release): release v7.18.0 (#9450)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 13 +++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 0fb11cbd996..f6475935835 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.17.0"
+  ".": "7.18.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd68e143309..702f2ff2a5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.18.0](https://github.com/ParabolInc/parabol/compare/v7.17.0...v7.18.0) (2024-02-27)
+
+
+### Added
+
+* **standalone-deployment:** Standalone host deployment improved and documented ([#9445](https://github.com/ParabolInc/parabol/issues/9445)) ([61ba015](https://github.com/ParabolInc/parabol/commit/61ba015c8310a72b7e89c64be081cd2f399fc721))
+* support env-defined saml issuer for PPMIs ([#9455](https://github.com/ParabolInc/parabol/issues/9455)) ([92ab5be](https://github.com/ParabolInc/parabol/commit/92ab5be298ceb19ca8718c67a0c9da8728b6b0bf))
+
+
+### Changed
+
+* Associate logs with traces ([#9444](https://github.com/ParabolInc/parabol/issues/9444)) ([c77925b](https://github.com/ParabolInc/parabol/commit/c77925b1c0e07afc428022008143b8b7f4002280))
+
 ## [7.17.0](https://github.com/ParabolInc/parabol/compare/v7.16.0...v7.17.0) (2024-02-21)
 
 
diff --git a/package.json b/package.json
index edde1656431..962c45f4873 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.17.0",
+  "version": "7.18.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 5295ced9dd0..6be287b79d6 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.17.0",
+  "version": "7.18.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.17.0"
+    "parabol-server": "7.18.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 9faef2216e4..3776a1094db 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.17.0",
+  "version": "7.18.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 1675bcaf5ea..64942d20a59 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.17.0",
+  "version": "7.18.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.17.0",
-    "parabol-server": "7.17.0",
+    "parabol-client": "7.18.0",
+    "parabol-server": "7.18.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 0190f526ea8..a73d3eb3327 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.17.0",
+  "version": "7.18.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index c1bde9cbe3f..2f4bd7453ff 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.17.0",
+  "version": "7.18.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.17.0",
+    "parabol-client": "7.18.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 6d46e1b2aab6731493de2d2547c88ae3921393f0 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 27 Feb 2024 11:09:18 -0800
Subject: [PATCH 012/183] chore: no force-push to prod (#9401)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/release-to-staging.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
index 139b8472fa8..6e9225bf871 100644
--- a/.github/workflows/release-to-staging.yml
+++ b/.github/workflows/release-to-staging.yml
@@ -99,6 +99,7 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git checkout -b "release/v${{ env.ACTION_VERSION }}"
+          git merge -s ours origin/production
           git push --set-upstream origin "release/v${{ env.ACTION_VERSION }}"
           gh pr create \
             --assignee ${{ github.actor }} \

From b60ff4e87951081fbee48d2a9f31a5e66fafb09b Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 11:15:58 -0800
Subject: [PATCH 013/183] chore(release): release v7.18.1 (#9459)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index f6475935835..28707a42151 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.18.0"
+  ".": "7.18.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 702f2ff2a5a..9d1147fe08f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.18.1](https://github.com/ParabolInc/parabol/compare/v7.18.0...v7.18.1) (2024-02-27)
+
+
+### Changed
+
+* no force-push to prod ([#9401](https://github.com/ParabolInc/parabol/issues/9401)) ([6d46e1b](https://github.com/ParabolInc/parabol/commit/6d46e1b2aab6731493de2d2547c88ae3921393f0))
+
 ## [7.18.0](https://github.com/ParabolInc/parabol/compare/v7.17.0...v7.18.0) (2024-02-27)
 
 
diff --git a/package.json b/package.json
index 962c45f4873..179fed1c4cb 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.0",
+  "version": "7.18.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 6be287b79d6..5619754d830 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.18.0",
+  "version": "7.18.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.18.0"
+    "parabol-server": "7.18.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 3776a1094db..141dca1fe36 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.0",
+  "version": "7.18.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 64942d20a59..1f7848776eb 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.18.0",
+  "version": "7.18.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.18.0",
-    "parabol-server": "7.18.0",
+    "parabol-client": "7.18.1",
+    "parabol-server": "7.18.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index a73d3eb3327..3331444dcae 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.0",
+  "version": "7.18.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 2f4bd7453ff..18ca0f00370 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.0",
+  "version": "7.18.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.18.0",
+    "parabol-client": "7.18.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 55faa17ada5b1bd49182a29341b3465a82d2ddfd Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Tue, 27 Feb 2024 14:54:40 -0800
Subject: [PATCH 014/183] feat: embedder service (#9417)

* feat: add embedder service

---------

Signed-off-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: Matt Krick <matt.krick@gmail.com>
---
 .env.example                                  |   5 +
 docker/dev.yml                                |  17 +-
 package.json                                  |   4 +-
 packages/embedder/.eslintrc.js                |  11 +
 packages/embedder/README.md                   |  71 ++
 packages/embedder/ai_models/AbstractModel.ts  |  75 ++
 packages/embedder/ai_models/ModelManager.ts   | 153 ++++
 .../ai_models/TextEmbeddingsInference.ts      |  71 ++
 .../ai_models/TextGenerationInference.ts      |  87 ++
 .../ai_models/helpers/fetchWithRetry.ts       |  65 ++
 packages/embedder/embedder.ts                 | 253 ++++++
 packages/embedder/indexing/countWords.ts      |  17 +
 .../indexing/createEmbeddingTextFrom.ts       |  15 +
 .../embedder/indexing/embeddingsTablesOps.ts  | 198 +++++
 packages/embedder/indexing/getRedisClient.ts  |  11 +
 .../embedder/indexing/getRootDataLoader.ts    |  10 +
 .../embedder/indexing/numberVectorToString.ts |   5 +
 .../indexing/orgIdsWithFeatureFlag.ts         |  15 +
 .../indexing/retrospectiveDiscussionTopic.ts  | 326 ++++++++
 packages/embedder/package.json                |  31 +
 packages/embedder/tsconfig.json               |  15 +
 .../server/dataloader/customLoaderMakers.ts   |  10 +-
 .../server/dataloader/customRedisQueries.ts   |  10 +-
 packages/server/postgres/getKysely.ts         |   7 +
 .../1708127504000_updateEmbeddingMetadata.ts  |  20 +
 pm2.config.js                                 |  17 +-
 pm2.dev.config.js                             |  29 +-
 scripts/generateGraphQLArtifacts.js           |   7 +-
 scripts/prod.js                               |  28 +-
 scripts/runEmbedder.js                        |  13 +
 scripts/webpack/dev.servers.config.js         |   2 +
 scripts/webpack/prod.servers.config.js        |   2 +
 scripts/webpack/toolbox.config.js             |  20 +
 scripts/webpack/utils/transformRules.js       |   3 +-
 yarn.lock                                     | 759 +++++++++++++++++-
 35 files changed, 2303 insertions(+), 79 deletions(-)
 create mode 100644 packages/embedder/.eslintrc.js
 create mode 100644 packages/embedder/README.md
 create mode 100644 packages/embedder/ai_models/AbstractModel.ts
 create mode 100644 packages/embedder/ai_models/ModelManager.ts
 create mode 100644 packages/embedder/ai_models/TextEmbeddingsInference.ts
 create mode 100644 packages/embedder/ai_models/TextGenerationInference.ts
 create mode 100644 packages/embedder/ai_models/helpers/fetchWithRetry.ts
 create mode 100644 packages/embedder/embedder.ts
 create mode 100644 packages/embedder/indexing/countWords.ts
 create mode 100644 packages/embedder/indexing/createEmbeddingTextFrom.ts
 create mode 100644 packages/embedder/indexing/embeddingsTablesOps.ts
 create mode 100644 packages/embedder/indexing/getRedisClient.ts
 create mode 100644 packages/embedder/indexing/getRootDataLoader.ts
 create mode 100644 packages/embedder/indexing/numberVectorToString.ts
 create mode 100644 packages/embedder/indexing/orgIdsWithFeatureFlag.ts
 create mode 100644 packages/embedder/indexing/retrospectiveDiscussionTopic.ts
 create mode 100644 packages/embedder/package.json
 create mode 100644 packages/embedder/tsconfig.json
 create mode 100644 packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts
 create mode 100644 scripts/runEmbedder.js

diff --git a/.env.example b/.env.example
index 25c9a9c856e..0d0a44b41f0 100644
--- a/.env.example
+++ b/.env.example
@@ -8,6 +8,11 @@ SERVER_ID='1'
 # Websocket port for the websocket server, only used in development (yarn dev)
 SOCKET_PORT='3001'
 
+# AI MODELS
+AI_EMBEDDING_MODELS='[{"model": "text-embeddings-inference:llmrails/ember-v1", "url": "http://localhost:3040/"}]'
+AI_GENERATION_MODELS='[{"model": "text-generation-inference:TheBloke/zephyr-7b-beta", "url": "http://localhost:3050/"}]'
+AI_EMBEDDER_ENABLED='true'
+
 # APPLICATION
 # AMPLITUDE_WRITE_KEY='key_AMPLITUDE_WRITE_KEY'
 # Enter a short url redirect service for invitations, it needs to redirecto to /invitation-link
diff --git a/docker/dev.yml b/docker/dev.yml
index 0b7de79ddb8..c45ba6b6f6b 100644
--- a/docker/dev.yml
+++ b/docker/dev.yml
@@ -13,8 +13,6 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /proc/:/host/proc/:ro
       - /sys/fs/cgroup:/host/sys/fs/cgroup:ro
-      - "./dd-conf.d:/etc/datadog-agent/conf.d/local.d/"
-      - "../dev/logs:/var/log/datadog/logs"
   db:
     image: rethinkdb:2.4.2
     restart: unless-stopped
@@ -72,6 +70,20 @@ services:
       - "8082:8081"
     networks:
       parabol-network:
+  text-embeddings-inference:
+    container_name: text-embeddings-inference
+    image: ghcr.io/huggingface/text-embeddings-inference:cpu-0.6
+    command:
+      - "--model-id=llmrails/ember-v1"
+    platform: linux/x86_64
+    hostname: text-embeddings-inference
+    restart: unless-stopped
+    ports:
+      - "3040:80"
+    volumes:
+      - text-embeddings-inference-data:/data
+    networks:
+      parabol-network:
 networks:
   parabol-network:
 volumes:
@@ -79,3 +91,4 @@ volumes:
   rethink-data: {}
   postgres-data: {}
   pgadmin-data: {}
+  text-embeddings-inference-data: {}
diff --git a/package.json b/package.json
index 179fed1c4cb..fbc0c896925 100644
--- a/package.json
+++ b/package.json
@@ -103,8 +103,8 @@
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
     "jscodeshift": "^0.14.0",
-    "kysely": "^0.26.3",
-    "kysely-codegen": "^0.10.0",
+    "kysely": "^0.27.2",
+    "kysely-codegen": "^0.11.0",
     "lerna": "^6.4.1",
     "mini-css-extract-plugin": "^2.7.2",
     "minimist": "^1.2.5",
diff --git a/packages/embedder/.eslintrc.js b/packages/embedder/.eslintrc.js
new file mode 100644
index 00000000000..a6a5d110f1e
--- /dev/null
+++ b/packages/embedder/.eslintrc.js
@@ -0,0 +1,11 @@
+module.exports = {
+  extends: [
+    '../../.eslintrc.js'
+  ],
+  parserOptions: {
+    project: './tsconfig.json',
+    ecmaVersion: 2020,
+    sourceType: 'module'
+  },
+  "ignorePatterns": ["**/lib", "*.js"]
+}
diff --git a/packages/embedder/README.md b/packages/embedder/README.md
new file mode 100644
index 00000000000..fc3fc68f335
--- /dev/null
+++ b/packages/embedder/README.md
@@ -0,0 +1,71 @@
+# `Embedder`
+
+This service builds embedding vectors for semantic search and for other AI/ML
+use cases. It does so by:
+
+1.  Updating a list of all possible items to create embedding vectors for and
+    storing that list in the `EmbeddingsMetadata` table
+2.  Adding these items in batches to the `EmbeddingsJobQueue` table and a redis
+    priority queue called `embedder:queue`
+3.  Allowing one or more parallel embedding services to calculate embedding
+    vectors (EmbeddingJobQueue states transistion from `queued` -> `embedding`,
+    then `embedding` -> [deleting the `EmbeddingJobQueue` row]
+
+    In addition to deleteing the `EmbeddingJobQueue` row, when a job completes
+    successfully:
+
+    - A row is added to the model table with the embedding vector; the
+      `EmbeddingMetadataId` field on this row points the appropriate
+      metadata row on `EmbeddingsMetadata`
+    - The `EmbeddingsMetadata.models` array is updated with the name of the
+      table that the embedding has been generated for
+
+4.  This process repeats forever using a silly polling loop
+
+In the future, it would be wonderful to enhance this service such that it were
+event driven.
+
+## Prerequisites
+
+The Embedder service depends on pgvector being available in Postgres.
+
+The predeploy script checks for an environment variable
+`POSTGRES_USE_PGVECTOR=true` to enable this extension in production.
+
+## Configuration
+
+The Embedder service takes no arguments and is controlled by the following
+environment variables, here given with example configuration:
+
+- `AI_EMBEDDER_ENABLE`: enable/disable the embedder service from
+  performing work, or sleeping indefinitely
+
+`AI_EMBEDDER_ENABLED='true'`
+
+- `AI_EMBEDDING_MODELS`: JSON configuration for which embedding models
+  are enabled. Each model in the array will be instantiated by
+  `ai_models/ModelManager`. Each model instance will have its own
+  database table created for it (if it does not exist already) used
+  to store calculated vectors. See `ai_models/ModelManager` for
+  which configurations are supported.
+
+  Example:
+
+`AI_EMBEDDING_MODELS='[{"model": "text-embeddings-inference:llmrails/ember-v1", "url": "http://localhost:3040/"}]'`
+
+- `AI_GENERATION_MODELS`: JSON configuration for which AI generation
+  models (i.e. GPTS are enabled). These models are used for summarization
+  text to be embedded by an embedding model if the text length would be
+  greater than the context window of the embedding model. Each model in
+  the array will be instantiated by `ai_models/ModelManager`.
+  See `ai_models/ModelManager` for which configurations are supported.
+
+  Example:
+
+`AI_GENERATION_MODELS='[{"model": "text-generation-inference:TheBloke/zephyr-7b-beta", "url": "http://localhost:3050/"}]'`
+
+## Usage
+
+The Embedder service is stateless and takes no arguments. Multiple instances
+of the service may be started in order to match embedding load, or to
+catch up on history more quickly.
diff --git a/packages/embedder/ai_models/AbstractModel.ts b/packages/embedder/ai_models/AbstractModel.ts
new file mode 100644
index 00000000000..b0f709ce485
--- /dev/null
+++ b/packages/embedder/ai_models/AbstractModel.ts
@@ -0,0 +1,75 @@
+export interface ModelConfig {
+  model: string
+  url: string
+}
+
+export interface EmbeddingModelConfig extends ModelConfig {
+  tableSuffix: string
+}
+
+export interface GenerationModelConfig extends ModelConfig {}
+
+export abstract class AbstractModel {
+  public readonly url?: string
+  public modelInstance: any
+
+  constructor(config: ModelConfig) {
+    this.url = this.normalizeUrl(config.url)
+  }
+
+  // removes a trailing slash from the inputUrl
+  private normalizeUrl(inputUrl: string | undefined) {
+    if (!inputUrl) return undefined
+    const regex = /[/]+$/
+    return inputUrl.replace(regex, '')
+  }
+}
+
+export interface EmbeddingModelParams {
+  embeddingDimensions: number
+  maxInputTokens: number
+  tableSuffix: string
+}
+
+export abstract class AbstractEmbeddingsModel extends AbstractModel {
+  readonly embeddingDimensions: number
+  readonly maxInputTokens: number
+  readonly tableName: string
+  constructor(config: EmbeddingModelConfig) {
+    super(config)
+    const modelParams = this.constructModelParams(config)
+    this.embeddingDimensions = modelParams.embeddingDimensions
+    this.maxInputTokens = modelParams.maxInputTokens
+    this.tableName = `Embeddings_${modelParams.tableSuffix}`
+  }
+  protected abstract constructModelParams(config: EmbeddingModelConfig): EmbeddingModelParams
+  abstract getEmbedding(content: string): Promise<number[]>
+}
+
+export interface GenerationModelParams {
+  maxInputTokens: number
+}
+
+export interface GenerationOptions {
+  maxNewTokens?: number
+  seed?: number
+  stop?: string
+  temperature?: number
+  topK?: number
+  topP?: number
+  truncate?: boolean
+}
+
+export abstract class AbstractGenerationModel extends AbstractModel {
+  readonly maxInputTokens: number
+  constructor(config: GenerationModelConfig) {
+    super(config)
+    const modelParams = this.constructModelParams(config)
+    this.maxInputTokens = modelParams.maxInputTokens
+  }
+
+  protected abstract constructModelParams(config: GenerationModelConfig): GenerationModelParams
+  abstract summarize(content: string, options: GenerationOptions): Promise<string>
+}
+
+export default AbstractModel
diff --git a/packages/embedder/ai_models/ModelManager.ts b/packages/embedder/ai_models/ModelManager.ts
new file mode 100644
index 00000000000..ac8f04cc891
--- /dev/null
+++ b/packages/embedder/ai_models/ModelManager.ts
@@ -0,0 +1,153 @@
+import {Kysely, sql} from 'kysely'
+
+import {
+  AbstractEmbeddingsModel,
+  AbstractGenerationModel,
+  EmbeddingModelConfig,
+  GenerationModelConfig,
+  ModelConfig
+} from './AbstractModel'
+import TextEmbeddingsInference from './TextEmbeddingsInference'
+import TextGenerationInference from './TextGenerationInference'
+
+interface ModelManagerConfig {
+  embeddingModels: EmbeddingModelConfig[]
+  generationModels: GenerationModelConfig[]
+}
+
+export type EmbeddingsModelType = 'text-embeddings-inference'
+export type GenerationModelType = 'text-generation-inference'
+
+export class ModelManager {
+  embeddingModels: AbstractEmbeddingsModel[]
+  embeddingModelsMapByTable: {[key: string]: AbstractEmbeddingsModel}
+  generationModels: AbstractGenerationModel[]
+
+  private isValidConfig(
+    maybeConfig: Partial<ModelManagerConfig>
+  ): maybeConfig is ModelManagerConfig {
+    if (!maybeConfig.embeddingModels || !Array.isArray(maybeConfig.embeddingModels)) {
+      throw new Error('Invalid configuration: embedding_models is missing or not an array')
+    }
+    if (!maybeConfig.generationModels || !Array.isArray(maybeConfig.generationModels)) {
+      throw new Error('Invalid configuration: summarization_models is missing or not an array')
+    }
+
+    maybeConfig.embeddingModels.forEach((model: ModelConfig) => {
+      this.isValidModelConfig(model)
+    })
+
+    maybeConfig.generationModels.forEach((model: ModelConfig) => {
+      this.isValidModelConfig(model)
+    })
+
+    return true
+  }
+
+  private isValidModelConfig(model: ModelConfig): model is ModelConfig {
+    if (typeof model.model !== 'string') {
+      throw new Error('Invalid ModelConfig: model field should be a string')
+    }
+    if (model.url !== undefined && typeof model.url !== 'string') {
+      throw new Error('Invalid ModelConfig: url field should be a string')
+    }
+
+    return true
+  }
+
+  constructor(config: ModelManagerConfig) {
+    // Validate configuration
+    this.isValidConfig(config)
+
+    // Initialize embeddings models
+    this.embeddingModelsMapByTable = {}
+    this.embeddingModels = config.embeddingModels.map((modelConfig) => {
+      const [modelType] = modelConfig.model.split(':') as [EmbeddingsModelType, string]
+
+      switch (modelType) {
+        case 'text-embeddings-inference': {
+          const embeddingsModel = new TextEmbeddingsInference(modelConfig)
+          this.embeddingModelsMapByTable[embeddingsModel.tableName] = embeddingsModel
+          return embeddingsModel
+        }
+        default:
+          throw new Error(`unsupported embeddings model '${modelType}'`)
+      }
+    })
+
+    // Initialize summarization models
+    this.generationModels = config.generationModels.map((modelConfig) => {
+      const [modelType, _] = modelConfig.model.split(':') as [GenerationModelType, string]
+
+      switch (modelType) {
+        case 'text-generation-inference': {
+          const generator = new TextGenerationInference(modelConfig)
+          return generator
+        }
+        default:
+          throw new Error(`unsupported summarization model '${modelType}'`)
+      }
+    })
+  }
+
+  async maybeCreateTables(pg: Kysely<any>) {
+    const maybePromises = this.embeddingModels.map(async (embeddingsModel) => {
+      const tableName = embeddingsModel.tableName
+      const hasTable =
+        (
+          await sql<number[]>`SELECT 1 FROM ${sql.id('pg_catalog', 'pg_tables')} WHERE ${sql.id(
+            'tablename'
+          )} = ${tableName}`.execute(pg)
+        ).rows.length > 0
+      if (hasTable) return undefined
+      const vectorDimensions = embeddingsModel.embeddingDimensions
+      console.log(`ModelManager: creating ${tableName} with ${vectorDimensions} dimensions`)
+      const query = sql`
+      DO $$
+  BEGIN
+  CREATE TABLE IF NOT EXISTS ${sql.id(tableName)} (
+    "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+    "embedText" TEXT,
+    "embedding" vector(${sql.raw(vectorDimensions.toString())}),
+    "embeddingsMetadataId" INTEGER NOT NULL,
+    FOREIGN KEY ("embeddingsMetadataId")
+      REFERENCES "EmbeddingsMetadata"("id")
+      ON DELETE CASCADE
+  );
+  CREATE INDEX IF NOT EXISTS "idx_${sql.raw(tableName)}_embedding_vector_cosign_ops"
+    ON ${sql.id(tableName)}
+    USING hnsw ("embedding" vector_cosine_ops);
+  END $$;
+
+      `
+      return query.execute(pg)
+    })
+    Promise.all(maybePromises)
+  }
+}
+
+let modelManager: ModelManager | undefined
+export function getModelManager() {
+  if (modelManager) return modelManager
+  const {AI_EMBEDDING_MODELS, AI_GENERATION_MODELS} = process.env
+  const config: ModelManagerConfig = {
+    embeddingModels: [],
+    generationModels: []
+  }
+  try {
+    config.embeddingModels = AI_EMBEDDING_MODELS && JSON.parse(AI_EMBEDDING_MODELS)
+  } catch (e) {
+    throw new Error(`Invalid AI_EMBEDDING_MODELS .env JSON: ${e}`)
+  }
+  try {
+    config.generationModels = AI_GENERATION_MODELS && JSON.parse(AI_GENERATION_MODELS)
+  } catch (e) {
+    throw new Error(`Invalid AI_GENERATION_MODELS .env JSON: ${e}`)
+  }
+
+  modelManager = new ModelManager(config)
+
+  return modelManager
+}
+
+export default getModelManager
diff --git a/packages/embedder/ai_models/TextEmbeddingsInference.ts b/packages/embedder/ai_models/TextEmbeddingsInference.ts
new file mode 100644
index 00000000000..93bb2c88c2f
--- /dev/null
+++ b/packages/embedder/ai_models/TextEmbeddingsInference.ts
@@ -0,0 +1,71 @@
+import {AbstractEmbeddingsModel, EmbeddingModelConfig, EmbeddingModelParams} from './AbstractModel'
+import fetchWithRetry from './helpers/fetchWithRetry'
+
+const MAX_REQUEST_TIME_S = 3 * 60
+
+export type ModelId = 'BAAI/bge-large-en-v1.5' | 'llmrails/ember-v1'
+
+const modelIdDefinitions: Record<ModelId, EmbeddingModelParams> = {
+  'BAAI/bge-large-en-v1.5': {
+    embeddingDimensions: 1024,
+    maxInputTokens: 512,
+    tableSuffix: 'bge_l_en_1p5'
+  },
+  'llmrails/ember-v1': {
+    embeddingDimensions: 1024,
+    maxInputTokens: 512,
+    tableSuffix: 'ember_1'
+  }
+}
+
+function isValidModelId(object: any): object is ModelId {
+  return Object.keys(modelIdDefinitions).includes(object)
+}
+
+export class TextEmbeddingsInference extends AbstractEmbeddingsModel {
+  constructor(config: EmbeddingModelConfig) {
+    super(config)
+  }
+
+  public async getEmbedding(content: string) {
+    const fetchOptions = {
+      body: JSON.stringify({inputs: content}),
+      deadline: new Date(new Date().getTime() + MAX_REQUEST_TIME_S * 1000),
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json; charset=utf-8'
+      },
+      method: 'POST'
+    }
+
+    try {
+      const res = await fetchWithRetry(`${this.url}/embed`, fetchOptions)
+      const listOfVectors = (await res.json()) as Array<number[]>
+      if (!listOfVectors)
+        throw new Error('TextEmbeddingsInference.getEmbeddings(): listOfVectors is undefined')
+      if (listOfVectors.length !== 1 || !listOfVectors[0])
+        throw new Error(
+          `TextEmbeddingsInference.getEmbeddings(): listOfVectors list length !== 1 (length: ${listOfVectors.length})`
+        )
+      return listOfVectors[0]
+    } catch (e) {
+      console.log(`TextEmbeddingsInference.getEmbeddings() timeout: `, e)
+      throw e
+    }
+  }
+
+  protected constructModelParams(config: EmbeddingModelConfig): EmbeddingModelParams {
+    const modelConfigStringSplit = config.model.split(':')
+    if (modelConfigStringSplit.length != 2) {
+      throw new Error('TextGenerationInference model string must be colon-delimited and len 2')
+    }
+
+    if (!this.url) throw new Error('TextGenerationInferenceSummarizer model requires url')
+    const maybeModelId = modelConfigStringSplit[1]
+    if (!isValidModelId(maybeModelId))
+      throw new Error(`TextGenerationInference model subtype unknown: ${maybeModelId}`)
+    return modelIdDefinitions[maybeModelId]
+  }
+}
+
+export default TextEmbeddingsInference
diff --git a/packages/embedder/ai_models/TextGenerationInference.ts b/packages/embedder/ai_models/TextGenerationInference.ts
new file mode 100644
index 00000000000..6f12ce09974
--- /dev/null
+++ b/packages/embedder/ai_models/TextGenerationInference.ts
@@ -0,0 +1,87 @@
+import {
+  AbstractGenerationModel,
+  GenerationModelConfig,
+  GenerationModelParams,
+  GenerationOptions
+} from './AbstractModel'
+import fetchWithRetry from './helpers/fetchWithRetry'
+
+const MAX_REQUEST_TIME_S = 3 * 60
+
+export type ModelId = 'TheBloke/zephyr-7b-beta'
+
+const modelIdDefinitions: Record<ModelId, GenerationModelParams> = {
+  'TheBloke/zephyr-7b-beta': {
+    maxInputTokens: 512
+  }
+}
+
+function isValidModelId(object: any): object is ModelId {
+  return Object.keys(modelIdDefinitions).includes(object)
+}
+
+export class TextGenerationInference extends AbstractGenerationModel {
+  constructor(config: GenerationModelConfig) {
+    super(config)
+  }
+
+  public async summarize(content: string, options: GenerationOptions) {
+    const {
+      maxNewTokens: max_new_tokens = 512,
+      seed,
+      stop,
+      temperature = 0.8,
+      topP,
+      topK,
+      truncate
+    } = options
+    const parameters = {
+      max_new_tokens,
+      seed,
+      stop,
+      temperature,
+      topP,
+      topK,
+      truncate
+    }
+    const prompt = `Create a brief, one-paragraph summary of the following: ${content}`
+    const fetchOptions = {
+      body: JSON.stringify({
+        inputs: prompt,
+        parameters
+      }),
+      deadline: new Date(new Date().getTime() + MAX_REQUEST_TIME_S * 1000),
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json; charset=utf-8'
+      },
+      method: 'POST'
+    }
+
+    try {
+      // console.log(`TextGenerationInterface.summarize(): summarizing from ${this.url}/generate`)
+      const res = await fetchWithRetry(`${this.url}/generate`, fetchOptions)
+      const json = await res.json()
+      if (!json || !json.generated_text)
+        throw new Error('TextGenerationInterface.summarize(): malformed response')
+      return json.generated_text as string
+    } catch (e) {
+      console.log('TextGenerationInterfaceSummarizer.summarize(): timeout')
+      throw e
+    }
+  }
+  protected constructModelParams(config: GenerationModelConfig): GenerationModelParams {
+    const modelConfigStringSplit = config.model.split(':')
+    if (modelConfigStringSplit.length != 2) {
+      throw new Error('TextGenerationInterface model string must be colon-delimited and len 2')
+    }
+
+    if (!this.url) throw new Error('TextGenerationInterfaceSummarizer model requires url')
+    const maybeModelId = modelConfigStringSplit[1]
+    if (!isValidModelId(maybeModelId))
+      throw new Error(`TextGenerationInterface model subtype unknown: ${maybeModelId}`)
+    return modelIdDefinitions[maybeModelId]
+  }
+}
+
+export default TextGenerationInference
diff --git a/packages/embedder/ai_models/helpers/fetchWithRetry.ts b/packages/embedder/ai_models/helpers/fetchWithRetry.ts
new file mode 100644
index 00000000000..98343ef26e6
--- /dev/null
+++ b/packages/embedder/ai_models/helpers/fetchWithRetry.ts
@@ -0,0 +1,65 @@
+interface FetchWithRetryOptions extends RequestInit {
+  deadline: Date // Deadline for the request to complete
+  debug?: boolean // Enable debug tracing
+  retryStatusCodes?: number[] // Array of status codes to retry on
+}
+
+export default async (url: RequestInfo, options: FetchWithRetryOptions): Promise<Response> => {
+  const {deadline, debug = false, retryStatusCodes = [429], ...fetchOptions} = options
+  let attempt = 0
+  const controller = new AbortController()
+  fetchOptions.signal = controller.signal
+
+  const timeout = deadline.getTime() - Date.now()
+  if (timeout <= 0) {
+    throw new Error('Deadline has already passed')
+  }
+
+  const timeoutId = setTimeout(() => controller.abort(), timeout)
+
+  try {
+    while (Date.now() < deadline.getTime()) {
+      attempt++
+
+      if (debug) {
+        console.log(`Attempt ${attempt}: Fetching ${url}`)
+      }
+
+      const response = await fetch(url, fetchOptions)
+
+      if (!retryStatusCodes.includes(response.status)) {
+        clearTimeout(timeoutId)
+        return response
+      }
+
+      const retryAfter = response.headers.get('Retry-After')
+      // if Retry-After specified, use it; else fallback to exponential backoff
+      let waitTime = retryAfter ? parseInt(retryAfter, 10) * 1000 : Math.pow(2, attempt) * 1000
+
+      // cap waitTime to prevent exceeding the deadline
+      waitTime = Math.min(waitTime, deadline.getTime() - Date.now())
+
+      if (debug) {
+        console.log(
+          `Waiting ${waitTime / 1000} seconds before retrying due to status ${response.status}...`
+        )
+      }
+      await new Promise((resolve) => setTimeout(resolve, waitTime))
+    }
+
+    throw new Error('Deadline exceeded')
+  } catch (error) {
+    clearTimeout(timeoutId)
+    if (error instanceof Error && error.name === 'AbortError') {
+      throw new Error('Request aborted due to deadline')
+    }
+    if (debug) {
+      console.error(`Attempt ${attempt} failed: ${error}`)
+    }
+    const currentTime = Date.now()
+    if (currentTime >= deadline.getTime()) {
+      throw new Error('Deadline exceeded before a successful request')
+    }
+    throw error // Re-throw the error if it's not related to deadline exceeding
+  }
+}
diff --git a/packages/embedder/embedder.ts b/packages/embedder/embedder.ts
new file mode 100644
index 00000000000..1072a546d00
--- /dev/null
+++ b/packages/embedder/embedder.ts
@@ -0,0 +1,253 @@
+import {Insertable} from 'kysely'
+import tracer from 'dd-trace'
+import Redlock, {RedlockAbortSignal} from 'redlock'
+
+import 'parabol-server/initSentry'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {DB} from 'parabol-server/postgres/pg'
+import {refreshRetroDiscussionTopicsMeta as refreshRetroDiscussionTopicsMeta} from './indexing/retrospectiveDiscussionTopic'
+import {orgIdsWithFeatureFlag} from './indexing/orgIdsWithFeatureFlag'
+import getModelManager, {ModelManager} from './ai_models/ModelManager'
+import {countWords} from './indexing/countWords'
+import {createEmbeddingTextFrom} from './indexing/createEmbeddingTextFrom'
+import {
+  selectJobQueueItemById,
+  selectMetadataByJobQueueId,
+  updateJobState
+} from './indexing/embeddingsTablesOps'
+import {selectMetaToQueue} from './indexing/embeddingsTablesOps'
+import {insertNewJobs} from './indexing/embeddingsTablesOps'
+import {completeJobTxn} from './indexing/embeddingsTablesOps'
+import {getRootDataLoader} from './indexing/getRootDataLoader'
+import {getRedisClient} from './indexing/getRedisClient'
+
+/*
+ * TODO List
+ * - [ ] implement a clean-up function that re-queues items that haven't transitioned
+ *       to a completed state, or that failed
+ */
+
+export type DBInsert = {
+  [K in keyof DB]: Insertable<DB[K]>
+}
+
+const POLLING_PERIOD_SEC = 60 // How often do we try to grab the lock and re-index?
+const Q_MAX_LENGTH = 100 // How many EmbeddingIndex items do we batch in redis?
+const WORD_COUNT_TO_TOKEN_RATIO = 3.0 / 2 // We multiple the word count by this to estimate token count
+
+const {AI_EMBEDDER_ENABLED} = process.env
+const {SERVER_ID} = process.env
+
+tracer.init({
+  service: `embedder`,
+  appsec: process.env.DD_APPSEC_ENABLED === 'true',
+  plugins: false,
+  version: process.env.npm_package_version
+})
+tracer.use('pg')
+
+const refreshMetadata = async () => {
+  const dataLoader = getRootDataLoader()
+  await refreshRetroDiscussionTopicsMeta(dataLoader)
+  // In the future, other sorts of objects to index could be added here...
+}
+const maybeQueueMetadataItems = async (modelManager: ModelManager) => {
+  const redisClient = getRedisClient()
+  const queueLength = await redisClient.zcard('embedder:queue')
+  if (queueLength >= Q_MAX_LENGTH) return
+  const itemCountToQueue = Q_MAX_LENGTH - queueLength
+  const modelTables = modelManager.embeddingModels.map((m) => m.tableName)
+  const orgIds = await orgIdsWithFeatureFlag()
+
+  // For each configured embedding model, select rows from EmbeddingsMetadata
+  // that haven't been calculated nor exist in the EmbeddingsJobQueue yet
+  //
+  // Notes:
+  //   * `em.models @> ARRAY[v.model]` is an indexed query
+  //   * I don't love all overrides, I wish there was a better way
+  //     see: https://github.com/kysely-org/kysely/issues/872
+
+  const batchToQueue = await selectMetaToQueue(modelTables, orgIds, itemCountToQueue)
+
+  if (!batchToQueue.length) {
+    console.log(`embedder: no new items to queue`)
+    return
+  }
+
+  const ejqHash: {
+    [key: string]: {
+      refUpdatedAt: Date
+    }
+  } = {}
+  const makeKey = (item: {objectType: string; refId: string}) => `${item.objectType}:${item.refId}`
+
+  const ejqValues = batchToQueue.map((item) => {
+    ejqHash[makeKey(item)] = {
+      refUpdatedAt: item.refUpdatedAt
+    }
+    return {
+      objectType: item.objectType,
+      refId: item.refId as string,
+      model: item.model,
+      state: 'queued' as const
+    }
+  })
+
+  const ejqRows = await insertNewJobs(ejqValues)
+
+  ejqRows.forEach((item) => {
+    const {refUpdatedAt} = ejqHash[makeKey(item)]!
+    const score = new Date(refUpdatedAt).getTime()
+    redisClient.zadd('embedder:queue', score, item.id)
+  })
+
+  console.log(`embedder: queued ${batchToQueue.length} items`)
+}
+
+const dequeueAndEmbedUntilEmpty = async (modelManager: ModelManager) => {
+  const dataLoader = getRootDataLoader()
+  const redisClient = getRedisClient()
+  while (true) {
+    const maybeRedisQItem = await redisClient.zpopmax('embedder:queue', 1)
+    if (maybeRedisQItem.length < 2) return // Q is empty, all done!
+
+    const [id, _] = maybeRedisQItem
+    if (!id) {
+      console.log(`embedder: de-queued undefined item from embedder:queue`)
+      continue
+    }
+    const jobQueueId = parseInt(id, 10)
+    const jobQueueItem = await selectJobQueueItemById(jobQueueId)
+    if (!jobQueueItem) {
+      console.log(`embedder: unable to fetch EmbeddingsJobQueue.id = ${id}`)
+      continue
+    }
+
+    const metadata = await selectMetadataByJobQueueId(jobQueueId)
+    if (!metadata) {
+      await updateJobState(jobQueueId, 'failed', {
+        stateMessage: `unable to fetch metadata by EmbeddingsJobQueue.id = ${id}`
+      })
+      continue
+    }
+
+    let fullText = metadata?.fullText
+    try {
+      if (!fullText) {
+        fullText = await createEmbeddingTextFrom(jobQueueItem, dataLoader)
+      }
+    } catch (e) {
+      await updateJobState(jobQueueId, 'failed', {
+        stateMessage: `unable to create embedding text: ${e}`
+      })
+      continue
+    }
+
+    const wordCount = countWords(fullText)
+
+    const embeddingModel = modelManager.embeddingModelsMapByTable[jobQueueItem.model]
+    if (!embeddingModel) {
+      await updateJobState(jobQueueId, 'failed', {
+        stateMessage: `embedding model ${jobQueueItem.model} not available`
+      })
+      continue
+    }
+    const itemKey = `${jobQueueItem.objectType}:${jobQueueItem.refId}`
+    const modelTable = embeddingModel.tableName
+
+    let embedText = fullText
+    const maxInputTokens = embeddingModel.maxInputTokens
+    // we're using word count as an appoximation of tokens
+    if (wordCount * WORD_COUNT_TO_TOKEN_RATIO > maxInputTokens) {
+      try {
+        const generator = modelManager.generationModels[0] // use 1st generator
+        if (!generator) throw new Error(`Generator unavailable`)
+        const summarizeOptions = {maxInputTokens, truncate: true}
+        console.log(`embedder:     ...summarizing ${itemKey} for ${modelTable}`)
+        embedText = await generator.summarize(fullText, summarizeOptions)
+      } catch (e) {
+        await updateJobState(jobQueueId, 'failed', {
+          stateMessage: `unable to summarize long embed text: ${e}`
+        })
+        continue
+      }
+    }
+    // console.log(`embedText: ${embedText}`)
+
+    let embeddingVector: number[]
+    try {
+      embeddingVector = await embeddingModel.getEmbedding(embedText)
+    } catch (e) {
+      await updateJobState(jobQueueId, 'failed', {
+        stateMessage: `unable to get embeddings: ${e}`
+      })
+      continue
+    }
+
+    // complete job, do the following atomically
+    // (1) update EmbeddingsMetadata to reflect model completion
+    // (2) upsert model table row with embedding
+    // (3) delete EmbeddingsJobQueue row
+    await completeJobTxn(modelTable, jobQueueId, metadata, fullText, embedText, embeddingVector)
+    console.log(`embedder: completed ${itemKey} -> ${modelTable}`)
+  }
+}
+
+const tick = async (modelManager: ModelManager) => {
+  console.log(`embedder: tick`)
+  const redisClient = getRedisClient()
+  const redlock = new Redlock([redisClient], {
+    driftFactor: 0.01,
+    retryCount: 10,
+    retryDelay: 250,
+    retryJitter: 50,
+    automaticExtensionThreshold: 500
+  })
+
+  await redlock
+    .using(['embedder:lock'], 10000, async (signal: RedlockAbortSignal) => {
+      console.log(`embedder: acquired index queue lock`)
+      // N.B. one of the many benefits of using redlock is the using() interface
+      // will automatically extend the lock if these operations exceed the
+      // original redis timeout time
+      await refreshMetadata()
+      await maybeQueueMetadataItems(modelManager)
+
+      if (signal.aborted) {
+        // Not certain which conditions this would happen, it would
+        // happen after operations took place, so nothing much to do here.
+        console.log('embedder: lock was lost!')
+      }
+    })
+    .catch((err: string) => {
+      // Handle errors (including lock acquisition errors)
+      console.error('embedder: an error occurred ', err)
+    })
+  console.log('embedder: index queue lock released')
+
+  // get the highest priority item and embed it
+  await dequeueAndEmbedUntilEmpty(modelManager)
+
+  setTimeout(() => tick(modelManager), POLLING_PERIOD_SEC * 1000)
+}
+
+function parseEnvBoolean(envVarValue: string | undefined): boolean {
+  return envVarValue === 'true'
+}
+
+const run = async () => {
+  console.log(`embedder: run()`)
+  const embedderEnabled = parseEnvBoolean(AI_EMBEDDER_ENABLED)
+  const modelManager = getModelManager()
+  if (embedderEnabled && modelManager) {
+    const pg = getKysely()
+    await modelManager.maybeCreateTables(pg)
+    console.log(`\n⚡⚡⚡️️ Server ID: ${SERVER_ID}. Embedder is ready ⚡⚡⚡️️️`)
+    tick(modelManager)
+  } else {
+    console.log(`embedder: no valid configuration (check AI_EMBEDDER_ENABLED in .env)`)
+    // exit
+  }
+}
+
+run()
diff --git a/packages/embedder/indexing/countWords.ts b/packages/embedder/indexing/countWords.ts
new file mode 100644
index 00000000000..75dae3effa2
--- /dev/null
+++ b/packages/embedder/indexing/countWords.ts
@@ -0,0 +1,17 @@
+export function countWords(text: string) {
+  let count = 0
+  let inWord = false
+
+  for (const char of text) {
+    if (/\w/.test(char)) {
+      if (!inWord) {
+        count++
+        inWord = true
+      }
+    } else {
+      inWord = false
+    }
+  }
+
+  return count
+}
diff --git a/packages/embedder/indexing/createEmbeddingTextFrom.ts b/packages/embedder/indexing/createEmbeddingTextFrom.ts
new file mode 100644
index 00000000000..9d6e66b60e7
--- /dev/null
+++ b/packages/embedder/indexing/createEmbeddingTextFrom.ts
@@ -0,0 +1,15 @@
+import {Selectable} from 'kysely'
+import {DB} from 'parabol-server/postgres/pg'
+import {DataLoaderWorker} from 'parabol-server/graphql/graphql'
+
+import {createText as createTextFromRetrospectiveDiscussionTopic} from './retrospectiveDiscussionTopic'
+
+export const createEmbeddingTextFrom = async (
+  item: Selectable<DB['EmbeddingsJobQueue']>,
+  dataLoader: DataLoaderWorker
+): Promise<string> => {
+  switch (item.objectType) {
+    case 'retrospectiveDiscussionTopic':
+      return createTextFromRetrospectiveDiscussionTopic(item, dataLoader)
+  }
+}
diff --git a/packages/embedder/indexing/embeddingsTablesOps.ts b/packages/embedder/indexing/embeddingsTablesOps.ts
new file mode 100644
index 00000000000..b68bc21ccbe
--- /dev/null
+++ b/packages/embedder/indexing/embeddingsTablesOps.ts
@@ -0,0 +1,198 @@
+import {Insertable, Selectable, Updateable, sql} from 'kysely'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {DB} from 'parabol-server/postgres/pg'
+import {DBInsert} from '../embedder'
+import {RawBuilder} from 'kysely'
+import numberVectorToString from './numberVectorToString'
+
+function unnestedArray<T>(maybeArray: T[] | T): RawBuilder<T> {
+  let a: T[] = Array.isArray(maybeArray) ? maybeArray : [maybeArray]
+  return sql`unnest(ARRAY[${sql.join(a)}]::varchar[])`
+}
+
+export const selectJobQueueItemById = async (
+  id: number
+): Promise<Selectable<DB['EmbeddingsJobQueue']> | undefined> => {
+  const pg = getKysely()
+  return pg.selectFrom('EmbeddingsJobQueue').selectAll().where('id', '=', id).executeTakeFirst()
+}
+export const selectMetadataByJobQueueId = async (
+  id: number
+): Promise<Selectable<DB['EmbeddingsMetadata']> | undefined> => {
+  const pg = getKysely()
+  return pg
+    .selectFrom('EmbeddingsMetadata as em')
+    .selectAll()
+    .leftJoin('EmbeddingsJobQueue as ejq', (join) =>
+      join.onRef('em.objectType', '=', 'ejq.objectType').onRef('em.refId', '=', 'ejq.refId')
+    )
+    .where('ejq.id', '=', id)
+    .executeTakeFirstOrThrow()
+}
+
+// For each configured embedding model, select rows from EmbeddingsMetadata
+// that haven't been calculated nor exist in the EmbeddingsJobQueue yet
+//
+// Notes:
+//   * `em.models @> ARRAY[v.model]` is an indexed query
+//   * I don't love all overrides, I wish there was a better way
+//     see: https://github.com/kysely-org/kysely/issues/872
+export async function selectMetaToQueue(
+  configuredModels: string[],
+  orgIds: any[],
+  itemCountToQueue: number
+) {
+  const pg = getKysely()
+  const maybeMetaToQueue = (await pg
+    .selectFrom('EmbeddingsMetadata as em')
+    .selectAll('em')
+    .leftJoinLateral(unnestedArray(configuredModels).as('model'), (join) => join.onTrue())
+    .leftJoin('Team as t', 'em.teamId', 't.id')
+    .select('model' as any)
+    .where(({eb, not, or, and, exists, selectFrom}) =>
+      and([
+        or([
+          not(eb('em.models', '<@', sql`ARRAY[${sql.ref('model')}]::varchar[]` as any) as any),
+          eb('em.models' as any, 'is', null)
+        ]),
+        not(
+          exists(
+            selectFrom('EmbeddingsJobQueue as ejq')
+              .select('ejq.id')
+              .whereRef('em.objectType', '=', 'ejq.objectType')
+              .whereRef('em.refId', '=', 'ejq.refId')
+              .whereRef('ejq.model', '=', 'model' as any)
+          )
+        ),
+        eb('t.orgId', 'in', orgIds)
+      ])
+    )
+    .limit(itemCountToQueue)
+    .execute()) as unknown as Selectable<DB['EmbeddingsMetadata'] & {model: string}>[]
+
+  type MetadataToQueue = Selectable<
+    Omit<DB['EmbeddingsMetadata'], 'refId'> & {
+      refId: NonNullable<DB['EmbeddingsMetadata']['refId']>
+    } & {model: string}
+  >
+
+  return maybeMetaToQueue.filter(
+    (item) => item.refId !== null && item.refId !== undefined
+  ) as MetadataToQueue[]
+}
+
+export const updateJobState = async (
+  id: number,
+  state: Updateable<DB['EmbeddingsJobQueue']>['state'],
+  jobQueueFields: Updateable<DB['EmbeddingsJobQueue']> = {}
+) => {
+  const pg = getKysely()
+  const jobQueueColumns: Updateable<DB['EmbeddingsJobQueue']> = {
+    ...jobQueueFields,
+    state
+  }
+  if (state === 'failed') console.log(`embedder: failed job ${id}, ${jobQueueFields.stateMessage}`)
+  return pg
+    .updateTable('EmbeddingsJobQueue')
+    .set(jobQueueColumns)
+    .where('id', '=', id)
+    .executeTakeFirstOrThrow()
+}
+
+export function insertNewJobs(ejqValues: Insertable<DB['EmbeddingsJobQueue']>[]) {
+  const pg = getKysely()
+  return pg
+    .insertInto('EmbeddingsJobQueue')
+    .values(ejqValues)
+    .returning(['id', 'objectType', 'refId'])
+    .execute()
+}
+
+// complete job, do the following atomically
+// (1) update EmbeddingsMetadata to reflect model completion
+// (2) upsert model table row with embedding
+// (3) delete EmbeddingsJobQueue row
+export function completeJobTxn(
+  modelTable: string,
+  jobQueueId: number,
+  metadata: Updateable<DB['EmbeddingsMetadata']>,
+  fullText: string,
+  embedText: string,
+  embeddingVector: number[]
+) {
+  const pg = getKysely()
+  return pg.transaction().execute(async (trx) => {
+    // get fields to update correct metadata row
+    const jobQueueItem = await trx
+      .selectFrom('EmbeddingsJobQueue')
+      .select(['objectType', 'refId', 'model'])
+      .where('id', '=', jobQueueId)
+      .executeTakeFirstOrThrow()
+
+    // (1) update metadata row
+    const metadataColumnsToUpdate: {
+      models: RawBuilder<string[]>
+      fullText?: string | null | undefined
+    } = {
+      // update models as a set
+      models: sql<string[]>`(
+SELECT array_agg(DISTINCT value)
+FROM (
+  SELECT unnest(COALESCE("models", '{}')) AS value
+  UNION
+  SELECT unnest(ARRAY[${modelTable}]::VARCHAR[]) AS value
+) AS combined_values
+)`
+    }
+
+    if (metadata?.fullText !== fullText) {
+      metadataColumnsToUpdate.fullText = fullText
+    }
+
+    const updatedMetadata = await trx
+      .updateTable('EmbeddingsMetadata')
+      .set(metadataColumnsToUpdate)
+      .where('objectType', '=', jobQueueItem.objectType)
+      .where('refId', '=', jobQueueItem.refId)
+      .returning(['id'])
+      .executeTakeFirstOrThrow()
+
+    // (2) upsert into model table
+    await trx
+      .insertInto(modelTable as any)
+      .values({
+        embedText: fullText !== embedText ? embedText : null,
+        embedding: numberVectorToString(embeddingVector),
+        embeddingsMetadataId: updatedMetadata.id
+      })
+      .onConflict((oc) =>
+        oc.column('id').doUpdateSet((eb) => ({
+          embedText: eb.ref('excluded.embedText'),
+          embeddingsMetadataId: eb.ref('excluded.embeddingsMetadataId')
+        }))
+      )
+      .executeTakeFirstOrThrow()
+
+    // (3) delete completed job queue item
+    return await trx
+      .deleteFrom('EmbeddingsJobQueue')
+      .where('id', '=', jobQueueId)
+      .executeTakeFirstOrThrow()
+  })
+}
+export async function upsertEmbeddingsMetaRows(
+  embeddingsMetaRows: DBInsert['EmbeddingsMetadata'][]
+) {
+  const pg = getKysely()
+  return pg
+    .insertInto('EmbeddingsMetadata')
+    .values(embeddingsMetaRows)
+    .onConflict((oc) =>
+      oc.columns(['objectType', 'refId']).doUpdateSet((eb) => ({
+        objectType: eb.ref('excluded.objectType'),
+        refId: eb.ref('excluded.refId'),
+        refUpdatedAt: eb.ref('excluded.refUpdatedAt')
+      }))
+    )
+    .execute()
+}
diff --git a/packages/embedder/indexing/getRedisClient.ts b/packages/embedder/indexing/getRedisClient.ts
new file mode 100644
index 00000000000..7aaf65be33c
--- /dev/null
+++ b/packages/embedder/indexing/getRedisClient.ts
@@ -0,0 +1,11 @@
+import RedisInstance from 'parabol-server/utils/RedisInstance'
+
+const {SERVER_ID} = process.env
+
+let redisClient: RedisInstance
+export const getRedisClient = () => {
+  if (!redisClient) {
+    redisClient = new RedisInstance(`embedder-${SERVER_ID}`)
+  }
+  return redisClient
+}
diff --git a/packages/embedder/indexing/getRootDataLoader.ts b/packages/embedder/indexing/getRootDataLoader.ts
new file mode 100644
index 00000000000..304c0c01058
--- /dev/null
+++ b/packages/embedder/indexing/getRootDataLoader.ts
@@ -0,0 +1,10 @@
+import getDataLoader from 'parabol-server/graphql/getDataLoader'
+import {DataLoaderWorker} from 'parabol-server/graphql/graphql'
+
+let rootDataLoader: DataLoaderWorker
+export const getRootDataLoader = () => {
+  if (!rootDataLoader) {
+    rootDataLoader = getDataLoader() as DataLoaderWorker
+  }
+  return rootDataLoader
+}
diff --git a/packages/embedder/indexing/numberVectorToString.ts b/packages/embedder/indexing/numberVectorToString.ts
new file mode 100644
index 00000000000..df49a716d57
--- /dev/null
+++ b/packages/embedder/indexing/numberVectorToString.ts
@@ -0,0 +1,5 @@
+function numberVectorToString(vector: number[]): string {
+  return '[' + vector.join(', ') + ']'
+}
+
+export default numberVectorToString
diff --git a/packages/embedder/indexing/orgIdsWithFeatureFlag.ts b/packages/embedder/indexing/orgIdsWithFeatureFlag.ts
new file mode 100644
index 00000000000..82d86702e67
--- /dev/null
+++ b/packages/embedder/indexing/orgIdsWithFeatureFlag.ts
@@ -0,0 +1,15 @@
+import getRethink from 'parabol-server/database/rethinkDriver'
+import {RDatum} from 'parabol-server/database/stricterR'
+
+export const orgIdsWithFeatureFlag = async () => {
+  // I had to add a secondary index to the Organization table to get
+  // this query to be cheap
+  const r = await getRethink()
+  return await r
+    .table('Organization')
+    .getAll('relatedDiscussions', {index: 'featureFlagsIndex' as any})
+    .filter((r: RDatum) => r('featureFlags').contains('relatedDiscussions'))
+    .map((r: RDatum) => r('id'))
+    .coerceTo('array')
+    .run()
+}
diff --git a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
new file mode 100644
index 00000000000..f31aab74cc2
--- /dev/null
+++ b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
@@ -0,0 +1,326 @@
+import {Selectable} from 'kysely'
+import prettier from 'prettier'
+
+import getRethink, {RethinkSchema} from 'parabol-server/database/rethinkDriver'
+import {DataLoaderWorker} from 'parabol-server/graphql/graphql'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {DB} from 'parabol-server/postgres/pg'
+
+import Comment from 'parabol-server/database/types/Comment'
+import DiscussStage from 'parabol-server/database/types/DiscussStage'
+import MeetingRetrospective, {
+  isMeetingRetrospective
+} from 'parabol-server/database/types/MeetingRetrospective'
+
+import {upsertEmbeddingsMetaRows} from './embeddingsTablesOps'
+import {AnyMeeting} from 'parabol-server/postgres/types/Meeting'
+
+const BATCH_SIZE = 1000
+
+export interface EmbeddingsJobQueueRetrospectiveDiscussionTopic
+  extends Omit<DB['EmbeddingsJobQueue'], 'objectType'> {
+  objectType: 'retrospectiveDiscussionTopic'
+}
+
+// Here's a generic reprentation of the text generated here:
+
+// A topic "<DISCUSSION_TOPIC>" was discussed during the meeting "<MEETING_NAME>"
+// that followed the "<TEMPLATE_NAME>" template.
+//
+// <FOR EACH PROMPT>
+// Participants were prompted with, "<PROMPT>: <PROMPT DESCRIPTION>".
+//  - <PARTICIPANT|ANONYMOUS> wrote, "<RESPONSE>"
+//
+// </FOR EACH PROMPT>
+//
+// <IF DISCUSSION>
+// A discussion was held. <DISCUSSION SUMMARY>
+// </END IF DISCUSSION>
+
+const IGNORE_COMMENT_USER_IDS = ['parabolAIUser']
+
+const pg = getKysely()
+
+export async function refreshRetroDiscussionTopicsMeta(dataLoader: DataLoaderWorker) {
+  const r = await getRethink()
+  const {createdAt: newestMeetingDate} = (await r
+    .table('NewMeeting')
+    .max({index: 'createdAt'})
+    .run()) as unknown as RethinkSchema['NewMeeting']['type']
+  const {createdAt: oldestMeetingDate} = (await r
+    .table('NewMeeting')
+    .min({index: 'createdAt'})
+    .run()) as unknown as RethinkSchema['NewMeeting']['type']
+
+  const {newestMetaDate} = (await pg
+    .selectFrom('EmbeddingsMetadata')
+    .select(pg.fn.max('refUpdatedAt').as('newestMetaDate'))
+    .where('objectType', '=', 'retrospectiveDiscussionTopic')
+    .executeTakeFirst()) ?? {newestMetaDate: null}
+  let startDateTime = newestMetaDate || oldestMeetingDate
+
+  if (startDateTime.getTime() === newestMeetingDate.getTime()) return
+
+  console.log(
+    `refreshRetroDiscussionTopicsMeta(): ` +
+      `will consider adding items from ${startDateTime.toISOString()} to ` +
+      `${newestMeetingDate.toISOString()}`
+  )
+
+  let totalAdded = 0
+  do {
+    // Process history in batches.
+    //
+    // N.B. We add historical meetings to the EmbeddingsMetadata table here.
+    // This query will intentionally miss meetings that haven't been completed
+    // (`summarySentAt` is null). These meetings will need to be added to the
+    // EmbeddingsMetadata table by a hook that runs when the meetings complete.
+    const {maxCreatedAt, completedNewMeetings} = await r
+      .table('NewMeeting')
+      .between(startDateTime, newestMeetingDate, {rightBound: 'closed', index: 'createdAt'})
+      .orderBy({index: 'createdAt'})
+      .limit(BATCH_SIZE)
+      .coerceTo('array')
+      .do((rows: any) => ({
+        maxCreatedAt: r.expr(rows).max('createdAt')('createdAt'), // Then find the max createdAt value
+        completedNewMeetings: r.expr(rows).filter((r: any) =>
+          r('meetingType')
+            .eq('retrospective')
+            .and(
+              r('endedAt').gt(0),
+              r
+                .hasFields('phases')
+                .and(r('phases').count().gt(0))
+                .and(
+                  r('phases')
+                    .filter((phase: any) => phase('phaseType').eq('discuss'))
+                    .filter((phase: any) =>
+                      phase.hasFields('stages').and(phase('stages').count().gt(0))
+                    )
+                    .count()
+                    .gt(0)
+                )
+            )
+        )
+      }))
+      .run()
+    const embeddingsMetaRows = (
+      await Promise.all(
+        completedNewMeetings.map((m: AnyMeeting) =>
+          newRetroDiscussionTopicsFromNewMeeting(m, dataLoader)
+        )
+      )
+    ).flat()
+    if (embeddingsMetaRows.length > 0) {
+      await upsertEmbeddingsMetaRows(embeddingsMetaRows)
+      totalAdded += embeddingsMetaRows.length
+      console.log(
+        `refreshRetroDiscussionTopicsMeta(): synced to ${maxCreatedAt.toISOString()}, added` +
+          ` ${embeddingsMetaRows.length} retrospectiveDiscussionTopics`
+      )
+    }
+
+    // N.B. In the unlikely event that we have >=BATCH_SIZE meetings that end at _exactly_
+    // the same timetsamp, this will loop forever.
+    if (
+      startDateTime.getTime() === newestMeetingDate.getTime() &&
+      completedNewMeetings.length < BATCH_SIZE
+    )
+      break
+    startDateTime = maxCreatedAt
+  } while (true)
+
+  console.log(
+    `refreshRetroDiscussionTopicsMeta(): added ${totalAdded} total retrospectiveDiscussionTopics`
+  )
+}
+
+async function getPreferredNameByUserId(userId: string, dataLoader: DataLoaderWorker) {
+  const user = await dataLoader.get('users').load(userId)
+  return !user ? 'Unknown' : user.preferredName
+}
+
+async function formatThread(
+  dataLoader: DataLoaderWorker,
+  comments: Comment[],
+  parentId: string | null = null,
+  depth = 0
+): Promise<string> {
+  // Filter and sort comments as before
+  const filteredComments = comments
+    .filter((comment) => comment.threadParentId === parentId)
+    .sort((a, b) => (a.threadSortOrder < b.threadSortOrder ? -1 : 1))
+
+  // Use map to create an array of promises for each formatted comment string
+  const formattedCommentsPromises = filteredComments.map(async (comment) => {
+    const indent = '   '.repeat(depth + 1)
+    const author = comment.isAnonymous
+      ? 'Anonymous'
+      : comment.createdBy
+      ? await getPreferredNameByUserId(comment.createdBy, dataLoader)
+      : 'Unknown'
+    const how = depth === 0 ? 'wrote' : 'replied'
+    const content = comment.plaintextContent
+    const formattedPost = `${indent}- ${author} ${how}, "${content}"\n`
+
+    // Recursively format child threads
+    const childThread = await formatThread(dataLoader, comments, comment.id, depth + 1)
+    return formattedPost + '\n' + childThread
+  })
+
+  // Resolve all promises and join the results
+  const formattedComments = await Promise.all(formattedCommentsPromises)
+  return formattedComments.join('')
+}
+
+export const createTextFromNewMeetingDiscussionStage = async (
+  newMeeting: MeetingRetrospective,
+  stageId: string,
+  dataLoader: DataLoaderWorker,
+  textForReranking: boolean = false
+) => {
+  if (!newMeeting) throw 'newMeeting is undefined'
+  if (!isMeetingRetrospective(newMeeting)) throw 'newMeeting is not retrospective'
+  if (!newMeeting.templateId) throw 'template is undefined'
+  const template = await dataLoader.get('meetingTemplates').load(newMeeting.templateId)
+  if (!template) throw 'template is undefined'
+  const discussPhase = newMeeting.phases.find((phase) => phase.phaseType === 'discuss')
+  if (!discussPhase) throw 'newMeeting discuss phase is undefined'
+  if (!discussPhase.stages) throw 'newMeeting discuss phase has no stages'
+  const discussStage = discussPhase.stages.find((stage) => stage.id === stageId) as DiscussStage
+  if (!discussStage) throw 'newMeeting discuss stage not found'
+  const {summary: discussionSummary} = discussStage.discussionId
+    ? (await dataLoader.get('discussions').load(discussStage.discussionId)) ?? {summary: null}
+    : {summary: null}
+  const r = await getRethink()
+  if (!discussStage.reflectionGroupId) throw 'newMeeting discuss stage has no reflectionGroupId'
+  const reflectionGroup = await r
+    .table('RetroReflectionGroup')
+    .get(discussStage.reflectionGroupId)
+    .run()
+  if (!reflectionGroup.id) throw 'newMeeting reflectionGroup has no id'
+  const reflections = await r
+    .table('RetroReflection')
+    .getAll(reflectionGroup.id, {index: 'reflectionGroupId'})
+    .run()
+  const promptIds = [...new Set(reflections.map((r) => r.promptId))]
+  let markdown = ''
+  if (!textForReranking)
+    markdown =
+      `A topic "${reflectionGroup.title}" was discussed during ` +
+      `the meeting "${newMeeting.name}" that followed the "${template.name}" template.\n` +
+      `\n`
+  const prompts = await dataLoader.get('reflectPrompts').loadMany(promptIds)
+  for (const prompt of prompts) {
+    if (!prompt || prompt instanceof Error) continue
+    if (!textForReranking) {
+      markdown += `Participants were prompted with, "${prompt.question}`
+      if (prompt.description) markdown += `: ${prompt.description}`
+      markdown += `".\n`
+    }
+    if (newMeeting.disableAnonymity) {
+      for (const reflection of reflections.filter((r) => r.promptId === prompt.id)) {
+        const author = await getPreferredNameByUserId(reflection.creatorId, dataLoader)
+        markdown += `   - ${author} wrote, "${reflection.plaintextContent}"\n`
+      }
+    } else {
+      for (const reflection of reflections.filter((r) => r.promptId === prompt.id)) {
+        markdown += `   - Anonymous wrote, "${reflection.plaintextContent}"\n`
+      }
+    }
+    markdown += `\n`
+  }
+
+  markdown += `\n`
+
+  /**
+   * The choice I made here was default to the summary of the discussion if it exists in order to make this textual
+   * representation of a retrospective discussion a shorter token count. Using the summary almost certainly ensures
+   * this text won't need to be sent to be summarized again before an embedding vector is calculated.
+   *
+   * If we included the comments all the time, then we're maximizing the chance that rarer tokens might end up in the
+   * embed text and these tokens might affect the final embed vector in a useful way. However, we increase the odds that
+   * the embed text will need to be summarized before the vector is calculated.
+   *
+   * I decided to "just be cheap" and try and minimize calls to the summarizer.
+   *
+   * If we wanted to compare and contrast these approaches, we could always generate a second set of embed vectors
+   * objectType: 'retrospectiveDiscussionNoSummary' or something and do a bit of testing.
+   */
+
+  if (discussionSummary) {
+    markdown += `Further discussion was made. ` + ` ${discussionSummary}`
+  } else {
+    const comments = await dataLoader.get('commentsByDiscussionId').load(stageId)
+
+    const sortedComments = comments
+      .map((comment) => {
+        if (!comment.threadParentId) {
+          return {
+            ...comment,
+            threadParentId: null
+          }
+        }
+        return comment
+      })
+      .sort((a, b) => {
+        if (a.threadParentId === b.threadParentId) {
+          return a.threadSortOrder - b.threadSortOrder
+        }
+        if (a.threadParentId == null) return 1
+        if (b.threadParentId == null) return -1
+        return a.threadParentId > b.threadParentId ? 1 : -1
+      }) as Comment[]
+
+    const filteredComments = sortedComments.filter(
+      (c) => !IGNORE_COMMENT_USER_IDS.includes(c.createdBy)
+    )
+    if (filteredComments.length) {
+      markdown += `Futher discussion was made:\n`
+      markdown += await formatThread(dataLoader, filteredComments)
+      // TODO: if the discussion threads are too long, summarize them
+    }
+  }
+
+  markdown = prettier.format(markdown, {
+    parser: 'markdown',
+    proseWrap: 'always',
+    printWidth: 72
+  })
+
+  return markdown
+}
+
+export const createText = async (
+  item: Selectable<EmbeddingsJobQueueRetrospectiveDiscussionTopic>,
+  dataLoader: DataLoaderWorker
+): Promise<string> => {
+  if (!item.refId) throw 'refId is undefined'
+  const [newMeetingId, discussionId] = item.refId.split(':')
+  if (!newMeetingId) throw new Error('newMeetingId cannot be undefined')
+  if (!discussionId) throw new Error('discussionId cannot be undefined')
+  const newMeeting = await dataLoader.get('newMeetings').load(newMeetingId)
+  return createTextFromNewMeetingDiscussionStage(
+    newMeeting as MeetingRetrospective,
+    discussionId,
+    dataLoader
+  )
+}
+
+export const newRetroDiscussionTopicsFromNewMeeting = async (
+  newMeeting: RethinkSchema['NewMeeting']['type'],
+  dataLoader: DataLoaderWorker
+) => {
+  const discussPhase = newMeeting.phases.find((phase) => phase.phaseType === 'discuss')
+  const orgId = (await dataLoader.get('teams').load(newMeeting.teamId))?.orgId
+  if (orgId && discussPhase && discussPhase.stages) {
+    return discussPhase.stages.map((stage) => ({
+      objectType: 'retrospectiveDiscussionTopic' as const,
+      teamId: newMeeting.teamId,
+      refId: `${newMeeting.id}:${stage.id}`,
+      refUpdatedAt: newMeeting.createdAt
+    }))
+  } else {
+    return []
+  }
+}
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
new file mode 100644
index 00000000000..47af8737dac
--- /dev/null
+++ b/packages/embedder/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "parabol-embedder",
+  "version": "7.10.0",
+  "description": "A service that computes embedding vectors from Parabol objects",
+  "author": "Jordan Husney <jordan.husney@gmail.com>",
+  "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
+  "license": "AGPL-3.0-or-later",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ParabolInc/parabol.git"
+  },
+  "scripts": {
+    "typecheck": "yarn tsc --noEmit -p tsconfig.json"
+  },
+  "bugs": {
+    "url": "https://github.com/ParabolInc/parabol/issues"
+  },
+  "devDependencies": {
+    "@babel/cli": "7.18.6",
+    "@babel/core": "7.18.6",
+    "@types/node": "^16.11.62",
+    "babel-plugin-inline-import": "^3.0.0",
+    "sucrase": "^3.32.0",
+    "ts-node-dev": "^1.0.0-pre.44",
+    "typescript": "4.9.5"
+  },
+  "dependencies": {
+    "dd-trace": "^4.2.0",
+    "redlock": "^5.0.0-beta.2"
+  }
+}
diff --git a/packages/embedder/tsconfig.json b/packages/embedder/tsconfig.json
new file mode 100644
index 00000000000..1d179d08096
--- /dev/null
+++ b/packages/embedder/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "../",
+    "paths": {
+      // when we import from lib, make goto-definition point to the src
+      "parabol-server/*": ["server/*"],
+      "parabol-client/*": ["client/*"]
+    },
+    "outDir": "lib",
+    "lib": ["esnext"],
+    "types": ["node"]
+  },
+  "files": ["../server/types/modules.d.ts"]
+}
diff --git a/packages/server/dataloader/customLoaderMakers.ts b/packages/server/dataloader/customLoaderMakers.ts
index b39e1e42d30..8bd64c6250b 100644
--- a/packages/server/dataloader/customLoaderMakers.ts
+++ b/packages/server/dataloader/customLoaderMakers.ts
@@ -1,5 +1,5 @@
 import DataLoader from 'dataloader'
-import {Selectable, sql} from 'kysely'
+import {Selectable, SqlBool, sql} from 'kysely'
 import {PARABOL_AI_USER_ID} from '../../client/utils/constants'
 import getRethink, {RethinkSchema} from '../database/rethinkDriver'
 import {RDatum} from '../database/stricterR'
@@ -478,11 +478,11 @@ export const meetingTemplatesByOrgId = (parent: RootDataLoader) => {
         .selectAll()
         .where('orgId', 'in', orgIds)
         .where('isActive', '=', true)
-        .where(({or, cmpr}) =>
+        .where(({or, eb}) =>
           or([
-            cmpr('hideStartingAt', 'is', null),
-            sql`make_date(2020 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`,
-            sql`make_date(2019 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`
+            eb('hideStartingAt', 'is', null),
+            sql<SqlBool>`make_date(2020 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`,
+            sql<SqlBool>`make_date(2019 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`
           ])
         )
         .orderBy('createdAt', 'desc')
diff --git a/packages/server/dataloader/customRedisQueries.ts b/packages/server/dataloader/customRedisQueries.ts
index b3ed754dcab..a461202ca5a 100644
--- a/packages/server/dataloader/customRedisQueries.ts
+++ b/packages/server/dataloader/customRedisQueries.ts
@@ -1,7 +1,7 @@
 // Sometimes, a value cached is redis is harder to get than simply querying the primary key on a table
 // this allows redis to cache the results of arbitrarily complex rethinkdb queries
 
-import {sql} from 'kysely'
+import {sql, SqlBool} from 'kysely'
 import ms from 'ms'
 import getRethink from '../database/rethinkDriver'
 import {RDatum} from '../database/stricterR'
@@ -38,11 +38,11 @@ const customRedisQueries = {
           .where('teamId', '=', 'aGhostTeam')
           .where('isActive', '=', true)
           .where('type', '=', templateType)
-          .where(({or, cmpr}) =>
+          .where(({or, eb}) =>
             or([
-              cmpr('hideStartingAt', 'is', null),
-              sql`make_date(2020 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`,
-              sql`make_date(2019 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`
+              eb('hideStartingAt', 'is', null),
+              sql<SqlBool>`make_date(2020 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`,
+              sql<SqlBool>`make_date(2019 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`
             ])
           )
           .execute()
diff --git a/packages/server/postgres/getKysely.ts b/packages/server/postgres/getKysely.ts
index 0a8632a3eb6..f2824a800d0 100644
--- a/packages/server/postgres/getKysely.ts
+++ b/packages/server/postgres/getKysely.ts
@@ -10,6 +10,13 @@ const getKysely = () => {
       dialect: new PostgresDialect({
         pool: pg
       })
+      // query logging, if you'd like it:
+      // log(event) {
+      //   if (event.level === 'query') {
+      //     console.log(event.query.sql)
+      //     console.log(event.query.parameters)
+      //   }
+      // }
     })
   }
   return kysely
diff --git a/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts b/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts
new file mode 100644
index 00000000000..3c93617c0b1
--- /dev/null
+++ b/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts
@@ -0,0 +1,20 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    ALTER TABLE "EmbeddingsMetadata" RENAME COLUMN "embedText" TO "fullText";
+  `)
+  await client.end()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    ALTER TABLE "EmbeddingsMetadata" RENAME COLUMN "fullText" TO "embedText";
+  `)
+  await client.end()
+}
diff --git a/pm2.config.js b/pm2.config.js
index 4d270b745ea..fdf09ea9ca2 100644
--- a/pm2.config.js
+++ b/pm2.config.js
@@ -30,6 +30,21 @@ module.exports = {
         NODE_ENV: 'production'
       }
     },
+    {
+      name: 'Embedder',
+      script: 'dist/embedder.js',
+      instances: 1,
+      increment_var: 'SERVER_ID',
+      autorestart: true,
+      watch: false,
+      max_memory_restart: '4096M',
+      env: {
+        SERVER_ID: 5
+      },
+      env_production: {
+        NODE_ENV: 'production'
+      }
+    },
     {
       name: 'GQL Executor',
       script: 'dist/gqlExecutor.js',
@@ -39,7 +54,7 @@ module.exports = {
       watch: false,
       max_memory_restart: '24576M',
       env: {
-        SERVER_ID: 5
+        SERVER_ID: 6
       },
       env_production: {
         NODE_ENV: 'production'
diff --git a/pm2.dev.config.js b/pm2.dev.config.js
index c5f04196dff..6cd457059ef 100644
--- a/pm2.dev.config.js
+++ b/pm2.dev.config.js
@@ -4,6 +4,19 @@ module.exports = {
       name: 'Webpack Servers',
       script: 'scripts/buildServers.js'
     },
+    {
+      name: 'Socket Server',
+      script: 'scripts/runSocketServer.js',
+      // increase this to test scaling
+      instances: 1,
+      increment_var: 'SERVER_ID',
+      env: {
+        SERVER_ID: 0
+      },
+      watch: ['dev/web.js'],
+      // if the watched file doeesn't exist, wait for it instead of restarting
+      autorestart: false
+    },
     {
       name: 'GraphQL Executor',
       script: 'scripts/runExecutor.js',
@@ -15,24 +28,20 @@ module.exports = {
       },
       watch: ['dev/gqlExecutor.js'],
       // if the watched file doeesn't exist, wait for it instead of restarting
-      autorestart: false,
-      log_file: 'dev/logs/gqlExecutor.log',
-      combine_logs: true
+      autorestart: false
     },
     {
-      name: 'Socket Server',
-      script: 'scripts/runSocketServer.js',
+      name: 'Embedder',
+      script: 'scripts/runEmbedder.js',
       // increase this to test scaling
       instances: 1,
       increment_var: 'SERVER_ID',
       env: {
-        SERVER_ID: 0
+        SERVER_ID: 6
       },
-      watch: ['dev/web.js'],
+      watch: ['dev/embedder.js'],
       // if the watched file doeesn't exist, wait for it instead of restarting
-      autorestart: false,
-      log_file: 'dev/logs/web.log',
-      combine_logs: true
+      autorestart: false
     },
     {
       name: 'Dev Server',
diff --git a/scripts/generateGraphQLArtifacts.js b/scripts/generateGraphQLArtifacts.js
index de2fd452e67..9ca5cd43067 100644
--- a/scripts/generateGraphQLArtifacts.js
+++ b/scripts/generateGraphQLArtifacts.js
@@ -16,8 +16,11 @@ const generateGraphQLArtifacts = async () => {
         relayCompiler?.kill()
       })
     })
-
-  await Promise.all([generate(codegenSchema), runCompiler()])
+  console.log('gen graphql artifacts start')
+  await generate(codegenSchema)
+  console.log('codegen complete')
+  await runCompiler()
+  console.log('relay compiler complete')
   persistServer.close()
 }
 
diff --git a/scripts/prod.js b/scripts/prod.js
index 65d121446d8..94a7565363b 100644
--- a/scripts/prod.js
+++ b/scripts/prod.js
@@ -10,15 +10,25 @@ const runChild = (cmd) => {
 
 const prod = async (isDeploy, noDeps) => {
   console.log('🙏🙏🙏      Building Production Server      🙏🙏🙏')
-  await generateGraphQLArtifacts()
-  await Promise.all([
-    runChild(
-      `yarn webpack --config ./scripts/webpack/prod.servers.config.js --no-stats --env=noDeps=${noDeps}`
-    ),
-    runChild(
-      `yarn webpack --config ./scripts/webpack/prod.client.config.js --no-stats --env=minimize=${isDeploy}`
-    )
-  ])
+  try {
+    await generateGraphQLArtifacts()
+  } catch (e) {
+    console.log('ERR generating artifacts', e)
+  }
+
+  console.log('starting webpack build')
+  try {
+    await Promise.all([
+      runChild(
+        `yarn webpack --config ./scripts/webpack/prod.servers.config.js --no-stats --env=noDeps=${noDeps}`
+      ),
+      runChild(
+        `yarn webpack --config ./scripts/webpack/prod.client.config.js --no-stats --env=minimize=${isDeploy}`
+      )
+    ])
+  } catch (e) {
+    console.log('error webpackifying', e)
+  }
 }
 
 if (require.main === module) {
diff --git a/scripts/runEmbedder.js b/scripts/runEmbedder.js
new file mode 100644
index 00000000000..c235888f861
--- /dev/null
+++ b/scripts/runEmbedder.js
@@ -0,0 +1,13 @@
+/**
+  Starts up an instance of the stateless Embedder service.
+  When you modify a server file, the webpack watcher in
+  {@link buildServers} writes the change to {@link ../dev/embedder}.
+  Pm2 reloads this file whenever {@link embedder} changes
+*/
+
+try {
+  require('../dev/embedder.js')
+} catch (e) {
+  // webpack has not created the file yet
+  // pm2 will restart this process when the file changes
+}
diff --git a/scripts/webpack/dev.servers.config.js b/scripts/webpack/dev.servers.config.js
index b32e586562c..80591f24b0f 100644
--- a/scripts/webpack/dev.servers.config.js
+++ b/scripts/webpack/dev.servers.config.js
@@ -7,6 +7,7 @@ const webpack = require('webpack')
 const PROJECT_ROOT = getProjectRoot()
 const CLIENT_ROOT = path.join(PROJECT_ROOT, 'packages', 'client')
 const SERVER_ROOT = path.join(PROJECT_ROOT, 'packages', 'server')
+const EMBEDDER_ROOT = path.join(PROJECT_ROOT, 'packages', 'embedder')
 const GQL_ROOT = path.join(PROJECT_ROOT, 'packages', 'gql-executor')
 const DOTENV = path.join(PROJECT_ROOT, 'scripts', 'webpack', 'utils', 'dotenv.js')
 // const CircularDependencyPlugin = require('circular-dependency-plugin')
@@ -26,6 +27,7 @@ module.exports = {
   },
   entry: {
     web: [DOTENV, path.join(SERVER_ROOT, 'server.ts')],
+    embedder: [DOTENV, path.join(EMBEDDER_ROOT, 'embedder.ts')],
     gqlExecutor: [DOTENV, path.join(GQL_ROOT, 'gqlExecutor.ts')]
   },
   output: {
diff --git a/scripts/webpack/prod.servers.config.js b/scripts/webpack/prod.servers.config.js
index 5db575b51e3..52feb216089 100644
--- a/scripts/webpack/prod.servers.config.js
+++ b/scripts/webpack/prod.servers.config.js
@@ -11,6 +11,7 @@ const cp = require('child_process')
 const PROJECT_ROOT = getProjectRoot()
 const CLIENT_ROOT = path.join(PROJECT_ROOT, 'packages', 'client')
 const SERVER_ROOT = path.join(PROJECT_ROOT, 'packages', 'server')
+const EMBEDDER_ROOT = path.join(PROJECT_ROOT, 'packages', 'embedder')
 const GQL_ROOT = path.join(PROJECT_ROOT, 'packages', 'gql-executor')
 const DOTENV = path.join(PROJECT_ROOT, 'scripts/webpack/utils/dotenv.js')
 const distPath = path.join(PROJECT_ROOT, 'dist')
@@ -32,6 +33,7 @@ module.exports = (config) => {
         path.join(PROJECT_ROOT, 'scripts/toolboxSrc/applyEnvVarsToClientAssets.ts'),
         path.join(SERVER_ROOT, 'server.ts')
       ],
+      embedder: [DOTENV, path.join(EMBEDDER_ROOT, 'embedder.ts')],
       gqlExecutor: [DOTENV, path.join(GQL_ROOT, 'gqlExecutor.ts')],
       preDeploy: [DOTENV, path.join(PROJECT_ROOT, 'scripts/toolboxSrc/preDeploy.ts')],
       pushToCDN: [DOTENV, path.join(PROJECT_ROOT, 'scripts/toolboxSrc/pushToCDN.ts')],
diff --git a/scripts/webpack/toolbox.config.js b/scripts/webpack/toolbox.config.js
index 3edcb77ed56..d63a8f6505c 100644
--- a/scripts/webpack/toolbox.config.js
+++ b/scripts/webpack/toolbox.config.js
@@ -56,6 +56,26 @@ module.exports = {
     new webpack.DefinePlugin({
       __PRODUCTION__: true
     })
+    // new CircularDependencyPlugin({
+    //   // `onStart` is called before the cycle detection starts
+    //   onStart({compilation}) {
+    //     console.log('start detecting webpack modules cycles')
+    //   },
+    //   // `onDetected` is called for each module that is cyclical
+    //   onDetected({module: webpackModuleRecord, paths, compilation}) {
+    //     // `paths` will be an Array of the relative module paths that make up the cycle
+    //     // `module` is the module record that caused the cycle
+    //     compilation.errors.push(new Error(paths.join(' -> ')))
+    //   },
+    //   // `onEnd` is called before the cycle detection ends
+    //   onEnd({compilation}) {
+    //     console.log('end detecting webpack modules cycles')
+    //   },
+    //   // set to false to only detect cycles that include an entrypoint
+    //   allowAsyncCycles: false,
+    //   // set to true to detect cycles in node_modules
+    //   cwd: process.cwd() // set the current working directory for displaying module paths
+    // })
   ],
   module: {
     rules: [
diff --git a/scripts/webpack/utils/transformRules.js b/scripts/webpack/utils/transformRules.js
index 0c44e2ae3e6..e6bc0c9dadf 100644
--- a/scripts/webpack/utils/transformRules.js
+++ b/scripts/webpack/utils/transformRules.js
@@ -3,6 +3,7 @@ const path = require('path')
 const transformRules = (projectRoot, isProd) => {
   const CLIENT_ROOT = path.join(projectRoot, 'packages', 'client')
   const SERVER_ROOT = path.join(projectRoot, 'packages', 'server')
+  const EMBEDDER_ROOT = path.join(projectRoot, 'packages', 'embedder')
   const GQL_ROOT = path.join(projectRoot, 'packages', 'gql-executor')
   const CHRONOS_ROOT = path.join(projectRoot, 'packages', 'chronos')
   const TOOLBOX_SRC = path.join(projectRoot, 'scripts', 'toolboxSrc')
@@ -48,7 +49,7 @@ const transformRules = (projectRoot, isProd) => {
     {
       test: /\.(tsx?|js)$/,
       // things that don't need babel
-      include: [SERVER_ROOT, GQL_ROOT, CHRONOS_ROOT, TOOLBOX_SRC],
+      include: [SERVER_ROOT, EMBEDDER_ROOT, GQL_ROOT, CHRONOS_ROOT, TOOLBOX_SRC],
       // things that need babel
       exclude: path.join(SERVER_ROOT, 'email'),
       use: {
diff --git a/yarn.lock b/yarn.lock
index 99d793dc367..69cf14bcce1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1317,11 +1317,34 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.18.6", "@babel/compat-data@^7.22.9":
+"@babel/code-frame@^7.16.7", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
+
+"@babel/compat-data@^7.13.11":
+  version "7.16.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e"
+  integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==
+
+"@babel/compat-data@^7.18.6":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
+  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+
+"@babel/compat-data@^7.22.9":
   version "7.22.9"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
   integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
+"@babel/compat-data@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
+  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
+
 "@babel/core@7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.6.tgz#54a107a3c298aee3fe5e1947a6464b9b6faca03d"
@@ -1343,7 +1366,91 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.20.12", "@babel/core@^7.22.9":
+"@babel/core@^7.11.1":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876"
+  integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-compilation-targets" "^7.18.2"
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helpers" "^7.18.2"
+    "@babel/parser" "^7.18.0"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
+    semver "^6.3.0"
+
+"@babel/core@^7.11.6":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
+  integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.5"
+    "@babel/helper-compilation-targets" "^7.21.5"
+    "@babel/helper-module-transforms" "^7.21.5"
+    "@babel/helpers" "^7.21.5"
+    "@babel/parser" "^7.21.8"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
+"@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
+  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helpers" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/core@^7.20.12":
+  version "7.20.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
+  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helpers" "^7.20.7"
+    "@babel/parser" "^7.20.7"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.12"
+    "@babel/types" "^7.20.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
+
+"@babel/core@^7.22.9":
   version "7.22.10"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.10.tgz#aad442c7bcd1582252cb4576747ace35bc122f35"
   integrity sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==
@@ -1374,7 +1481,24 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.7", "@babel/helper-annotate-as-pure@^7.18.6":
+"@babel/generator@^7.16.7", "@babel/generator@^7.18.2", "@babel/generator@^7.20.7", "@babel/generator@^7.21.5", "@babel/generator@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+  dependencies:
+    "@babel/types" "^7.23.6"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
+"@babel/helper-annotate-as-pure@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
+  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
   integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
@@ -1400,7 +1524,31 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.18.6":
+"@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.18.2", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+  dependencies:
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.7.tgz#9c5b34b53a01f2097daf10678d65135c1b9f84ba"
+  integrity sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
+"@babel/helper-create-class-features-plugin@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz#6f15f8459f3b523b39e00a99982e2c040871ed72"
   integrity sha512-YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw==
@@ -1435,7 +1583,19 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.6", "@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-environment-visitor@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz#b7eee2b5b9d70602e59d1a6cad7dd24de7ca6cd7"
+  integrity sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==
+
+"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
@@ -1447,7 +1607,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.18.6", "@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.18.6", "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -1462,6 +1622,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.22.15":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
+  dependencies:
+    "@babel/types" "^7.23.0"
+
 "@babel/helper-member-expression-to-functions@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz#44802d7d602c285e1692db0bad9396d007be2afc"
@@ -1469,13 +1636,45 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.22.5":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+  dependencies:
+    "@babel/types" "^7.22.15"
+
+"@babel/helper-module-imports@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
   integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.5":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
+
 "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.22.9":
   version "7.22.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
@@ -1487,6 +1686,13 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.5"
 
+"@babel/helper-optimise-call-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
+  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -1494,7 +1700,29 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+
+"@babel/helper-plugin-utils@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz#9448974dd4fb1d80fefe72e8a0af37809cd30d6d"
+  integrity sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==
+
+"@babel/helper-plugin-utils@^7.20.2":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56"
+  integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==
+
+"@babel/helper-plugin-utils@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
@@ -1509,6 +1737,15 @@
     "@babel/helper-wrap-function" "^7.18.6"
     "@babel/types" "^7.18.6"
 
+"@babel/helper-replace-supers@^7.16.7":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+
 "@babel/helper-replace-supers@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz#efedf51cfccea7b7b8c0f00002ab317e7abfe420"
@@ -1520,7 +1757,7 @@
     "@babel/traverse" "^7.18.6"
     "@babel/types" "^7.18.6"
 
-"@babel/helper-simple-access@^7.18.6", "@babel/helper-simple-access@^7.22.5":
+"@babel/helper-simple-access@^7.16.7", "@babel/helper-simple-access@^7.18.6", "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
   integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
@@ -1534,19 +1771,39 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
+"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6", "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-string-parser@^7.19.4", "@babel/helper-string-parser@^7.21.5", "@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+
 "@babel/helper-string-parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5":
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
+"@babel/helper-validator-identifier@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
+  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+
+"@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
@@ -1556,6 +1813,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
   integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
 
+"@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+
 "@babel/helper-wrap-function@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz#ec44ea4ad9d8988b90c3e465ba2382f4de81a073"
@@ -1566,6 +1828,15 @@
     "@babel/traverse" "^7.18.6"
     "@babel/types" "^7.18.6"
 
+"@babel/helpers@^7.16.7", "@babel/helpers@^7.18.2", "@babel/helpers@^7.20.7", "@babel/helpers@^7.21.5":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d"
+  integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==
+  dependencies:
+    "@babel/template" "^7.23.9"
+    "@babel/traverse" "^7.23.9"
+    "@babel/types" "^7.23.9"
+
 "@babel/helpers@^7.18.6", "@babel/helpers@^7.22.10":
   version "7.22.10"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.10.tgz#ae6005c539dfbcb5cd71fb51bfc8a52ba63bc37a"
@@ -1584,11 +1855,55 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.8", "@babel/parser@^7.18.6", "@babel/parser@^7.20.15", "@babel/parser@^7.22.10", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.7.tgz#d372dda9c89fcec340a82630a9f533f2fe15877e"
+  integrity sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA==
+
+"@babel/parser@^7.16.8", "@babel/parser@^7.18.6":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.8.tgz#822146080ac9c62dac0823bb3489622e0bc1cbdf"
+  integrity sha512-RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA==
+
+"@babel/parser@^7.18.0":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef"
+  integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
+
+"@babel/parser@^7.20.15", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
+"@babel/parser@^7.20.7":
+  version "7.20.15"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89"
+  integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
+
+"@babel/parser@^7.21.8":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8"
+  integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==
+
+"@babel/parser@^7.22.10":
+  version "7.22.10"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55"
+  integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==
+
+"@babel/parser@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
+  integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -2002,7 +2317,17 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.18.6":
+"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.7.tgz#fd119e6a433c527d368425b45df361e1e95d3c1a"
+  integrity sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-simple-access" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
   integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
@@ -2101,7 +2426,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.18.6":
+"@babel/plugin-transform-shorthand-properties@^7.0.0":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
+  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
   integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
@@ -2289,14 +2621,83 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.17.2", "@babel/runtime@^7.18.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.2.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
+  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
+  integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.10.5":
+  version "7.17.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
+  integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.11.2":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
+  integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.13.10":
+  version "7.20.13"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
+  integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
+"@babel/runtime@^7.17.2":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
+  integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.21.0":
   version "7.21.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
   integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.3.3":
+"@babel/template@^7.16.7", "@babel/template@^7.3.3":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/template@^7.18.10", "@babel/template@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+
+"@babel/template@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
+  integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.18.6"
+    "@babel/types" "^7.18.6"
+
+"@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
   integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
@@ -2305,6 +2706,15 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
+"@babel/template@^7.22.5", "@babel/template@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a"
+  integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.23.9"
+    "@babel/types" "^7.23.9"
+
 "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.6", "@babel/traverse@^7.22.10", "@babel/traverse@^7.7.2":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
@@ -2321,7 +2731,82 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/traverse@^7.16.7", "@babel/traverse@^7.18.2", "@babel/traverse@^7.20.12", "@babel/traverse@^7.21.5", "@babel/traverse@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
+  integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.9"
+    "@babel/types" "^7.23.9"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159"
+  integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
+  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.18.13", "@babel/types@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
+  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.18.2":
+  version "7.18.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354"
+  integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.18.6":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.8.tgz#c5af199951bf41ba4a6a9a6d0d8ad722b30cd42f"
+  integrity sha512-qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
+  integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.21.5"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.22.10", "@babel/types@^7.22.5":
+  version "7.22.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03"
+  integrity sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.22.15", "@babel/types@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
   integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
@@ -2330,6 +2815,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.23.6", "@babel/types@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
+  integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -7968,13 +8462,22 @@ agent-base@^7.0.2, agent-base@^7.1.0:
   dependencies:
     debug "^4.3.4"
 
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
   integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
   dependencies:
     humanize-ms "^1.2.1"
 
+agentkeepalive@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
+  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+  dependencies:
+    debug "^4.1.0"
+    depd "^1.1.2"
+    humanize-ms "^1.2.1"
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -8408,7 +8911,16 @@ axios@0.21.4, axios@^0.21.0, axios@^0.21.4:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^1.0.0, axios@^1.3.3:
+axios@^1.0.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3"
+  integrity sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==
+  dependencies:
+    follow-redirects "^1.15.0"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
+axios@^1.3.3:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
   integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
@@ -8790,6 +9302,16 @@ browserslist@^4.14.5, browserslist@^4.21.1, browserslist@^4.21.4, browserslist@^
     node-releases "^2.0.13"
     update-browserslist-db "^1.0.11"
 
+browserslist@^4.22.2:
+  version "4.22.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
+  integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
+  dependencies:
+    caniuse-lite "^1.0.30001580"
+    electron-to-chromium "^1.4.648"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
+
 bs-logger@0.x:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
@@ -9011,10 +9533,10 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@~1.0.0:
-  version "1.0.30001587"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz#a0bce920155fa56a1885a69c74e1163fc34b4881"
-  integrity sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==
+caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
+  version "1.0.30001571"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001571.tgz#4182e93d696ff42930f4af7eba515ddeb57917ac"
+  integrity sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -9075,7 +9597,7 @@ chalk@4.1.2, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^2.4.2:
+chalk@^2.3.2, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -9177,7 +9699,22 @@ cheerio@^1.0.0-rc.10:
     parse5-htmlparser2-tree-adapter "^6.0.1"
     tslib "^2.2.0"
 
-chokidar@^3.3.1, chokidar@^3.4.0, chokidar@^3.5.1, chokidar@^3.5.3:
+chokidar@^3.3.1, chokidar@^3.4.0, chokidar@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -10307,10 +10844,10 @@ depd@2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@~1.1.2:
+depd@^1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 dependency-graph@^0.11.0:
   version "0.11.0"
@@ -10394,6 +10931,11 @@ diff-sequences@^29.4.3:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
   integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
+diff@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -10588,6 +11130,7 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
+  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"
@@ -10658,6 +11201,11 @@ electron-to-chromium@^1.4.477:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz#d99286f6e915667fa18ea4554def1aa60eb4d5f1"
   integrity sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==
 
+electron-to-chromium@^1.4.648:
+  version "1.4.660"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.660.tgz#80be71d08c1224980e645904ab9155f3fa54a1ea"
+  integrity sha512-1BqvQG0BBQrAA7FVL2EMrb5A1sVyXF3auwJneXjGWa1TpN+g0C4KbUsYWePz6OZ0mXZfXGy+RmQDELJWwE8v/Q==
+
 email-addresses@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.1.0.tgz#cabf7e085cbdb63008a70319a74e6136188812fb"
@@ -11640,7 +12188,7 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-extra@^11.0.0, fs-extra@^11.1.0:
+fs-extra@^11.0.0:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
   integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
@@ -11649,6 +12197,15 @@ fs-extra@^11.0.0, fs-extra@^11.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
+  integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -11715,6 +12272,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -11900,6 +12462,17 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+git-diff@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/git-diff/-/git-diff-2.0.6.tgz#4a8ece670d64d1f9f4e68191ad8b1013900f6c1e"
+  integrity sha512-/Iu4prUrydE3Pb3lCBMbcSNIf81tgGt0W1ZwknnyF62t3tHmtiJTRj0f+1ZIhp3+Rh0ktz1pJVoa7ZXUCskivA==
+  dependencies:
+    chalk "^2.3.2"
+    diff "^3.5.0"
+    loglevel "^1.6.1"
+    shelljs "^0.8.1"
+    shelljs.exec "^1.1.7"
+
 git-node-fs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/git-node-fs/-/git-node-fs-1.0.0.tgz#49b215e242ebe43aa4c7561bbba499521752080f"
@@ -12350,6 +12923,13 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 hdr-histogram-js@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz#0b860534655722b6e3f3e7dca7b78867cf43dcb5"
@@ -12852,6 +13432,11 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+interpret@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
+
 interpret@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
@@ -12968,6 +13553,13 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-core-module@^2.13.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
 is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
@@ -14172,20 +14764,21 @@ koalas@^1.0.2:
   resolved "https://registry.yarnpkg.com/koalas/-/koalas-1.0.2.tgz#318433f074235db78fae5661a02a8ca53ee295cd"
   integrity sha1-MYQz8HQjXbePrlZhoCqMpT7ilc0=
 
-kysely-codegen@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/kysely-codegen/-/kysely-codegen-0.10.0.tgz#ccc4a1d9c1a2f334a35d820554880251f2386524"
-  integrity sha512-EV2v9yr9N9WrUPrURvFl5FPTtz39npsi1p1tLpJwEcFeOAKAPJruBpAASvnZWdqu5Pw/aaTssStE3qcI2sfxMQ==
+kysely-codegen@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/kysely-codegen/-/kysely-codegen-0.11.0.tgz#7506955c4c09201b571d528b42ffec8a1869160b"
+  integrity sha512-8aklzXygjANshk5BoGSQ0BWukKIoPL4/k1iFWyteGUQ/VtB1GlyrELBZv1GglydjLGECSSVDpsOgEXyWQmuksg==
   dependencies:
     chalk "4.1.2"
     dotenv "^16.0.3"
+    git-diff "^2.0.6"
     micromatch "^4.0.5"
     minimist "^1.2.8"
 
-kysely@^0.26.3:
-  version "0.26.3"
-  resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.26.3.tgz#45fdd0153d8c9418b0ea9a6f05ed46b95ed27678"
-  integrity sha512-yWSgGi9bY13b/W06DD2OCDDHQmq1kwTGYlQ4wpZkMOJqMGCstVCFIvxCCVG4KfY1/3G0MhDAcZsip/Lw8/vJWw==
+kysely@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.27.2.tgz#b289ce5e561064ec613a17149b7155783d2b36de"
+  integrity sha512-DmRvEfiR/NLpgsTbSxma2ldekhsdcd65+MNiKXyd/qj7w7X5e3cLkXxcj+MypsRDjPhHQ/CD5u3Eq1sBYzX0bw==
 
 launch-editor@^2.6.0:
   version "2.6.0"
@@ -14628,6 +15221,11 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.0"
 
+loglevel@^1.6.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.9.1.tgz#d63976ac9bcd03c7c873116d41c2a85bafff1be7"
+  integrity sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==
+
 long@^5.0.0:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
@@ -15512,6 +16110,11 @@ node-releases@^2.0.13:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
   integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+
 node-rsa@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/node-rsa/-/node-rsa-1.1.1.tgz#efd9ad382097782f506153398496f79e4464434d"
@@ -17853,6 +18456,13 @@ recast@^0.21.0:
     source-map "~0.6.1"
     tslib "^2.0.1"
 
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
+  dependencies:
+    resolve "^1.1.6"
+
 rechoir@^0.7.0:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
@@ -17895,6 +18505,13 @@ redis-parser@^3.0.0:
   dependencies:
     redis-errors "^1.0.0"
 
+redlock@^5.0.0-beta.2:
+  version "5.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/redlock/-/redlock-5.0.0-beta.2.tgz#a629c07e07d001c0fdd9f2efa614144c4416fe44"
+  integrity sha512-2RDWXg5jgRptDrB1w9O/JgSZC0j7y4SlaXnor93H/UJm/QyDiFgBKNtrh0TI6oCXqYSaSoXxFh6Sd3VtYfhRXw==
+  dependencies:
+    node-abort-controller "^3.0.1"
+
 redux@^4.0.0, redux@^4.0.4:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
@@ -17924,11 +18541,16 @@ regenerator-runtime@^0.12.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.5:
+regenerator-runtime@^0.13.11:
   version "0.13.11"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
+regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5:
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+
 regenerator-transform@^0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
@@ -18133,6 +18755,15 @@ resolve@^1.0.0, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.1.6:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 resolve@^2.0.0-next.3:
   version "2.0.0-next.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
@@ -18560,6 +19191,20 @@ shell-quote@^1.7.3, shell-quote@^1.8.0:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
+shelljs.exec@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/shelljs.exec/-/shelljs.exec-1.1.8.tgz#6f3c8dd017cb96d2dea82e712b758eab4fc2f68c"
+  integrity sha512-vFILCw+lzUtiwBAHV8/Ex8JsFjelFMdhONIsgKNLgTzeRckp2AOYRQtHJE/9LhNvdMmE27AGtzWx0+DHpwIwSw==
+
+shelljs@^0.8.1:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
+  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
 shimmer@^1.1.0, shimmer@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
@@ -18831,10 +19476,10 @@ source-map-support@0.5.21, source-map-support@^0.5.12, source-map-support@^0.5.1
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.5.7:
+source-map@^0.5.0, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
@@ -19127,7 +19772,16 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
+string-width@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.0.tgz#5ab00980cfb29f43e736b113a120a73a0fb569d3"
+  integrity sha512-7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
+string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
@@ -20244,6 +20898,14 @@ update-browserslist-db@^1.0.11:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 upper-case-first@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324"
@@ -21239,7 +21901,7 @@ yargs-parser@20.2.4:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
+yargs-parser@21.1.1, yargs-parser@^21.0.0, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -21287,7 +21949,20 @@ yargs@^16.2.0, yargs@~16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.0.0, yargs@^17.0.1, yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.1, yargs@^17.7.2:
+yargs@^17.0.0, yargs@^17.0.1:
+  version "17.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9"
+  integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.0.0"
+
+yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.1, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==

From 1008578fe38979940659d239bab584e2524efcad Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 27 Feb 2024 15:47:13 -0800
Subject: [PATCH 015/183] merge production to avoid force push (#9461)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/release-to-staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
index 6e9225bf871..23428e40d7c 100644
--- a/.github/workflows/release-to-staging.yml
+++ b/.github/workflows/release-to-staging.yml
@@ -99,7 +99,7 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git checkout -b "release/v${{ env.ACTION_VERSION }}"
-          git merge -s ours origin/production
+          git merge -s ours production
           git push --set-upstream origin "release/v${{ env.ACTION_VERSION }}"
           gh pr create \
             --assignee ${{ github.actor }} \

From 20ca927985830c95e9288bc97de4d667312d5e96 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:52:39 -0800
Subject: [PATCH 016/183] chore(release): release v7.19.0 (#9460)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 28707a42151..5987f97c1f9 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.18.1"
+  ".": "7.19.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d1147fe08f..95e59988ef7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.0](https://github.com/ParabolInc/parabol/compare/v7.18.1...v7.19.0) (2024-02-27)
+
+
+### Added
+
+* embedder service ([#9417](https://github.com/ParabolInc/parabol/issues/9417)) ([55faa17](https://github.com/ParabolInc/parabol/commit/55faa17ada5b1bd49182a29341b3465a82d2ddfd))
+
 ## [7.18.1](https://github.com/ParabolInc/parabol/compare/v7.18.0...v7.18.1) (2024-02-27)
 
 
diff --git a/package.json b/package.json
index fbc0c896925..ac443d0a50b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.1",
+  "version": "7.19.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 5619754d830..0a26dc6eab0 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.18.1",
+  "version": "7.19.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.18.1"
+    "parabol-server": "7.19.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 141dca1fe36..d87a2711aa8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.1",
+  "version": "7.19.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 1f7848776eb..eafe4276efd 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.18.1",
+  "version": "7.19.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.18.1",
-    "parabol-server": "7.18.1",
+    "parabol-client": "7.19.0",
+    "parabol-server": "7.19.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 3331444dcae..be7381348af 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.1",
+  "version": "7.19.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 18ca0f00370..482d4e39efd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.18.1",
+  "version": "7.19.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.18.1",
+    "parabol-client": "7.19.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 7bd880314f6f48c897a9a708b2d6435b257fae90 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 27 Feb 2024 15:59:07 -0800
Subject: [PATCH 017/183] fix: checkout prod before merging it (#9463)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/release-to-staging.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
index 23428e40d7c..965fc86deaa 100644
--- a/.github/workflows/release-to-staging.yml
+++ b/.github/workflows/release-to-staging.yml
@@ -14,6 +14,10 @@ jobs:
       id-token: "write"
       pull-requests: "write"
     steps:
+      - name: Checkout production
+        uses: actions/checkout@v3
+        with:
+          ref: production
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup environment variables

From 12ba80ec5fd41496126988507929279fb15e9999 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:09:11 -0800
Subject: [PATCH 018/183] chore(release): release v7.19.1 (#9464)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 5987f97c1f9..0b5216f29bb 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.0"
+  ".": "7.19.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95e59988ef7..8fd3aabcae1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.1](https://github.com/ParabolInc/parabol/compare/v7.19.0...v7.19.1) (2024-02-27)
+
+
+### Fixed
+
+* checkout prod before merging it ([#9463](https://github.com/ParabolInc/parabol/issues/9463)) ([7bd8803](https://github.com/ParabolInc/parabol/commit/7bd880314f6f48c897a9a708b2d6435b257fae90))
+
 ## [7.19.0](https://github.com/ParabolInc/parabol/compare/v7.18.1...v7.19.0) (2024-02-27)
 
 
diff --git a/package.json b/package.json
index ac443d0a50b..c0a3b7c159d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.0",
+  "version": "7.19.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 0a26dc6eab0..93a7eb54c77 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.0",
+  "version": "7.19.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.0"
+    "parabol-server": "7.19.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index d87a2711aa8..bc0bce70b96 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.0",
+  "version": "7.19.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index eafe4276efd..b6354eaa7c9 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.0",
+  "version": "7.19.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.0",
-    "parabol-server": "7.19.0",
+    "parabol-client": "7.19.1",
+    "parabol-server": "7.19.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index be7381348af..926879401ae 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.0",
+  "version": "7.19.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 482d4e39efd..3cc17f95bd4 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.0",
+  "version": "7.19.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.0",
+    "parabol-client": "7.19.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 9e90b9df95b8505c0e1e50d4e8e4f18c73ef17cd Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 27 Feb 2024 16:13:57 -0800
Subject: [PATCH 019/183] fix: mrege origin/production strategy (#9465)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/release-to-staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
index 965fc86deaa..22efc4326c4 100644
--- a/.github/workflows/release-to-staging.yml
+++ b/.github/workflows/release-to-staging.yml
@@ -103,7 +103,7 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git checkout -b "release/v${{ env.ACTION_VERSION }}"
-          git merge -s ours production
+          git merge -s ours origin/production
           git push --set-upstream origin "release/v${{ env.ACTION_VERSION }}"
           gh pr create \
             --assignee ${{ github.actor }} \

From e67ca9100406b1da5e757ceebe7954525e889091 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:19:34 -0800
Subject: [PATCH 020/183] chore(release): release v7.19.2 (#9466)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 0b5216f29bb..f7e3c7439f1 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.1"
+  ".": "7.19.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fd3aabcae1..b59c8a24c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.2](https://github.com/ParabolInc/parabol/compare/v7.19.1...v7.19.2) (2024-02-28)
+
+
+### Fixed
+
+* mrege origin/production strategy ([#9465](https://github.com/ParabolInc/parabol/issues/9465)) ([9e90b9d](https://github.com/ParabolInc/parabol/commit/9e90b9df95b8505c0e1e50d4e8e4f18c73ef17cd))
+
 ## [7.19.1](https://github.com/ParabolInc/parabol/compare/v7.19.0...v7.19.1) (2024-02-27)
 
 
diff --git a/package.json b/package.json
index c0a3b7c159d..0b090221999 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.1",
+  "version": "7.19.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 93a7eb54c77..9b0cdf6e408 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.1",
+  "version": "7.19.2",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.1"
+    "parabol-server": "7.19.2"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index bc0bce70b96..fde694d8712 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.1",
+  "version": "7.19.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index b6354eaa7c9..90360640290 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.1",
+  "version": "7.19.2",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.1",
-    "parabol-server": "7.19.1",
+    "parabol-client": "7.19.2",
+    "parabol-server": "7.19.2",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 926879401ae..6bf9e8fb58f 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.1",
+  "version": "7.19.2",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 3cc17f95bd4..03c796234f6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.1",
+  "version": "7.19.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.1",
+    "parabol-client": "7.19.2",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 581f0cfa2255bbeb438c53b2b5f4d8ceb6a0b0cc Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 27 Feb 2024 16:28:34 -0800
Subject: [PATCH 021/183] fix: force push 5 (#9467)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/release-to-staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
index 22efc4326c4..c6e3601f2ff 100644
--- a/.github/workflows/release-to-staging.yml
+++ b/.github/workflows/release-to-staging.yml
@@ -103,7 +103,7 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git checkout -b "release/v${{ env.ACTION_VERSION }}"
-          git merge -s ours origin/production
+          git merge -s ours origin/production --allow-unrelated-histories
           git push --set-upstream origin "release/v${{ env.ACTION_VERSION }}"
           gh pr create \
             --assignee ${{ github.actor }} \

From b52faf2accf88492fdf641825e554f8451bd2fd7 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:34:40 -0800
Subject: [PATCH 022/183] chore(release): release v7.19.3 (#9468)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index f7e3c7439f1..517aeb7a63e 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.2"
+  ".": "7.19.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b59c8a24c45..579182dc3f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.3](https://github.com/ParabolInc/parabol/compare/v7.19.2...v7.19.3) (2024-02-28)
+
+
+### Fixed
+
+* force push 5 ([#9467](https://github.com/ParabolInc/parabol/issues/9467)) ([581f0cf](https://github.com/ParabolInc/parabol/commit/581f0cfa2255bbeb438c53b2b5f4d8ceb6a0b0cc))
+
 ## [7.19.2](https://github.com/ParabolInc/parabol/compare/v7.19.1...v7.19.2) (2024-02-28)
 
 
diff --git a/package.json b/package.json
index 0b090221999..cc2eb303c5d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.2",
+  "version": "7.19.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 9b0cdf6e408..ff73a275826 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.2",
+  "version": "7.19.3",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.2"
+    "parabol-server": "7.19.3"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index fde694d8712..364dbda0932 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.2",
+  "version": "7.19.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 90360640290..84dbff4bdfb 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.2",
+  "version": "7.19.3",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.2",
-    "parabol-server": "7.19.2",
+    "parabol-client": "7.19.3",
+    "parabol-server": "7.19.3",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 6bf9e8fb58f..f105f56d7da 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.2",
+  "version": "7.19.3",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 03c796234f6..625dc427b3f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.2",
+  "version": "7.19.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.2",
+    "parabol-client": "7.19.3",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 5b9526c092f7f8675ad2a442da4440e2507cbdcc Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Wed, 28 Feb 2024 09:59:59 +0000
Subject: [PATCH 023/183] fix: limit invites from spammers (#9416)

* fix: limit invites from spammers

* update where we check pending emails

* check total plus pending invites

* use invitees instead of pending
---
 .../mutations/helpers/inviteToTeamHelper.ts       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts b/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts
index c78036add14..053ca0f381f 100644
--- a/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts
+++ b/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts
@@ -37,6 +37,21 @@ const inviteToTeamHelper = async (
   const operationId = dataLoader.share()
   const subOptions = {mutatorId, operationId}
 
+  const [total, pending] = await Promise.all([
+    r.table('TeamInvitation').getAll(teamId, {index: 'teamId'}).count().run(),
+    r
+      .table('TeamInvitation')
+      .getAll(teamId, {index: 'teamId'})
+      .filter({acceptedAt: null})
+      .count()
+      .run()
+  ])
+  const accepted = total - pending
+  // if no one has accepted one of their 100+ invites, don't trust them
+  if (accepted === 0 && total + invitees.length >= 100) {
+    return standardError(new Error('Exceeded unaccepted invitation limit'), {userId: viewerId})
+  }
+
   const untrustedDomains = ['tempmail.cn', 'qq.com']
   const filteredInvitees = invitees.filter(
     (invitee) => !untrustedDomains.includes(getDomainFromEmail(invitee).toLowerCase())

From 9cec00a5fd0b46c73ebdde27e6d966b485216132 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 28 Feb 2024 19:20:49 +0100
Subject: [PATCH 024/183] fix: Fetch Jira projects in parallel (#9456)

Previously we tried to fetch more projects per page, but Jira only ever
returns 50 max. Instead once we know how many projects there are after
fetching the first page, we fetch all remaining pages in parallel.
---
 .../server/utils/AtlassianServerManager.ts    | 54 +++++++++++++++----
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/packages/server/utils/AtlassianServerManager.ts b/packages/server/utils/AtlassianServerManager.ts
index d84a448f7be..2cd82d3e8e4 100644
--- a/packages/server/utils/AtlassianServerManager.ts
+++ b/packages/server/utils/AtlassianServerManager.ts
@@ -358,7 +358,38 @@ class AtlassianServerManager extends AtlassianManager {
   async getAllProjects(cloudIds: string[]) {
     const projects = [] as (JiraProject & {cloudId: string})[]
     let error: Error | undefined
-    const getProjectPage = async (cloudId: string, url: string): Promise<void> => {
+    const getProjectsPage = async (
+      cloudId: string,
+      startAt: number,
+      maxResults: number
+    ): Promise<void> => {
+      const url = `https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/project/search?orderBy=name&startAt=${startAt}`
+      const res = await this.get<JiraProjectResponse>(url)
+      if (res instanceof Error || res instanceof RateLimitError) {
+        error = res
+      } else {
+        const pagedProjects = res.values.map((project) => ({
+          ...project,
+          cloudId
+        }))
+        projects.push(...pagedProjects)
+
+        if (pagedProjects.length < maxResults && res.nextPage) {
+          Logger.log(
+            'Underfetched in getAllProjects, requested',
+            maxResults,
+            'got',
+            pagedProjects.length
+          )
+          const nextStart = res.startAt + pagedProjects.length
+          const nextMaxResults = maxResults - pagedProjects.length
+          return getProjectsPage(cloudId, nextStart, nextMaxResults)
+        }
+      }
+    }
+
+    const getProjects = async (cloudId: string) => {
+      const url = `https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/project/search?orderBy=name`
       const res = await this.get<JiraProjectResponse>(url)
       if (res instanceof Error || res instanceof RateLimitError) {
         error = res
@@ -369,19 +400,20 @@ class AtlassianServerManager extends AtlassianManager {
         }))
         projects.push(...pagedProjects)
         if (res.nextPage) {
-          Logger.log('AtlassianServerManager.getAllProjects fetching more results', res.total)
-          return getProjectPage(cloudId, res.nextPage)
+          const {total} = res
+          const nextStart = res.startAt + pagedProjects.length
+          const fetches = [] as Array<Promise<void>>
+          // 50 is the default maxResults for Jira, Jira does not respond with more than that
+          const maxResults = 50
+          for (let i = nextStart; i < total; i += maxResults) {
+            fetches.push(getProjectsPage(cloudId, i, maxResults))
+          }
+          await Promise.all(fetches)
         }
       }
     }
-    await Promise.all(
-      cloudIds.map((cloudId) =>
-        getProjectPage(
-          cloudId,
-          `https://api.atlassian.com/ex/jira/${cloudId}/rest/api/3/project/search?orderBy=name&maxResults=500`
-        )
-      )
-    )
+
+    await Promise.all(cloudIds.map((cloudId) => getProjects(cloudId)))
 
     if (error) {
       Logger.log('getAllProjects ERROR:', error)

From 00092ec55659d1441e9566d501940dcc6fcf07f4 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 28 Feb 2024 12:56:50 -0800
Subject: [PATCH 025/183] fix: replace lone surrogates in draft-js content
 (#9415)

* fix: replace lone surrogates in draft-js content

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* fix typo

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* fix: eslint errors

Signed-off-by: Matt Krick <matt.krick@gmail.com>

---------

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .eslintrc.js                                  |   1 +
 package.json                                  |   7 +-
 packages/chronos/package.json                 |   2 +-
 packages/client/package.json                  |   2 +-
 packages/client/utils/AtlassianManager.ts     |   2 +-
 .../draftjs/extractTextFromDraftString.ts     |   3 +-
 packages/gql-executor/package.json            |   4 +-
 packages/integration-tests/package.json       |   5 +-
 packages/server/package.json                  |   4 +-
 packages/server/tsconfig.json                 |  15 +-
 yarn.lock                                     | 249 ++++++++++++------
 11 files changed, 181 insertions(+), 113 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 111e259c651..1962c0f1b60 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -20,6 +20,7 @@ module.exports = {
     '@typescript-eslint/no-use-before-define': 'off',
     '@typescript-eslint/explicit-member-accessibility': 'off',
     '@typescript-eslint/interface-name-prefix': 'off',
+    '@typescript-eslint/no-duplicate-enum-values': 'off',
     '@typescript-eslint/no-unused-vars': 'off',
     '@typescript-eslint/no-var-requires': 'off',
     '@typescript-eslint/no-parameter-properties': 'off',
diff --git a/package.json b/package.json
index cc2eb303c5d..5b7253fec2e 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "test:server": "yarn workspace parabol-server test"
   },
   "resolutions": {
-    "typescript": "4.9.5",
+    "typescript": "^5.3.3",
     "hoist-non-react-statics": "^3.3.0",
     "@types/react": "16.9.11",
     "@types/react-dom": "16.9.4",
@@ -92,8 +92,8 @@
     "@types/dotenv": "^6.1.1",
     "@types/jscodeshift": "^0.11.3",
     "@types/lodash.toarray": "^4.4.7",
-    "@typescript-eslint/eslint-plugin": "5.17.0",
-    "@typescript-eslint/parser": "5.17.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "autoprefixer": "^10.4.13",
     "babel-loader": "^9.1.2",
     "concurrently": "^8.0.1",
@@ -123,6 +123,7 @@
     "tailwindcss": "^3.2.7",
     "terser-webpack-plugin": "^5.3.9",
     "ts-loader": "9.2.6",
+    "typescript": "^5.3.3",
     "vscode-apollo-relay": "^1.5.0",
     "webpack": "^5.89.0",
     "webpack-cli": "4.9.1",
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index ff73a275826..39bec48dcf6 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/cron": "^2.0.1",
-    "@types/node": "^16.11.62"
+    "@types/node": "^20.11.17"
   },
   "dependencies": {
     "cron": "^2.3.1",
diff --git a/packages/client/package.json b/packages/client/package.json
index 364dbda0932..19a38863130 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -60,7 +60,7 @@
     "prettier": "^2.8.8",
     "react-refresh": "^0.9.0",
     "strict-event-emitter-types": "^2.0.0",
-    "typescript": "4.9.5",
+    "typescript": "^5.3.3",
     "webpack-dev-server": "^4.15.1"
   },
   "dependencies": {
diff --git a/packages/client/utils/AtlassianManager.ts b/packages/client/utils/AtlassianManager.ts
index c501b9bc768..5726a0e5636 100644
--- a/packages/client/utils/AtlassianManager.ts
+++ b/packages/client/utils/AtlassianManager.ts
@@ -40,7 +40,7 @@ export type JiraPermissionScope =
 
 export class RateLimitError {
   retryAt: Date
-  name: 'RateLimitError' = 'RateLimitError'
+  name = 'RateLimitError' as const
   message: string
 
   constructor(message: string, retryAt: Date) {
diff --git a/packages/client/utils/draftjs/extractTextFromDraftString.ts b/packages/client/utils/draftjs/extractTextFromDraftString.ts
index a7ac9f22b4f..95e03014184 100644
--- a/packages/client/utils/draftjs/extractTextFromDraftString.ts
+++ b/packages/client/utils/draftjs/extractTextFromDraftString.ts
@@ -2,7 +2,8 @@ import {RawDraftContentState} from 'draft-js'
 
 const extractTextFromDraftString = (content: string) => {
   const parsedContent = JSON.parse(content) as RawDraftContentState
-  const textBlocks = parsedContent.blocks.map(({text}) => text)
+  // toWellFormed replaces lone surrogates with replacement char (e.g. emoji that only has its first code point)
+  const textBlocks = parsedContent.blocks.map(({text}) => (text as any).toWellFormed())
   return textBlocks.join('\n')
 }
 
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 84dbff4bdfb..10852a68c4a 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -18,12 +18,12 @@
   "devDependencies": {
     "@babel/cli": "7.18.6",
     "@babel/core": "7.18.6",
-    "@types/node": "^16.11.62",
+    "@types/node": "^20.11.17",
     "babel-plugin-inline-import": "^3.0.0",
     "chokidar": "^3.3.1",
     "sucrase": "^3.32.0",
     "ts-node-dev": "^1.0.0-pre.44",
-    "typescript": "4.9.5"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index f105f56d7da..a70463e1320 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -11,13 +11,10 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.34.3",
-    "@types/node": "^16.11.62",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
     "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.5.0",
     "lint-staged": "^12.3.3",
     "ts-app-env": "^1.4.2",
-    "typescript": "^4.5.5"
+    "typescript": "^5.3.3"
   }
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 625dc427b3f..79b79743566 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -39,7 +39,7 @@
     "@types/jsonwebtoken": "^8.3.0",
     "@types/mime-types": "^2.1.0",
     "@types/ms": "^0.7.30",
-    "@types/node": "^16.11.62",
+    "@types/node": "^20.11.17",
     "@types/nodemailer": "^6.4.14",
     "@types/relay-runtime": "^14.1.9",
     "@types/sharp": "^0.32.0",
@@ -68,7 +68,7 @@
     "sucrase": "^3.32.0",
     "ts-jest": "^29.1.0",
     "ts-node": "^8.6.2",
-    "typescript": "4.9.5",
+    "typescript": "^5.3.3",
     "url-loader": "4.1.1",
     "vscode-apollo-relay": "^1.5.0",
     "webpack-bundle-analyzer": "4.3.0",
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index 4a095c384e0..a1a9c3130df 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -8,15 +8,8 @@
       "parabol-client/*": ["client/*"],
       "~/*": ["client/*"]
     },
-    "lib": [
-      "esnext",
-      "dom"
-    ],
-    "types": [
-      "node",
-      "jest",
-      "jest-extended"
-    ]
+    "lib": ["esnext", "dom"],
+    "types": ["node", "jest", "jest-extended"]
   },
 
   "exclude": [
@@ -31,9 +24,7 @@
     "server.ts",
     "../client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx"
   ],
-  "include": [
-    "graphql/**/*.ts",
-  ]
+  "include": ["graphql/**/*.ts"]
 
   // if "include" or "files" is added, even if they are empty arrays, then strictNullChecks breaks
   // repro: https://www.typescriptlang.org/play?strictFunctionTypes=false&strictPropertyInitialization=false&strictBindCallApply=false&noImplicitThis=false&noImplicitReturns=false&alwaysStrict=false&declaration=false&experimentalDecorators=false&emitDecoratorMetadata=false&target=6&ts=3.5.1#code/C4TwDgpgBA8gRgKygXigbwFBSgWwIYhwQDKwATgIJlkD8AXFAM7kCWAdgOYDaAuhgL4ZQkKFTIpYiLgHJ8hEuTHS+AYwD2bZlDwS2AVwA2B7Y21sQJ0dQx4AdADM1ZAKJ4VACwAUngF4BKFAA+KH8MIA
diff --git a/yarn.lock b/yarn.lock
index 69cf14bcce1..5054b6dcddb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3159,6 +3159,18 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
   integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
 
+"@eslint-community/eslint-utils@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.5.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
 "@eslint/eslintrc@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
@@ -7572,6 +7584,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
+"@types/json-schema@^7.0.12":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/json-stable-stringify@^1.0.32":
   version "1.0.33"
   resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz#099b0712d824d15e2660c20e1c16e6a8381f308c"
@@ -7699,15 +7716,22 @@
     undici-types "~5.25.1"
 
 "@types/node@^16.11.62":
-  version "16.11.62"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.62.tgz#bab2e6208531321d147eda20c38e389548cd5ffc"
-  integrity sha512-K/ggecSdwAAy2NUW4WKmF4Rc03GKbsfP+k326UWgckoS+Rzd2PaWbjk76dSmqdLQvLTJAO9axiTUJ6488mFsYQ==
+  version "16.18.85"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.85.tgz#17b5338c958efd67b064b92fbef41ad0333c397b"
+  integrity sha512-un7Bj6CPCRLxG2qp+9enNVFuRWCDKKOS6Q/FSpJ4xyrpLNJnRdAQERM2sJ6esaGvl02nK6kiGcMTb0pqknm62g==
 
 "@types/node@^18.11.18":
   version "18.17.18"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.18.tgz#acae19ad9011a2ab3d792232501c95085ba1838f"
   integrity sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==
 
+"@types/node@^20.11.17":
+  version "20.11.17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.17.tgz#cdd642d0e62ef3a861f88ddbc2b61e32578a9292"
+  integrity sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/nodemailer@^6.4.14":
   version "6.4.14"
   resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.14.tgz#5c81a5e856db7f8ede80013e6dbad7c5fb2283e2"
@@ -7892,6 +7916,11 @@
     "@types/glob" "*"
     "@types/node" "*"
 
+"@types/semver@^7.5.0":
+  version "7.5.6"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339"
+  integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==
+
 "@types/send@*":
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
@@ -8044,85 +8073,91 @@
   resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.29.11.tgz#d654a112973f5e004bf8438122bd7e56a8e5cd7e"
   integrity sha512-9cwk3c87qQKZrT251EDoibiYRILjCmxBvvcb4meofCmx1vdnNcR9gyildy5vOHASpOKMsn42CugxUvcwK5eu1g==
 
-"@typescript-eslint/eslint-plugin@5.17.0", "@typescript-eslint/eslint-plugin@^5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67"
-  integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==
+"@typescript-eslint/eslint-plugin@^6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
+  integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/type-utils" "5.17.0"
-    "@typescript-eslint/utils" "5.17.0"
-    debug "^4.3.2"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
-    regexpp "^3.2.0"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+    "@eslint-community/regexpp" "^4.5.1"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/type-utils" "6.21.0"
+    "@typescript-eslint/utils" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.4"
+    natural-compare "^1.4.0"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@5.17.0", "@typescript-eslint/parser@^5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5"
-  integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==
+"@typescript-eslint/parser@^6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
+  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
-    debug "^4.3.2"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+    debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952"
-  integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==
+"@typescript-eslint/scope-manager@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
+  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
 
-"@typescript-eslint/type-utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672"
-  integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==
+"@typescript-eslint/type-utils@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
+  integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==
   dependencies:
-    "@typescript-eslint/utils" "5.17.0"
-    debug "^4.3.2"
-    tsutils "^3.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/utils" "6.21.0"
+    debug "^4.3.4"
+    ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f"
-  integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==
+"@typescript-eslint/types@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
+  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
-"@typescript-eslint/typescript-estree@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488"
-  integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==
+"@typescript-eslint/typescript-estree@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
+  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306"
-  integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
+    minimatch "9.0.3"
+    semver "^7.5.4"
+    ts-api-utils "^1.0.1"
+
+"@typescript-eslint/utils@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
+  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.12"
+    "@types/semver" "^7.5.0"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128"
-  integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==
+"@typescript-eslint/visitor-keys@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
+  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    eslint-visitor-keys "^3.0.0"
+    "@typescript-eslint/types" "6.21.0"
+    eslint-visitor-keys "^3.4.1"
 
 "@webassemblyjs/ast@1.11.5", "@webassemblyjs/ast@^1.11.5":
   version "1.11.5"
@@ -11130,7 +11165,6 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
-  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"
@@ -11498,7 +11532,7 @@ eslint-plugin-react@^7.16.0:
     semver "^6.3.0"
     string.prototype.matchall "^4.0.6"
 
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -11526,7 +11560,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.2.0, eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.2.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
@@ -11836,6 +11870,17 @@ fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.4:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-glob@^3.2.9:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-patch@^3.0.0-1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
@@ -12619,7 +12664,7 @@ globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
+globby@^11.0.1, globby@^11.0.2, globby@^11.0.3:
   version "11.0.4"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
   integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -12631,6 +12676,18 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
 globby@^13.1.1:
   version "13.1.3"
   resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff"
@@ -12726,6 +12783,11 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 graphiql@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/graphiql/-/graphiql-3.0.0.tgz#9ea10cb552759ae69a14c72bf219e9f425a607d7"
@@ -13269,11 +13331,16 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.0.4, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0:
+ignore@^5.0.4, ignore@^5.1.4, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+ignore@^5.2.4:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+
 image-size@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.0.tgz#58b31fe4743b1cec0a0ac26f5c914d3c5b2f0750"
@@ -15637,6 +15704,13 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -20457,6 +20531,11 @@ ts-algebra@^1.2.0:
   resolved "https://registry.yarnpkg.com/ts-algebra/-/ts-algebra-1.2.0.tgz#f91c481207a770f0d14d055c376cbee040afdfc9"
   integrity sha512-kMuJJd8B2N/swCvIvn1hIFcIOrLGbWl9m/J6O3kHx9VRaevh00nvgjPiEGaRee7DRaAczMYR2uwWvXU22VFltw==
 
+ts-api-utils@^1.0.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.2.1.tgz#f716c7e027494629485b21c0df6180f4d08f5e8b"
+  integrity sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==
+
 ts-app-env@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/ts-app-env/-/ts-app-env-1.4.2.tgz#2a76d19d61b66c6bc92ff90e3a0e6db6c545a776"
@@ -20574,7 +20653,7 @@ tslib@1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.11.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -20599,13 +20678,6 @@ tslib@~2.5.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -20729,10 +20801,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.9.5, "typescript@^3 || ^4", typescript@^4.2.4, typescript@^4.5.5:
-  version "4.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+typescript@4.9.5, "typescript@^3 || ^4", typescript@^4.2.4, typescript@^5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
+  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
 uWebSockets.js@uNetworking/uWebSockets.js#v20.34.0:
   version "20.34.0"
@@ -20778,6 +20850,11 @@ undici-types@~5.25.1:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
   integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 undici@^5.26.2:
   version "5.26.3"
   resolved "https://registry.yarnpkg.com/undici/-/undici-5.26.3.tgz#ab3527b3d5bb25b12f898dfd22165d472dd71b79"

From 92f0be917d4bd182bc6ea249f5dc40c05b98320a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:57:26 -0800
Subject: [PATCH 026/183] chore(deps): bump es5-ext from 0.10.62 to 0.10.64
 (#9457)

Bumps [es5-ext](https://github.com/medikoo/es5-ext) from 0.10.62 to 0.10.64.
- [Release notes](https://github.com/medikoo/es5-ext/releases)
- [Changelog](https://github.com/medikoo/es5-ext/blob/main/CHANGELOG.md)
- [Commits](https://github.com/medikoo/es5-ext/compare/v0.10.62...v0.10.64)

---
updated-dependencies:
- dependency-name: es5-ext
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5054b6dcddb..5b2a827fe6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11408,13 +11408,14 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.62"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
-  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@^0.10.62, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.64"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
+  integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
   dependencies:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.3"
+    esniff "^2.0.1"
     next-tick "^1.1.0"
 
 es6-iterator@^2.0.3:
@@ -11606,6 +11607,16 @@ eslint@^8.2.0, eslint@^8.8.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
 espree@^9.0.0, espree@^9.2.0, espree@^9.3.0:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"

From 1e0075e843ce3cf52966a0b77293d72f1d9c60b9 Mon Sep 17 00:00:00 2001
From: adaniels-parabol <71724289+adaniels-parabol@users.noreply.github.com>
Date: Wed, 28 Feb 2024 14:58:35 -0600
Subject: [PATCH 027/183] fix: packages/server/package.json to reduce
 vulnerabilities (#9434)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-UNDICI-6252336

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 packages/server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 79b79743566..0da2cdd6a75 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -137,6 +137,6 @@
     "stripe": "^9.13.0",
     "tslib": "^2.4.0",
     "uWebSockets.js": "uNetworking/uWebSockets.js#v20.34.0",
-    "undici": "^5.26.2"
+    "undici": "^5.28.3"
   }
 }

From fd833f541ef7f915b40331c9d12e94243c8fa24f Mon Sep 17 00:00:00 2001
From: adaniels-parabol <71724289+adaniels-parabol@users.noreply.github.com>
Date: Wed, 28 Feb 2024 14:59:29 -0600
Subject: [PATCH 028/183] fix: packages/server/package.json to reduce
 vulnerabilities (#9392)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NODEMAILER-6219989

Co-authored-by: snyk-bot <snyk-bot@snyk.io>

From fd75d3f2a907888bb461d55ac945d9449071a414 Mon Sep 17 00:00:00 2001
From: adaniels-parabol <71724289+adaniels-parabol@users.noreply.github.com>
Date: Wed, 28 Feb 2024 15:01:26 -0600
Subject: [PATCH 029/183] fix: packages/server/package.json to reduce
 vulnerabilities (#9298)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-FOLLOWREDIRECTS-6141137

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 packages/server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 0da2cdd6a75..29150a626a0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -87,7 +87,7 @@
     "@sentry/integrations": "^7.74.1",
     "@sentry/node": "^7.74.1",
     "adaptivecards": "^2.10.0",
-    "analytics-node": "^5.0.0",
+    "analytics-node": "^6.0.0",
     "api": "^5.0.7",
     "base64url": "^3.0.1",
     "bcryptjs": "^2.4.3",

From 9441b2727deefb7e27e4015f37d64ff933415c8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:01:41 -0800
Subject: [PATCH 030/183] chore(deps): bump follow-redirects from 1.14.8 to
 1.15.4 (#9312)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.8 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.8...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matt Krick <matt.krick@gmail.com>
---
 yarn.lock | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index 5b2a827fe6d..b240f3b0964 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20873,6 +20873,13 @@ undici@^5.26.2:
   dependencies:
     "@fastify/busboy" "^2.0.0"
 
+undici@^5.28.3:
+  version "5.28.3"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b"
+  integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==
+  dependencies:
+    "@fastify/busboy" "^2.0.0"
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"

From 7bfec9188a42b38eb69930fdd86e6fb39249ed7e Mon Sep 17 00:00:00 2001
From: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com>
Date: Wed, 28 Feb 2024 14:30:17 -0800
Subject: [PATCH 031/183] chore: add upload to GCS step in ironbank (#9471)

* add upload to GCS step in ironbank

* update workflow name
---
 .github/workflows/ironbank.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ironbank.yml b/.github/workflows/ironbank.yml
index b6a15acd539..e9782493f43 100644
--- a/.github/workflows/ironbank.yml
+++ b/.github/workflows/ironbank.yml
@@ -1,4 +1,4 @@
-name: Ironbank S3 Upload
+name: Ironbank Image Upload
 
 on:
   workflow_dispatch:
@@ -64,3 +64,11 @@ jobs:
       - name: Upload to S3
         run: |
           aws s3 cp ${{ github.event.inputs.version_number }}.zip s3://ironbank-proving-ground-action-files.parabol.co/${{ github.event.inputs.version_number }}.zip
+
+      - name: Upload to GCS
+        uses: actions-hub/gcloud@master
+        env:
+          CLOUDSDK_AUTH_ACCESS_TOKEN: "${{ steps.auth.outputs.access_token }}"
+        with:
+          args: storage cp ${{ github.event.inputs.version_number }}.zip gs://ironbank-proving-ground/${{ github.event.inputs.version_number }}.zip
+          cli: gcloud

From c1da6baf2d3dbead396561b6da41d43c46cbe3c0 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 09:36:22 +0100
Subject: [PATCH 032/183] chore(release): release v7.19.4 (#9470)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 19 +++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 517aeb7a63e..909f7972a63 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.3"
+  ".": "7.19.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 579182dc3f5..56ea22e2f03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.4](https://github.com/ParabolInc/parabol/compare/v7.19.3...v7.19.4) (2024-02-28)
+
+
+### Fixed
+
+* Fetch Jira projects in parallel ([#9456](https://github.com/ParabolInc/parabol/issues/9456)) ([9cec00a](https://github.com/ParabolInc/parabol/commit/9cec00a5fd0b46c73ebdde27e6d966b485216132))
+* limit invites from spammers ([#9416](https://github.com/ParabolInc/parabol/issues/9416)) ([5b9526c](https://github.com/ParabolInc/parabol/commit/5b9526c092f7f8675ad2a442da4440e2507cbdcc))
+* packages/server/package.json to reduce vulnerabilities ([#9298](https://github.com/ParabolInc/parabol/issues/9298)) ([fd75d3f](https://github.com/ParabolInc/parabol/commit/fd75d3f2a907888bb461d55ac945d9449071a414))
+* packages/server/package.json to reduce vulnerabilities ([#9392](https://github.com/ParabolInc/parabol/issues/9392)) ([fd833f5](https://github.com/ParabolInc/parabol/commit/fd833f541ef7f915b40331c9d12e94243c8fa24f))
+* packages/server/package.json to reduce vulnerabilities ([#9434](https://github.com/ParabolInc/parabol/issues/9434)) ([1e0075e](https://github.com/ParabolInc/parabol/commit/1e0075e843ce3cf52966a0b77293d72f1d9c60b9))
+* replace lone surrogates in draft-js content ([#9415](https://github.com/ParabolInc/parabol/issues/9415)) ([00092ec](https://github.com/ParabolInc/parabol/commit/00092ec55659d1441e9566d501940dcc6fcf07f4))
+
+
+### Changed
+
+* add upload to GCS step in ironbank ([#9471](https://github.com/ParabolInc/parabol/issues/9471)) ([7bfec91](https://github.com/ParabolInc/parabol/commit/7bfec9188a42b38eb69930fdd86e6fb39249ed7e))
+* **deps:** bump es5-ext from 0.10.62 to 0.10.64 ([#9457](https://github.com/ParabolInc/parabol/issues/9457)) ([92f0be9](https://github.com/ParabolInc/parabol/commit/92f0be917d4bd182bc6ea249f5dc40c05b98320a))
+* **deps:** bump follow-redirects from 1.14.8 to 1.15.4 ([#9312](https://github.com/ParabolInc/parabol/issues/9312)) ([9441b27](https://github.com/ParabolInc/parabol/commit/9441b2727deefb7e27e4015f37d64ff933415c8d))
+
 ## [7.19.3](https://github.com/ParabolInc/parabol/compare/v7.19.2...v7.19.3) (2024-02-28)
 
 
diff --git a/package.json b/package.json
index 5b7253fec2e..2603f250ca4 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.3",
+  "version": "7.19.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 39bec48dcf6..c53c697fef2 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.3",
+  "version": "7.19.4",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.3"
+    "parabol-server": "7.19.4"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 19a38863130..2d0ec1344e3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.3",
+  "version": "7.19.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 10852a68c4a..bfb366858cf 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.3",
+  "version": "7.19.4",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.3",
-    "parabol-server": "7.19.3",
+    "parabol-client": "7.19.4",
+    "parabol-server": "7.19.4",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index a70463e1320..7c7c4ffe520 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.3",
+  "version": "7.19.4",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 29150a626a0..1699bdf5d11 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.3",
+  "version": "7.19.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.3",
+    "parabol-client": "7.19.4",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 419d104757d905c468d6a72ce607430d01f3b97f Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 29 Feb 2024 11:20:04 +0100
Subject: [PATCH 033/183] fix: Fix seasonal templates for leap years (#9476)

* fix: Fix seasonal templates for leap years

It would produce invalid dates on February 29th.

* Master was not clean
---
 .../server/dataloader/customLoaderMakers.ts   |  4 +--
 yarn.lock                                     | 25 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/server/dataloader/customLoaderMakers.ts b/packages/server/dataloader/customLoaderMakers.ts
index 8bd64c6250b..ac7e1ea6ec7 100644
--- a/packages/server/dataloader/customLoaderMakers.ts
+++ b/packages/server/dataloader/customLoaderMakers.ts
@@ -481,8 +481,8 @@ export const meetingTemplatesByOrgId = (parent: RootDataLoader) => {
         .where(({or, eb}) =>
           or([
             eb('hideStartingAt', 'is', null),
-            sql<SqlBool>`make_date(2020 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`,
-            sql<SqlBool>`make_date(2019 , extract(month from current_date)::integer, extract(day from current_date)::integer) between "hideEndingAt" and "hideStartingAt"`
+            sql<SqlBool>`DATE '2020-01-01' + EXTRACT(DOY FROM CURRENT_DATE)::INTEGER - 1 between "hideEndingAt" and "hideStartingAt"`,
+            sql<SqlBool>`DATE '2019-01-01' + EXTRACT(DOY FROM CURRENT_DATE)::INTEGER - 1 between "hideEndingAt" and "hideStartingAt"`
           ])
         )
         .orderBy('createdAt', 'desc')
diff --git a/yarn.lock b/yarn.lock
index b240f3b0964..17637e0e348 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8577,13 +8577,13 @@ amp@0.3.1, amp@~0.3.1:
   resolved "https://registry.yarnpkg.com/amp/-/amp-0.3.1.tgz#6adf8d58a74f361e82c1fa8d389c079e139fc47d"
   integrity sha1-at+NWKdPNh6CwfqNOJwHnhOfxH0=
 
-analytics-node@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/analytics-node/-/analytics-node-5.2.0.tgz#ef167bbf0d51f630e96d3abe604ce449b50a2584"
-  integrity sha512-JAc0K7J//QKGGX2mfwBE7wyG/Rh4W0BATB6CncwYhVX1qLjiXwHmB7bYr9PgJIer5M6jKMOhZoO5lxiruQk9BQ==
+analytics-node@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/analytics-node/-/analytics-node-6.2.0.tgz#8ae2ebc73d85e5b2aac8d366b974ad36996f629d"
+  integrity sha512-NLU4tCHlWt0tzEaFQL7NIoWhq2KmQSmz0JvyS2lYn6fc4fEjTMSabhJUx8H1r5995FX8fE3rZ15uIHU6u+ovlQ==
   dependencies:
     "@segment/loosely-validate-event" "^2.0.0"
-    axios "^0.21.4"
+    axios "^0.27.2"
     axios-retry "3.2.0"
     lodash.isstring "^4.0.1"
     md5 "^2.2.1"
@@ -8939,13 +8939,21 @@ axios-retry@3.2.0:
   dependencies:
     is-retry-allowed "^1.1.0"
 
-axios@0.21.4, axios@^0.21.0, axios@^0.21.4:
+axios@0.21.4, axios@^0.21.0:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
 
+axios@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+  dependencies:
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
+
 axios@^1.0.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.2.tgz#7ac517f0fa3ec46e0e636223fd973713a09c72b3"
@@ -12154,6 +12162,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+follow-redirects@^1.14.9:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+
 foreground-child@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"

From ba67da80878dab73a32ba187c418cc6ac3f2dfef Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 11:20:39 +0100
Subject: [PATCH 034/183] chore(release): release v7.19.5 (#9477)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 909f7972a63..6e9dcf42d00 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.4"
+  ".": "7.19.5"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56ea22e2f03..080f2ea136c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.5](https://github.com/ParabolInc/parabol/compare/v7.19.4...v7.19.5) (2024-02-29)
+
+
+### Fixed
+
+* Fix seasonal templates for leap years ([#9476](https://github.com/ParabolInc/parabol/issues/9476)) ([419d104](https://github.com/ParabolInc/parabol/commit/419d104757d905c468d6a72ce607430d01f3b97f))
+
 ## [7.19.4](https://github.com/ParabolInc/parabol/compare/v7.19.3...v7.19.4) (2024-02-28)
 
 
diff --git a/package.json b/package.json
index 2603f250ca4..ee9f994f9d9 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.4",
+  "version": "7.19.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index c53c697fef2..f9c5675491e 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.4",
+  "version": "7.19.5",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.4"
+    "parabol-server": "7.19.5"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 2d0ec1344e3..b5e0427873c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.4",
+  "version": "7.19.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index bfb366858cf..0e97990948c 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.4",
+  "version": "7.19.5",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.4",
-    "parabol-server": "7.19.4",
+    "parabol-client": "7.19.5",
+    "parabol-server": "7.19.5",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 7c7c4ffe520..1b7a9030731 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.4",
+  "version": "7.19.5",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 1699bdf5d11..5dc86873eb0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.4",
+  "version": "7.19.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.4",
+    "parabol-client": "7.19.5",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 052acd14035fe7c96af8d17ca4763be91d863a80 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 29 Feb 2024 13:56:44 +0100
Subject: [PATCH 035/183] fix: After parameter for meetingCount was ignored
 (#9479)

---
 packages/server/graphql/public/types/Company.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/graphql/public/types/Company.ts b/packages/server/graphql/public/types/Company.ts
index 2e01f3b8beb..351d4fb7981 100644
--- a/packages/server/graphql/public/types/Company.ts
+++ b/packages/server/graphql/public/types/Company.ts
@@ -139,7 +139,7 @@ const Company: CompanyResolvers = {
     const teams = await getTeamsByOrgIds(orgIds, dataLoader, true)
     const teamIds = teams.map(({id}) => id)
     if (teamIds.length === 0) return 0
-    const filterFn = after ? () => true : (meeting: any) => meeting('createdAt').ge(after)
+    const filterFn = after ? (meeting: any) => meeting('createdAt').ge(after) : () => true
     return r
       .table('NewMeeting')
       .getAll(r.args(teamIds), {index: 'teamId'})

From 5e356c2566db8e32e45a1393e1b1ea27c4be0a5c Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:02:45 +0000
Subject: [PATCH 036/183] chore(docker-build): simplify the docker build
 process and reduce docker image size (#9447)

* Dockerfile basic created. Improvements added to reduce build time and size (down from 795MB to 445MB, depending on systemtap). Readme reduced, removing the old process used to build the image.

* basic-env file using a RethinkDB database name that is clearly dedicated to the building proces.

* Readme improved to run all three components

* Unused dockerfiles removed. Docker entrypoint renamed. Docker Readme adapted

* Legacy build kept in both dockerfile and env file. Readme adapted to use the new basic image. Build GH workflow adapted to use the new basic.dockerfile.
---
 .github/workflows/build.yml                   |   3 +-
 docker/parabol-ubi/docker-build/README.md     |  82 ++++--------
 .../docker-build/dockerfiles/basic.dockerfile |  26 ++++
 .../dockerfiles/parabol.dockerfile            |   5 +-
 .../dockerfiles/pipeline.dockerfile           | 117 ------------------
 .../dockerfiles/security-test.dockerfile      |  60 ---------
 .../{buildenv => docker-entrypoint.sh}        |   0
 .../docker-build/environments/basic-env       |  17 +++
 .../environments/{buildenv => legacy-build}   |   0
 .../docker-build/environments/local-buildenv  |  54 --------
 10 files changed, 69 insertions(+), 295 deletions(-)
 create mode 100644 docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
 delete mode 100644 docker/parabol-ubi/docker-build/dockerfiles/pipeline.dockerfile
 delete mode 100644 docker/parabol-ubi/docker-build/dockerfiles/security-test.dockerfile
 rename docker/parabol-ubi/docker-build/entrypoints/{buildenv => docker-entrypoint.sh} (100%)
 create mode 100644 docker/parabol-ubi/docker-build/environments/basic-env
 rename docker/parabol-ubi/docker-build/environments/{buildenv => legacy-build} (100%)
 delete mode 100644 docker/parabol-ubi/docker-build/environments/local-buildenv

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b7cf97ce90..9e2e74b3df6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 env:
-  PARABOL_DOCKERFILE: ./docker/parabol-ubi/docker-build/dockerfiles/pipeline.dockerfile
+  PARABOL_DOCKERFILE: ./docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
   PARABOL_BUILD_ENV_PATH: docker/parabol-ubi/docker-build/environments/pipeline
 jobs:
   build:
@@ -114,7 +114,6 @@ jobs:
           context: .
           build-args: |
             "_NODE_VERSION=${{ env.NODE_VERSION }}"
-            "_SECURITY_ENABLED=true"
           push: true
           tags: |
             "${{ secrets.GCP_AR_PARABOL_DEV }}:${{github.sha}}"
diff --git a/docker/parabol-ubi/docker-build/README.md b/docker/parabol-ubi/docker-build/README.md
index 57233e4dbcb..85c1a2d42b3 100644
--- a/docker/parabol-ubi/docker-build/README.md
+++ b/docker/parabol-ubi/docker-build/README.md
@@ -1,17 +1,8 @@
 # docker-image-parabol
 
-This repo was created to build a **secure** Parabol base image that is **agnostic to configuration and can be used anywhere**. Once an image is built, it can be pushed to any repository.
+This repo was created to build a Parabol base image that is **agnostic to configuration and can be used anywhere**. Once an image is built, it can be pushed to any repository.
 
-There are two possible ways to build the application:
-
-- **Standard build:** duild using local files, using the same Dockerfile and process used in our Docker Build pipeline.
-- **Build from git:** build using a simplified process that downloads the source code and builds from scratch.
-
-The processes are different and the details of it can be checked in both dockerfiles.
-
-## Standard build
-
-### Requirements
+## Requirements
 
 Required:
 
@@ -21,37 +12,35 @@ Required:
 
 Recommended:
 
-- jq installed.
+- [jq](https://jqlang.github.io/jq/) installed. It is used to get the version of the application.
 
-### Variables
+## Variables
 
 | Name                 | Description                                                                                                             | Possible values                                       | Recommended value                                                   |
 | -------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------- | ------------------------------------------------------------------- |
 | `postgresql_tag`     | PostgreSQL version from the [Docker image](https://hub.docker.com/_/postgres)                                           | `Any tag`                                             | `15.4`                                                              |
 | `rethinkdb_tag`      | RethinkDB version from the [Docker image](https://hub.docker.com/_/rethinkdb)                                           | `Any tag`                                             | `2.4.2`                                                             |
 | `redis_tag`          | Redis version from the [Docker image](https://hub.docker.com/_/redis)                                                   | `Any tag`                                             | `7.0-alpine`                                                        |
-| `_BUILD_ENV_PATH`    | File `.env` used by the application during the build process                                                            | `Relative path from the root level of the repository` | `docker/parabol-ubi/docker-build/environments/pipeline`             |
+| `_BUILD_ENV_PATH`    | File `.env` used by the application during the build process                                                            | `Relative path from the root level of the repository` | `docker/parabol-ubi/docker-build/environments/basic-env`             |
 | `_NODE_VERSION`      | Node version, used by Docker to use the Docker image node:\_NODE_VERSION as base image to build                         | `Same as in root package.json`                        |                                                                     |
-| `_DOCKERFILE`        | Dockerfile used to build the image                                                                                      | `Relative path from the root level of the repository` | `./docker/parabol-ubi/docker-build/dockerfiles/pipeline.dockerfile` |
-| `_SECURITY_ENABLED`  | Enable or disable security configurations. It will add some MBs to the final image, but it will produce a secured image | `true/false`                                          | `true`                                                              |
+| `_DOCKERFILE`        | Dockerfile used to build the image                                                                                      | `Relative path from the root level of the repository` | `./docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile` |
 | `_DOCKER_REPOSITORY` | The destination repository                                                                                              | `String`                                              | `parabol`                                                           |
 | `_DOCKER_TAG`        | Tag for the produced image                                                                                              | `String`                                              |                                                                     |
 
 Example of variables:
 
 ```commandLine
-export postgresql_tag=15.4-alpine; \
+export postgresql_tag=15.4; \
 export rethinkdb_tag=2.4.2; \
 export redis_tag=7.0-alpine; \
-export _BUILD_ENV_PATH=docker/parabol-ubi/docker-build/environments/pipeline; \
+export _BUILD_ENV_PATH=docker/parabol-ubi/docker-build/environments/basic-env; \
 export _NODE_VERSION=$(jq -r -j '.engines.node|ltrimstr("^")' package.json); \
-export _DOCKERFILE=./docker/parabol-ubi/docker-build/dockerfiles/pipeline.dockerfile; \
-export _SECURITY_ENABLED=true; \
+export _DOCKERFILE=./docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile; \
 export _DOCKER_REPOSITORY=parabol; \
 export _DOCKER_TAG=test-image
 ```
 
-### Building the image
+## Building the image
 
 The application must be already built locally using the command `yarn build --no-deps` mode.
 
@@ -90,7 +79,7 @@ yarn build --no-deps
 - **Build the docker image:**
 
 ```commandLine
-docker build -t $_DOCKER_REPOSITORY:$_DOCKER_TAG -f $_DOCKERFILE --build-arg _NODE_VERSION=$_NODE_VERSION --build-arg _SECURITY_ENABLED=$_SECURITY_ENABLED .
+docker build -t $_DOCKER_REPOSITORY:$_DOCKER_TAG -f $_DOCKERFILE --build-arg _NODE_VERSION=$_NODE_VERSION .
 ```
 
 > Some build tips
@@ -119,57 +108,30 @@ It will produce a Docker image tagged as `${_DOCKER_REPOSITORY}:${_DOCKER_TAG}`.
 docker images $_DOCKER_REPOSITORY:$_DOCKER_TAG
 ```
 
-## Build from git
-
-This version of the Dockerfile downloads the application during the docker build process and differs in other
+## Run the application using a docker image
 
-Modify the version export below e.g. update vX.X.X and run the export command and the docker command. The command below will create a temp postgres container (this allows pgtype files to be generated) and then build the docker image with a temp .env file.
+_Assumes redis, rethinkdb, and postgres already running to have operational stack._
 
-- Change `environments/buildenv` connection string names form container names to localhost for local image build.
-- Use `_PARABOL_GIT_REF` to select the reference in Parabol's Git repository. It can be any tag or branch, but it is recommended to use released tags as `v6.69.0`. By default it buils a local image using only `parabol` as repository.
-- Use `_DOCKER_REPOSITORY` to build the image for a remote repository (ex: `gcr.io/parabol-proving-ground/parabol`)
-- Use `_DOCKER_TAG` to define the tag for the new image.
+The commands below will start a Parabol container on the target tag specified in \_DOCKER_TAG export. It will volume mount a .env in your current working directory to the container, so you can pass in any .env in your current working directory.
 
-```commandLine
-export postgresql_tag=15.4-alpine; \
-export rethinkdb_tag=2.4.2; \
-export redis_tag=7.0-alpine; \
-export _BUILD_ENV_PATH=environments/local-buildenv \
-export _NODE_VERSION=20.11.0 \
-export _DOCKER_REPOSITORY=parabol \
-export _PARABOL_GIT_REF=vX.X.X \
-export _DOCKER_TAG=vX.X.X
-```
+For a more detailed how-to deploy Parabol, please go to the section [docker-host-st](https://github.com/ParabolInc/parabol/tree/master/docker/parabol-ubi/docker-host-st)
 
-Now you can build the image
+- Run the PreDeploy script
 
 ```commandLine
-docker run --name temp-postgres --network=host -e POSTGRES_PASSWORD=temppassword -e POSTGRES_USER=tempuser -e POSTGRES_DB=tempdb -d -p 5432:5432 postgres:${postgresql_tag} && \
-docker run --name temp-rethinkdb --network=host -d -p 28015:28015 -p 29015:29015 -p 8080:8080 rethinkdb:${rethinkdb_tag} && \
-docker run --name temp-redis --network=host -d -p 6379:6379 redis:${redis_tag} && \
-docker build --no-cache --network=host -t ${_DOCKER_REPOSITORY}:${_DOCKER_TAG} -f ./dockerfiles/parabol.dockerfile --build-arg _PARABOL_GIT_REF=${_PARABOL_GIT_REF} --build-arg  _NODE_VERSION=$_NODE_VERSION --build-arg _BUILD_ENV_PATH=${_BUILD_ENV_PATH} . && \
-docker stop temp-postgres temp-rethinkdb temp-redis && docker rm temp-postgres temp-rethinkdb temp-redis -f || docker stop temp-postgres temp-rethinkdb temp-redis && docker rm temp-postgres temp-rethinkdb temp-redis -f
-```
-
-If `_DOCKER_REPOSITORY` wasn't local and you want to push the image, you can run then:
+export _DOCKER_REPOSITORY=parabol; \
+export _DOCKER_TAG=vX.X.X
 
-```commandLine
-docker push ${_DOCKER_REPOSITORY}:${_DOCKER_TAG}
+docker run --name=parabol-predeploy --network=host -v $(pwd)/.env:/home/node/parabol/.env ${_DOCKER_REPOSITORY}:${_DOCKER_TAG} /bin/bash -c "node dist/preDeploy.js"
 ```
 
-## Run the application using a docker image
-
-_Assumes redis, rethinkdb, and postgres already running to have operational stack._
-
-The commands below will start a Parabol container on the target tag specified in \_DOCKER_TAG export. It will volume mount a .env in your current working directory to the container, so you can pass in any .env in your current working directory.
-
 - Start GraphQL
 
 ```commandLine
 export _DOCKER_REPOSITORY=parabol; \
 export _DOCKER_TAG=vX.X.X
 
-docker run --name=parabolgraphql --network=host -v $(pwd)/.env:/home/node/parabol/.env ${_DOCKER_REPOSITORY}:${_DOCKER_TAG} /bin/bash -c "yarn predeploy && NODE_ENV=production && node ./dist/gqlExecutor.js" || docker container rm parabolgraphql -f
+docker run --name=parabol-gql-executor --network=host -v $(pwd)/.env:/home/node/parabol/.env ${_DOCKER_REPOSITORY}:${_DOCKER_TAG} /bin/bash -c "node ./dist/gqlExecutor.js" || docker container rm parabol-gql-executor -f
 ```
 
 - Start Web Server
@@ -178,7 +140,7 @@ docker run --name=parabolgraphql --network=host -v $(pwd)/.env:/home/node/parabo
 export _DOCKER_REPOSITORY=parabol; \
 export _DOCKER_TAG=vX.X.X
 
-docker run --name=parabol --network=host -v $(pwd)/.env:/home/node/parabol/.env -p 3000:3000 ${_DOCKER_REPOSITORY}:${_DOCKER_TAG} /bin/bash -c "yarn predeploy && NODE_ENV=production && node ./dist/web.js" || docker container rm parabol -f
+docker run --name=parabol-web-server --network=host -v $(pwd)/.env:/home/node/parabol/.env -p 3000:3000 ${_DOCKER_REPOSITORY}:${_DOCKER_TAG} /bin/bash -c "node ./dist/web.js" || docker container rm parabol-web-server -f
 ```
 
-To stop the container, just open another terminal and enter `docker container stop parabol`
+To stop the container, just open another terminal and enter `docker container stop parabol-COMPONENT`
diff --git a/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile b/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
new file mode 100644
index 00000000000..025862bedfe
--- /dev/null
+++ b/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
@@ -0,0 +1,26 @@
+ARG _NODE_VERSION=${_NODE_VERSION}
+FROM node:${_NODE_VERSION}-bookworm-slim as base
+
+ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
+ENV PORT=3000
+
+COPY --chown=node --chmod=755 docker/parabol-ubi/docker-build/entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY --chown=node docker/parabol-ubi/docker-build/tools/ip-to-server_id ${HOME}/tools/ip-to-server_id
+
+# Required for pushToCDN to work with FILE_STORE_PROVIDER set to 'local'
+RUN mkdir -p ${HOME}/parabol/self-hosted && \
+    chown node:node ${HOME}/parabol/self-hosted
+
+COPY --chown=node .env.example ${HOME}/parabol/.env.example
+
+# The application requires a yarn.lock file on the root folder to identify it
+COPY --chown=node yarn.lock ${HOME}/parabol/yarn.lock
+COPY --chown=node build ${HOME}/parabol/build
+COPY --chown=node dist ${HOME}/parabol/dist
+
+WORKDIR ${HOME}/parabol/
+
+USER node
+EXPOSE ${PORT}
+
+ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/docker/parabol-ubi/docker-build/dockerfiles/parabol.dockerfile b/docker/parabol-ubi/docker-build/dockerfiles/parabol.dockerfile
index f2f7466af8b..2688d19ee8d 100644
--- a/docker/parabol-ubi/docker-build/dockerfiles/parabol.dockerfile
+++ b/docker/parabol-ubi/docker-build/dockerfiles/parabol.dockerfile
@@ -1,9 +1,10 @@
+# DO NOT DELETE. Legacy docker file for versions still in use. Delete only when all Parabol instances are using the newest docker image.
 ARG _NODE_VERSION=${_NODE_VERSION}
 #base build for dev deps
 FROM node:${_NODE_VERSION} as base
 
 ARG _PARABOL_GIT_REF=${_PARABOL_GIT_REF}
-ARG _BUILD_ENV_PATH=environments/buildenv
+ARG _BUILD_ENV_PATH=environments/legacy-build
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 
 WORKDIR /home/node
@@ -45,7 +46,7 @@ COPY --from=base /usr/local/lib/node_modules /usr/local/lib/node_modules
 COPY --from=base /opt /opt
 COPY --from=base /home/node/parabol/ ${HOME}/parabol
 RUN rm -rf ${HOME}/parabol/.env
-COPY entrypoints/buildenv /usr/local/bin/docker-entrypoint.sh
+COPY entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY security /security
 
 COPY ./tools/ip-to-server_id /home/node/tools/ip-to-server_id
diff --git a/docker/parabol-ubi/docker-build/dockerfiles/pipeline.dockerfile b/docker/parabol-ubi/docker-build/dockerfiles/pipeline.dockerfile
deleted file mode 100644
index 5194efcbe4d..00000000000
--- a/docker/parabol-ubi/docker-build/dockerfiles/pipeline.dockerfile
+++ /dev/null
@@ -1,117 +0,0 @@
-ARG _NODE_VERSION=${_NODE_VERSION}
-FROM node:${_NODE_VERSION} as base
-
-ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
-ENV PORT=3000
-
-RUN apt update -y && \
-    apt install systemtap -y
-
-USER node
-EXPOSE ${PORT}
-
-ENTRYPOINT ["docker-entrypoint.sh"]
-
-# Final image - copies in parabol build and applies all security configurations to container if enabled
-FROM redhat/ubi9:9.2
-
-ARG _SECURITY_ENABLED="true"
-
-ENV HOME=/home/node \
-    USER=node
-
-ENV PORT=3000
-
-RUN groupadd -g 1000 node && \
-    useradd -r -u 1000 -m -s /sbin/nologin -g node node
-
-COPY --from=base /usr/local/bin /usr/local/bin
-COPY --from=base /usr/local/include /usr/local/include
-COPY --from=base /usr/local/share/man /usr/local/share/man
-COPY --from=base /usr/local/share/doc /usr/local/share/doc
-COPY --from=base /usr/share/systemtap /usr/local/share/systemtap
-COPY --from=base /usr/local/lib/node_modules /usr/local/lib/node_modules
-COPY --from=base /opt /opt
-
-# Security
-COPY docker/parabol-ubi/docker-build/security /security
-
-RUN  if [ "$_SECURITY_ENABLED" = "true" ]; then \
-        echo Update packages and install security patches && \
-        sed -i "s/enabled=1/enabled=0/" /etc/dnf/plugins/subscription-manager.conf && \
-        echo "exclude=filesystem-*" >> /etc/dnf/dnf.conf && \
-        chmod +x /security/*.sh && \
-        dnf repolist && \
-        dnf update -y && \
-        echo "* hard maxlogins 10" > /etc/security/limits.d/maxlogins.conf && \
-        /security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh && \
-        /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh && \
-        /security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh && \
-        /security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh && \
-        /security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh && \
-        /security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh && \
-        /security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh && \
-        /security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh && \
-        /security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh && \
-        /security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh && \
-        /security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh && \
-        /security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh && \
-        /security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh && \
-        /security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh && \
-        /security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh && \
-        /security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh && \
-        dnf clean all && \
-        rm -rf /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* && \
-        chmod g-s /opt/yarn-v*/bin /opt/yarn-v*/lib && \
-        chgrp -R root /opt/yarn-v* && \
-        chgrp root /opt/yarn-v*/lib/* /opt/yarn-v*/bin/* /opt/yarn-v*/*; \
-    else \
-        echo "Security checks disabled."; \
-    fi
-
-RUN rm -rf /security/
-
-COPY --chown=node --chmod=755 docker/parabol-ubi/docker-build/entrypoints/buildenv /usr/local/bin/docker-entrypoint.sh
-COPY --chown=node docker/parabol-ubi/docker-build/tools/ip-to-server_id ${HOME}/tools/ip-to-server_id
-
-# The application requires a yarn.lock file on the root folder to identify it
-COPY --chown=node yarn.lock ${HOME}/parabol/yarn.lock
-# Required for pushToCDN to work with FILE_STORE_PROVIDER set to 'local'
-RUN mkdir -p ${HOME}/parabol/self-hosted && \
-    chown node:node ${HOME}/parabol/self-hosted
-
-COPY --chown=node .env.example ${HOME}/parabol/.env.example
-COPY --chown=node build ${HOME}/parabol/build
-COPY --chown=node dist ${HOME}/parabol/dist
-
-WORKDIR ${HOME}/parabol/
-USER node
-EXPOSE ${PORT}
-
-ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/docker/parabol-ubi/docker-build/dockerfiles/security-test.dockerfile b/docker/parabol-ubi/docker-build/dockerfiles/security-test.dockerfile
deleted file mode 100644
index 246eba76add..00000000000
--- a/docker/parabol-ubi/docker-build/dockerfiles/security-test.dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-#final image
-FROM redhat/ubi9:9.2
-
-COPY entrypoints/buildenv /usr/local/bin/docker-entrypoint.sh
-COPY security /security
-
-RUN echo Update packages and install security patches && \
-    sed -i "s/enabled=1/enabled=0/" /etc/dnf/plugins/subscription-manager.conf && \
-    echo "exclude=filesystem-*" >> /etc/dnf/dnf.conf && \
-    chmod +x /security/*.sh && \
-    dnf repolist && \
-    dnf update -y && \
-    echo "* hard maxlogins 10" > /etc/security/limits.d/maxlogins.conf && \
-    /security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh && \
-    /security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh && \
-    /security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh && \
-    /security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh && \
-    /security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh && \
-    /security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh && \
-    /security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh && \
-    /security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh && \
-    /security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh && \
-    /security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh && \
-    /security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh && \
-    /security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh && \
-    /security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh && \
-    /security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh && \
-    dnf clean all && \
-    rm -rf /security/ /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* && \
-    chmod 755 /usr/local/bin/docker-entrypoint.sh
-
-ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/docker/parabol-ubi/docker-build/entrypoints/buildenv b/docker/parabol-ubi/docker-build/entrypoints/docker-entrypoint.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/entrypoints/buildenv
rename to docker/parabol-ubi/docker-build/entrypoints/docker-entrypoint.sh
diff --git a/docker/parabol-ubi/docker-build/environments/basic-env b/docker/parabol-ubi/docker-build/environments/basic-env
new file mode 100644
index 00000000000..86bbad9252d
--- /dev/null
+++ b/docker/parabol-ubi/docker-build/environments/basic-env
@@ -0,0 +1,17 @@
+FILE_STORE_PROVIDER='local'
+HOST='localhost'
+NODE_ENV='production'
+NODE_EXTRA_CA_CERTS=''
+PROTO='https'
+PORT='3000'
+# Database configurations must be the same used in the docker-build.yml Github workflow
+POSTGRES_PASSWORD='temppassword'
+POSTGRES_USER='tempuser'
+POSTGRES_DB='tempdb'
+POSTGRES_HOST='localhost'
+POSTGRES_PORT='5432'
+REDIS_URL='redis://localhost:6379'
+RETHINKDB_SSL=''
+RETHINKDB_URL='rethinkdb://localhost:28015/buildDB'
+SERVER_ID='0'
+SERVER_SECRET='FAKE_VALUE'
diff --git a/docker/parabol-ubi/docker-build/environments/buildenv b/docker/parabol-ubi/docker-build/environments/legacy-build
similarity index 100%
rename from docker/parabol-ubi/docker-build/environments/buildenv
rename to docker/parabol-ubi/docker-build/environments/legacy-build
diff --git a/docker/parabol-ubi/docker-build/environments/local-buildenv b/docker/parabol-ubi/docker-build/environments/local-buildenv
deleted file mode 100644
index f5f7c27ab83..00000000000
--- a/docker/parabol-ubi/docker-build/environments/local-buildenv
+++ /dev/null
@@ -1,54 +0,0 @@
-ATLASSIAN_CLIENT_ID=''
-ATLASSIAN_CLIENT_SECRET=''
-AWS_ACCESS_KEY_ID=''
-AWS_REGION=''
-AWS_S3_BUCKET=''
-AWS_SECRET_ACCESS_KEY=''
-CDN_BASE_URL=''
-FILE_STORE_PROVIDER='local'
-GITHUB_CLIENT_ID=''
-GITHUB_CLIENT_SECRET=''
-GITHUB_WEBHOOK_SECRET=''
-GITLAB_CLIENT_ID=''
-GITLAB_CLIENT_SECRET=''
-GOOGLE_CLOUD_CLIENT_EMAIL=''
-GOOGLE_CLOUD_PRIVATE_KEY=''
-GOOGLE_CLOUD_PRIVATE_KEY_ID=''
-GOOGLE_OAUTH_CLIENT_ID=''
-GOOGLE_OAUTH_CLIENT_SECRET=''
-GOOGLE_TAG_MANAGER_CONTAINER_ID=''
-GRAPHQL_HOST=''
-GRAPHQL_PROTOCOL=''
-HOST=''
-INVITATION_SHORTLINK=''
-MAIL_PROVIDER=''
-MAIL_GOOGLE_USER=''
-MAIL_GOOGLE_PASS=''
-MAILGUN_API_KEY=''
-MAILGUN_DOMAIN=''
-MAILGUN_PUBLIC_KEY=''
-MAIL_FROM=''
-NODE_ENV='production'
-NODE_EXTRA_CA_CERTS=''
-PROTO='https'
-PGADMIN_DEFAULT_EMAIL=''
-PGADMIN_DEFAULT_PASSWORD=''
-PGSSLMODE=''
-PORT=''
-POSTGRES_PASSWORD='temppassword'
-POSTGRES_USER='tempuser'
-POSTGRES_DB='tempdb'
-POSTGRES_HOST='localhost'
-POSTGRES_PORT='5432'
-REDIS_URL='redis://localhost:6379'
-RETHINKDB_SSL=''
-RETHINKDB_URL='rethinkdb://localhost:28015/actionProduction'
-SENTRY_DSN=''
-SERVER_ID=''
-SERVER_SECRET='FAKE_VALUE'
-SLACK_CLIENT_ID=''
-SLACK_CLIENT_SECRET=''
-STRIPE_PUBLISHABLE_KEY=''
-STRIPE_SECRET_KEY=''
-STRIPE_WEBHOOK_SECRET=''
-HUBSPOT_API_KEY=''

From aa88da0205d2434ab3376169ce9cd37e5e5f0db1 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 16:08:39 +0000
Subject: [PATCH 037/183] chore(release): release v7.19.6 (#9480)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 12 ++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 6e9dcf42d00..a1ce62b5bc5 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.5"
+  ".": "7.19.6"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 080f2ea136c..8fbd69d25fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.6](https://github.com/ParabolInc/parabol/compare/v7.19.5...v7.19.6) (2024-02-29)
+
+
+### Fixed
+
+* After parameter for meetingCount was ignored ([#9479](https://github.com/ParabolInc/parabol/issues/9479)) ([052acd1](https://github.com/ParabolInc/parabol/commit/052acd14035fe7c96af8d17ca4763be91d863a80))
+
+
+### Changed
+
+* **docker-build:** simplify the docker build process and reduce docker image size ([#9447](https://github.com/ParabolInc/parabol/issues/9447)) ([5e356c2](https://github.com/ParabolInc/parabol/commit/5e356c2566db8e32e45a1393e1b1ea27c4be0a5c))
+
 ## [7.19.5](https://github.com/ParabolInc/parabol/compare/v7.19.4...v7.19.5) (2024-02-29)
 
 
diff --git a/package.json b/package.json
index ee9f994f9d9..f582fbc4f5d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.5",
+  "version": "7.19.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index f9c5675491e..8a2a986bd03 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.5",
+  "version": "7.19.6",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.5"
+    "parabol-server": "7.19.6"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index b5e0427873c..7dac5ea4e99 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.5",
+  "version": "7.19.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 0e97990948c..8bc4c541782 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.5",
+  "version": "7.19.6",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.5",
-    "parabol-server": "7.19.5",
+    "parabol-client": "7.19.6",
+    "parabol-server": "7.19.6",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 1b7a9030731..ad76a9338b1 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.5",
+  "version": "7.19.6",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 5dc86873eb0..439b2f4ab0f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.5",
+  "version": "7.19.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.5",
+    "parabol-client": "7.19.6",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 2ff4a6e6328bf437a31e9ac7984af4a55aae3d11 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Thu, 29 Feb 2024 17:08:29 +0000
Subject: [PATCH 038/183] fix(docker-build): home folder is /home/node now
 (#9482)

---
 docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile b/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
index 025862bedfe..077d95a8fb6 100644
--- a/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
+++ b/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
@@ -1,6 +1,9 @@
 ARG _NODE_VERSION=${_NODE_VERSION}
 FROM node:${_NODE_VERSION}-bookworm-slim as base
 
+ENV HOME=/home/node \
+    USER=node
+
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 ENV PORT=3000
 

From 9c44e23c4d223735551dbae2a0897040840b9e10 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 17:17:19 +0000
Subject: [PATCH 039/183] chore(release): release v7.19.7 (#9483)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index a1ce62b5bc5..57085bcbc6b 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.6"
+  ".": "7.19.7"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fbd69d25fa..7191952d8a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.19.7](https://github.com/ParabolInc/parabol/compare/v7.19.6...v7.19.7) (2024-02-29)
+
+
+### Fixed
+
+* **docker-build:** home folder is /home/node now ([#9482](https://github.com/ParabolInc/parabol/issues/9482)) ([2ff4a6e](https://github.com/ParabolInc/parabol/commit/2ff4a6e6328bf437a31e9ac7984af4a55aae3d11))
+
 ## [7.19.6](https://github.com/ParabolInc/parabol/compare/v7.19.5...v7.19.6) (2024-02-29)
 
 
diff --git a/package.json b/package.json
index f582fbc4f5d..8749898ad6a 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.6",
+  "version": "7.19.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 8a2a986bd03..f44740aee53 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.6",
+  "version": "7.19.7",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.6"
+    "parabol-server": "7.19.7"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 7dac5ea4e99..a065260e9ad 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.6",
+  "version": "7.19.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 8bc4c541782..ea18a30925c 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.6",
+  "version": "7.19.7",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.6",
-    "parabol-server": "7.19.6",
+    "parabol-client": "7.19.7",
+    "parabol-server": "7.19.7",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index ad76a9338b1..a1780c8c5b4 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.6",
+  "version": "7.19.7",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 439b2f4ab0f..4e47bbb8ad0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.6",
+  "version": "7.19.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.6",
+    "parabol-client": "7.19.7",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 807e34718d8a7939b7be84438900ef200a6ca896 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Thu, 29 Feb 2024 11:44:15 -0800
Subject: [PATCH 040/183] feat: OpenAIGeneration model for embedder (#9474)

---
 packages/embedder/ai_models/AbstractModel.ts  |  2 -
 packages/embedder/ai_models/ModelManager.ts   |  9 +-
 .../embedder/ai_models/OpenAIGeneration.ts    | 94 +++++++++++++++++++
 .../ai_models/TextEmbeddingsInference.ts      |  2 +-
 .../ai_models/TextGenerationInference.ts      | 26 ++---
 packages/embedder/embedder.ts                 |  3 +-
 .../embedder/indexing/embeddingsTablesOps.ts  |  2 +-
 7 files changed, 112 insertions(+), 26 deletions(-)
 create mode 100644 packages/embedder/ai_models/OpenAIGeneration.ts

diff --git a/packages/embedder/ai_models/AbstractModel.ts b/packages/embedder/ai_models/AbstractModel.ts
index b0f709ce485..b57d220cd35 100644
--- a/packages/embedder/ai_models/AbstractModel.ts
+++ b/packages/embedder/ai_models/AbstractModel.ts
@@ -11,7 +11,6 @@ export interface GenerationModelConfig extends ModelConfig {}
 
 export abstract class AbstractModel {
   public readonly url?: string
-  public modelInstance: any
 
   constructor(config: ModelConfig) {
     this.url = this.normalizeUrl(config.url)
@@ -57,7 +56,6 @@ export interface GenerationOptions {
   temperature?: number
   topK?: number
   topP?: number
-  truncate?: boolean
 }
 
 export abstract class AbstractGenerationModel extends AbstractModel {
diff --git a/packages/embedder/ai_models/ModelManager.ts b/packages/embedder/ai_models/ModelManager.ts
index ac8f04cc891..bf6888378c8 100644
--- a/packages/embedder/ai_models/ModelManager.ts
+++ b/packages/embedder/ai_models/ModelManager.ts
@@ -7,6 +7,7 @@ import {
   GenerationModelConfig,
   ModelConfig
 } from './AbstractModel'
+import OpenAIGeneration from './OpenAIGeneration'
 import TextEmbeddingsInference from './TextEmbeddingsInference'
 import TextGenerationInference from './TextGenerationInference'
 
@@ -16,7 +17,7 @@ interface ModelManagerConfig {
 }
 
 export type EmbeddingsModelType = 'text-embeddings-inference'
-export type GenerationModelType = 'text-generation-inference'
+export type GenerationModelType = 'openai' | 'text-generation-inference'
 
 export class ModelManager {
   embeddingModels: AbstractEmbeddingsModel[]
@@ -80,9 +81,11 @@ export class ModelManager {
       const [modelType, _] = modelConfig.model.split(':') as [GenerationModelType, string]
 
       switch (modelType) {
+        case 'openai': {
+          return new OpenAIGeneration(modelConfig)
+        }
         case 'text-generation-inference': {
-          const generator = new TextGenerationInference(modelConfig)
-          return generator
+          return new TextGenerationInference(modelConfig)
         }
         default:
           throw new Error(`unsupported summarization model '${modelType}'`)
diff --git a/packages/embedder/ai_models/OpenAIGeneration.ts b/packages/embedder/ai_models/OpenAIGeneration.ts
new file mode 100644
index 00000000000..b5614b608c5
--- /dev/null
+++ b/packages/embedder/ai_models/OpenAIGeneration.ts
@@ -0,0 +1,94 @@
+import OpenAI from 'openai'
+import {
+  AbstractGenerationModel,
+  GenerationModelConfig,
+  GenerationModelParams,
+  GenerationOptions
+} from './AbstractModel'
+
+const MAX_REQUEST_TIME_S = 3 * 60
+
+export type ModelId = 'gpt-3.5-turbo-0125' | 'gpt-4-turbo-preview'
+
+type OpenAIGenerationOptions = Omit<GenerationOptions, 'topK'>
+
+const modelIdDefinitions: Record<ModelId, GenerationModelParams> = {
+  'gpt-3.5-turbo-0125': {
+    maxInputTokens: 4096
+  },
+  'gpt-4-turbo-preview': {
+    maxInputTokens: 128000
+  }
+}
+
+function isValidModelId(object: any): object is ModelId {
+  return Object.keys(modelIdDefinitions).includes(object)
+}
+
+export class OpenAIGeneration extends AbstractGenerationModel {
+  private openAIApi: OpenAI | null
+  private modelId: ModelId
+
+  constructor(config: GenerationModelConfig) {
+    super(config)
+    if (!process.env.OPEN_AI_API_KEY) {
+      this.openAIApi = null
+      return
+    }
+    this.openAIApi = new OpenAI({
+      apiKey: process.env.OPEN_AI_API_KEY,
+      organization: process.env.OPEN_AI_ORG_ID
+    })
+  }
+
+  async summarize(content: string, options: OpenAIGenerationOptions) {
+    if (!this.openAIApi) {
+      const eMsg = 'OpenAI is not configured'
+      console.log('OpenAIGenerationSummarizer.summarize(): ', eMsg)
+      throw new Error(eMsg)
+    }
+    const {maxNewTokens: max_tokens = 512, seed, stop, temperature = 0.8, topP: top_p} = options
+    const prompt = `Create a brief, one-paragraph summary of the following: ${content}`
+
+    try {
+      const response = await this.openAIApi.chat.completions.create({
+        frequency_penalty: 0,
+        max_tokens,
+        messages: [
+          {
+            role: 'user',
+            content: prompt
+          }
+        ],
+        model: this.modelId,
+        presence_penalty: 0,
+        temperature,
+        seed,
+        stop,
+        top_p
+      })
+      const maybeSummary = response.choices[0]?.message?.content?.trim()
+      if (!maybeSummary) throw new Error('OpenAI returned empty summary')
+      return maybeSummary
+    } catch (e) {
+      console.log('OpenAIGenerationSummarizer.summarize(): ', e)
+      throw e
+    }
+  }
+  protected constructModelParams(config: GenerationModelConfig): GenerationModelParams {
+    const modelConfigStringSplit = config.model.split(':')
+    if (modelConfigStringSplit.length != 2) {
+      throw new Error('OpenAIGeneration model string must be colon-delimited and len 2')
+    }
+
+    const maybeModelId = modelConfigStringSplit[1]
+    if (!isValidModelId(maybeModelId))
+      throw new Error(`OpenAIGeneration model id unknown: ${maybeModelId}`)
+
+    this.modelId = maybeModelId
+
+    return modelIdDefinitions[maybeModelId]
+  }
+}
+
+export default OpenAIGeneration
diff --git a/packages/embedder/ai_models/TextEmbeddingsInference.ts b/packages/embedder/ai_models/TextEmbeddingsInference.ts
index 93bb2c88c2f..549fadcd6fd 100644
--- a/packages/embedder/ai_models/TextEmbeddingsInference.ts
+++ b/packages/embedder/ai_models/TextEmbeddingsInference.ts
@@ -63,7 +63,7 @@ export class TextEmbeddingsInference extends AbstractEmbeddingsModel {
     if (!this.url) throw new Error('TextGenerationInferenceSummarizer model requires url')
     const maybeModelId = modelConfigStringSplit[1]
     if (!isValidModelId(maybeModelId))
-      throw new Error(`TextGenerationInference model subtype unknown: ${maybeModelId}`)
+      throw new Error(`TextGenerationInference model id unknown: ${maybeModelId}`)
     return modelIdDefinitions[maybeModelId]
   }
 }
diff --git a/packages/embedder/ai_models/TextGenerationInference.ts b/packages/embedder/ai_models/TextGenerationInference.ts
index 6f12ce09974..bcf1daa6303 100644
--- a/packages/embedder/ai_models/TextGenerationInference.ts
+++ b/packages/embedder/ai_models/TextGenerationInference.ts
@@ -25,16 +25,8 @@ export class TextGenerationInference extends AbstractGenerationModel {
     super(config)
   }
 
-  public async summarize(content: string, options: GenerationOptions) {
-    const {
-      maxNewTokens: max_new_tokens = 512,
-      seed,
-      stop,
-      temperature = 0.8,
-      topP,
-      topK,
-      truncate
-    } = options
+  async summarize(content: string, options: GenerationOptions) {
+    const {maxNewTokens: max_new_tokens = 512, seed, stop, temperature = 0.8, topP, topK} = options
     const parameters = {
       max_new_tokens,
       seed,
@@ -42,7 +34,7 @@ export class TextGenerationInference extends AbstractGenerationModel {
       temperature,
       topP,
       topK,
-      truncate
+      truncate: true
     }
     const prompt = `Create a brief, one-paragraph summary of the following: ${content}`
     const fetchOptions = {
@@ -59,27 +51,27 @@ export class TextGenerationInference extends AbstractGenerationModel {
     }
 
     try {
-      // console.log(`TextGenerationInterface.summarize(): summarizing from ${this.url}/generate`)
+      // console.log(`TextGenerationInference.summarize(): summarizing from ${this.url}/generate`)
       const res = await fetchWithRetry(`${this.url}/generate`, fetchOptions)
       const json = await res.json()
       if (!json || !json.generated_text)
-        throw new Error('TextGenerationInterface.summarize(): malformed response')
+        throw new Error('TextGenerationInference.summarize(): malformed response')
       return json.generated_text as string
     } catch (e) {
-      console.log('TextGenerationInterfaceSummarizer.summarize(): timeout')
+      console.log('TextGenerationInferenceSummarizer.summarize(): timeout')
       throw e
     }
   }
   protected constructModelParams(config: GenerationModelConfig): GenerationModelParams {
     const modelConfigStringSplit = config.model.split(':')
     if (modelConfigStringSplit.length != 2) {
-      throw new Error('TextGenerationInterface model string must be colon-delimited and len 2')
+      throw new Error('TextGenerationInference model string must be colon-delimited and len 2')
     }
 
-    if (!this.url) throw new Error('TextGenerationInterfaceSummarizer model requires url')
+    if (!this.url) throw new Error('TextGenerationInferenceSummarizer model requires url')
     const maybeModelId = modelConfigStringSplit[1]
     if (!isValidModelId(maybeModelId))
-      throw new Error(`TextGenerationInterface model subtype unknown: ${maybeModelId}`)
+      throw new Error(`TextGenerationInference model id unknown: ${maybeModelId}`)
     return modelIdDefinitions[maybeModelId]
   }
 }
diff --git a/packages/embedder/embedder.ts b/packages/embedder/embedder.ts
index 1072a546d00..f6762013d08 100644
--- a/packages/embedder/embedder.ts
+++ b/packages/embedder/embedder.ts
@@ -162,9 +162,8 @@ const dequeueAndEmbedUntilEmpty = async (modelManager: ModelManager) => {
       try {
         const generator = modelManager.generationModels[0] // use 1st generator
         if (!generator) throw new Error(`Generator unavailable`)
-        const summarizeOptions = {maxInputTokens, truncate: true}
         console.log(`embedder:     ...summarizing ${itemKey} for ${modelTable}`)
-        embedText = await generator.summarize(fullText, summarizeOptions)
+        embedText = await generator.summarize(fullText, {maxNewTokens: maxInputTokens})
       } catch (e) {
         await updateJobState(jobQueueId, 'failed', {
           stateMessage: `unable to summarize long embed text: ${e}`
diff --git a/packages/embedder/indexing/embeddingsTablesOps.ts b/packages/embedder/indexing/embeddingsTablesOps.ts
index b68bc21ccbe..c74eb709708 100644
--- a/packages/embedder/indexing/embeddingsTablesOps.ts
+++ b/packages/embedder/indexing/embeddingsTablesOps.ts
@@ -52,7 +52,7 @@ export async function selectMetaToQueue(
     .where(({eb, not, or, and, exists, selectFrom}) =>
       and([
         or([
-          not(eb('em.models', '<@', sql`ARRAY[${sql.ref('model')}]::varchar[]` as any) as any),
+          not(eb('em.models', '@>', sql`ARRAY[${sql.ref('model')}]::varchar[]` as any) as any),
           eb('em.models' as any, 'is', null)
         ]),
         not(

From 4e2e2ca00f237a7a8c94dc2e7f0d2f7d9ef9210d Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 29 Feb 2024 17:58:38 -0800
Subject: [PATCH 041/183] fix: support single-tenant saml record (#9486)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/server/graphql/private/mutations/loginSAML.ts | 7 +++++--
 packages/server/utils/getSAMLURLFromEmail.ts           | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/server/graphql/private/mutations/loginSAML.ts b/packages/server/graphql/private/mutations/loginSAML.ts
index c14201f35eb..c3137a14205 100644
--- a/packages/server/graphql/private/mutations/loginSAML.ts
+++ b/packages/server/graphql/private/mutations/loginSAML.ts
@@ -16,6 +16,7 @@ import getSignOnURL from '../../public/mutations/helpers/SAMLHelpers/getSignOnUR
 import {SSORelayState} from '../../queries/SAMLIdP'
 import {MutationResolvers} from '../resolverTypes'
 import standardError from '../../../utils/standardError'
+import {isSingleTenantSSO} from '../../../utils/getSAMLURLFromEmail'
 
 const serviceProvider = samlify.ServiceProvider({})
 samlify.setSchemaValidator(samlXMLValidator)
@@ -104,8 +105,10 @@ const loginSAML: MutationResolvers['loginSAML'] = async (
   }
   const ssoDomain = getSSODomainFromEmail(email)
   if (!ssoDomain || !domains.includes(ssoDomain)) {
-    // don't blindly trust the IdP
-    return {error: {message: `${email} does not belong to ${domains.join(', ')}`}}
+    if (!isSingleTenantSSO) {
+      // don't blindly trust the IdP unless there is only 1
+      return {error: {message: `${email} does not belong to ${domains.join(', ')}`}}
+    }
   }
 
   if (newMetadata) {
diff --git a/packages/server/utils/getSAMLURLFromEmail.ts b/packages/server/utils/getSAMLURLFromEmail.ts
index 2c07d74a06d..896a479b483 100644
--- a/packages/server/utils/getSAMLURLFromEmail.ts
+++ b/packages/server/utils/getSAMLURLFromEmail.ts
@@ -4,7 +4,7 @@ import {URL} from 'url'
 import {DataLoaderWorker} from '../graphql/graphql'
 import getKysely from '../postgres/getKysely'
 
-const isSingleTenantSSO =
+export const isSingleTenantSSO =
   process.env.AUTH_INTERNAL_DISABLED === 'true' &&
   process.env.AUTH_GOOGLE_DISABLED === 'true' &&
   process.env.AUTH_MICROSOFT_DISABLED === 'true' &&

From ba7d7246c8db632f8016ec632c7841ae9a847dd2 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 08:37:27 -0800
Subject: [PATCH 042/183] chore(release): release v7.20.0 (#9485)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 12 ++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 57085bcbc6b..7f814dacbc5 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.19.7"
+  ".": "7.20.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7191952d8a0..9d762695706 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.20.0](https://github.com/ParabolInc/parabol/compare/v7.19.7...v7.20.0) (2024-03-01)
+
+
+### Added
+
+* OpenAIGeneration model for embedder ([#9474](https://github.com/ParabolInc/parabol/issues/9474)) ([807e347](https://github.com/ParabolInc/parabol/commit/807e34718d8a7939b7be84438900ef200a6ca896))
+
+
+### Fixed
+
+* support single-tenant saml record ([#9486](https://github.com/ParabolInc/parabol/issues/9486)) ([4e2e2ca](https://github.com/ParabolInc/parabol/commit/4e2e2ca00f237a7a8c94dc2e7f0d2f7d9ef9210d))
+
 ## [7.19.7](https://github.com/ParabolInc/parabol/compare/v7.19.6...v7.19.7) (2024-02-29)
 
 
diff --git a/package.json b/package.json
index 8749898ad6a..a2b1c1f913c 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.7",
+  "version": "7.20.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index f44740aee53..b0166f09a82 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.19.7",
+  "version": "7.20.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.19.7"
+    "parabol-server": "7.20.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index a065260e9ad..085bd29d0b3 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.7",
+  "version": "7.20.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index ea18a30925c..5fc6dbb0961 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.19.7",
+  "version": "7.20.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.19.7",
-    "parabol-server": "7.19.7",
+    "parabol-client": "7.20.0",
+    "parabol-server": "7.20.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index a1780c8c5b4..9053ded2078 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.7",
+  "version": "7.20.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 4e47bbb8ad0..1d09f43fca0 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.19.7",
+  "version": "7.20.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.11.0",
-    "parabol-client": "7.19.7",
+    "parabol-client": "7.20.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From a95fb88b9a76e04eb73630404e29e6325dcf1a12 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 4 Mar 2024 21:35:15 +0100
Subject: [PATCH 043/183] chore: Update reviewers (#9504)

---
 .github/reviewers.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/reviewers.yml b/.github/reviewers.yml
index 2b92d6ef8f6..8d2732ba714 100644
--- a/.github/reviewers.yml
+++ b/.github/reviewers.yml
@@ -1,19 +1,16 @@
 reviewers:
   groups:
     reviewers:
-      - igorlesnenko
       - nickoferrall
     maintainers:
       - mattkrick
       - Dschoordsch
     data:
       - tianrunhe
-      - tghanken
     designers:
       - ackernaut
     devops:
       - rafaelromcar-parabol
-      - adaniels-parabol
       - dbumblis-parabol
     none:
 

From 58c5817463bcb73dbcaa83b05a0d2a201262de77 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Tue, 5 Mar 2024 14:17:30 -0800
Subject: [PATCH 044/183] chore: bump ts node (#9498)

* chore: bump ts-node

* chore: fixup implicit any in migrations

* chore: regenerate yarn.lock
---
 packages/server/package.json                  |  2 +-
 .../1693991480688_truncateReflectPromptIds.ts |  9 +-
 .../migrations/1694191002164_migrateSAML.ts   |  6 +-
 ...ameEmailVerificationSegmentIdToPseudoId.ts |  6 +-
 yarn.lock                                     | 82 +++++++++++++++++--
 5 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 1d09f43fca0..776adbfb414 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -67,7 +67,7 @@
     "style-loader": "2.0.0",
     "sucrase": "^3.32.0",
     "ts-jest": "^29.1.0",
-    "ts-node": "^8.6.2",
+    "ts-node": "10.9.2",
     "typescript": "^5.3.3",
     "url-loader": "4.1.1",
     "vscode-apollo-relay": "^1.5.0",
diff --git a/packages/server/postgres/migrations/1693991480688_truncateReflectPromptIds.ts b/packages/server/postgres/migrations/1693991480688_truncateReflectPromptIds.ts
index f2f5d42472d..a17dd2f0de1 100644
--- a/packages/server/postgres/migrations/1693991480688_truncateReflectPromptIds.ts
+++ b/packages/server/postgres/migrations/1693991480688_truncateReflectPromptIds.ts
@@ -1,5 +1,4 @@
-import {Client} from 'pg'
-import {r} from 'rethinkdb-ts'
+import {r, RDatum} from 'rethinkdb-ts'
 import connectRethinkDB from '../../database/connectRethinkDB'
 
 /**
@@ -12,13 +11,13 @@ export async function up() {
     .insert(
       r
         .table('ReflectPrompt')
-        .filter((row) => row('id').count().gt(100))
-        .map((row) => row.merge({id: row('id').slice(0, 100)}))
+        .filter((row: RDatum) => row('id').count().gt(100))
+        .map((row: RDatum) => row.merge({id: row('id').slice(0, 100)}))
     )
     .run()
   await r
     .table('ReflectPrompt')
-    .filter((row) => row('id').count().gt(100))
+    .filter((row: RDatum) => row('id').count().gt(100))
     .delete()
     .run()
   await r.getPoolMaster()?.drain()
diff --git a/packages/server/postgres/migrations/1694191002164_migrateSAML.ts b/packages/server/postgres/migrations/1694191002164_migrateSAML.ts
index f8824407f67..1b2a41bfbc1 100644
--- a/packages/server/postgres/migrations/1694191002164_migrateSAML.ts
+++ b/packages/server/postgres/migrations/1694191002164_migrateSAML.ts
@@ -1,6 +1,6 @@
 import {Kysely, PostgresDialect, sql} from 'kysely'
 import {Client} from 'pg'
-import {r} from 'rethinkdb-ts'
+import {r, RDatum} from 'rethinkdb-ts'
 import getPg from '../getPg'
 import getPgConfig from '../getPgConfig'
 
@@ -57,7 +57,7 @@ export async function up() {
   await r
     .table('SAML')
     .update(
-      (saml) => ({
+      (saml: RDatum) => ({
         orgId: r
           .table('Organization')
           .getAll(r.args(saml('domains')), {index: 'activeDomain'})
@@ -78,7 +78,7 @@ export async function up() {
 
   const nextSAMLDomains = [] as {domain: string; samlId: string}[]
   existingSAMLs.forEach((saml) => {
-    saml.domains.forEach((domain) => {
+    saml.domains.forEach((domain: any) => {
       nextSAMLDomains.push({domain, samlId: saml.id})
     })
   })
diff --git a/packages/server/postgres/migrations/1698265572466_renameEmailVerificationSegmentIdToPseudoId.ts b/packages/server/postgres/migrations/1698265572466_renameEmailVerificationSegmentIdToPseudoId.ts
index c6cc5c2659d..694fa70b2fb 100644
--- a/packages/server/postgres/migrations/1698265572466_renameEmailVerificationSegmentIdToPseudoId.ts
+++ b/packages/server/postgres/migrations/1698265572466_renameEmailVerificationSegmentIdToPseudoId.ts
@@ -1,4 +1,4 @@
-import {r} from 'rethinkdb-ts'
+import {r, RDatum} from 'rethinkdb-ts'
 
 const connectRethinkDB = async () => {
   const {hostname: host, port, pathname} = new URL(process.env.RETHINKDB_URL!)
@@ -13,7 +13,7 @@ export async function up() {
   await connectRethinkDB()
   await r
     .table('EmailVerification')
-    .replace((row) => row.without('segmentId').merge({pseudoId: row('segmentId')}))
+    .replace((row: RDatum) => row.without('segmentId').merge({pseudoId: row('segmentId')}))
     .run()
 }
 
@@ -21,6 +21,6 @@ export async function down() {
   await connectRethinkDB()
   await r
     .table('EmailVerification')
-    .replace((row) => row.without('pseudoId').merge({segmentId: row('pseudoId')}))
+    .replace((row: RDatum) => row.without('pseudoId').merge({segmentId: row('pseudoId')}))
     .run()
 }
diff --git a/yarn.lock b/yarn.lock
index 17637e0e348..0678b62b736 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2829,6 +2829,13 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
 "@datadog/browser-core@3.6.12":
   version "3.6.12"
   resolved "https://registry.yarnpkg.com/@datadog/browser-core/-/browser-core-3.6.12.tgz#6fcdbd6809656544289f7684f03b88a598cc3345"
@@ -4087,6 +4094,11 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
 "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
@@ -4105,6 +4117,14 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.8", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.18"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
@@ -7259,6 +7279,26 @@
     mkdirp "^1.0.4"
     path-browserify "^1.0.1"
 
+"@tsconfig/node10@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
+
 "@types/analytics-node@^3.1.3":
   version "3.1.7"
   resolved "https://registry.yarnpkg.com/@types/analytics-node/-/analytics-node-3.1.7.tgz#cb97c80ee505094e44a0188c3ad25f70c67e3c65"
@@ -8458,6 +8498,11 @@ acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.2.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
+acorn-walk@^8.1.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
+  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
+
 acorn@^7.0.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
@@ -8468,6 +8513,11 @@ acorn@^8.0.4, acorn@^8.1.0, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
+acorn@^8.4.1:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+
 adaptivecards@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/adaptivecards/-/adaptivecards-2.10.0.tgz#1c94e84491afe5a4f2d4060f6e0fc57b895205e3"
@@ -9577,9 +9627,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
-  version "1.0.30001571"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001571.tgz#4182e93d696ff42930f4af7eba515ddeb57917ac"
-  integrity sha512-tYq/6MoXhdezDLFZuCO/TKboTzuQ/xR5cFdgXPfDtM7/kchBO3b4VWghE/OAi/DV7tTdhmLjZiZBZi1fA/GheQ==
+  version "1.0.30001591"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz#16745e50263edc9f395895a7cd468b9f3767cf33"
+  integrity sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -11173,6 +11223,7 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
+  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"
@@ -20623,15 +20674,23 @@ ts-node-dev@^1.0.0-pre.44:
     ts-node "^9.0.0"
     tsconfig "^7.0.0"
 
-ts-node@^8.6.2:
-  version "8.10.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"
-  integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==
-  dependencies:
+ts-node@10.9.2:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
     arg "^4.1.0"
+    create-require "^1.1.0"
     diff "^4.0.1"
     make-error "^1.1.1"
-    source-map-support "^0.5.17"
+    v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
 ts-node@^9.0.0:
@@ -21144,6 +21203,11 @@ uuid@^9.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
 v8-compile-cache@2.3.0, v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"

From 06c1f7eec63c6de343181ee1324635c2ae8d286a Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 5 Mar 2024 15:25:26 -0800
Subject: [PATCH 045/183] chore: put server assets on CDN (#9278)

* chore: put server assets on CDN

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* fix: stray uncorked res

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* prod support for public path

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* support nested dirs

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* log bg processes

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* fix failed test path

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* simplify webpack build

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* change proto to http for CI localhost

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* fix: remove comment

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* add embedder back to build

Signed-off-by: Matt Krick <matt.krick@gmail.com>

---------

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/test.yml                    |  13 ++--
 .../docker-build/environments/pipeline        |   2 +-
 .../EmailDiscussionMentioned.tsx              |   4 +-
 .../EmailResponseReplied.tsx                  |   4 +-
 packages/client/serviceWorker/sw.ts           |   2 +-
 .../styles/theme/images/anonymous-avatar.png  | Bin 0 -> 1843 bytes
 .../server/fileStorage/FileStoreManager.ts    |   6 +-
 packages/server/fileStorage/GCSManager.ts     |  12 +--
 .../server/fileStorage/S3FileStoreManager.ts  |  12 +--
 packages/server/initPublicPath.ts             |  16 ++++
 packages/server/jiraImagesHandler.ts          |  11 +--
 packages/server/selfHostedHandler.ts          |   2 +-
 packages/server/types/modules.d.ts            |   2 +-
 packages/server/utils/serveStatic.ts          |   6 +-
 .../toolboxSrc/applyEnvVarsToClientAssets.ts  |  27 +++----
 scripts/toolboxSrc/pushToCDN.ts               |  73 +++++++++++-------
 scripts/webpack/dev.servers.config.js         |   9 ++-
 scripts/webpack/prod.client.config.js         |   2 +-
 scripts/webpack/prod.servers.config.js        |  46 ++---------
 19 files changed, 124 insertions(+), 125 deletions(-)
 create mode 100644 packages/client/styles/theme/images/anonymous-avatar.png
 create mode 100644 packages/server/initPublicPath.ts

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a4cc2323d8c..634787a6813 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -93,11 +93,12 @@ jobs:
         run: yarn predeploy
 
       - name: Start testing server in background
-        run: |
-          yarn start &
-
-      - name: Wait for testing server to be healthy
-        run: curl -4 --retry 30 --retry-connrefused --retry-delay 2 http://localhost:3000/graphql
+        uses: JarvusInnovations/background-action@v1
+        with:
+          run: |
+            yarn start &
+          wait-on: |
+            http://localhost:3000/graphql
 
       - name: Run server tests
         run: yarn test:server -- --reporters=default --reporters=jest-junit
@@ -130,5 +131,5 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: test-results
-          path: test-results/
+          path: packages/integration-tests/test-results/
           retention-days: 7
diff --git a/docker/parabol-ubi/docker-build/environments/pipeline b/docker/parabol-ubi/docker-build/environments/pipeline
index 8fd2ac929d9..5641d43725f 100644
--- a/docker/parabol-ubi/docker-build/environments/pipeline
+++ b/docker/parabol-ubi/docker-build/environments/pipeline
@@ -31,7 +31,7 @@ MAILGUN_PUBLIC_KEY=''
 MAIL_FROM=''
 NODE_ENV='production'
 NODE_EXTRA_CA_CERTS=''
-PROTO='https'
+PROTO='http'
 PGADMIN_DEFAULT_EMAIL=''
 PGADMIN_DEFAULT_PASSWORD=''
 PGSSLMODE=''
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx b/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx
index 876f800860e..87e69cfd1dc 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailDiscussionMentioned.tsx
@@ -1,17 +1,17 @@
 import graphql from 'babel-plugin-relay/macro'
 import {convertFromRaw, Editor, EditorState} from 'draft-js'
-import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import {EmailDiscussionMentioned_notification$key} from 'parabol-client/__generated__/EmailDiscussionMentioned_notification.graphql'
+import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import React, {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {cardShadow} from '../../../../styles/elevation'
 import {PALETTE} from '../../../../styles/paletteV3'
+import anonymousAvatar from '../../../../styles/theme/images/anonymous-avatar.png'
 import {FONT_FAMILY} from '../../../../styles/typographyV2'
 import makeAppURL from '../../../../utils/makeAppURL'
 import fromStageIdToUrl from '../../../../utils/meetings/fromStageIdToUrl'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
 import EmailNotificationTemplate from './EmailNotificationTemplate'
-import anonymousAvatar from '../../../../styles/theme/images/anonymous-avatar.svg'
 
 const editorStyles: React.CSSProperties = {
   backgroundColor: '#FFFFFF',
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx b/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx
index 7fc99507586..d18009f4d02 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailResponseReplied.tsx
@@ -1,16 +1,16 @@
 import graphql from 'babel-plugin-relay/macro'
 import {convertFromRaw, Editor, EditorState} from 'draft-js'
-import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import {EmailResponseReplied_notification$key} from 'parabol-client/__generated__/EmailResponseReplied_notification.graphql'
+import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import React, {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {cardShadow} from '../../../../styles/elevation'
 import {PALETTE} from '../../../../styles/paletteV3'
+import anonymousAvatar from '../../../../styles/theme/images/anonymous-avatar.png'
 import {FONT_FAMILY} from '../../../../styles/typographyV2'
 import makeAppURL from '../../../../utils/makeAppURL'
 import {notificationSummaryUrlParams} from '../NotificationSummaryEmail'
 import EmailNotificationTemplate from './EmailNotificationTemplate'
-import anonymousAvatar from '../../../../styles/theme/images/anonymous-avatar.svg'
 
 const editorStyles = {
   backgroundColor: '#FFFFFF',
diff --git a/packages/client/serviceWorker/sw.ts b/packages/client/serviceWorker/sw.ts
index 3fba470695b..e35d7f86db7 100644
--- a/packages/client/serviceWorker/sw.ts
+++ b/packages/client/serviceWorker/sw.ts
@@ -18,7 +18,7 @@ const DYNAMIC_CACHE = `parabol-dynamic-${__APP_VERSION__}`
 const cacheList = [STATIC_CACHE, DYNAMIC_CACHE]
 
 // this gets built in applyEnvVarToClientAssets
-const PUBLIC_PATH = `__PUBLIC_PATH__`.replace(/\/{2,}/, 'https://')
+const PUBLIC_PATH = `__PUBLIC_PATH__`.replace(/^\/{2,}/, 'https://')
 const waitUntil = (cb: (e: ExtendableEvent) => void) => (e: ExtendableEvent) => {
   e.waitUntil(cb(e))
 }
diff --git a/packages/client/styles/theme/images/anonymous-avatar.png b/packages/client/styles/theme/images/anonymous-avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..791dcd86512fdd5030d2c560ef7fa6dd1238a5a2
GIT binary patch
literal 1843
zcmV-32h8}1P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000tn
z000tn0p4aGcmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H12Ea)~
zK~z|Uy_rjI8`l-b{~XR}UZh1*jAuy6mgL%zV@R!1Nma$lC<Orl+N3~GchSeE=%NPN
zMK?uSB<Z&(vM>;M(*l7D2&O8<j44@mTvx8sNPdW~p~xXAk(}Y&;jjytvR)=<nArcF
z&OK-DPq>eB&ZVo_Y@!P>i;Jtj)HU+Hrt71+X2^z41hdg_0|4!IHyD<#@dBIWIqm_^
zvDYo^T#H7drqhXBP5|TaFW)Yzm5<ayc~;l!oRf(-j@A2uzNKED?`kA+>E5>rc>DIf
z3)|bfpKL4YWTRoZoPZsb+f6l3OM!$x;Qvh|GP?1N0dFoOK795p`&&X9%r^l$Du!Xm
z*|XAL=jNyW&=p`j9_I^rb19q2PkftTM<s`XiM}8motc@@Yy-yQ>w!!<yQUV(gRc^<
zrM_VA6FDSL%*<R;I|9bzaXypQ9=<NPmi&QJN$;sQF23{5cdG~O)KSMm-duX!Z~#zL
zcLs=2UN~w$1h}w}_^8`Gr)xTjY7s@X2wl^=g3P4z(+dlU4-VS)mpGBQKm6bItw)Ao
z*gmbPWC~B7J%y4{KumIIjA0l^vV_6GK@9Zw+lFKqH@Pr!?yc4pM7IWVx$-q9aIx4T
z6h(RII3Wbdtt66LNl21}X!OUnzDr1hDXPW40f+$4m-yDL_3>>*owN(5X&Q35oLzV1
zaye+)iMPnf{)+m;<>j@BeZW$&__31=kxr-KBt<rxO=Qv;+y0G)<=WlR{{jG1EEc2H
zLV4D9G=Ox*{$$<86!N9Z02s>U^8Ct4;<u~@a*F-sZAnoSG#Zv|e_gM0OG|gJP`XCm
zcQjFM8>Z>FYJzE+*mkgQ0YIzjS7=SEk2wkI^?Gfe$fNRlJdXS|T_2-0O_!Vm38Dx=
z6dg^}t#pmZv{5(sZa>g$HenbB48wp)Of;+p0KiST!7wx!rUxv?b`4ms6M?p@Cf&)g
z*=(Yysz_(Ds8n`Qt=3SfR#4XsG@I==K1I2}vK&NFgeZ#edOZk*Lh$?jaJkywY^G_t
z+rp`Z0-ij5ic~6vTFw4Ndr+3ugr;fGG!6ND9suy*!G9p|0tU|XWAN-*1p4}38c$P{
z%WO1oEXCDoH4xK8e}6yv9pqA{BBqI2tp-65j>FM(gYIE_G(xmvfPx^L7^LYsGU*Hq
z!+^)@K{ylwMIEc!005R{A(PHvw^Bh5%OD&IgX8S?S}e=dXrAYkYDGI`Ct!2)G1k`Z
zf~MUNL;<@yyI|QK{AhL-exL7<Z&58``SZ_V7zVtjyr@-cSi5r%-=7%Ax#4rR06Ct?
z(mc=p8^DE5&e=>BD=RA)A0Nla$eREFViK&b+`;0_7=H5ZPr>%|008RsI%129kYyQ@
zQxjn5y#;#o=qs!wRv`!?WU2G*CJ4fPn&;T-0Dj)ddHvx-3=a+M!vO$8Gnk&9!e^h|
zz&~%?K)t?K6S6D=mSr(LJq3z#@B5F8yopk&g!T1xdw?SMDP>{j8pp96OJG%15e|os
z*(u76P$&eJ<uE@#hxz$Auq+2zmJh+T6z&g0EfhP#@jR;$QoK$@qfxUj=v(R(K)Kx@
zjgxaQF-?e~2*2MCzuyl*6hK~*uT9eg?LPTX9aJFbTZ%@bCItY!KHpWhn`&F&g(L}^
z8=J@Mnyw?AN<ot47rwHLbSec+KfW-V8=HrGPZC8@me<Q)1)dkIk;tWcr=>umUC`**
zD9WWWmX?=MDwRP9fubl_jKv@d0?rM;Xat9bh9QUo7Gp6eiUL9iO3!1<<ub;`M%w~P
za^Q>E*|)z04m3@-Zap0Q`m4?Vwd+et#S#*$D=4Zj_RyI#XD~52v44VFsv8FGtgK=y
zncTMp0)9+QPQm9td?g(e!!YE+$k2Y%bf|H^xv=u*jg92*+x~k1D%C3LnhuZ0)3F$+
z*XyY4R>1NcJT|JJ;qMImX?}j{kFCFty)69W?@PC{nfwnre(4n`6b{DUeeZJQpzYXk
zdhchKXM;ii*RKz2Pr*Ll<B^M@xuf=z&O4Dpr>FaZy-!{})}Dev-(x8(O`bo0zJ7G9
z?em*jFmGnk`RP{)7YYaCBNsz+C&9G^Y-wR3@j+^9`*%)W9qg!wWsLp->BEBuqANgP
z@7-oQSN=rFs?(Nbbxs3qL{XF_$$>BYf#9zrk++_9@^|!zzPx<*d%HW@$Ax_9a#xS&
zZ}|S@_3~F+m#`f<0&FQ3i_va(?=Q5fenr#uF<m3FuIoapzo96X$#Yzl<rzf~g!_WX
heM(62dN)5q{2$-<86xIEx@iCa002ovPDHLkV1g!<e?$NP

literal 0
HcmV?d00001

diff --git a/packages/server/fileStorage/FileStoreManager.ts b/packages/server/fileStorage/FileStoreManager.ts
index 203d221eb2c..32bb27e2d6d 100644
--- a/packages/server/fileStorage/FileStoreManager.ts
+++ b/packages/server/fileStorage/FileStoreManager.ts
@@ -1,8 +1,10 @@
 import generateUID from '../generateUID'
 
+export type FileAssetDir = 'store' | 'build'
+
 export default abstract class FileStoreManager {
-  abstract checkExists(fileName: string): Promise<boolean>
-  abstract prependPath(partialPath: string): string
+  abstract checkExists(fileName: string, assetDir?: FileAssetDir): Promise<boolean>
+  abstract prependPath(partialPath: string, assetDir?: FileAssetDir): string
   abstract getPublicFileLocation(fullPath: string): string
 
   protected abstract putFile(file: Buffer, fullPath: string): Promise<string>
diff --git a/packages/server/fileStorage/GCSManager.ts b/packages/server/fileStorage/GCSManager.ts
index a3a1cb4d03e..fe952eed138 100644
--- a/packages/server/fileStorage/GCSManager.ts
+++ b/packages/server/fileStorage/GCSManager.ts
@@ -2,7 +2,7 @@ import {sign} from 'jsonwebtoken'
 import mime from 'mime-types'
 import path from 'path'
 import {Logger} from '../utils/Logger'
-import FileStoreManager from './FileStoreManager'
+import FileStoreManager, {FileAssetDir} from './FileStoreManager'
 
 interface CloudKey {
   clientEmail: string
@@ -141,18 +141,18 @@ export default class GCSManager extends FileStoreManager {
   }
 
   putBuildFile(file: Buffer, partialPath: string): Promise<string> {
-    const fullPath = path.join(this.envSubDir, 'build', partialPath)
+    const fullPath = this.prependPath(partialPath, 'build')
     return this.putFile(file, fullPath)
   }
 
-  prependPath(partialPath: string) {
-    return path.join(this.envSubDir, 'store', partialPath)
+  prependPath(partialPath: string, assetDir: FileAssetDir = 'store') {
+    return path.join(this.envSubDir, assetDir, partialPath)
   }
   getPublicFileLocation(fullPath: string) {
     return encodeURI(`${this.baseUrl}${fullPath}`)
   }
-  async checkExists(partialPath: string) {
-    const fullPath = encodeURIComponent(this.prependPath(partialPath))
+  async checkExists(partialPath: string, assetDir?: FileAssetDir) {
+    const fullPath = encodeURIComponent(this.prependPath(partialPath, assetDir))
     const url = `https://storage.googleapis.com/storage/v1/b/${this.bucket}/o/${fullPath}`
     const res = await fetch(url)
     return res.status !== 404
diff --git a/packages/server/fileStorage/S3FileStoreManager.ts b/packages/server/fileStorage/S3FileStoreManager.ts
index caace24f9c9..3971ea80eea 100644
--- a/packages/server/fileStorage/S3FileStoreManager.ts
+++ b/packages/server/fileStorage/S3FileStoreManager.ts
@@ -1,7 +1,7 @@
 import {HeadObjectCommand, PutObjectCommand, S3Client} from '@aws-sdk/client-s3'
 import mime from 'mime-types'
 import path from 'path'
-import FileStoreManager from './FileStoreManager'
+import FileStoreManager, {FileAssetDir} from './FileStoreManager'
 
 export default class S3Manager extends FileStoreManager {
   // e.g. development, production
@@ -55,8 +55,8 @@ export default class S3Manager extends FileStoreManager {
     return this.getPublicFileLocation(fullPath)
   }
 
-  prependPath(partialPath: string) {
-    return path.join(this.envSubDir, 'store', partialPath)
+  prependPath(partialPath: string, assetDir: FileAssetDir = 'store') {
+    return path.join(this.envSubDir, assetDir, partialPath)
   }
 
   getPublicFileLocation(fullPath: string) {
@@ -64,11 +64,11 @@ export default class S3Manager extends FileStoreManager {
   }
 
   putBuildFile(file: Buffer, partialPath: string): Promise<string> {
-    const fullPath = path.join(this.envSubDir, 'build', partialPath)
+    const fullPath = this.prependPath(partialPath, 'build')
     return this.putFile(file, fullPath)
   }
-  async checkExists(key: string) {
-    const Key = this.prependPath(key)
+  async checkExists(key: string, assetDir?: FileAssetDir) {
+    const Key = this.prependPath(key, assetDir)
     try {
       await this.s3.send(new HeadObjectCommand({Bucket: this.bucket, Key}))
     } catch (e) {
diff --git a/packages/server/initPublicPath.ts b/packages/server/initPublicPath.ts
new file mode 100644
index 00000000000..79d626cf1e3
--- /dev/null
+++ b/packages/server/initPublicPath.ts
@@ -0,0 +1,16 @@
+import appOrigin from './appOrigin'
+
+declare let __webpack_public_path__: string
+declare const __PRODUCTION__: boolean
+
+const {CDN_BASE_URL, SOCKET_PORT} = process.env
+
+if (CDN_BASE_URL) {
+  // pushToCDN#pushServerAssetsToCDN ensures all assets will be available on the CDN
+  __webpack_public_path__ = `${CDN_BASE_URL.replace(/^\/{2,}/, 'https://')}/build/`
+} else {
+  const url = new URL('/static/', appOrigin)
+  // the webpack dev server uses /static on PORT, so fetch assets at SOCKET_PORT
+  url.port = __PRODUCTION__ ? url.port : SOCKET_PORT!
+  __webpack_public_path__ = url.toString()
+}
diff --git a/packages/server/jiraImagesHandler.ts b/packages/server/jiraImagesHandler.ts
index 64d7c787b83..8aea88d2cdb 100644
--- a/packages/server/jiraImagesHandler.ts
+++ b/packages/server/jiraImagesHandler.ts
@@ -1,5 +1,3 @@
-import {promises as fsp} from 'fs'
-import path from 'path'
 import {HttpRequest, HttpResponse} from 'uWebSockets.js'
 import jiraPlaceholder from '../../static/images/illustrations/imageNotFound.png'
 import sleep from '../client/utils/sleep'
@@ -31,9 +29,12 @@ const getImageFromCache = async (
 let jiraPlaceholderBuffer: Buffer | undefined
 const servePlaceholderImage = async (res: HttpResponse) => {
   if (!jiraPlaceholderBuffer) {
-    jiraPlaceholderBuffer = await fsp.readFile(
-      path.join(__dirname, jiraPlaceholder.slice(__webpack_public_path__.length))
-    )
+    try {
+      const res = await fetch(jiraPlaceholder)
+      jiraPlaceholderBuffer = Buffer.from(await res.arrayBuffer())
+    } catch (e) {
+      console.error('Jira Placeholder image could not be fetched', e)
+    }
   }
   res.writeStatus('200').writeHeader('Content-Type', 'image/png').end(jiraPlaceholderBuffer)
 }
diff --git a/packages/server/selfHostedHandler.ts b/packages/server/selfHostedHandler.ts
index 4174e125f23..2387a01d87e 100644
--- a/packages/server/selfHostedHandler.ts
+++ b/packages/server/selfHostedHandler.ts
@@ -21,7 +21,7 @@ const selfHostedHandler = async (res: HttpResponse, req: HttpRequest) => {
   try {
     stats = fs.statSync(url)
   } catch (e) {
-    res.writeStatus('404').end()
+    res.cork(() => res.writeStatus('404').end())
     return
   }
   const {size} = stats
diff --git a/packages/server/types/modules.d.ts b/packages/server/types/modules.d.ts
index 14b0e362636..c79e5a0b011 100644
--- a/packages/server/types/modules.d.ts
+++ b/packages/server/types/modules.d.ts
@@ -26,7 +26,7 @@ declare module 'object-hash'
 declare module 'string-score'
 
 declare const __APP_VERSION__: string
-declare const __PRODUCTION__: string
+declare const __PRODUCTION__: boolean
 declare const __SOCKET_PORT__: string
 declare const __webpack_public_path__: string
 
diff --git a/packages/server/utils/serveStatic.ts b/packages/server/utils/serveStatic.ts
index 2448123077b..4ff491881da 100644
--- a/packages/server/utils/serveStatic.ts
+++ b/packages/server/utils/serveStatic.ts
@@ -18,9 +18,9 @@ const getProjectRoot = () => {
 const PROJECT_ROOT = getProjectRoot()
 const staticPaths = {
   [path.join(PROJECT_ROOT, 'build')]: true,
-  [path.join(PROJECT_ROOT, 'dist')]: !__PRODUCTION__,
-  [path.join(PROJECT_ROOT, 'static')]: !__PRODUCTION__,
-  [path.join(PROJECT_ROOT, 'dev', 'dll')]: !__PRODUCTION__
+  // publish server assets at /static
+  [path.join(PROJECT_ROOT, 'dist')]: __PRODUCTION__,
+  [path.join(PROJECT_ROOT, 'dev')]: !__PRODUCTION__
 }
 const staticServer = new StaticServer({staticPaths})
 
diff --git a/scripts/toolboxSrc/applyEnvVarsToClientAssets.ts b/scripts/toolboxSrc/applyEnvVarsToClientAssets.ts
index 76f61d59878..1723bab9515 100644
--- a/scripts/toolboxSrc/applyEnvVarsToClientAssets.ts
+++ b/scripts/toolboxSrc/applyEnvVarsToClientAssets.ts
@@ -5,35 +5,33 @@ import logo192 from '../../static/images/brand/mark-cropped-192.png'
 import logo512 from '../../static/images/brand/mark-cropped-512.png'
 import getProjectRoot from '../webpack/utils/getProjectRoot'
 
+declare const __webpack_public_path__: string
+
 const PROJECT_ROOT = getProjectRoot()
 const clientDir = path.join(PROJECT_ROOT, 'build')
-const serverDir = path.join(PROJECT_ROOT, 'dist')
-
-const getCDNURL = () => {
-  const {CDN_BASE_URL} = process.env
-  return CDN_BASE_URL ? `${CDN_BASE_URL}/build` : '/static'
-}
 
 const rewriteServiceWorker = () => {
   const skeleton = fs.readFileSync(path.join(clientDir, 'swSkeleton.js'), 'utf-8')
-  const deploySpecificServiceWorker = skeleton.replaceAll('__PUBLIC_PATH__', getCDNURL())
+  const deploySpecificServiceWorker = skeleton.replaceAll(
+    '__PUBLIC_PATH__',
+    __webpack_public_path__
+  )
   fs.writeFileSync(path.join(clientDir, 'sw.js'), deploySpecificServiceWorker)
 }
 
 const writeManifest = () => {
   // If src is relative, then it will be relative to the manifest location, so manifest.json must be at root /
-  const cdn = getCDNURL()
   const manifest = {
     short_name: 'Parabol',
     name: 'Parabol',
     icons: [
       {
-        src: `${cdn}/${logo192}`,
+        src: logo192,
         type: 'image/png',
         sizes: '192x192'
       },
       {
-        src: `${cdn}/${logo512}`,
+        src: logo512,
         type: 'image/png',
         sizes: '512x512'
       }
@@ -46,9 +44,6 @@ const writeManifest = () => {
   }
   const manifestPath = path.join(clientDir, 'manifest.json')
   fs.writeFileSync(manifestPath, JSON.stringify(manifest))
-  // move the referenced icons into the client build
-  fs.copyFileSync(path.join(serverDir, logo192), path.join(clientDir, logo192))
-  fs.copyFileSync(path.join(serverDir, logo512), path.join(clientDir, logo512))
 }
 
 const rewriteIndexHTML = () => {
@@ -63,7 +58,7 @@ const rewriteIndexHTML = () => {
     sentry: process.env.SENTRY_DSN,
     slack: process.env.SLACK_CLIENT_ID,
     stripe: process.env.STRIPE_PUBLISHABLE_KEY,
-    publicPath: getCDNURL() + '/',
+    publicPath: __webpack_public_path__,
     oauth2Redirect: process.env.OAUTH2_REDIRECT,
     prblIn: process.env.INVITATION_SHORTLINK,
     AUTH_INTERNAL_ENABLED: process.env.AUTH_INTERNAL_DISABLED !== 'true',
@@ -72,7 +67,7 @@ const rewriteIndexHTML = () => {
     AUTH_SSO_ENABLED: process.env.AUTH_SSO_DISABLED !== 'true',
     AMPLITUDE_WRITE_KEY: process.env.AMPLITUDE_WRITE_KEY,
     microsoftTenantId: process.env.MICROSOFT_TENANT_ID,
-    microsoft: process.env.MICROSOFT_CLIENT_ID,
+    microsoft: process.env.MICROSOFT_CLIENT_ID
   }
 
   const skeleton = fs.readFileSync(path.join(clientDir, 'skeleton.html'), 'utf8')
@@ -82,7 +77,7 @@ const rewriteIndexHTML = () => {
   const keys = `<script>window.__ACTION__=${JSON.stringify(clientKeys)}</script>`
   const rawHTML = skeleton
     .replace('<head>', `<head>${noindex}${keys}`)
-    .replaceAll('__PUBLIC_PATH__', getCDNURL())
+    .replaceAll('__PUBLIC_PATH__', __webpack_public_path__.replace(/\/$/, ''))
   const minifiedHTML = minify(rawHTML, {
     collapseBooleanAttributes: true,
     collapseWhitespace: true,
diff --git a/scripts/toolboxSrc/pushToCDN.ts b/scripts/toolboxSrc/pushToCDN.ts
index e646fcc3c03..df6d52515df 100644
--- a/scripts/toolboxSrc/pushToCDN.ts
+++ b/scripts/toolboxSrc/pushToCDN.ts
@@ -25,46 +25,63 @@ const pushClientAssetsToCDN = async () => {
   console.log(`⛅️ Uploaded ${dirEnts.length} client assets to CDN`)
 }
 
-const pushTemplatesToCDN = async () => {
+const pushServerAssetsToCDN = async () => {
   const fileStoreManager = getFileStoreManager()
-  const collector = {} as Record<string, string>
-  const context = (require as any).context(
+  const templatesContext = (require as any).context(
     '../../static/images/illustrations',
     false,
     /\/action.png$|\/teamPrompt.png$|Template.png$/
   )
-
-  context.keys().forEach((relativePath: string) => {
-    const {name, ext} = path.parse(relativePath)
-    // This path only exists on the build machine
-    const builtPath = context(relativePath).default
-    // sub out the build machine path prefix with the __dirname
-    // e.g. /Users/CI/dist/templates/X.png -> /app/dist/templates/X.png
-    const absPath = builtPath.replace(/^.+\/dist(\/.+$)/, __dirname + '$1')
-    collector[`${name}${ext}`] = absPath
+  const templatePaths = new Set<string>()
+  templatesContext.keys().forEach((relativePath: `./${string}`) => {
+    const {base} = path.parse(relativePath)
+    templatePaths.add(base)
   })
-  const results = await Promise.all(
-    Object.entries(collector).map(async ([fileName, pathName]) => {
-      // store meeting templates under our Parabol ghost organization
-      const partialPath = `Organization/aGhostOrg/template/${fileName}`
-      const exists = await fileStoreManager.checkExists(partialPath)
-      if (exists) return false
-      const buffer = await fs.promises.readFile(pathName as string)
-      const {name, ext} = path.parse(fileName)
-      return fileStoreManager.putTemplateIllustration(buffer, 'aGhostOrg', ext, name)
-    })
-  )
-  const urls = results.filter(Boolean)
+  const isTemplate = (filename: string) => templatePaths.has(filename)
+
+  const localServerAssetsDir = path.join(PROJECT_ROOT, 'dist', 'images')
 
-  if (urls.length > 0) {
-    console.log(urls.join('\n'))
+  // Use this pattern if this is a user asset (including aGhostUser) & kept in the DB
+  const templateFileUploader = async (filename: string) => {
+    const partialPath = `Organization/aGhostOrg/template/${filename}`
+    const exists = await fileStoreManager.checkExists(partialPath)
+    if (exists) return false
+    const buffer = await fs.promises.readFile(path.join(localServerAssetsDir, filename))
+    const {name, ext} = path.parse(filename)
+    const url = await fileStoreManager.putTemplateIllustration(buffer, 'aGhostOrg', ext, name)
+    console.log(`⛅️ Uploaded template ${filename} to ${url}`)
+    return true
   }
 
-  console.log(`⛅️ Uploaded ${urls.length} Meeting Templates to CDN`)
+  // Use this pattern if the asset is publicly available
+  const defaultFileUploader = async (filename: string) => {
+    // static assets in /dist/images are already hosted at /static/images
+    if (process.env.FILE_STORE_PROVIDER === 'local') return
+    const targetObject = `images/${filename}`
+    const exists = await fileStoreManager.checkExists(targetObject)
+    if (exists) return false
+    const buffer = await fs.promises.readFile(path.join(localServerAssetsDir, filename))
+    const url = await fileStoreManager.putBuildFile(buffer, targetObject)
+    console.log(`⛅️ Uploaded server asset ${targetObject} to ${url}`)
+    return true
+  }
+
+  const dirEnts = await fs.promises.readdir(localServerAssetsDir, {withFileTypes: true})
+  const entries = await Promise.all(
+    dirEnts.map(async (dirent) => {
+      const {name} = dirent
+      if (!dirent.isFile()) throw new Error(`⛅️ Expected ${name} to be a file`)
+      return isTemplate(name) ? templateFileUploader(name) : defaultFileUploader(name)
+    })
+  )
+
+  const pushed = entries.filter(Boolean).length
+  console.log(`⛅️ Server upload complete. Pushed ${pushed} assets to CDN`)
 }
+
 const pushToCDN = async () => {
   console.log('⛅️ Push to CDN Started')
-  await Promise.all([pushClientAssetsToCDN(), pushTemplatesToCDN()])
+  await Promise.all([pushClientAssetsToCDN(), pushServerAssetsToCDN()])
   console.log('⛅️ Push to CDN Complete')
 }
 
diff --git a/scripts/webpack/dev.servers.config.js b/scripts/webpack/dev.servers.config.js
index 80591f24b0f..9632b40f66f 100644
--- a/scripts/webpack/dev.servers.config.js
+++ b/scripts/webpack/dev.servers.config.js
@@ -10,6 +10,7 @@ const SERVER_ROOT = path.join(PROJECT_ROOT, 'packages', 'server')
 const EMBEDDER_ROOT = path.join(PROJECT_ROOT, 'packages', 'embedder')
 const GQL_ROOT = path.join(PROJECT_ROOT, 'packages', 'gql-executor')
 const DOTENV = path.join(PROJECT_ROOT, 'scripts', 'webpack', 'utils', 'dotenv.js')
+const INIT_PUBLIC_PATH = path.join(SERVER_ROOT, 'initPublicPath.ts')
 // const CircularDependencyPlugin = require('circular-dependency-plugin')
 
 module.exports = {
@@ -26,9 +27,9 @@ module.exports = {
     __dirname: false
   },
   entry: {
-    web: [DOTENV, path.join(SERVER_ROOT, 'server.ts')],
-    embedder: [DOTENV, path.join(EMBEDDER_ROOT, 'embedder.ts')],
-    gqlExecutor: [DOTENV, path.join(GQL_ROOT, 'gqlExecutor.ts')]
+    web: [DOTENV, INIT_PUBLIC_PATH, path.join(SERVER_ROOT, 'server.ts')],
+    embedder: [DOTENV, INIT_PUBLIC_PATH, path.join(EMBEDDER_ROOT, 'embedder.ts')],
+    gqlExecutor: [DOTENV, INIT_PUBLIC_PATH, path.join(GQL_ROOT, 'gqlExecutor.ts')]
   },
   output: {
     filename: '[name].js',
@@ -81,7 +82,7 @@ module.exports = {
           {
             loader: 'file-loader',
             options: {
-              publicPath: `http://localhost:${process.env.PORT}/static/`
+              name: '[name].[ext]'
             }
           }
         ]
diff --git a/scripts/webpack/prod.client.config.js b/scripts/webpack/prod.client.config.js
index 080cf489c0c..4cc8788abcf 100644
--- a/scripts/webpack/prod.client.config.js
+++ b/scripts/webpack/prod.client.config.js
@@ -116,7 +116,7 @@ module.exports = (config) => {
         // Trying to keep GraphqlContainer out of here is difficult because there are a lot of common dependencies
         exclude: [/\.map$/, /^manifest.*\.js$/, /skeleton.html$/],
         modifyURLPrefix: {
-          '': '__PUBLIC_PATH__/'
+          '': '__PUBLIC_PATH__'
         }
       }),
       new MiniCssExtractPlugin({
diff --git a/scripts/webpack/prod.servers.config.js b/scripts/webpack/prod.servers.config.js
index 52feb216089..b1b914ba7c2 100644
--- a/scripts/webpack/prod.servers.config.js
+++ b/scripts/webpack/prod.servers.config.js
@@ -15,6 +15,7 @@ const EMBEDDER_ROOT = path.join(PROJECT_ROOT, 'packages', 'embedder')
 const GQL_ROOT = path.join(PROJECT_ROOT, 'packages', 'gql-executor')
 const DOTENV = path.join(PROJECT_ROOT, 'scripts/webpack/utils/dotenv.js')
 const distPath = path.join(PROJECT_ROOT, 'dist')
+const INIT_PUBLIC_PATH = path.join(SERVER_ROOT, 'initPublicPath.ts')
 
 const COMMIT_HASH = cp.execSync('git rev-parse HEAD').toString().trim()
 
@@ -29,6 +30,7 @@ module.exports = (config) => {
       chronos: [DOTENV, path.join(PROJECT_ROOT, 'packages/chronos/chronos.ts')],
       web: [
         DOTENV,
+        INIT_PUBLIC_PATH,
         // each instance of web needs to generate its own index.html to use on startup
         path.join(PROJECT_ROOT, 'scripts/toolboxSrc/applyEnvVarsToClientAssets.ts'),
         path.join(SERVER_ROOT, 'server.ts')
@@ -108,46 +110,10 @@ module.exports = (config) => {
         ...transformRules(PROJECT_ROOT, true),
         {
           test: /\.(png|jpg|jpeg|gif|svg)$/,
-          oneOf: [
-            {
-              // Put templates in their own directory that will get pushed to the CDN. PG Migrations will reference that URL
-              test: /Template.png$/,
-              include: [path.resolve(PROJECT_ROOT, 'static/images/illustrations')],
-              use: [
-                {
-                  loader: 'file-loader',
-                  options: {
-                    name: 'templates/[name].[ext]',
-                    publicPath: distPath
-                  }
-                }
-              ]
-            },
-            {
-              // manifest.json icons just need the file name, we'll prefix them with the CDN in preDeploy
-              test: /mark-cropped-\d+.png$/,
-              include: [path.resolve(PROJECT_ROOT, 'static/images/brand')],
-              use: [
-                {
-                  loader: 'file-loader',
-                  options: {
-                    name: '[name].[ext]'
-                  }
-                }
-              ]
-            },
-            {
-              use: [
-                {
-                  loader: 'file-loader',
-                  options: {
-                    publicPath: distPath,
-                    name: '[name].[ext]'
-                  }
-                }
-              ]
-            }
-          ]
+          type: 'asset/resource',
+          generator: {
+            filename: 'images/[name][ext]'
+          }
         },
         {
           include: [/node_modules/],

From 17517318502b5aaa0849c8d03c4e068f5da92e82 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 5 Mar 2024 15:47:56 -0800
Subject: [PATCH 046/183] fix: upgrade oy-vey from 0.11.2 to 0.12.1 (#9497)

Snyk has created this PR to upgrade oy-vey from 0.11.2 to 0.12.1.

See this package in npm:
https://www.npmjs.com/package/oy-vey

See this project in Snyk:
https://app.snyk.io/org/mattkrick/project/261c96ef-7af4-4e13-a731-451e0158293e?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 packages/server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 776adbfb414..e27f11a0f4f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -123,7 +123,7 @@
     "nodemailer": "^6.9.9",
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
-    "oy-vey": "^0.11.0",
+    "oy-vey": "^0.12.1",
     "parabol-client": "7.20.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",

From 9fff93397e35e2bfeb8f4fbc34c8d535284551eb Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 5 Mar 2024 15:48:52 -0800
Subject: [PATCH 047/183] fix: upgrade sharp from 0.32.6 to 0.33.2 (#9493)

Snyk has created this PR to upgrade sharp from 0.32.6 to 0.33.2.

See this package in npm:
https://www.npmjs.com/package/sharp

See this project in Snyk:
https://app.snyk.io/org/mattkrick/project/261c96ef-7af4-4e13-a731-451e0158293e?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 packages/server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index e27f11a0f4f..fdb0c1d0a2e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -132,7 +132,7 @@
     "rethinkdb-ts": "2.6.0",
     "rrule": "^2.7.2",
     "samlify": "^2.8.2",
-    "sharp": "^0.32.6",
+    "sharp": "^0.33.2",
     "string-similarity": "^3.0.0",
     "stripe": "^9.13.0",
     "tslib": "^2.4.0",

From fe1ad434a990ffbfb5c52863988e7f4406d2ac84 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 5 Mar 2024 18:17:57 -0800
Subject: [PATCH 048/183] fix: upgrade graphql-jit from 0.7.4 to 0.8.4 (#9495)

Snyk has created this PR to upgrade graphql-jit from 0.7.4 to 0.8.4.

See this package in npm:
https://www.npmjs.com/package/graphql-jit

See this project in Snyk:
https://app.snyk.io/org/mattkrick/project/261c96ef-7af4-4e13-a731-451e0158293e?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 packages/server/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index fdb0c1d0a2e..b98145e0cb6 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -103,7 +103,7 @@
     "fast-xml-parser": "^4.2.7",
     "googleapis": "^118.0.0",
     "graphql": "15.7.2",
-    "graphql-jit": "^0.7.4",
+    "graphql-jit": "^0.8.4",
     "graphql-middleware": "^6.1.18",
     "graphql-relay": "^0.10.0",
     "graphql-shield": "^7.5.0",

From 5dfe26b29753f881dc54c35d6dfa15e894f3726a Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 5 Mar 2024 18:18:08 -0800
Subject: [PATCH 049/183] chore: remove pg-typed part 1 (#9508)

* chore: refactor archive team

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* remove archivedTeam sql

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* refactor addNewFeature sql

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* chore: refactor add/remove reactjis

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* chore: refactor add/remove feature flags

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* chore: refactor appendUserTmsQuery

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* fix: revert sharp back to v0.32.6 (#9509)

Signed-off-by: Matt Krick <matt.krick@gmail.com>

---------

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .../server/billing/helpers/teamLimitsCheck.ts | 20 ++++++-----
 .../private/mutations/addNewFeature.ts        |  6 ++--
 .../public/mutations/addReactjiToReactable.ts | 34 ++++++++++---------
 .../public/mutations/updateFeatureFlag.ts     | 14 ++++----
 packages/server/package.json                  |  2 +-
 .../postgres/queries/archiveTeamsByTeamIds.ts | 17 ----------
 .../queries/src/addUserNewFeatureQuery.sql    |  6 ----
 .../src/appendTeamResponseReactjiQuery.sql    |  7 ----
 .../src/appendUserFeatureFlagsQuery.sql       |  7 ----
 .../queries/src/appendUserTmsQuery.sql        |  6 ----
 .../src/archiveTeamsByTeamIdsQuery.sql        | 10 ------
 .../src/removeTeamResponseReactjiQuery.sql    |  7 ----
 .../src/removeUserFeatureFlagsQuery.sql       | 12 -------
 .../server/safeMutations/addTeamIdToTMS.ts    | 11 ++++--
 .../server/safeMutations/safeArchiveTeam.ts   | 12 +++++--
 yarn.lock                                     | 15 ++++----
 16 files changed, 66 insertions(+), 120 deletions(-)
 delete mode 100644 packages/server/postgres/queries/archiveTeamsByTeamIds.ts
 delete mode 100644 packages/server/postgres/queries/src/addUserNewFeatureQuery.sql
 delete mode 100644 packages/server/postgres/queries/src/appendTeamResponseReactjiQuery.sql
 delete mode 100644 packages/server/postgres/queries/src/appendUserFeatureFlagsQuery.sql
 delete mode 100644 packages/server/postgres/queries/src/appendUserTmsQuery.sql
 delete mode 100644 packages/server/postgres/queries/src/archiveTeamsByTeamIdsQuery.sql
 delete mode 100644 packages/server/postgres/queries/src/removeTeamResponseReactjiQuery.sql
 delete mode 100644 packages/server/postgres/queries/src/removeUserFeatureFlagsQuery.sql

diff --git a/packages/server/billing/helpers/teamLimitsCheck.ts b/packages/server/billing/helpers/teamLimitsCheck.ts
index b9326c20e7c..31103db959b 100644
--- a/packages/server/billing/helpers/teamLimitsCheck.ts
+++ b/packages/server/billing/helpers/teamLimitsCheck.ts
@@ -2,32 +2,36 @@ import ms from 'ms'
 import {Threshold} from 'parabol-client/types/constEnums'
 // Uncomment for easier testing
 // import { ThresholdTest as Threshold } from "~/types/constEnums";
+import {sql} from 'kysely'
 import {r} from 'rethinkdb-ts'
 import NotificationTeamsLimitExceeded from '../../database/types/NotificationTeamsLimitExceeded'
 import Organization from '../../database/types/Organization'
 import scheduleTeamLimitsJobs from '../../database/types/scheduleTeamLimitsJobs'
 import {DataLoaderWorker} from '../../graphql/graphql'
 import publishNotification from '../../graphql/public/mutations/helpers/publishNotification'
+import getActiveTeamCountByTeamIds from '../../graphql/public/types/helpers/getActiveTeamCountByTeamIds'
+import {getFeatureTier} from '../../graphql/types/helpers/getFeatureTier'
 import {domainHasActiveDeals} from '../../hubSpot/hubSpotApi'
-import getPg from '../../postgres/getPg'
-import {appendUserFeatureFlagsQuery} from '../../postgres/queries/generated/appendUserFeatureFlagsQuery'
+import getKysely from '../../postgres/getKysely'
+import getTeamIdsByOrgIds from '../../postgres/queries/getTeamIdsByOrgIds'
+import {getBillingLeadersByOrgId} from '../../utils/getBillingLeadersByOrgId'
 import sendToSentry from '../../utils/sendToSentry'
 import removeTeamsLimitObjects from './removeTeamsLimitObjects'
 import sendTeamsLimitEmail from './sendTeamsLimitEmail'
-import getTeamIdsByOrgIds from '../../postgres/queries/getTeamIdsByOrgIds'
-import getActiveTeamCountByTeamIds from '../../graphql/public/types/helpers/getActiveTeamCountByTeamIds'
-import {getBillingLeadersByOrgId} from '../../utils/getBillingLeadersByOrgId'
-import {getFeatureTier} from '../../graphql/types/helpers/getFeatureTier'
 
 const enableUsageStats = async (userIds: string[], orgId: string) => {
+  const pg = getKysely()
   await r
     .table('OrganizationUser')
     .getAll(r.args(userIds), {index: 'userId'})
     .filter({orgId})
     .update({suggestedTier: 'team'})
     .run()
-
-  await appendUserFeatureFlagsQuery.run({ids: userIds, flag: 'insights'}, getPg())
+  await pg
+    .updateTable('User')
+    .set({featureFlags: sql`arr_append_uniq("featureFlags", 'insights')`})
+    .where('id', 'in', userIds)
+    .execute()
 }
 
 const sendWebsiteNotifications = async (
diff --git a/packages/server/graphql/private/mutations/addNewFeature.ts b/packages/server/graphql/private/mutations/addNewFeature.ts
index 3a5c8fb73d1..b612061ee9d 100644
--- a/packages/server/graphql/private/mutations/addNewFeature.ts
+++ b/packages/server/graphql/private/mutations/addNewFeature.ts
@@ -1,8 +1,7 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
 import generateUID from '../../../generateUID'
-import getPg from '../../../postgres/getPg'
-import {addUserNewFeatureQuery} from '../../../postgres/queries/generated/addUserNewFeatureQuery'
+import getKysely from '../../../postgres/getKysely'
 import getRedis from '../../../utils/getRedis'
 import publish from '../../../utils/publish'
 import sendToSentry from '../../../utils/sendToSentry'
@@ -15,6 +14,7 @@ const addNewFeature: MutationResolvers['addNewFeature'] = async (
 ) => {
   const r = await getRethink()
   const redis = getRedis()
+  const pg = getKysely()
 
   // AUTH
   const operationId = dataLoader.share()
@@ -30,7 +30,7 @@ const addNewFeature: MutationResolvers['addNewFeature'] = async (
   }
   await Promise.all([
     r.table('NewFeature').insert(newFeature).run(),
-    addUserNewFeatureQuery.run({newFeatureId}, getPg())
+    pg.updateTable('User').set({newFeatureId}).execute()
   ])
 
   const onlineUserIds = new Set()
diff --git a/packages/server/graphql/public/mutations/addReactjiToReactable.ts b/packages/server/graphql/public/mutations/addReactjiToReactable.ts
index 1b4161f0335..0a343f921f4 100644
--- a/packages/server/graphql/public/mutations/addReactjiToReactable.ts
+++ b/packages/server/graphql/public/mutations/addReactjiToReactable.ts
@@ -7,9 +7,6 @@ import {RDatum} from '../../../database/stricterR'
 import Comment from '../../../database/types/Comment'
 import {Reactable} from '../../../database/types/Reactable'
 import Reflection from '../../../database/types/Reflection'
-import getPg from '../../../postgres/getPg'
-import {appendTeamResponseReactji} from '../../../postgres/queries/generated/appendTeamResponseReactjiQuery'
-import {removeTeamResponseReactji} from '../../../postgres/queries/generated/removeTeamResponseReactjiQuery'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId} from '../../../utils/authorization'
 import emojiIds from '../../../utils/emojiIds'
@@ -17,14 +14,15 @@ import getGroupedReactjis from '../../../utils/getGroupedReactjis'
 import publish from '../../../utils/publish'
 import {GQLContext} from '../../graphql'
 
-import getReactableType from '../../types/getReactableType'
-import {ReactableEnumType} from '../../types/ReactableEnum'
-import getKysely from '../../../postgres/getKysely'
-import {AnyMeeting} from '../../../postgres/types/Meeting'
+import {sql} from 'kysely'
 import MeetingRetrospective from '../../../database/types/MeetingRetrospective'
+import NotificationKudosReceived from '../../../database/types/NotificationKudosReceived'
+import getKysely from '../../../postgres/getKysely'
 import {TeamPromptResponse} from '../../../postgres/queries/getTeamPromptResponsesByIds'
+import {AnyMeeting} from '../../../postgres/types/Meeting'
+import {ReactableEnumType} from '../../types/ReactableEnum'
+import getReactableType from '../../types/getReactableType'
 import {MutationResolvers} from '../resolverTypes'
-import NotificationKudosReceived from '../../../database/types/NotificationKudosReceived'
 import publishNotification from './helpers/publishNotification'
 
 const rethinkTableLookup = {
@@ -129,15 +127,19 @@ const addReactjiToReactable: MutationResolvers['addReactjiToReactable'] = async
   if (pgLoaderName) {
     const numberReactableId = TeamPromptResponseId.split(reactableId)
     if (isRemove) {
-      await removeTeamResponseReactji.run(
-        {id: numberReactableId, reactji: {shortname: reactji, userid: viewerId}},
-        getPg()
-      )
+      await pg
+        .updateTable('TeamPromptResponse')
+        .set({reactjis: sql`array_remove("reactjis", (${reactji},${viewerId})::"Reactji")`})
+        .where('id', '=', numberReactableId)
+        .execute()
     } else {
-      await appendTeamResponseReactji.run(
-        {id: numberReactableId, reactji: {shortname: reactji, userid: viewerId}},
-        getPg()
-      )
+      await pg
+        .updateTable('TeamPromptResponse')
+        .set({
+          reactjis: sql`arr_append_uniq("reactjis", (${reactji},${viewerId})::"Reactji")`
+        })
+        .where('id', '=', numberReactableId)
+        .execute()
     }
 
     dataLoader.get(pgLoaderName).clear(reactableId)
diff --git a/packages/server/graphql/public/mutations/updateFeatureFlag.ts b/packages/server/graphql/public/mutations/updateFeatureFlag.ts
index a8b336c6db9..bf7a19cef69 100644
--- a/packages/server/graphql/public/mutations/updateFeatureFlag.ts
+++ b/packages/server/graphql/public/mutations/updateFeatureFlag.ts
@@ -1,7 +1,7 @@
+import {ValueExpression, sql} from 'kysely'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getPg from '../../../postgres/getPg'
-import {appendUserFeatureFlagsQuery} from '../../../postgres/queries/generated/appendUserFeatureFlagsQuery'
-import {removeUserFeatureFlagsQuery} from '../../../postgres/queries/generated/removeUserFeatureFlagsQuery'
+import getKysely from '../../../postgres/getKysely'
+import {DB} from '../../../postgres/pg'
 import getUsersByDomain from '../../../postgres/queries/getUsersByDomain'
 import {getUsersByEmails} from '../../../postgres/queries/getUsersByEmails'
 import IUser from '../../../postgres/types/IUser'
@@ -17,6 +17,7 @@ const updateFeatureFlag: MutationResolvers['updateFeatureFlag'] = async (
 ) => {
   const operationId = dataLoader.share()
   const subOptions = {operationId}
+  const pg = getKysely()
 
   // AUTH
   const viewerId = getUserId(authToken)
@@ -43,9 +44,10 @@ const updateFeatureFlag: MutationResolvers['updateFeatureFlag'] = async (
   }
 
   const userIds = isUpdatingViewerFlag ? [viewerId] : users.map(({id}) => id)
-  addFlag
-    ? await appendUserFeatureFlagsQuery.run({ids: userIds, flag}, getPg())
-    : await removeUserFeatureFlagsQuery.run({ids: userIds, flag}, getPg())
+  const featureFlags: ValueExpression<DB, 'User', string[]> = addFlag
+    ? sql`arr_append_uniq("featureFlags", ${flag})`
+    : sql`array_remove("featureFlags", ${flag})`
+  await pg.updateTable('User').set({featureFlags}).where('id', 'in', userIds).execute()
   userIds.forEach((userId) => {
     const data = {userId}
     publish(SubscriptionChannel.NOTIFICATION, userId, 'UpdateFeatureFlagPayload', data, subOptions)
diff --git a/packages/server/package.json b/packages/server/package.json
index b98145e0cb6..6c187954e77 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -132,7 +132,7 @@
     "rethinkdb-ts": "2.6.0",
     "rrule": "^2.7.2",
     "samlify": "^2.8.2",
-    "sharp": "^0.33.2",
+    "sharp": "^0.32.6",
     "string-similarity": "^3.0.0",
     "stripe": "^9.13.0",
     "tslib": "^2.4.0",
diff --git a/packages/server/postgres/queries/archiveTeamsByTeamIds.ts b/packages/server/postgres/queries/archiveTeamsByTeamIds.ts
deleted file mode 100644
index 7ba702c37a2..00000000000
--- a/packages/server/postgres/queries/archiveTeamsByTeamIds.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import getPg from '../../postgres/getPg'
-import {
-  archiveTeamsByTeamIdsQuery,
-  IArchiveTeamsByTeamIdsQueryParams
-} from '../../postgres/queries/generated/archiveTeamsByTeamIdsQuery'
-
-const archiveTeamsByTeamIds = async (teamIds: string | string[]) => {
-  teamIds = typeof teamIds === 'string' ? [teamIds] : teamIds
-  return archiveTeamsByTeamIdsQuery.run(
-    {
-      ids: teamIds
-    } as IArchiveTeamsByTeamIdsQueryParams,
-    getPg()
-  )
-}
-
-export default archiveTeamsByTeamIds
diff --git a/packages/server/postgres/queries/src/addUserNewFeatureQuery.sql b/packages/server/postgres/queries/src/addUserNewFeatureQuery.sql
deleted file mode 100644
index b91f680f7b5..00000000000
--- a/packages/server/postgres/queries/src/addUserNewFeatureQuery.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
-  @name addUserNewFeatureQuery
-*/
-UPDATE "User" SET
-  "newFeatureId" = :newFeatureId
-;
diff --git a/packages/server/postgres/queries/src/appendTeamResponseReactjiQuery.sql b/packages/server/postgres/queries/src/appendTeamResponseReactjiQuery.sql
deleted file mode 100644
index 7e0875c3857..00000000000
--- a/packages/server/postgres/queries/src/appendTeamResponseReactjiQuery.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  @name appendTeamResponseReactji
-  @param reactji -> (shortname, userid)
-*/
-UPDATE "TeamPromptResponse" SET
-  "reactjis" = arr_append_uniq("reactjis", (:reactji)::"Reactji")
-WHERE id = :id;
diff --git a/packages/server/postgres/queries/src/appendUserFeatureFlagsQuery.sql b/packages/server/postgres/queries/src/appendUserFeatureFlagsQuery.sql
deleted file mode 100644
index 4b155286fe4..00000000000
--- a/packages/server/postgres/queries/src/appendUserFeatureFlagsQuery.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  @name appendUserFeatureFlagsQuery
-  @param ids -> (...)
-*/
-UPDATE "User" SET
-  "featureFlags" = arr_append_uniq("featureFlags", :flag)
-WHERE id IN :ids;
diff --git a/packages/server/postgres/queries/src/appendUserTmsQuery.sql b/packages/server/postgres/queries/src/appendUserTmsQuery.sql
deleted file mode 100644
index 9bca7883e64..00000000000
--- a/packages/server/postgres/queries/src/appendUserTmsQuery.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
-  @name appendUserTmsQuery
-*/
-UPDATE "User" SET
-  tms = arr_append_uniq(tms, :teamId)
-WHERE id = :id;
diff --git a/packages/server/postgres/queries/src/archiveTeamsByTeamIdsQuery.sql b/packages/server/postgres/queries/src/archiveTeamsByTeamIdsQuery.sql
deleted file mode 100644
index aa2d38a8270..00000000000
--- a/packages/server/postgres/queries/src/archiveTeamsByTeamIdsQuery.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-  @name archiveTeamsByTeamIdsQuery
-  @param ids -> (...)
-*/
-UPDATE "Team" SET
-  "isArchived" = true
-WHERE
-  id IN :ids AND
-  "isArchived" = false
-RETURNING *;
diff --git a/packages/server/postgres/queries/src/removeTeamResponseReactjiQuery.sql b/packages/server/postgres/queries/src/removeTeamResponseReactjiQuery.sql
deleted file mode 100644
index d86f4d852b8..00000000000
--- a/packages/server/postgres/queries/src/removeTeamResponseReactjiQuery.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
-  @name removeTeamResponseReactji
-  @param reactji -> (shortname, userid)
-*/
-UPDATE "TeamPromptResponse" SET
-  "reactjis" = array_remove("reactjis", (:reactji)::"Reactji")
-WHERE id = :id;
diff --git a/packages/server/postgres/queries/src/removeUserFeatureFlagsQuery.sql b/packages/server/postgres/queries/src/removeUserFeatureFlagsQuery.sql
deleted file mode 100644
index 8db6a6fe0bd..00000000000
--- a/packages/server/postgres/queries/src/removeUserFeatureFlagsQuery.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-  @name removeUserFeatureFlagsQuery
-  @param ids -> (...)
-*/
-UPDATE "User"
-SET "featureFlags" = array_remove("featureFlags", x)
-FROM (
-SELECT id, unnest("featureFlags") as x
-FROM "User"
-WHERE id IN :ids
-) sub
-WHERE "User".id = sub.id AND x = :flag;
diff --git a/packages/server/safeMutations/addTeamIdToTMS.ts b/packages/server/safeMutations/addTeamIdToTMS.ts
index 0da65f0e66e..faa223723d3 100644
--- a/packages/server/safeMutations/addTeamIdToTMS.ts
+++ b/packages/server/safeMutations/addTeamIdToTMS.ts
@@ -1,8 +1,13 @@
-import getPg from '../postgres/getPg'
-import {appendUserTmsQuery} from '../postgres/queries/generated/appendUserTmsQuery'
+import {sql} from 'kysely'
+import getKysely from '../postgres/getKysely'
 
 const addTeamIdToTMS = async (userId: string, teamId: string) => {
-  return appendUserTmsQuery.run({id: userId, teamId}, getPg())
+  const pg = getKysely()
+  return pg
+    .updateTable('User')
+    .set({tms: sql`arr_append_uniq("tms", ${teamId})`})
+    .where('id', '=', userId)
+    .execute()
 }
 
 export default addTeamIdToTMS
diff --git a/packages/server/safeMutations/safeArchiveTeam.ts b/packages/server/safeMutations/safeArchiveTeam.ts
index 9ed81c4ce7b..5283349838d 100644
--- a/packages/server/safeMutations/safeArchiveTeam.ts
+++ b/packages/server/safeMutations/safeArchiveTeam.ts
@@ -1,11 +1,12 @@
 import getRethink from '../database/rethinkDriver'
 import {RDatum} from '../database/stricterR'
 import {DataLoaderWorker} from '../graphql/graphql'
-import archiveTeamsByTeamIds from '../postgres/queries/archiveTeamsByTeamIds'
+import getKysely from '../postgres/getKysely'
 import removeUserTms from '../postgres/queries/removeUserTms'
 
 const safeArchiveTeam = async (teamId: string, dataLoader: DataLoaderWorker) => {
   const r = await getRethink()
+  const pg = getKysely()
   const now = new Date()
   const userIds = await r
     .table('TeamMember')
@@ -34,10 +35,15 @@ const safeArchiveTeam = async (teamId: string, dataLoader: DataLoaderWorker) =>
         )('changes')('new_val')('id')
         .default([]) as unknown as string[]
     }).run(),
-    archiveTeamsByTeamIds(teamId)
+    pg
+      .updateTable('Team')
+      .set({isArchived: true})
+      .where('id', '=', teamId)
+      .returningAll()
+      .executeTakeFirst()
   ])
 
-  return {...rethinkResult, team: pgResult[0] ?? null, users}
+  return {...rethinkResult, team: pgResult ?? null, users}
 }
 
 export default safeArchiveTeam
diff --git a/yarn.lock b/yarn.lock
index 0678b62b736..976027c679f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9627,9 +9627,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
-  version "1.0.30001591"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz#16745e50263edc9f395895a7cd468b9f3767cf33"
-  integrity sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==
+  version "1.0.30001594"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz#bea552414cd52c2d0c985ed9206314a696e685f5"
+  integrity sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -11223,7 +11223,6 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
-  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"
@@ -16844,10 +16843,10 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-oy-vey@^0.11.0:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.11.2.tgz#3bbc36a4064993a2ff52f985b066d44dcb4500d9"
-  integrity sha512-06prDST4MicbAWie4eXcouJbGhAu0r7j3Yta1KFtgs7v2t7goHmY06/GWFjT6lpIsGKJC+7vZtwdecRSYnFtPQ==
+oy-vey@^0.12.1:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.12.1.tgz#a3bdda93bdb3a9f483fc01432b7b8d5abf838405"
+  integrity sha512-fFpS8mRoXqMTPYXUoDTO6S5S8WXvqBE+AOPbDwxFu2n3ZNns6x3+Ml/49lAomyJV6RzdFBVA5LxCUEHNaLlhjA==
   dependencies:
     clean-css "^4.0.12"
     object-assign "^4.1.1"

From 6762ebc4068f9062091db7f8d467fecf60388d63 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Wed, 6 Mar 2024 09:05:45 +0000
Subject: [PATCH 050/183] feat: make all templates free (#9503)

* feat: make all templates free

* set orgid to aghostorg

* update template ids and down migration org id check

* make down migration noop

* remove unused var
---
 .../1709551949071_makeAllTemplatesFree.ts     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 packages/server/postgres/migrations/1709551949071_makeAllTemplatesFree.ts

diff --git a/packages/server/postgres/migrations/1709551949071_makeAllTemplatesFree.ts b/packages/server/postgres/migrations/1709551949071_makeAllTemplatesFree.ts
new file mode 100644
index 00000000000..25bc6553255
--- /dev/null
+++ b/packages/server/postgres/migrations/1709551949071_makeAllTemplatesFree.ts
@@ -0,0 +1,20 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(
+    `
+    UPDATE "MeetingTemplate"
+      SET "isFree" = true
+      WHERE "orgId" = 'aGhostOrg'
+   `
+  )
+
+  await client.end()
+}
+
+export async function down() {
+  // noop
+}

From 4ce391e53a11cbd174bf67364db29128afe72092 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 6 Mar 2024 05:37:05 -0800
Subject: [PATCH 051/183] feat: saml login no email, auth design fixups (#9507)

* feat: saml login no email, auth design fixups

Signed-off-by: Matt Krick <matt.krick@gmail.com>

* fixup: remove console log

Signed-off-by: Matt Krick <matt.krick@gmail.com>

---------

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .../components/AuthenticationDialog.tsx       |  3 +-
 .../client/components/AuthenticationPage.tsx  |  4 ++-
 .../components/EmailPasswordAuthForm.tsx      | 21 ++++++------
 .../components/GenericAuthentication.tsx      | 23 +++++++++----
 .../components/GoogleOAuthButtonBlock.tsx     | 12 ++++---
 .../components/MicrosoftOAuthButtonBlock.tsx  |  6 ++--
 .../TeamInvitationEmailCreateAccount.tsx      |  5 +--
 .../components/TeamInvitationEmailSignin.tsx  |  3 +-
 .../TeamInvitationGoogleCreateAccount.tsx     |  3 +-
 .../components/TeamInvitationWrapper.tsx      | 29 ++--------------
 .../OrgAuthenticationMetadata.tsx             |  2 +-
 packages/client/utils/GoogleClientManager.ts  |  9 +++--
 .../client/utils/MicrosoftClientManager.ts    |  9 +++--
 .../client/utils/getOAuthPopupFeatures.ts     |  7 ++--
 packages/client/utils/getTokenFromSSO.ts      |  4 +--
 .../graphql/private/mutations/loginSAML.ts    |  6 ++--
 packages/server/graphql/public/permissions.ts |  3 +-
 .../server/graphql/public/queries/SAMLIdP.ts  | 13 ++++++++
 .../graphql/public/typeDefs/Query.graphql     |  4 +--
 packages/server/graphql/queries/SAMLIdP.ts    | 33 -------------------
 packages/server/graphql/rootQuery.ts          |  4 +--
 packages/server/utils/getSAMLURLFromEmail.ts  |  8 +++--
 22 files changed, 97 insertions(+), 114 deletions(-)
 create mode 100644 packages/server/graphql/public/queries/SAMLIdP.ts
 delete mode 100644 packages/server/graphql/queries/SAMLIdP.ts

diff --git a/packages/client/components/AuthenticationDialog.tsx b/packages/client/components/AuthenticationDialog.tsx
index 3ed5ad9f103..a53e250c3e1 100644
--- a/packages/client/components/AuthenticationDialog.tsx
+++ b/packages/client/components/AuthenticationDialog.tsx
@@ -1,11 +1,12 @@
 import styled from '@emotion/styled'
 import InviteDialog from './InviteDialog'
 
+export const AUTH_DIALOG_WIDTH = 356
 const AuthenticationDialog = styled(InviteDialog)({
   alignItems: 'center',
   paddingTop: 24,
   paddingBottom: 24,
-  width: 356
+  width: AUTH_DIALOG_WIDTH
 })
 
 export default AuthenticationDialog
diff --git a/packages/client/components/AuthenticationPage.tsx b/packages/client/components/AuthenticationPage.tsx
index dd3f6808e82..c89eb2c9be2 100644
--- a/packages/client/components/AuthenticationPage.tsx
+++ b/packages/client/components/AuthenticationPage.tsx
@@ -5,13 +5,15 @@ import useAtmosphere from '../hooks/useAtmosphere'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import useRouter from '../hooks/useRouter'
 import getValidRedirectParam from '../utils/getValidRedirectParam'
+import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 import GenericAuthentication, {AuthPageSlug, GotoAuthPage} from './GenericAuthentication'
 import TeamInvitationWrapper from './TeamInvitationWrapper'
 
 const CopyBlock = styled('div')({
   marginBottom: 48,
   width: 'calc(100vw - 16px)',
-  maxWidth: 500,
+  // must be no wider than the auth popup width to keep it looking clean
+  maxWidth: AUTH_DIALOG_WIDTH,
   textAlign: 'center'
 })
 
diff --git a/packages/client/components/EmailPasswordAuthForm.tsx b/packages/client/components/EmailPasswordAuthForm.tsx
index ed195b49b16..d124dd8428c 100644
--- a/packages/client/components/EmailPasswordAuthForm.tsx
+++ b/packages/client/components/EmailPasswordAuthForm.tsx
@@ -30,6 +30,8 @@ import RaisedButton from './RaisedButton'
 import StyledTip from './StyledTip'
 
 interface Props {
+  // used to determine the coordinates of the auth popup
+  getOffsetTop?: () => number
   email: string
   invitationToken: string | undefined | null
   // is the primary login action (not secondary to Google Oauth)
@@ -38,9 +40,6 @@ interface Props {
   goToPage?: (page: AuthPageSlug, params: string) => void
 }
 
-const FieldGroup = styled('div')({
-  margin: '16px 0'
-})
 const FieldBlock = styled('div')<{isSSO?: boolean}>(({isSSO}) => ({
   margin: '0 0 1.25rem',
   visibility: isSSO ? 'hidden' : undefined
@@ -90,7 +89,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
   const isInternalAuthEnabled = window.__ACTION__.AUTH_INTERNAL_ENABLED
   const isSSOAuthEnabled = window.__ACTION__.AUTH_SSO_ENABLED
 
-  const {isPrimary, isSignin, invitationToken, email, goToPage} = props
+  const {getOffsetTop, isPrimary, isSignin, invitationToken, email, goToPage} = props
   const {location} = useRouter()
   const params = new URLSearchParams(location.search)
   const isSSODefault = isSSOAuthEnabled && Boolean(params.get('sso'))
@@ -105,7 +104,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
   const {fields, onChange, setDirtyField, validateField} = useForm({
     email: {
       getDefault: () => email,
-      validate: validateEmail
+      validate: signInWithSSOOnly ? undefined : validateEmail
     },
     password: {
       getDefault: () => '',
@@ -150,6 +149,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
     const domain = getSSODomainFromEmail(email)!
     const validSSOURL = domain === ssoDomain && ssoURL
     const isProbablySSO = isSSO || !fields.password.value || validSSOURL
+    const top = getOffsetTop?.() || 56
     let optimisticPopup
     if (isProbablySSO) {
       // Safari blocks all calls to window.open that are not triggered SYNCHRONOUSLY from an event
@@ -164,7 +164,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
       optimisticPopup = window.open(
         '',
         'SSO',
-        getOAuthPopupFeatures({width: 385, height: 550, top: 64})
+        getOAuthPopupFeatures({width: 385, height: 576, top})
       )
     }
     const url = validSSOURL || (await getSSOUrl(atmosphere, email))
@@ -173,7 +173,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
       return false
     }
     submitMutation()
-    const response = await getTokenFromSSO(url)
+    const response = await getTokenFromSSO(url, top)
     if ('error' in response) {
       onError(new Error(response.error || 'Error logging in'))
       return true
@@ -198,6 +198,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
   const onSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     if (submitting) return
+    onCompleted()
     setDirtyField()
     const {email: emailRes, password: passwordRes} = validateField()
     if (emailRes.error) return
@@ -244,8 +245,8 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
       <Form onSubmit={onSubmit}>
         {error && <ErrorAlert message={error.message} />}
         {isSSO && submitting && <HelpMessage>Continue through the login popup</HelpMessage>}
-        <FieldGroup>
-          <FieldBlock>
+        <div className={signInWithSSOOnly ? 'hidden' : 'mt-4 mb-4'}>
+          <FieldBlock isSSO={signInWithSSOOnly}>
             <EmailInputField
               autoFocus={!hasEmail}
               {...fields.email}
@@ -263,7 +264,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
               />
             </FieldBlock>
           )}
-        </FieldGroup>
+        </div>
         <Button size='medium' disabled={false} waiting={submitting}>
           {isSignin ? SIGNIN_LABEL : CREATE_ACCOUNT_BUTTON_LABEL}
           {signInWithSSOOnly ? ' with SSO' : ''}
diff --git a/packages/client/components/GenericAuthentication.tsx b/packages/client/components/GenericAuthentication.tsx
index bb23d45c48e..f790c4eeadc 100644
--- a/packages/client/components/GenericAuthentication.tsx
+++ b/packages/client/components/GenericAuthentication.tsx
@@ -9,14 +9,14 @@ import {
   SIGNIN_LABEL,
   SIGNIN_SLUG
 } from '../utils/constants'
-import AuthenticationDialog from './AuthenticationDialog'
 import AuthPrivacyFooter from './AuthPrivacyFooter'
+import AuthenticationDialog from './AuthenticationDialog'
 import DialogTitle from './DialogTitle'
 import EmailPasswordAuthForm from './EmailPasswordAuthForm'
 import ForgotPasswordPage from './ForgotPasswordPage'
 import GoogleOAuthButtonBlock from './GoogleOAuthButtonBlock'
-import MicrosoftOAuthButtonBlock from './MicrosoftOAuthButtonBlock'
 import HorizontalSeparator from './HorizontalSeparator/HorizontalSeparator'
+import MicrosoftOAuthButtonBlock from './MicrosoftOAuthButtonBlock'
 import PlainButton from './PlainButton/PlainButton'
 import SubmittedForgotPasswordPage from './SubmittedForgotPasswordPage'
 
@@ -70,12 +70,12 @@ const GenericAuthentication = (props: Props) => {
   const {location} = useRouter()
   const params = new URLSearchParams(location.search)
   const email = params.get('email')
-
+  const authDialogRef = useRef<HTMLDivElement>(null)
+  const getOffsetTop = () => authDialogRef.current?.offsetTop || 0
   const isGoogleAuthEnabled = window.__ACTION__.AUTH_GOOGLE_ENABLED
   const isMicrosoftAuthEnabled = window.__ACTION__.AUTH_MICROSOFT_ENABLED
   const isInternalAuthEnabled = window.__ACTION__.AUTH_INTERNAL_ENABLED
   const isSSOAuthEnabled = window.__ACTION__.AUTH_SSO_ENABLED
-
   if (page === 'forgot-password') {
     return <ForgotPasswordPage goToPage={goToPage} />
   }
@@ -97,7 +97,7 @@ const GenericAuthentication = (props: Props) => {
     goToPage('forgot-password', `?email=${emailRef.current?.email()}`)
   }
   return (
-    <AuthenticationDialog>
+    <AuthenticationDialog ref={authDialogRef}>
       <DialogTitle>{title}</DialogTitle>
       <DialogSubTitle>
         <span>{actionCopy}</span>
@@ -106,10 +106,18 @@ const GenericAuthentication = (props: Props) => {
         </BrandedLink>
       </DialogSubTitle>
       {isGoogleAuthEnabled && (
-        <GoogleOAuthButtonBlock isCreate={isCreate} invitationToken={invitationToken} />
+        <GoogleOAuthButtonBlock
+          isCreate={isCreate}
+          invitationToken={invitationToken}
+          getOffsetTop={getOffsetTop}
+        />
       )}
       {isMicrosoftAuthEnabled && (
-        <MicrosoftOAuthButtonBlock isCreate={isCreate} invitationToken={invitationToken} />
+        <MicrosoftOAuthButtonBlock
+          isCreate={isCreate}
+          invitationToken={invitationToken}
+          getOffsetTop={getOffsetTop}
+        />
       )}
       {(isGoogleAuthEnabled || isMicrosoftAuthEnabled) &&
         (isInternalAuthEnabled || isSSOAuthEnabled) && (
@@ -121,6 +129,7 @@ const GenericAuthentication = (props: Props) => {
           isSignin={!isCreate}
           invitationToken={invitationToken}
           ref={emailRef}
+          getOffsetTop={getOffsetTop}
           goToPage={goToPage}
         />
       )}
diff --git a/packages/client/components/GoogleOAuthButtonBlock.tsx b/packages/client/components/GoogleOAuthButtonBlock.tsx
index 55431fb5393..bf10cfc7eea 100644
--- a/packages/client/components/GoogleOAuthButtonBlock.tsx
+++ b/packages/client/components/GoogleOAuthButtonBlock.tsx
@@ -1,19 +1,20 @@
 import styled from '@emotion/styled'
+import clsx from 'clsx'
 import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
+import logo from '../styles/theme/images/graphics/google.svg'
 import GoogleClientManager from '../utils/GoogleClientManager'
+import RaisedButton from './RaisedButton'
 import StyledError from './StyledError'
 import StyledTip from './StyledTip'
-import logo from '../styles/theme/images/graphics/google.svg'
-import RaisedButton from './RaisedButton'
-import clsx from 'clsx'
 
 interface Props {
   invitationToken?: string
   isCreate?: boolean
   loginHint?: string
+  getOffsetTop?: () => number
 }
 
 const helpText = {
@@ -30,7 +31,7 @@ const HelpMessage = styled(StyledTip)({
 })
 
 const GoogleOAuthButtonBlock = (props: Props) => {
-  const {invitationToken, isCreate, loginHint} = props
+  const {invitationToken, isCreate, loginHint, getOffsetTop} = props
   const {onError, error, submitting, onCompleted, submitMutation} = useMutationProps()
   const atmosphere = useAtmosphere()
   const {history, location} = useRouter()
@@ -43,7 +44,8 @@ const GoogleOAuthButtonBlock = (props: Props) => {
       history,
       location.search,
       invitationToken,
-      loginHint
+      loginHint,
+      getOffsetTop
     )
   }
   return (
diff --git a/packages/client/components/MicrosoftOAuthButtonBlock.tsx b/packages/client/components/MicrosoftOAuthButtonBlock.tsx
index 99c46c7d231..160c074955b 100644
--- a/packages/client/components/MicrosoftOAuthButtonBlock.tsx
+++ b/packages/client/components/MicrosoftOAuthButtonBlock.tsx
@@ -14,6 +14,7 @@ interface Props {
   invitationToken?: string
   isCreate?: boolean
   loginHint?: string
+  getOffsetTop?: () => number
 }
 
 const helpText = {
@@ -30,7 +31,7 @@ const HelpMessage = styled(StyledTip)({
 })
 
 const MicrosoftOAuthButtonBlock = (props: Props) => {
-  const {invitationToken, isCreate, loginHint} = props
+  const {invitationToken, isCreate, loginHint, getOffsetTop} = props
   const {onError, error, submitting, onCompleted, submitMutation} = useMutationProps()
   const atmosphere = useAtmosphere()
   const {history, location} = useRouter()
@@ -43,7 +44,8 @@ const MicrosoftOAuthButtonBlock = (props: Props) => {
       history,
       location.search,
       invitationToken,
-      loginHint
+      loginHint,
+      getOffsetTop
     )
   }
   return (
diff --git a/packages/client/components/TeamInvitationEmailCreateAccount.tsx b/packages/client/components/TeamInvitationEmailCreateAccount.tsx
index e98cbef5a25..b5920cf318f 100644
--- a/packages/client/components/TeamInvitationEmailCreateAccount.tsx
+++ b/packages/client/components/TeamInvitationEmailCreateAccount.tsx
@@ -2,9 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import useDocumentTitle from '../hooks/useDocumentTitle'
 import {TeamInvitationEmailCreateAccount_verifiedInvitation$key} from '../__generated__/TeamInvitationEmailCreateAccount_verifiedInvitation.graphql'
+import useDocumentTitle from '../hooks/useDocumentTitle'
 import AuthPrivacyFooter from './AuthPrivacyFooter'
+import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import EmailPasswordAuthForm from './EmailPasswordAuthForm'
@@ -18,7 +19,7 @@ interface Props {
 }
 
 const StyledDialog = styled(InviteDialog)({
-  maxWidth: 356
+  maxWidth: AUTH_DIALOG_WIDTH
 })
 
 const TeamName = styled('span')({
diff --git a/packages/client/components/TeamInvitationEmailSignin.tsx b/packages/client/components/TeamInvitationEmailSignin.tsx
index 4150c19ed56..092bcaf6894 100644
--- a/packages/client/components/TeamInvitationEmailSignin.tsx
+++ b/packages/client/components/TeamInvitationEmailSignin.tsx
@@ -11,6 +11,7 @@ import ForgotPasswordOneClick from './ForgotPasswordOneClick'
 import InvitationCenteredCopy from './InvitationCenteredCopy'
 import InvitationDialogCopy from './InvitationDialogCopy'
 import InviteDialog from './InviteDialog'
+import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 
 interface Props {
   invitationToken: string
@@ -18,7 +19,7 @@ interface Props {
 }
 
 const StyledDialog = styled(InviteDialog)({
-  maxWidth: 356
+  maxWidth: AUTH_DIALOG_WIDTH
 })
 
 const TeamName = styled('span')({
diff --git a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
index f0009075e71..e0df5c4b409 100644
--- a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
+++ b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
@@ -16,6 +16,7 @@ import InvitationCenteredCopy from './InvitationCenteredCopy'
 import InvitationDialogCopy from './InvitationDialogCopy'
 import InviteDialog from './InviteDialog'
 import PlainButton from './PlainButton/PlainButton'
+import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 
 interface Props {
   invitationToken: string
@@ -23,7 +24,7 @@ interface Props {
 }
 
 const StyledDialog = styled(InviteDialog)({
-  maxWidth: 356
+  maxWidth: AUTH_DIALOG_WIDTH
 })
 
 const StyledContent = styled(DialogContent)({
diff --git a/packages/client/components/TeamInvitationWrapper.tsx b/packages/client/components/TeamInvitationWrapper.tsx
index 402e5a7935f..1748381e3ed 100644
--- a/packages/client/components/TeamInvitationWrapper.tsx
+++ b/packages/client/components/TeamInvitationWrapper.tsx
@@ -1,29 +1,6 @@
-import styled from '@emotion/styled'
 import React, {ReactNode} from 'react'
-import {PALETTE} from '../styles/paletteV3'
 import Header from './AuthPage/Header'
 
-const PageContainer = styled('div')({
-  alignItems: 'center',
-  backgroundColor: PALETTE.SLATE_200,
-  color: PALETTE.SLATE_700,
-  display: 'flex',
-  flexDirection: 'column',
-  maxWidth: '100%',
-  minHeight: '100vh'
-})
-
-const CenteredBlock = styled('div')({
-  alignItems: 'center',
-  display: 'flex',
-  flexDirection: 'column',
-  flex: 1,
-  justifyContent: 'center',
-  maxWidth: '100%',
-  padding: '2rem 1rem',
-  width: '100%'
-})
-
 interface Props {
   children: ReactNode
 }
@@ -31,10 +8,10 @@ interface Props {
 function TeamInvitationWrapper(props: Props) {
   const {children} = props
   return (
-    <PageContainer>
+    <div className='flex min-h-screen  max-w-full flex-col items-center bg-slate-200 text-slate-700'>
       <Header />
-      <CenteredBlock>{children}</CenteredBlock>
-    </PageContainer>
+      <div className='maxw-full flex w-full flex-1 flex-col items-center py-8 px-4'>{children}</div>
+    </div>
   )
 }
 
diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx
index 0c1050d6faa..d49313ec356 100644
--- a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx
+++ b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthenticationMetadata.tsx
@@ -60,7 +60,7 @@ const OrgAuthenticationMetadata = (props: Props) => {
     const optimisticPopup = window.open(
       '',
       'SSO',
-      getOAuthPopupFeatures({width: 385, height: 550, top: 64})
+      getOAuthPopupFeatures({width: 385, height: 576, top: 64})
     )
 
     // Get the Sign-on URL, which includes metadataURL in the RelayState
diff --git a/packages/client/utils/GoogleClientManager.ts b/packages/client/utils/GoogleClientManager.ts
index ed3593fa78b..393cddb5448 100644
--- a/packages/client/utils/GoogleClientManager.ts
+++ b/packages/client/utils/GoogleClientManager.ts
@@ -1,11 +1,12 @@
 import {RouterProps} from 'react-router'
 import Atmosphere from '../Atmosphere'
+import {AUTH_DIALOG_WIDTH} from '../components/AuthenticationDialog'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import LoginWithGoogleMutation from '../mutations/LoginWithGoogleMutation'
 import {LocalStorageKey} from '../types/constEnums'
+import GoogleManager from './GoogleManager'
 import getAnonymousId from './getAnonymousId'
 import getOAuthPopupFeatures from './getOAuthPopupFeatures'
-import GoogleManager from './GoogleManager'
 import makeHref from './makeHref'
 
 class GoogleClientManager extends GoogleManager {
@@ -16,7 +17,8 @@ class GoogleClientManager extends GoogleManager {
     history: RouterProps['history'],
     pageParams: string,
     invitationToken?: string,
-    loginHint?: string
+    loginHint?: string,
+    getOffsetTop?: () => number
   ) {
     const {submitting, onError, onCompleted, submitMutation} = mutationProps
     const providerState = Math.random().toString(36).substring(5)
@@ -31,10 +33,11 @@ class GoogleClientManager extends GoogleManager {
     })
     const uri = `https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`
     submitMutation()
+    const top = getOffsetTop?.() || 56
     const popup = window.open(
       uri,
       'OAuth',
-      getOAuthPopupFeatures({width: 356, height: 530, top: 56})
+      getOAuthPopupFeatures({width: AUTH_DIALOG_WIDTH, height: 576, top})
     )
     const closeCheckerId = window.setInterval(() => {
       if (popup && popup.closed) {
diff --git a/packages/client/utils/MicrosoftClientManager.ts b/packages/client/utils/MicrosoftClientManager.ts
index faf4c35e0c7..6ae81825b78 100644
--- a/packages/client/utils/MicrosoftClientManager.ts
+++ b/packages/client/utils/MicrosoftClientManager.ts
@@ -1,11 +1,12 @@
 import {RouterProps} from 'react-router'
 import Atmosphere from '../Atmosphere'
+import {AUTH_DIALOG_WIDTH} from '../components/AuthenticationDialog'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import LoginWithMicrosoftMutation from '../mutations/LoginWithMicrosoftMutation'
 import {LocalStorageKey} from '../types/constEnums'
+import MicrosoftManager from './MicrosoftManager'
 import getAnonymousId from './getAnonymousId'
 import getOAuthPopupFeatures from './getOAuthPopupFeatures'
-import MicrosoftManager from './MicrosoftManager'
 import makeHref from './makeHref'
 
 class MicrosoftClientManager extends MicrosoftManager {
@@ -16,7 +17,8 @@ class MicrosoftClientManager extends MicrosoftManager {
     history: RouterProps['history'],
     pageParams: string,
     invitationToken?: string,
-    loginHint?: string
+    loginHint?: string,
+    getOffsetTop?: () => number
   ) {
     const {submitting, onError, onCompleted, submitMutation} = mutationProps
     const providerState = Math.random().toString(36).substring(5)
@@ -33,10 +35,11 @@ class MicrosoftClientManager extends MicrosoftManager {
       window.__ACTION__.microsoftTenantId
     }/oauth2/v2.0/authorize?${params.toString()}`
     submitMutation()
+    const top = getOffsetTop?.() || 56
     const popup = window.open(
       uri,
       'OAuth',
-      getOAuthPopupFeatures({width: 356, height: 530, top: 56})
+      getOAuthPopupFeatures({width: AUTH_DIALOG_WIDTH, height: 576, top})
     )
     const closeCheckerId = window.setInterval(() => {
       if (popup && popup.closed) {
diff --git a/packages/client/utils/getOAuthPopupFeatures.ts b/packages/client/utils/getOAuthPopupFeatures.ts
index 18fea4f2a41..599712d413e 100644
--- a/packages/client/utils/getOAuthPopupFeatures.ts
+++ b/packages/client/utils/getOAuthPopupFeatures.ts
@@ -1,16 +1,15 @@
 interface Box {
   width: number
   height: number
-  top: number
+  top?: number
 }
 
 const getOAuthPopupFeatures = ({width, height, top}: Box) => {
   const {outerWidth, innerWidth, outerHeight, innerHeight, screenX, screenY} = window
   const startX = screenX + (outerWidth - innerWidth) / 2
-  const startY = screenY + (outerHeight - innerHeight) / 2
+  const startY = screenY + (outerHeight - innerHeight)
   const left = Math.round(startX + (innerWidth - width) / 2)
-  // 64 is the Parabol header
-  const topOff = Math.round(startY + (innerHeight - height) / 2 + top)
+  const topOff = top ? Math.round(startY + top) : Math.round(startY + (innerHeight - height) / 2)
   return `popup,width=${width},height=${height},left=${left},top=${topOff}`
 }
 
diff --git a/packages/client/utils/getTokenFromSSO.ts b/packages/client/utils/getTokenFromSSO.ts
index 569d51a63d7..e9504136225 100644
--- a/packages/client/utils/getTokenFromSSO.ts
+++ b/packages/client/utils/getTokenFromSSO.ts
@@ -12,11 +12,11 @@ type ErrorReturnType = {
 
 type ReturnType = SucessReturnType | ErrorReturnType
 
-const getTokenFromSSO = (url: string): ReturnType | Promise<ReturnType> => {
+const getTokenFromSSO = (url: string, top?: number): ReturnType | Promise<ReturnType> => {
   // It's possible we prematurely opened a popup named SSO at the URL about:blank to avoid popup blockers
   // Calling window.open again will get a reference to that popup
   // Then, we can update the href to the valid URL
-  const popup = window.open(url, 'SSO', getOAuthPopupFeatures({width: 385, height: 550, top: 64}))
+  const popup = window.open(url, 'SSO', getOAuthPopupFeatures({width: 385, height: 576, top}))
   if (!popup) return {error: 'Failed to open login popup'}
   popup.location.href = url
   let closeCheckerId: undefined | number
diff --git a/packages/server/graphql/private/mutations/loginSAML.ts b/packages/server/graphql/private/mutations/loginSAML.ts
index c3137a14205..03584f15300 100644
--- a/packages/server/graphql/private/mutations/loginSAML.ts
+++ b/packages/server/graphql/private/mutations/loginSAML.ts
@@ -9,14 +9,14 @@ import {USER_PREFERRED_NAME_LIMIT} from '../../../postgres/constants'
 import getKysely from '../../../postgres/getKysely'
 import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
 import encodeAuthToken from '../../../utils/encodeAuthToken'
+import {isSingleTenantSSO} from '../../../utils/getSAMLURLFromEmail'
 import {getSSOMetadataFromURL} from '../../../utils/getSSOMetadataFromURL'
 import {samlXMLValidator} from '../../../utils/samlXMLValidator'
+import standardError from '../../../utils/standardError'
 import bootstrapNewUser from '../../mutations/helpers/bootstrapNewUser'
 import getSignOnURL from '../../public/mutations/helpers/SAMLHelpers/getSignOnURL'
-import {SSORelayState} from '../../queries/SAMLIdP'
+import {SSORelayState} from '../../public/queries/SAMLIdP'
 import {MutationResolvers} from '../resolverTypes'
-import standardError from '../../../utils/standardError'
-import {isSingleTenantSSO} from '../../../utils/getSAMLURLFromEmail'
 
 const serviceProvider = samlify.ServiceProvider({})
 samlify.setSchemaValidator(samlXMLValidator)
diff --git a/packages/server/graphql/public/permissions.ts b/packages/server/graphql/public/permissions.ts
index 37bb607f152..dd0930cdb35 100644
--- a/packages/server/graphql/public/permissions.ts
+++ b/packages/server/graphql/public/permissions.ts
@@ -57,7 +57,8 @@ const permissionMap: PermissionMap<Resolvers> = {
   },
   Query: {
     '*': isAuthenticated,
-    getDemoEntities: rateLimit({perMinute: 5, perHour: 50})
+    getDemoEntities: rateLimit({perMinute: 5, perHour: 50}),
+    SAMLIdP: rateLimit({perMinute: 120, perHour: 3600})
   },
   Organization: {
     saml: and(isViewerBillingLeaderSource, isOrgTierSource('enterprise'))
diff --git a/packages/server/graphql/public/queries/SAMLIdP.ts b/packages/server/graphql/public/queries/SAMLIdP.ts
new file mode 100644
index 00000000000..98b7c0f5e8b
--- /dev/null
+++ b/packages/server/graphql/public/queries/SAMLIdP.ts
@@ -0,0 +1,13 @@
+import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail'
+import {QueryResolvers} from '../resolverTypes'
+
+export interface SSORelayState {
+  isInvited?: boolean
+  metadataURL?: string
+}
+
+const SAMLIdP: QueryResolvers['SAMLIdP'] = async (_source, {email, isInvited}, {dataLoader}) => {
+  return getSAMLURLFromEmail(email, dataLoader, isInvited)
+}
+
+export default SAMLIdP
diff --git a/packages/server/graphql/public/typeDefs/Query.graphql b/packages/server/graphql/public/typeDefs/Query.graphql
index 1e196c7f36a..ccc8b3e0384 100644
--- a/packages/server/graphql/public/typeDefs/Query.graphql
+++ b/packages/server/graphql/public/typeDefs/Query.graphql
@@ -20,9 +20,9 @@ type Query {
   ): VerifiedInvitationPayload!
   SAMLIdP(
     """
-    the email associated with a SAML login
+    the email associated with a SAML login. null if instance is SSO-only
     """
-    email: ID!
+    email: ID
 
     """
     true if the user was invited, else false
diff --git a/packages/server/graphql/queries/SAMLIdP.ts b/packages/server/graphql/queries/SAMLIdP.ts
deleted file mode 100644
index 114b81958ea..00000000000
--- a/packages/server/graphql/queries/SAMLIdP.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
-import getSAMLURLFromEmail from '../../utils/getSAMLURLFromEmail'
-import rateLimit from '../rateLimit'
-
-export interface SSOParams {
-  RelayState: string
-}
-
-export interface SSORelayState {
-  isInvited?: boolean
-  metadataURL?: string
-}
-
-const SAMLIdP = {
-  args: {
-    email: {
-      type: new GraphQLNonNull(GraphQLID),
-      description: 'the email associated with a SAML login'
-    },
-    isInvited: {
-      type: GraphQLBoolean,
-      description: 'true if the user was invited, else false'
-    }
-  },
-  type: GraphQLString,
-  resolve: rateLimit({perMinute: 120, perHour: 3600})(
-    async (_source: unknown, {email, isInvited}, {dataLoader}) => {
-      return getSAMLURLFromEmail(email, dataLoader, isInvited)
-    }
-  )
-}
-
-export default SAMLIdP
diff --git a/packages/server/graphql/rootQuery.ts b/packages/server/graphql/rootQuery.ts
index 567516058ee..77b7249de74 100644
--- a/packages/server/graphql/rootQuery.ts
+++ b/packages/server/graphql/rootQuery.ts
@@ -2,7 +2,6 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {getUserId} from '../utils/authorization'
 import {GQLContext} from './graphql'
 import massInvitation from './queries/massInvitation'
-import SAMLIdP from './queries/SAMLIdP'
 import verifiedInvitation from './queries/verifiedInvitation'
 import User from './types/User'
 
@@ -18,7 +17,6 @@ export default new GraphQLObjectType<any, GQLContext>({
       }
     },
     massInvitation,
-    verifiedInvitation,
-    SAMLIdP
+    verifiedInvitation
   })
 })
diff --git a/packages/server/utils/getSAMLURLFromEmail.ts b/packages/server/utils/getSAMLURLFromEmail.ts
index 896a479b483..feb6d9a3075 100644
--- a/packages/server/utils/getSAMLURLFromEmail.ts
+++ b/packages/server/utils/getSAMLURLFromEmail.ts
@@ -19,12 +19,10 @@ const urlWithRelayState = (url: string, isInvited?: boolean | null) => {
 }
 
 const getSAMLURLFromEmail = async (
-  email: string,
+  email: string | null | undefined,
   dataLoader: DataLoaderWorker,
   isInvited?: boolean | null
 ) => {
-  const domainName = getSSODomainFromEmail(email)
-  if (!domainName) return null
   if (isSingleTenantSSO) {
     // For PPMI use
     const pg = getKysely()
@@ -38,6 +36,10 @@ const getSAMLURLFromEmail = async (
     if (!instanceURL) return null
     return urlWithRelayState(instanceURL, isInvited)
   }
+  if (!email) return null
+  const domainName = getSSODomainFromEmail(email)
+  if (!domainName) return null
+
   const saml = await dataLoader.get('samlByDomain').load(domainName)
   if (!saml) return null
   const {url} = saml

From fa9f8b1efc3329cc8fd35817bd6fa8b5b0e66ab6 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:42:34 +0000
Subject: [PATCH 052/183] chore(release): release v7.21.0 (#9505)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 23 +++++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 7f814dacbc5..3107bf4b240 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.20.0"
+  ".": "7.21.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d762695706..c613055fc36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.21.0](https://github.com/ParabolInc/parabol/compare/v7.20.0...v7.21.0) (2024-03-06)
+
+
+### Added
+
+* make all templates free ([#9503](https://github.com/ParabolInc/parabol/issues/9503)) ([6762ebc](https://github.com/ParabolInc/parabol/commit/6762ebc4068f9062091db7f8d467fecf60388d63))
+* saml login no email, auth design fixups ([#9507](https://github.com/ParabolInc/parabol/issues/9507)) ([4ce391e](https://github.com/ParabolInc/parabol/commit/4ce391e53a11cbd174bf67364db29128afe72092))
+
+
+### Fixed
+
+* upgrade graphql-jit from 0.7.4 to 0.8.4 ([#9495](https://github.com/ParabolInc/parabol/issues/9495)) ([fe1ad43](https://github.com/ParabolInc/parabol/commit/fe1ad434a990ffbfb5c52863988e7f4406d2ac84))
+* upgrade oy-vey from 0.11.2 to 0.12.1 ([#9497](https://github.com/ParabolInc/parabol/issues/9497)) ([1751731](https://github.com/ParabolInc/parabol/commit/17517318502b5aaa0849c8d03c4e068f5da92e82))
+* upgrade sharp from 0.32.6 to 0.33.2 ([#9493](https://github.com/ParabolInc/parabol/issues/9493)) ([9fff933](https://github.com/ParabolInc/parabol/commit/9fff93397e35e2bfeb8f4fbc34c8d535284551eb))
+
+
+### Changed
+
+* bump ts node ([#9498](https://github.com/ParabolInc/parabol/issues/9498)) ([58c5817](https://github.com/ParabolInc/parabol/commit/58c5817463bcb73dbcaa83b05a0d2a201262de77))
+* put server assets on CDN ([#9278](https://github.com/ParabolInc/parabol/issues/9278)) ([06c1f7e](https://github.com/ParabolInc/parabol/commit/06c1f7eec63c6de343181ee1324635c2ae8d286a))
+* remove pg-typed part 1 ([#9508](https://github.com/ParabolInc/parabol/issues/9508)) ([5dfe26b](https://github.com/ParabolInc/parabol/commit/5dfe26b29753f881dc54c35d6dfa15e894f3726a))
+* Update reviewers ([#9504](https://github.com/ParabolInc/parabol/issues/9504)) ([a95fb88](https://github.com/ParabolInc/parabol/commit/a95fb88b9a76e04eb73630404e29e6325dcf1a12))
+
 ## [7.20.0](https://github.com/ParabolInc/parabol/compare/v7.19.7...v7.20.0) (2024-03-01)
 
 
diff --git a/package.json b/package.json
index a2b1c1f913c..dc0564d2e8c 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index b0166f09a82..ab2130ca1fe 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.20.0"
+    "parabol-server": "7.21.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 085bd29d0b3..364c5dbd367 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 5fc6dbb0961..db8f577b591 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.20.0",
-    "parabol-server": "7.20.0",
+    "parabol-client": "7.21.0",
+    "parabol-server": "7.21.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 9053ded2078..b1a78c0c54a 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 6c187954e77..8fcf641b27d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.20.0",
+    "parabol-client": "7.21.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From e7539d152ccfb5fbe12bdcb9b5ce3cc64fd2955c Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:04:47 +0000
Subject: [PATCH 053/183] chore(gh-actions): reporting status to Slack if test
 or build GH Actions fail (#9512)

* chore(gh-actions): reporting status to Slack if test or build GH Actions fail

* chore: remove master branch from the if of report status on the build action, as it only runs  on release-please branches
---
 .github/workflows/build.yml | 9 +++++++++
 .github/workflows/test.yml  | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9e2e74b3df6..4f340977a97 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -137,3 +137,12 @@ jobs:
             --service=parabol-saas-production \
             --release-version=${{env.ACTION_VERSION}} \
             --minified-path-prefix=${{env.CDN_BUILD_URL}}
+
+      - name: Report Status
+        if: failure()
+        uses: ravsamhq/notify-slack-action@v2
+        with:
+          status: ${{ job.status }}
+          notify_when: 'failure'
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 634787a6813..cb6c94bd9a4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -133,3 +133,12 @@ jobs:
           name: test-results
           path: packages/integration-tests/test-results/
           retention-days: 7
+
+      - name: Report Status
+        if: ${{ failure() && github.ref_name == 'master' }}
+        uses: ravsamhq/notify-slack-action@v2
+        with:
+          status: ${{ job.status }}
+          notify_when: 'failure'
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}

From 233841498bf997343f3d94e443104973078bf736 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 7 Mar 2024 15:00:17 +0100
Subject: [PATCH 054/183] feat: Add team sections to the Custom category in
 activity library (#9511)

* feat: Add team sections to the Custom category in activity library

* Clean up create custom activity card
---
 .../ActivityLibrary/ActivityLibrary.tsx       | 145 +++++++++++-------
 .../components/ActivityLibrary/Categories.ts  |   4 +-
 .../ActivityLibrary/CreateActivityCard.tsx    |   4 +-
 3 files changed, 90 insertions(+), 63 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 0b9a4f8d215..921b2bb7b48 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -1,7 +1,7 @@
 import * as ScrollArea from '@radix-ui/react-scroll-area'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import React, {useEffect, useMemo} from 'react'
+import React, {Fragment, useEffect, useMemo} from 'react'
 import {PreloadedQuery, commitLocalUpdate, usePreloadedQuery} from 'react-relay'
 import {Redirect} from 'react-router'
 import {Link} from 'react-router-dom'
@@ -134,17 +134,63 @@ const CategoryIDToColorClass = Object.fromEntries(
 
 export type Template = Omit<ActivityLibrary_template$data, ' $fragmentType'>
 
-type SubCategory = 'popular' | 'recentlyUsed' | 'recentlyUsedInOrg' | 'neverTried' | 'getStarted'
-
-const subCategoryMapping: Record<SubCategory, string> = {
+const MAX_PER_SUBCATEGORY = 6
+const subCategoryMapping = {
   popular: 'Popular templates',
   recentlyUsed: 'You used these recently',
   recentlyUsedInOrg: 'Others in your organization are using',
   neverTried: 'Try these activities',
-  getStarted: 'Activities to get you started'
+  getStarted: 'Activities to get you started',
+  other: 'Other activities'
+} as const
+
+const mapRetroSubCategories = (templates: readonly Template[]) => {
+  const subCategoryTemplates = Object.fromEntries(
+    Object.keys(subCategoryMapping).map((subCategory) => {
+      return [
+        subCategory,
+        templates
+          .filter((template) => template.subCategories?.includes(subCategory))
+          .slice(0, MAX_PER_SUBCATEGORY) as Template[]
+      ]
+    })
+  )
+  //just in case there were values already
+  subCategoryTemplates.other = []
+  subCategoryTemplates.other = templates.filter(
+    (template) =>
+      !Object.values(subCategoryTemplates)
+        .flat()
+        .find((catTemplate) => catTemplate.id === template.id)
+  )
+
+  return Object.fromEntries(
+    Object.entries(subCategoryTemplates).map(([key, value]) => {
+      return [subCategoryMapping[key as keyof typeof subCategoryMapping]!, value]
+    })
+  )
 }
 
-const MAX_PER_SUBCATEGORY = 6
+const mapTeamCategories = (templates: readonly Template[]) => {
+  // list public templates last
+  const publicTemplates = [] as Template[]
+  const mapped = templates.reduce((acc, template) => {
+    const {team, scope} = template
+    if (scope === 'PUBLIC') {
+      publicTemplates.push(template)
+    } else {
+      const {name} = team
+      if (!acc[name]) {
+        acc[name] = []
+      }
+      acc[name]!.push(template)
+    }
+    return acc
+  }, {} as Record<string, Template[]>)
+
+  mapped['Parabol'] = publicTemplates
+  return mapped
+}
 
 export const ActivityLibrary = (props: Props) => {
   const atmosphere = useAtmosphere()
@@ -209,23 +255,24 @@ export const ActivityLibrary = (props: Props) => {
     )
   }, [searchQuery, filteredTemplates, categoryId])
 
-  const subCategoryTemplates = Object.fromEntries(
-    Object.keys(subCategoryMapping).map((subCategory) => {
-      return [
-        subCategory,
-        templatesToRender
-          .filter((template) => template.subCategories?.includes(subCategory))
-          .slice(0, MAX_PER_SUBCATEGORY) as Template[]
-      ]
-    })
-  ) as Record<SubCategory, Template[]>
+  const sectionedTemplates = useMemo(() => {
+    // Show the teams on search as well, because you can search by team name
+    if (categoryId === CUSTOM_CATEGORY_ID || searchQuery.length > 0) {
+      return mapTeamCategories(templatesToRender)
+    }
 
-  const otherTemplates = templatesToRender.filter(
-    (template) =>
-      !Object.values(subCategoryTemplates)
-        .flat()
-        .find((catTemplate) => catTemplate.id === template.id)
-  ) as Template[]
+    if (searchQuery.length > 0) {
+      return undefined
+    }
+
+    if (categoryId === 'retrospective') {
+      return mapRetroSubCategories(templatesToRender)
+    }
+    if (categoryId === 'recommended') {
+      return {[subCategoryMapping.getStarted]: [...templatesToRender]}
+    }
+    return undefined
+  }, [categoryId, templatesToRender])
 
   if (!featureFlags.retrosInDisguise) {
     return <Redirect to='/404' />
@@ -235,10 +282,6 @@ export const ActivityLibrary = (props: Props) => {
     return <Redirect to={`/activity-library/category/${QUICK_START_CATEGORY_ID}`} />
   }
 
-  const selectedCategory = categoryId as CategoryID | typeof QUICK_START_CATEGORY_ID
-  const quickStartTitle =
-    selectedCategory === 'recommended' ? subCategoryMapping['getStarted'] : undefined
-
   return (
     <div className='flex h-full w-full flex-col bg-white'>
       <div className='mx-2 flex'>
@@ -272,7 +315,7 @@ export const ActivityLibrary = (props: Props) => {
             )}
             <Link
               className='rounded-full bg-sky-500 px-4 py-2 text-sm font-medium text-white hover:bg-sky-600'
-              to={`/activity-library/new-activity/${selectedCategory}`}
+              to={`/activity-library/new-activity/${categoryId}`}
             >
               Create custom activity
             </Link>
@@ -297,7 +340,7 @@ export const ActivityLibrary = (props: Props) => {
                 <Link
                   className={clsx(
                     'flex-shrink-0 cursor-pointer rounded-full py-2 px-4 text-sm text-slate-800',
-                    category === selectedCategory && searchQuery.length === 0
+                    category === categoryId && searchQuery.length === 0
                       ? [
                           `${CategoryIDToColorClass[category]}`,
                           'font-semibold text-white focus:text-white'
@@ -326,8 +369,8 @@ export const ActivityLibrary = (props: Props) => {
           )}
           {templatesToRender.length === 0 ? (
             <div className='mx-auto flex p-2 text-slate-700'>
-              <img className='w-32' src={halloweenRetrospectiveTemplate} />
               <div className='ml-10'>
+                <img className='w-32' src={halloweenRetrospectiveTemplate} />
                 <div className='mb-4 text-xl font-semibold'>No results found!</div>
                 <div className='mb-6 max-w-[360px]'>
                   Try tapping a category above, using a different search, or creating exactly what
@@ -340,49 +383,33 @@ export const ActivityLibrary = (props: Props) => {
             </div>
           ) : (
             <>
-              {categoryId === 'retrospective' && searchQuery.length === 0 ? (
+              {sectionedTemplates ? (
                 <>
-                  {(Object.keys(subCategoryMapping) as SubCategory[]).map(
-                    (subCategory) =>
-                      subCategoryTemplates[subCategory].length > 0 && (
-                        <>
-                          <div className='ml-4 mt-8 text-xl font-bold text-slate-700'>
-                            {subCategoryMapping[subCategory]}
-                          </div>
+                  {Object.entries(sectionedTemplates).map(
+                    ([subCategory, subCategoryTemplates]) =>
+                      subCategoryTemplates.length > 0 && (
+                        <Fragment key={subCategory}>
+                          {subCategory && (
+                            <div className='ml-4 mt-8 text-xl font-bold text-slate-700'>
+                              {subCategory}
+                            </div>
+                          )}
                           <div className='mt-1 grid auto-rows-fr grid-cols-[repeat(auto-fill,minmax(min(40%,256px),1fr))] gap-4 px-4 md:mt-4'>
                             <ActivityGrid
-                              templates={subCategoryTemplates[subCategory]}
-                              selectedCategory={selectedCategory}
+                              templates={subCategoryTemplates}
+                              selectedCategory={categoryId}
                             />
                           </div>
-                        </>
+                        </Fragment>
                       )
                   )}
-                  {otherTemplates.length > 0 && (
-                    <>
-                      <div className='ml-4 mt-8 text-xl font-bold text-slate-700'>
-                        Other activities
-                      </div>
-                      <div className='mt-1 grid auto-rows-fr grid-cols-[repeat(auto-fill,minmax(min(40%,256px),1fr))] gap-4 px-4 md:mt-4'>
-                        <ActivityGrid
-                          templates={otherTemplates}
-                          selectedCategory={selectedCategory}
-                        />
-                      </div>
-                    </>
-                  )}
                 </>
               ) : (
                 <>
-                  {quickStartTitle && (
-                    <div className='ml-4 mt-8 text-xl font-bold text-slate-700'>
-                      {quickStartTitle}
-                    </div>
-                  )}
                   <div className='grid auto-rows-fr grid-cols-[repeat(auto-fill,minmax(min(40%,256px),1fr))] gap-4 p-4'>
                     <ActivityGrid
                       templates={templatesToRender as Template[]}
-                      selectedCategory={selectedCategory}
+                      selectedCategory={categoryId}
                     />
                   </div>
                 </>
diff --git a/packages/client/components/ActivityLibrary/Categories.ts b/packages/client/components/ActivityLibrary/Categories.ts
index 4d67a35df6e..e50a16131e6 100644
--- a/packages/client/components/ActivityLibrary/Categories.ts
+++ b/packages/client/components/ActivityLibrary/Categories.ts
@@ -51,14 +51,14 @@ export const CATEGORY_THEMES: Record<AllCategoryID, CardTheme> = {
 
 export const CATEGORY_ID_TO_NAME: Record<AllCategoryID, string> = {
   [QUICK_START_CATEGORY_ID]: 'Quick Start',
+  [CUSTOM_CATEGORY_ID]: 'Custom',
   retrospective: 'Retrospective',
   estimation: 'Estimation',
   standup: 'Standup',
   feedback: 'Feedback',
   strategy: 'Strategy',
   premortem: 'Pre-Mortem',
-  postmortem: 'Post-Mortem',
-  [CUSTOM_CATEGORY_ID]: 'Custom'
+  postmortem: 'Post-Mortem'
 }
 
 export const MEETING_TYPE_TO_CATEGORY: Record<MeetingTypeEnum, CategoryID> = {
diff --git a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
index 0e08be225cf..ea574d4cf1c 100644
--- a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
@@ -19,9 +19,9 @@ const CreateActivityCard = (props: Props) => {
       <ActivityLibraryCard
         className={'flex-1 cursor-pointer'}
         theme={CATEGORY_THEMES[category]}
-        badge={<ActivityBadge className='mx-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>}
+        badge={<ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>}
       >
-        <div className='flex flex-1 flex-col items-center justify-center text-center font-semibold md:mx-10'>
+        <div className='flex h-full w-full flex-col items-center justify-center pb-2 font-semibold'>
           <div className='h-12 w-12'>
             <AddIcon className='h-full w-full text-slate-700' />
           </div>

From af47966d6c07b295536327a3ee4d6bac1fece57b Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 7 Mar 2024 11:37:07 -0800
Subject: [PATCH 055/183] fix: recreate lockfile (#9516)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/validate_pr_title.yml |  5 +-
 yarn.lock                               | 64 +++++++++++++++++--------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/validate_pr_title.yml b/.github/workflows/validate_pr_title.yml
index 629ae6230e4..1e5a2d91a2a 100644
--- a/.github/workflows/validate_pr_title.yml
+++ b/.github/workflows/validate_pr_title.yml
@@ -14,9 +14,6 @@ jobs:
     name: Validate PR title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v4
+      - uses: amannn/action-semantic-pull-request@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          # See https://github.com/marketplace/actions/semantic-pull-request for details on other available options
-          validateSingleCommit: true
diff --git a/yarn.lock b/yarn.lock
index 976027c679f..af959f0896f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3203,6 +3203,13 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
   integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
 
+"@fastify/merge-json-schemas@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@fastify/merge-json-schemas/-/merge-json-schemas-0.1.1.tgz#3551857b8a17a24e8c799e9f51795edb07baa0bc"
+  integrity sha512-fERDVz7topgNjtXsJTTW1JKLy0rhuLRcquYqNR9rF7OcVpCa2OVW49ZPDIhaRRCaUuvVxI+N416xUoF76HNSXA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@floating-ui/core@^1.3.1":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.3.1.tgz#4d795b649cc3b1cbb760d191c80dcb4353c9a366"
@@ -8595,7 +8602,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.11.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -8605,7 +8612,7 @@ ajv@^6.10.0, ajv@^6.11.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.12.0, ajv@^8.6.0, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.10.0, ajv@^8.12.0, ajv@^8.6.0, ajv@^8.8.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -11960,14 +11967,18 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-sta
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-json-stringify@^1.21.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-1.21.0.tgz#51bc8c6d77d8c7b2cc7e5fa754f7f909f9e1262f"
-  integrity sha512-xY6gyjmHN3AK1Y15BCbMpeO9+dea5ePVsp3BouHCdukcx0hOHbXwFhRodhcI0NpZIgDChSeAKkHW9YjKvhwKBA==
+fast-json-stringify@^5.7.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stringify/-/fast-json-stringify-5.12.0.tgz#e9f77dc0b4face74351320c3618f1d869de5cb18"
+  integrity sha512-7Nnm9UPa7SfHRbHVA1kJQrGXCRzB7LMlAAqHXQFkEQqueJm1V8owm0FsE/2Do55/4CcdhwiLQERaKomOnKQkyA==
   dependencies:
-    ajv "^6.11.0"
-    deepmerge "^4.2.2"
-    string-similarity "^4.0.1"
+    "@fastify/merge-json-schemas" "^0.1.0"
+    ajv "^8.10.0"
+    ajv-formats "^2.1.1"
+    fast-deep-equal "^3.1.3"
+    fast-uri "^2.1.0"
+    json-schema-ref-resolver "^1.0.1"
+    rfdc "^1.2.0"
 
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
@@ -11991,6 +12002,11 @@ fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
   resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867"
   integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==
 
+fast-uri@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-2.3.0.tgz#bdae493942483d299e7285dcb4627767d42e2793"
+  integrity sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==
+
 fast-url-parser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
@@ -12894,15 +12910,14 @@ graphql-executor@0.0.22:
   resolved "https://registry.yarnpkg.com/graphql-executor/-/graphql-executor-0.0.22.tgz#14bc466bb27ab38346998e0b375cba55685eed94"
   integrity sha512-WbKSnSHFn6REKKH4T6UAwDM3mLUnYMQlQLNG0Fw+Lkb3ilCnL3m5lkJ7411LAI9sF7BvPbthovVZhsEUh9Xfag==
 
-graphql-jit@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/graphql-jit/-/graphql-jit-0.7.4.tgz#bc8ccf79596d13dff3835902a466f9a5ecc3a8c1"
-  integrity sha512-kWyHmsQtKMD6xcKDgf4dgPLyIZhviqA6IWGdnA0ElL9wgrIOTxf3eI4c0/U3tnoAU3t09zliVCfDkfIptzYjIA==
+graphql-jit@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/graphql-jit/-/graphql-jit-0.8.4.tgz#53c2e43b90ec98ea0942f4062516de910fbff709"
+  integrity sha512-4KRrJ1ROy3Usgbl3eAoUMfdfZCRjkcw9cCGT7QwTUIHm9dPGaSaldxzGUttyjErU0rsYEb6WWyb6mMh5r6lEoQ==
   dependencies:
-    "@graphql-typed-document-node/core" "^3.1.1"
-    fast-json-stringify "^1.21.0"
+    "@graphql-typed-document-node/core" "^3.2.0"
+    fast-json-stringify "^5.7.0"
     generate-function "^2.3.1"
-    json-schema "^0.4.0"
     lodash.memoize "^4.1.2"
     lodash.merge "4.6.2"
     lodash.mergewith "4.6.2"
@@ -14679,6 +14694,13 @@ json-schema-merge-allof@^0.8.1:
     json-schema-compare "^0.2.2"
     lodash "^4.17.20"
 
+json-schema-ref-resolver@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-schema-ref-resolver/-/json-schema-ref-resolver-1.0.1.tgz#6586f483b76254784fc1d2120f717bdc9f0a99bf"
+  integrity sha512-EJAj1pgHc1hxF6vo2Z3s69fMjO1INq6eGHXZ8Z6wCQeldCuwxGK9Sxf4/cScGn3FZubCVUehfWtcDM/PLteCQw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 json-schema-to-ts@^2.6.2-beta.0:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/json-schema-to-ts/-/json-schema-to-ts-2.8.2.tgz#233b810b73f01e0ab93ad06ddccb1c2b98f23b8d"
@@ -18974,6 +18996,11 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+rfdc@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
+  integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
+
 rfdc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
@@ -19897,11 +19924,6 @@ string-similarity@^3.0.0:
   resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-3.0.0.tgz#07b0bc69fae200ad88ceef4983878d03793847c7"
   integrity sha512-7kS7LyTp56OqOI2BDWQNVnLX/rCxIQn+/5M0op1WV6P8Xx6TZNdajpuqQdiJ7Xx+p1C5CsWMvdiBp9ApMhxzEQ==
 
-string-similarity@^4.0.1:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b"
-  integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==
-
 "string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"

From f351cf9f5a894fe019f331cc0ec6f012a0779c42 Mon Sep 17 00:00:00 2001
From: Bartosz Jarocki <jarocki.bartek@gmail.com>
Date: Fri, 8 Mar 2024 14:14:15 +0100
Subject: [PATCH 056/183] feat: managing teams (#9285)

Co-authored-by: Marcus Wermuth <hello@marcuswermuth.com>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
---
 .vscode/launch.json                           |   4 +-
 .../client/components/DeleteTeamDialog.tsx    |  74 +++++
 .../client/components/OrgAdminActionMenu.tsx  |  93 +++++++
 .../components/OrgBilling/Organization.tsx    |  22 +-
 .../components/OrgMembers/OrgMembers.tsx      |   5 +
 .../OrgTeamMembers/OrgTeamMemberMenu.tsx      |  71 +++++
 .../OrgTeamMembers/OrgTeamMembers.tsx         | 104 +++++++
 .../OrgTeamMembers/OrgTeamMembersMenu.tsx     |  26 ++
 .../OrgTeamMembers/OrgTeamMembersRoot.tsx     |  25 ++
 .../OrgTeamMembers/OrgTeamMembersRow.tsx      | 117 ++++++++
 .../components/OrgTeams/OrgTeams.tsx          |  57 ++--
 .../components/OrgTeams/OrgTeamsRow.tsx       |  51 ++--
 .../components/OrgUserRow/OrgMemberRow.tsx    | 258 ++++++++++++------
 .../containers/OrgMembers/OrgMembersRoot.tsx  |   1 +
 .../client/mutations/ArchiveTeamMutation.ts   |   8 +
 packages/client/package.json                  |   2 +
 .../client/ui/AlertDialog/AlertDialog.tsx     |   5 +
 .../ui/AlertDialog/AlertDialogAction.tsx      |  18 ++
 .../ui/AlertDialog/AlertDialogCancel.tsx      |  18 ++
 .../ui/AlertDialog/AlertDialogContent.tsx     |  23 ++
 .../ui/AlertDialog/AlertDialogDescription.tsx |  15 +
 .../ui/AlertDialog/AlertDialogFooter.tsx      |  10 +
 .../ui/AlertDialog/AlertDialogHeader.tsx      |   7 +
 .../ui/AlertDialog/AlertDialogOverlay.tsx     |  18 ++
 .../ui/AlertDialog/AlertDialogPortal.tsx      |   3 +
 .../ui/AlertDialog/AlertDialogTitle.tsx       |  15 +
 .../ui/AlertDialog/AlertDialogTrigger.tsx     |   3 +
 packages/client/ui/Avatar/Avatar.tsx          |  16 ++
 packages/client/ui/Avatar/AvatarFallback.tsx  |  19 ++
 packages/client/ui/Avatar/AvatarImage.tsx     |  16 ++
 packages/client/ui/Button/Button.tsx          |  21 +-
 packages/server/graphql/types/Organization.ts |  17 +-
 packages/server/utils/authorization.ts        |  25 +-
 yarn.lock                                     |  56 ++++
 34 files changed, 1058 insertions(+), 165 deletions(-)
 create mode 100644 packages/client/components/DeleteTeamDialog.tsx
 create mode 100644 packages/client/components/OrgAdminActionMenu.tsx
 create mode 100644 packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
 create mode 100644 packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
 create mode 100644 packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
 create mode 100644 packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
 create mode 100644 packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialog.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogAction.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogCancel.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogContent.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogDescription.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogFooter.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogHeader.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogOverlay.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogPortal.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogTitle.tsx
 create mode 100644 packages/client/ui/AlertDialog/AlertDialogTrigger.tsx
 create mode 100644 packages/client/ui/Avatar/Avatar.tsx
 create mode 100644 packages/client/ui/Avatar/AvatarFallback.tsx
 create mode 100644 packages/client/ui/Avatar/AvatarImage.tsx

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2d3b6382f4e..a7fe78cf299 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -30,7 +30,7 @@
     {
       "name": "Launch Chrome",
       "request": "launch",
-      "type": "pwa-chrome",
+      "type": "chrome",
       "url": "http://localhost:3000",
       "webRoot": "${workspaceFolder}"
     },
@@ -38,7 +38,7 @@
       "type": "node",
       "request": "launch",
       "name": "Debug Executor",
-      "program": "scripts/runExecutor.js",
+      "program": "scripts/runExecutor.js"
     },
     {
       "type": "node",
diff --git a/packages/client/components/DeleteTeamDialog.tsx b/packages/client/components/DeleteTeamDialog.tsx
new file mode 100644
index 00000000000..d6bb993bbde
--- /dev/null
+++ b/packages/client/components/DeleteTeamDialog.tsx
@@ -0,0 +1,74 @@
+import React, {useState} from 'react'
+import FlatPrimaryButton from './FlatPrimaryButton'
+import {Input} from '../ui/Input/Input'
+import {Dialog} from '../ui/Dialog/Dialog'
+import {DialogContent} from '../ui/Dialog/DialogContent'
+import {DialogTitle} from '../ui/Dialog/DialogTitle'
+import {DialogActions} from '../ui/Dialog/DialogActions'
+import useMutationProps from '../hooks/useMutationProps'
+import SecondaryButton from './SecondaryButton'
+import ArchiveTeamMutation from '../mutations/ArchiveTeamMutation'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useRouter from '../hooks/useRouter'
+
+interface Props {
+  isOpen: boolean
+  onClose: () => void
+  onDeleteTeam: (teamId: string) => void
+  teamId: string
+  teamName: string
+  teamOrgId: string
+}
+
+const DeleteTeamDialog = (props: Props) => {
+  const atmosphere = useAtmosphere()
+  const {history} = useRouter()
+  const {isOpen, onClose, teamId, teamName, teamOrgId, onDeleteTeam} = props
+
+  const {submitting, onCompleted, onError, error, submitMutation} = useMutationProps()
+
+  const [typedTeamName, setTypedTeamName] = useState(false)
+
+  const handleDeleteTeam = () => {
+    if (submitting) return
+    submitMutation()
+    ArchiveTeamMutation(atmosphere, {teamId}, {history, onError, onCompleted})
+    onDeleteTeam(teamId)
+    history.push(`/me/organizations/${teamOrgId}/teams`)
+  }
+
+  return (
+    <Dialog isOpen={isOpen} onClose={onClose}>
+      <DialogContent className='z-10'>
+        <DialogTitle className='mb-4'>Delete Team</DialogTitle>
+
+        <fieldset className='mx-0 mb-6 flex w-full flex-col p-0'>
+          <label className='mb-3 text-left text-sm font-semibold text-slate-600'>
+            Please type your team name to confirm. <b>This action can't be undone.</b>
+          </label>
+          <Input
+            autoFocus
+            onChange={(e) => {
+              e.preventDefault()
+              if (e.target.value === teamName) setTypedTeamName(true)
+              else setTypedTeamName(false)
+            }}
+            placeholder={teamName}
+          />
+          {error && (
+            <div className='mt-2 text-sm font-semibold text-tomato-500'>{error.message}</div>
+          )}
+        </fieldset>
+
+        <DialogActions>
+          <FlatPrimaryButton size='medium' onClick={handleDeleteTeam} disabled={!typedTeamName}>
+            I understand the consequences, delete this team
+          </FlatPrimaryButton>
+          <SecondaryButton onClick={onClose}>Cancel</SecondaryButton>
+        </DialogActions>
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+export default DeleteTeamDialog
diff --git a/packages/client/components/OrgAdminActionMenu.tsx b/packages/client/components/OrgAdminActionMenu.tsx
new file mode 100644
index 00000000000..19799e08abb
--- /dev/null
+++ b/packages/client/components/OrgAdminActionMenu.tsx
@@ -0,0 +1,93 @@
+import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
+import {useFragment} from 'react-relay'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import {MenuProps} from '../hooks/useMenu'
+import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation'
+import useMutationProps from '../hooks/useMutationProps'
+import {OrgAdminActionMenu_organization$key} from '../__generated__/OrgAdminActionMenu_organization.graphql'
+import {OrgAdminActionMenu_organizationUser$key} from '../__generated__/OrgAdminActionMenu_organizationUser.graphql'
+import Menu from './Menu'
+import MenuItem from './MenuItem'
+
+interface Props {
+  menuProps: MenuProps
+  isViewerLastOrgAdmin: boolean
+  organizationUser: OrgAdminActionMenu_organizationUser$key
+  organization: OrgAdminActionMenu_organization$key
+  toggleLeave: () => void
+  toggleRemove: () => void
+}
+
+const OrgAdminActionMenu = (props: Props) => {
+  const {
+    menuProps,
+    isViewerLastOrgAdmin,
+    organizationUser: organizationUserRef,
+    organization: organizationRef,
+    toggleLeave,
+    toggleRemove
+  } = props
+  const organization = useFragment(
+    graphql`
+      fragment OrgAdminActionMenu_organization on Organization {
+        id
+      }
+    `,
+    organizationRef
+  )
+  const organizationUser = useFragment(
+    graphql`
+      fragment OrgAdminActionMenu_organizationUser on OrganizationUser {
+        role
+        user {
+          id
+        }
+      }
+    `,
+    organizationUserRef
+  )
+  const atmosphere = useAtmosphere()
+  const {onError, onCompleted, submitting, submitMutation} = useMutationProps()
+  const {id: orgId} = organization
+  const {viewerId} = atmosphere
+  const {role, user} = organizationUser
+  const {id: userId} = user
+
+  const setRole =
+    (role: 'ORG_ADMIN' | 'BILLING_LEADER' | null = null) =>
+    () => {
+      if (submitting) return
+      submitMutation()
+      const variables = {orgId, userId, role}
+      SetOrgUserRoleMutation(atmosphere, variables, {onError, onCompleted})
+    }
+
+  const isOrgAdmin = role === 'ORG_ADMIN'
+  const isBillingLeader = role === 'BILLING_LEADER'
+  const isSelf = viewerId === userId
+  const canRemoveSelf = isSelf && !isViewerLastOrgAdmin
+  const roleName = role === 'ORG_ADMIN' ? 'Org Admin' : 'Billing Leader'
+
+  return (
+    <>
+      <Menu ariaLabel={'Select your action'} {...menuProps}>
+        {!isOrgAdmin && <MenuItem label='Promote to Org Admin' onClick={setRole('ORG_ADMIN')} />}
+        {!isOrgAdmin && !isBillingLeader && (
+          <MenuItem label='Promote to Billing Leader' onClick={setRole('BILLING_LEADER')} />
+        )}
+        {isOrgAdmin && !isSelf && (
+          <MenuItem label='Change to Billing Leader' onClick={setRole('BILLING_LEADER')} />
+        )}
+        {((role && !isSelf) || canRemoveSelf) && (
+          <MenuItem label={`Remove ${roleName} role`} onClick={setRole(null)} />
+        )}
+        {canRemoveSelf && <MenuItem label='Leave Organization' onClick={toggleLeave} />}
+        {!isSelf && <MenuItem label='Remove from Organization' onClick={toggleRemove} />}
+        {isSelf && !canRemoveSelf && <MenuItem label='Contact support@parabol.co to be removed' />}
+      </Menu>
+    </>
+  )
+}
+
+export default OrgAdminActionMenu
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
index 36ea78f60e3..ceab6eb6e09 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
@@ -21,6 +21,10 @@ const OrgMembers = lazy(
     import(/* webpackChunkName: 'OrgMembersRoot' */ '../../containers/OrgMembers/OrgMembersRoot')
 )
 
+const OrgTeamMembers = lazy(
+  () => import(/* webpackChunkName: 'OrgTeamMembers' */ '../OrgTeamMembers/OrgTeamMembersRoot')
+)
+
 const OrgDetails = lazy(() => import(/* webpackChunkName: 'OrgDetails' */ './OrgDetails'))
 const Authentication = lazy(
   () =>
@@ -70,13 +74,7 @@ const Organization = (props: Props) => {
           path={`${match.url}/${BILLING_PAGE}`}
           render={() => <OrgPlansAndBillingRoot organizationRef={organization} />}
         />
-        {isBillingLeader && (
-          <Route
-            exact
-            path={`${match.url}/${TEAMS_PAGE}`}
-            render={() => <OrgTeams organizationRef={organization} />}
-          />
-        )}
+
         <Route
           exact
           path={`${match.url}/${MEMBERS_PAGE}`}
@@ -92,6 +90,16 @@ const Organization = (props: Props) => {
           path={`${match.url}/${AUTHENTICATION_PAGE}`}
           render={(p) => <Authentication {...p} orgId={orgId} />}
         />
+        {isBillingLeader && (
+          <>
+            <Route
+              exact
+              path={`${match.url}/${TEAMS_PAGE}`}
+              render={() => <OrgTeams organizationRef={organization} />}
+            />
+            <Route exact path={`${match.url}/${TEAMS_PAGE}/:teamId`} component={OrgTeamMembers} />
+          </>
+        )}
       </Switch>
     </section>
   )
diff --git a/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx b/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx
index a4d365a8e91..e56be6deb45 100644
--- a/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx
+++ b/packages/client/modules/userDashboard/components/OrgMembers/OrgMembers.tsx
@@ -75,6 +75,10 @@ const OrgMembers = (props: Props) => {
       ['BILLING_LEADER', 'ORG_ADMIN'].includes(node.role ?? '') ? count + 1 : count,
     0
   )
+  const orgAdminCount = organizationUsers.edges.reduce(
+    (count, {node}) => (['ORG_ADMIN'].includes(node.role ?? '') ? count + 1 : count),
+    0
+  )
 
   const exportToCSV = async () => {
     const rows = organizationUsers.edges.map((orgUser, idx) => {
@@ -117,6 +121,7 @@ const OrgMembers = (props: Props) => {
           <OrgMemberRow
             key={organizationUser.id}
             billingLeaderCount={billingLeaderCount}
+            orgAdminCount={orgAdminCount}
             organizationUser={organizationUser}
             organization={organization}
           />
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
new file mode 100644
index 00000000000..7526eb55775
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
@@ -0,0 +1,71 @@
+import styled from '@emotion/styled'
+import React from 'react'
+import graphql from 'babel-plugin-relay/macro'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import {useFragment} from 'react-relay'
+import {MenuProps} from '../../../../hooks/useMenu'
+import Menu from '../../../../components/Menu'
+import MenuItem from '../../../../components/MenuItem'
+import MenuItemLabel from '../../../../components/MenuItemLabel'
+import {OrgTeamMemberMenu_teamMember$key} from '../../../../__generated__/OrgTeamMemberMenu_teamMember.graphql'
+
+interface OrgTeamMemberMenuProps {
+  isLead: boolean
+  menuProps: MenuProps
+  isViewerLead: boolean
+  isViewerOrgAdmin: boolean
+  manageTeamMemberId?: string | null
+  teamMember: OrgTeamMemberMenu_teamMember$key
+  handleNavigate?: () => void
+  togglePromote: () => void
+  toggleRemove: () => void
+}
+
+const StyledLabel = styled(MenuItemLabel)({
+  padding: '4px 16px'
+})
+
+export const OrgTeamMemberMenu = (props: OrgTeamMemberMenuProps) => {
+  const {
+    isViewerLead,
+    isViewerOrgAdmin,
+    teamMember: teamMemberRef,
+    menuProps,
+    togglePromote,
+    toggleRemove
+  } = props
+  const teamMember = useFragment(
+    graphql`
+      fragment OrgTeamMemberMenu_teamMember on TeamMember {
+        isSelf
+        preferredName
+        userId
+        isLead
+      }
+    `,
+    teamMemberRef
+  )
+  const atmosphere = useAtmosphere()
+  const {preferredName, userId} = teamMember
+  const {viewerId} = atmosphere
+  const isSelf = userId === viewerId
+  const isViewerTeamAdmin = isViewerLead || isViewerOrgAdmin
+
+  return (
+    <Menu ariaLabel={'Select your action'} {...menuProps}>
+      {isViewerTeamAdmin && (!isSelf || !isViewerLead) && (
+        <MenuItem
+          label={<StyledLabel>Promote {preferredName} to Team Lead</StyledLabel>}
+          key='promote'
+          onClick={togglePromote}
+        />
+      )}
+      {isViewerTeamAdmin && !isSelf && (
+        <MenuItem
+          label={<StyledLabel>Remove {preferredName} from Team</StyledLabel>}
+          onClick={toggleRemove}
+        />
+      )}
+    </Menu>
+  )
+}
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
new file mode 100644
index 00000000000..602a4b48ee5
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
@@ -0,0 +1,104 @@
+import React from 'react'
+import graphql from 'babel-plugin-relay/macro'
+import {ArrowBack} from '@mui/icons-material'
+import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {OrgTeamMembersQuery} from '../../../../__generated__/OrgTeamMembersQuery.graphql'
+import {OrgTeamMembersRow} from './OrgTeamMembersRow'
+import {Button} from '../../../../ui/Button/Button'
+import {Link} from 'react-router-dom'
+import {ORGANIZATIONS} from '../../../../utils/constants'
+import {MenuPosition} from '../../../../hooks/useCoords'
+import useMenu from '../../../../hooks/useMenu'
+import {OrgTeamMembersMenu} from './OrgTeamMembersMenu'
+import {useDialogState} from '../../../../ui/Dialog/useDialogState'
+import DeleteTeamDialog from '../../../../components/DeleteTeamDialog'
+
+interface Props {
+  queryRef: PreloadedQuery<OrgTeamMembersQuery>
+}
+
+const query = graphql`
+  query OrgTeamMembersQuery($teamId: ID!) {
+    viewer {
+      team(teamId: $teamId) {
+        ...ArchiveTeam_team
+        id
+        billingTier
+        isOrgAdmin
+        isViewerLead
+        name
+        orgId
+        teamMembers(sortBy: "preferredName") {
+          id
+          isNotRemoved
+          ...AddTeamMemberModal_teamMembers
+          ...OrgTeamMembersRow_teamMember
+        }
+        tier
+      }
+    }
+  }
+`
+
+export const OrgTeamMembers = (props: Props) => {
+  const {queryRef} = props
+  const data = usePreloadedQuery<OrgTeamMembersQuery>(query, queryRef)
+  const {viewer} = data
+  const {team} = viewer
+  const {menuPortal, menuProps} = useMenu(MenuPosition.UPPER_RIGHT)
+
+  const {
+    open: openDeleteTeamDialog,
+    close: closeDeleteTeamDialog,
+    isOpen: isDeleteTeamDialogOpened
+  } = useDialogState()
+
+  if (!team) return null
+  const {isViewerLead, isOrgAdmin: isViewerOrgAdmin, teamMembers} = team
+
+  return (
+    <div className='max-w-4xl pb-4'>
+      <div className='flex items-center justify-center py-1'>
+        <div className='flex items-center'>
+          <Button size='md' shape='circle' variant='ghost' asChild>
+            <Link to={`/me/${ORGANIZATIONS}/${team.orgId}/teams`}>
+              <ArrowBack />
+            </Link>
+          </Button>
+          <h1 className='flex-1 text-2xl font-semibold leading-7'>{team.name}</h1>
+        </div>
+      </div>
+
+      <div className='divide-y divide-slate-300 overflow-hidden rounded-md border border-slate-300 bg-white shadow-sm'>
+        <div className='bg-slate-100 px-4 py-2'>
+          <div className='flex w-full justify-between'>
+            <div className='flex items-center font-bold'>{teamMembers.length} Active</div>
+          </div>
+        </div>
+        {teamMembers.map((teamMember) => (
+          <OrgTeamMembersRow
+            isViewerLead={isViewerLead}
+            isViewerOrgAdmin={isViewerOrgAdmin}
+            teamMemberRef={teamMember}
+            key={teamMember.id}
+          />
+        ))}
+      </div>
+
+      {menuPortal(
+        <OrgTeamMembersMenu menuProps={menuProps} openDeleteTeamModal={openDeleteTeamDialog} />
+      )}
+
+      {isDeleteTeamDialogOpened ? (
+        <DeleteTeamDialog
+          isOpen={isDeleteTeamDialogOpened}
+          teamId={team.id}
+          teamName={team.name}
+          teamOrgId={team.orgId}
+          onDeleteTeam={closeDeleteTeamDialog}
+          onClose={closeDeleteTeamDialog}
+        />
+      ) : null}
+    </div>
+  )
+}
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
new file mode 100644
index 00000000000..bc53031bfc8
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
@@ -0,0 +1,26 @@
+import React from 'react'
+import {MenuProps} from '../../../../hooks/useMenu'
+import Menu from '../../../../components/Menu'
+import MenuItem from '../../../../components/MenuItem'
+
+interface OrgTeamMembersMenuProps {
+  menuProps: MenuProps
+  openDeleteTeamModal: () => void
+}
+
+export const OrgTeamMembersMenu = (props: OrgTeamMembersMenuProps) => {
+  const {menuProps, openDeleteTeamModal} = props
+  const {closePortal} = menuProps
+
+  return (
+    <Menu ariaLabel={'Select your action'} {...menuProps}>
+      <MenuItem
+        label='Delete team'
+        onClick={() => {
+          closePortal()
+          openDeleteTeamModal()
+        }}
+      />
+    </Menu>
+  )
+}
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
new file mode 100644
index 00000000000..c0c959d084c
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
@@ -0,0 +1,25 @@
+import React, {Suspense} from 'react'
+import orgTeamMembersQuery, {OrgTeamMembersQuery} from '~/__generated__/OrgTeamMembersQuery.graphql'
+import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
+import {LoaderSize} from '../../../../types/constEnums'
+import {Loader} from '../../../../utils/relay/renderLoader'
+import {OrgTeamMembers} from './OrgTeamMembers'
+import useRouter from '../../../../hooks/useRouter'
+
+const OrgTeamMembersRoot = () => {
+  const {match} = useRouter<{teamId: string}>()
+  const {
+    params: {teamId}
+  } = match
+  const queryRef = useQueryLoaderNow<OrgTeamMembersQuery>(orgTeamMembersQuery, {
+    teamId
+  })
+
+  return (
+    <Suspense fallback={<Loader size={LoaderSize.PANEL} />}>
+      {queryRef && <OrgTeamMembers queryRef={queryRef} />}
+    </Suspense>
+  )
+}
+
+export default OrgTeamMembersRoot
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
new file mode 100644
index 00000000000..02b643f744f
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
@@ -0,0 +1,117 @@
+import React from 'react'
+import graphql from 'babel-plugin-relay/macro'
+import {useFragment} from 'react-relay'
+import {OrgTeamMembersRow_teamMember$key} from '../../../../__generated__/OrgTeamMembersRow_teamMember.graphql'
+import {Avatar} from '../../../../ui/Avatar/Avatar'
+import {AvatarFallback} from '../../../../ui/Avatar/AvatarFallback'
+import {AvatarImage} from '../../../../ui/Avatar/AvatarImage'
+import {Button} from '../../../../ui/Button/Button'
+import {MoreVert} from '@mui/icons-material'
+import {OrgTeamMemberMenu} from './OrgTeamMemberMenu'
+import {MenuPosition} from '../../../../hooks/useCoords'
+import useMenu from '../../../../hooks/useMenu'
+import PromoteTeamMemberModal from '../../../teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal'
+import RemoveTeamMemberModal from '../../../teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal'
+import useModal from '../../../../hooks/useModal'
+import useAtmosphere from '../../../../hooks/useAtmosphere'
+
+type Props = {
+  teamMemberRef: OrgTeamMembersRow_teamMember$key
+  isViewerLead: boolean
+  isViewerOrgAdmin: boolean
+}
+
+export const OrgTeamMembersRow = (props: Props) => {
+  const {teamMemberRef} = props
+  const teamMember = useFragment(
+    graphql`
+      fragment OrgTeamMembersRow_teamMember on TeamMember {
+        ...OrgTeamMemberMenu_teamMember
+        userId
+        picture
+        preferredName
+        isLead
+        isOrgAdmin
+        isSelf
+        email
+        ...PromoteTeamMemberModal_teamMember
+        ...RemoveTeamMemberModal_teamMember
+      }
+    `,
+    teamMemberRef
+  )
+
+  const {isViewerLead, isViewerOrgAdmin} = props
+  const {isLead, isOrgAdmin, userId} = teamMember
+
+  const atmosphere = useAtmosphere()
+  const {viewerId} = atmosphere
+  const isSelf = userId === viewerId
+
+  const showMenuButton = (isViewerOrgAdmin && !isLead) || (isViewerLead && !isSelf && !isOrgAdmin)
+
+  const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_RIGHT)
+  const {
+    closePortal: closePromote,
+    togglePortal: togglePromote,
+    modalPortal: portalPromote
+  } = useModal()
+  const {
+    closePortal: closeRemove,
+    togglePortal: toggleRemove,
+    modalPortal: portalRemove
+  } = useModal()
+
+  return (
+    <div className='flex w-full items-center justify-center gap-4 p-4'>
+      <div>
+        <Avatar className='h-8 w-8'>
+          <AvatarImage src={teamMember.picture} alt={teamMember.preferredName} />
+          <AvatarFallback>{teamMember.preferredName.substring(0, 2)}</AvatarFallback>
+        </Avatar>
+      </div>
+      <div className='flex w-full flex-col gap-y-1 py-1'>
+        <div className='text-gray-700 inline-flex items-center gap-x-2 text-lg font-bold'>
+          {teamMember.preferredName}{' '}
+          {teamMember.isLead ? (
+            <span className='rounded-full bg-primary px-2 py-0.5 text-xs text-white'>
+              Team Lead
+            </span>
+          ) : null}
+        </div>
+        <div>
+          <Button asChild variant='link'>
+            <a href={`mailto:${teamMember.email}`}>{teamMember.email}</a>
+          </Button>
+        </div>
+      </div>
+      <div>
+        {showMenuButton && (
+          <Button
+            disabled={!showMenuButton}
+            shape='circle'
+            variant='ghost'
+            onClick={togglePortal}
+            ref={originRef}
+          >
+            <MoreVert />
+          </Button>
+        )}
+        {menuPortal(
+          <OrgTeamMemberMenu
+            menuProps={menuProps}
+            isLead={teamMember.isLead}
+            teamMember={teamMember}
+            isViewerLead={isViewerLead}
+            isViewerOrgAdmin={isViewerOrgAdmin}
+            togglePromote={togglePromote}
+            toggleRemove={toggleRemove}
+          />
+        )}
+      </div>
+
+      {portalPromote(<PromoteTeamMemberModal teamMember={teamMember} closePortal={closePromote} />)}
+      {portalRemove(<RemoveTeamMemberModal teamMember={teamMember} closePortal={closeRemove} />)}
+    </div>
+  )
+}
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
index e9bd39f71d7..3f544d7dd27 100644
--- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
@@ -1,16 +1,12 @@
 import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
-import styled from '@emotion/styled'
-import Row from '../../../../components/Row/Row'
-import Panel from '../../../../components/Panel/Panel'
-import {ElementWidth} from '../../../../types/constEnums'
 import {useFragment} from 'react-relay'
 import OrgTeamsRow from './OrgTeamsRow'
 import {OrgTeams_organization$key} from '../../../../__generated__/OrgTeams_organization.graphql'
-
-const StyledPanel = styled(Panel)({
-  maxWidth: ElementWidth.PANEL_WIDTH
-})
+import AddTeamDialogRoot from '../../../../components/AddTeamDialogRoot'
+import {Button} from '../../../../ui/Button/Button'
+import {useDialogState} from '../../../../ui/Dialog/useDialogState'
+import plural from '../../../../utils/plural'
 
 type Props = {
   organizationRef: OrgTeams_organization$key
@@ -31,23 +27,48 @@ const OrgTeams = (props: Props) => {
     `,
     organizationRef
   )
+  const {
+    open: openAddTeamDialog,
+    close: closeAddTeamDialog,
+    isOpen: isAddTeamDialogOpened
+  } = useDialogState()
+
   const {allTeams, isBillingLeader} = organization
   if (!isBillingLeader) return null
+
   return (
-    <>
-      <h1>{'Teams'}</h1>
-      <StyledPanel>
-        <Row>
-          <div className='flex w-full justify-between px-4'>
-            <div className='flex items-center font-bold'>Team Name</div>
-            <div className='flex items-center font-bold'>Lead</div>
+    <div className='max-w-4xl pb-4'>
+      <div className='flex items-center justify-center py-1'>
+        <h1 className='flex-1 text-2xl font-semibold leading-7'>Teams</h1>
+        <div className='ml-auto'>
+          <Button
+            variant='secondary'
+            shape='pill'
+            className='text-md w-32 py-2'
+            onClick={openAddTeamDialog}
+          >
+            Add team
+          </Button>
+        </div>
+      </div>
+
+      <div className='divide-y divide-slate-300 overflow-hidden rounded-md border border-slate-300 bg-white shadow-sm'>
+        <div className='bg-slate-100 px-4 py-2'>
+          <div className='flex w-full justify-between'>
+            <div className='flex items-center font-bold'>
+              {allTeams.length} {plural(allTeams.length, 'Team')}
+            </div>
           </div>
-        </Row>
+        </div>
         {allTeams.map((team) => (
           <OrgTeamsRow key={team.id} teamRef={team} />
         ))}
-      </StyledPanel>
-    </>
+      </div>
+
+      {isAddTeamDialogOpened ? (
+        <AddTeamDialogRoot onAddTeam={closeAddTeamDialog} onClose={closeAddTeamDialog} />
+      ) : null}
+    </div>
   )
 }
 
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
index 00123a43b5d..d6da2e5e6c6 100644
--- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
 import {Link} from 'react-router-dom'
 import graphql from 'babel-plugin-relay/macro'
-import Row from '../../../../components/Row/Row'
 import {useFragment} from 'react-relay'
+import {ChevronRight} from '@mui/icons-material'
+
 import plural from '../../../../utils/plural'
 import {OrgTeamsRow_team$key} from '../../../../__generated__/OrgTeamsRow_team.graphql'
 
@@ -30,42 +31,26 @@ const OrgTeamsRow = (props: Props) => {
   )
   const {id: teamId, teamMembers, name} = team
   const teamMembersCount = teamMembers.length
-  const teamLeadEmail = teamMembers.find((member) => member.isLead)?.email ?? ''
-  const isViewerTeamLead = teamMembers.some(
-    (member) => member.isSelf && (member.isLead || member.isOrgAdmin)
-  )
+
   return (
-    <Row>
-      <div className='flex w-full flex-col px-4 py-1'>
-        <div className='text-gray-700 text-lg font-bold'>{name}</div>
-        <div className='flex items-center justify-between'>
-          <div className='text-gray-600'>
-            {`${teamMembersCount} ${plural(teamMembersCount, 'member')}`}
-            {isViewerTeamLead && (
-              <>
-                <span className='mx-2'>•</span>
-                <Link
-                  to={`/team/${teamId}/settings`}
-                  className='cursor-pointer font-bold text-sky-500 hover:underline'
-                >
-                  {'Manage Team'}
-                </Link>
-              </>
-            )}
+    <Link
+      className='block hover:bg-slate-100 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-inset'
+      to={`teams/${teamId}`}
+    >
+      <div className='flex items-center p-4'>
+        <div className='flex flex-1 flex-col py-1'>
+          <div className='text-gray-700 text-lg font-bold'>{name}</div>
+          <div className='flex items-center justify-between'>
+            <div className='text-gray-600'>
+              {`${teamMembersCount} ${plural(teamMembersCount, 'member')}`}
+            </div>
           </div>
-
-          <a
-            href={`mailto:${teamLeadEmail}`}
-            target='_blank'
-            title='Email'
-            className='text-gray-600 hover:underline'
-            rel='noreferrer'
-          >
-            {`${teamLeadEmail} ${isViewerTeamLead ? '(You)' : ''}`}
-          </a>
+        </div>
+        <div className='flex items-center justify-center'>
+          <ChevronRight />
         </div>
       </div>
-    </Row>
+    </Link>
   )
 }
 
diff --git a/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx b/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
index eda83c7b6dc..8a15e046096 100644
--- a/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
@@ -18,13 +18,18 @@ import RoleTag from '../../../../components/Tag/RoleTag'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
 import useModal from '../../../../hooks/useModal'
-import useTooltip from '../../../../hooks/useTooltip'
 import defaultUserAvatar from '../../../../styles/theme/images/avatar-user.svg'
 import {Breakpoint} from '../../../../types/constEnums'
 import lazyPreload from '../../../../utils/lazyPreload'
 import withMutationProps, {WithMutationProps} from '../../../../utils/relay/withMutationProps'
-import {OrgMemberRow_organization$key} from '../../../../__generated__/OrgMemberRow_organization.graphql'
-import {OrgMemberRow_organizationUser$key} from '../../../../__generated__/OrgMemberRow_organizationUser.graphql'
+import {
+  OrgMemberRow_organization$key,
+  OrgMemberRow_organization$data
+} from '../../../../__generated__/OrgMemberRow_organization.graphql'
+import {
+  OrgMemberRow_organizationUser$key,
+  OrgMemberRow_organizationUser$data
+} from '../../../../__generated__/OrgMemberRow_organizationUser.graphql'
 import BaseTag from '../../../../components/Tag/BaseTag'
 
 const AvatarBlock = styled('div')({
@@ -59,6 +64,7 @@ const MenuToggleBlock = styled('div')({
 
 interface Props extends WithMutationProps {
   billingLeaderCount: number
+  orgAdminCount: number
   organizationUser: OrgMemberRow_organizationUser$key
   organization: OrgMemberRow_organization$key
 }
@@ -90,29 +96,157 @@ const BillingLeaderActionMenu = lazyPreload(
       /* webpackChunkName: 'BillingLeaderActionMenu' */ '../../../../components/BillingLeaderActionMenu'
     )
 )
+const OrgAdminActionMenu = lazyPreload(
+  () =>
+    import(/* webpackChunkName: 'OrgAdminActionMenu' */ '../../../../components/OrgAdminActionMenu')
+)
 
 const RemoveFromOrgModal = lazyPreload(
   () =>
     import(/* webpackChunkName: 'RemoveFromOrgModal' */ '../RemoveFromOrgModal/RemoveFromOrgModal')
 )
 
+interface UserAvatarProps {
+  picture?: string
+}
+
+const UserAvatar: React.FC<UserAvatarProps> = ({picture}) => (
+  <AvatarBlock>
+    {picture ? (
+      <Avatar hasBadge={false} picture={picture} size={44} />
+    ) : (
+      <img alt='default avatar' src={defaultUserAvatar} />
+    )}
+  </AvatarBlock>
+)
+
+interface UserInfoProps {
+  preferredName: string
+  email: string
+  isBillingLeader: boolean
+  isOrgAdmin: boolean
+  inactive: boolean | null
+  newUserUntil: string
+}
+
+const UserInfo: React.FC<UserInfoProps> = ({
+  preferredName,
+  email,
+  isBillingLeader,
+  isOrgAdmin,
+  inactive,
+  newUserUntil
+}) => (
+  <StyledRowInfo>
+    <RowInfoHeader>
+      <RowInfoHeading>{preferredName}</RowInfoHeading>
+      {isBillingLeader && <RoleTag>Billing Leader</RoleTag>}
+      {isOrgAdmin && <BaseTag className='bg-gold-500 text-white'>Org Admin</BaseTag>}
+      {inactive && !isBillingLeader && !isOrgAdmin && <InactiveTag>Inactive</InactiveTag>}
+      {new Date(newUserUntil) > new Date() && <EmphasisTag>New</EmphasisTag>}
+    </RowInfoHeader>
+    <RowInfoLink href={`mailto:${email}`} title='Send an email'>
+      {email}
+    </RowInfoLink>
+  </StyledRowInfo>
+)
+
+interface UserActionsProps {
+  isViewerOrgAdmin: boolean
+  isViewerBillingLeader: boolean
+  isViewerLastOrgAdmin: boolean
+  isViewerLastBillingLeader: boolean
+  organization: OrgMemberRow_organization$data
+  organizationUser: OrgMemberRow_organizationUser$data
+  preferredName: string
+  viewerId: string
+}
+
+const UserActions: React.FC<UserActionsProps> = ({
+  isViewerOrgAdmin,
+  isViewerBillingLeader,
+  isViewerLastOrgAdmin,
+  isViewerLastBillingLeader,
+  organizationUser,
+  organization,
+  preferredName,
+  viewerId
+}) => {
+  const {orgId} = organization
+  const {
+    user: {userId}
+  } = organizationUser
+  const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_RIGHT)
+  const {togglePortal: toggleLeave, modalPortal: leaveModal} = useModal()
+  const {togglePortal: toggleRemove, modalPortal: removeModal} = useModal()
+  const actionMenuProps = {
+    menuProps,
+    originRef,
+    togglePortal,
+    toggleLeave,
+    toggleRemove,
+    isViewerLastOrgAdmin,
+    isViewerLastBillingLeader,
+    organization,
+    organizationUser
+  }
+
+  const showLeaveButton = !isViewerOrgAdmin && !isViewerBillingLeader && viewerId === userId
+
+  return (
+    <RowActions>
+      <ActionsBlock>
+        {showLeaveButton && (
+          <StyledFlatButton onClick={toggleLeave} onMouseEnter={LeaveOrgModal.preload}>
+            Leave Organization
+          </StyledFlatButton>
+        )}
+        {(isViewerOrgAdmin || (isViewerBillingLeader && !isViewerLastBillingLeader)) && (
+          <MenuToggleBlock>
+            <MenuButton
+              onClick={togglePortal}
+              onMouseEnter={
+                isViewerOrgAdmin ? OrgAdminActionMenu.preload : BillingLeaderActionMenu.preload
+              }
+              ref={originRef}
+            />
+          </MenuToggleBlock>
+        )}
+        {isViewerOrgAdmin && menuPortal(<OrgAdminActionMenu {...actionMenuProps} />)}
+        {!isViewerOrgAdmin &&
+          isViewerBillingLeader &&
+          menuPortal(<BillingLeaderActionMenu {...actionMenuProps} />)}
+        {leaveModal(<LeaveOrgModal orgId={orgId} />)}
+        {removeModal(
+          <RemoveFromOrgModal orgId={orgId} userId={userId} preferredName={preferredName} />
+        )}
+      </ActionsBlock>
+    </RowActions>
+  )
+}
+
 const OrgMemberRow = (props: Props) => {
   const atmosphere = useAtmosphere()
   const {
     billingLeaderCount,
+    orgAdminCount,
     organizationUser: organizationUserRef,
     organization: organizationRef
   } = props
+
   const organization = useFragment(
     graphql`
       fragment OrgMemberRow_organization on Organization {
         isViewerBillingLeader: isBillingLeader
+        isViewerOrgAdmin: isOrgAdmin
         orgId: id
         ...BillingLeaderActionMenu_organization
+        ...OrgAdminActionMenu_organization
       }
     `,
     organizationRef
   )
+
   const organizationUser = useFragment(
     graphql`
       fragment OrgMemberRow_organizationUser on OrganizationUser {
@@ -126,103 +260,49 @@ const OrgMemberRow = (props: Props) => {
         role
         newUserUntil
         ...BillingLeaderActionMenu_organizationUser
+        ...OrgAdminActionMenu_organizationUser
       }
     `,
     organizationUserRef
   )
-  const {orgId, isViewerBillingLeader} = organization
-  const {newUserUntil, user, role} = organizationUser
+
+  const {isViewerBillingLeader, isViewerOrgAdmin} = organization
+
+  const {
+    newUserUntil,
+    user: {email, inactive, picture, preferredName},
+    role
+  } = organizationUser
+
+  const {viewerId} = atmosphere
+
   const isBillingLeader = role === 'BILLING_LEADER'
   const isOrgAdmin = role === 'ORG_ADMIN'
-  const {email, inactive, picture, preferredName, userId} = user
   const isViewerLastBillingLeader =
     isViewerBillingLeader && isBillingLeader && billingLeaderCount === 1
-  const {viewerId} = atmosphere
-  const {togglePortal, originRef, menuPortal, menuProps} = useMenu(MenuPosition.UPPER_RIGHT)
-  const {togglePortal: toggleLeave, modalPortal: leaveModal} = useModal()
-  const {togglePortal: toggleRemove, modalPortal: removeModal} = useModal()
-  const {
-    tooltipPortal,
-    openTooltip,
-    closeTooltip,
-    originRef: tooltipRef
-  } = useTooltip<HTMLDivElement>(MenuPosition.LOWER_RIGHT)
-  const canViewMenu = !isViewerLastBillingLeader && organizationUser.role !== 'ORG_ADMIN'
+  const isViewerLastOrgAdmin = isViewerOrgAdmin && isOrgAdmin && orgAdminCount === 1
 
   return (
     <StyledRow>
-      <AvatarBlock>
-        {picture ? (
-          <Avatar hasBadge={false} picture={picture} size={44} />
-        ) : (
-          <img alt='' src={defaultUserAvatar} />
-        )}
-      </AvatarBlock>
-      <StyledRowInfo>
-        <RowInfoHeader>
-          <RowInfoHeading>{preferredName}</RowInfoHeading>
-          {isBillingLeader && <RoleTag>{'Billing Leader'}</RoleTag>}
-          {isOrgAdmin && <BaseTag className='bg-gold-500 text-white'>{'Org Admin'}</BaseTag>}
-          {inactive && !isBillingLeader && !isOrgAdmin && <InactiveTag>{'Inactive'}</InactiveTag>}
-          {new Date(newUserUntil) > new Date() && <EmphasisTag>{'New'}</EmphasisTag>}
-        </RowInfoHeader>
-        <RowInfoLink href={`mailto:${email}`} title='Send an email'>
-          {email}
-        </RowInfoLink>
-      </StyledRowInfo>
-      <RowActions>
-        <ActionsBlock>
-          {!isBillingLeader && !isOrgAdmin && viewerId === userId && (
-            <StyledFlatButton onClick={toggleLeave} onMouseEnter={LeaveOrgModal.preload}>
-              Leave Organization
-            </StyledFlatButton>
-          )}
-          {!canViewMenu && (
-            <MenuToggleBlock
-              onClick={closeTooltip}
-              onMouseOver={openTooltip}
-              onMouseOut={closeTooltip}
-              ref={tooltipRef}
-            >
-              {tooltipPortal(
-                isViewerLastBillingLeader ? (
-                  <div>
-                    {'You need to promote another Billing Leader'}
-                    <br />
-                    {'before you can remove this role.'}
-                  </div>
-                ) : (
-                  <div>Contact support (love@parabol.co) to remove the Org Admin role</div>
-                )
-              )}
-              <MenuButton disabled />
-            </MenuToggleBlock>
-          )}
-          {isViewerBillingLeader && canViewMenu && (
-            <MenuToggleBlock>
-              <MenuButton
-                onClick={togglePortal}
-                onMouseEnter={BillingLeaderActionMenu.preload}
-                ref={originRef}
-              />
-            </MenuToggleBlock>
-          )}
-          {menuPortal(
-            <BillingLeaderActionMenu
-              menuProps={menuProps}
-              isViewerLastBillingLeader={isViewerLastBillingLeader}
-              organizationUser={organizationUser}
-              organization={organization}
-              toggleLeave={toggleLeave}
-              toggleRemove={toggleRemove}
-            />
-          )}
-          {leaveModal(<LeaveOrgModal orgId={orgId} />)}
-          {removeModal(
-            <RemoveFromOrgModal orgId={orgId} userId={userId} preferredName={preferredName} />
-          )}
-        </ActionsBlock>
-      </RowActions>
+      <UserAvatar picture={picture} />
+      <UserInfo
+        preferredName={preferredName}
+        email={email}
+        isBillingLeader={isBillingLeader}
+        isOrgAdmin={isOrgAdmin}
+        inactive={inactive}
+        newUserUntil={newUserUntil}
+      />
+      <UserActions
+        isViewerOrgAdmin={isViewerOrgAdmin}
+        isViewerBillingLeader={isViewerBillingLeader}
+        isViewerLastOrgAdmin={isViewerLastOrgAdmin}
+        isViewerLastBillingLeader={isViewerLastBillingLeader}
+        organizationUser={organizationUser}
+        organization={organization}
+        preferredName={preferredName}
+        viewerId={viewerId}
+      />
     </StyledRow>
   )
 }
diff --git a/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx b/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx
index b0a7ab43373..8242ebf2b8e 100644
--- a/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/OrgMembers/OrgMembersRoot.tsx
@@ -15,6 +15,7 @@ const OrgMembersRoot = (props: Props) => {
     orgId,
     first: 10000
   })
+
   return (
     <Suspense fallback={<Loader size={LoaderSize.PANEL} />}>
       {queryRef && <OrgMembers queryRef={queryRef} />}
diff --git a/packages/client/mutations/ArchiveTeamMutation.ts b/packages/client/mutations/ArchiveTeamMutation.ts
index 15afd828d4b..218fdd0c7c1 100644
--- a/packages/client/mutations/ArchiveTeamMutation.ts
+++ b/packages/client/mutations/ArchiveTeamMutation.ts
@@ -30,6 +30,14 @@ graphql`
       activeMeetings {
         id
       }
+      organization {
+        allTeams {
+          id
+        }
+        viewerTeams {
+          id
+        }
+      }
     }
     teamTemplateIds
   }
diff --git a/packages/client/package.json b/packages/client/package.json
index 364c5dbd367..81691d805d0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -82,6 +82,8 @@
     "@radix-ui/react-select": "^1.2.2",
     "@radix-ui/react-tooltip": "^1.0.7",
     "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-avatar": "^1.0.4",
+    "@radix-ui/react-alert-dialog": "1.0.5",
     "@sentry/browser": "^5.8.0",
     "@stripe/react-stripe-js": "^1.16.5",
     "@stripe/stripe-js": "^1.47.0",
diff --git a/packages/client/ui/AlertDialog/AlertDialog.tsx b/packages/client/ui/AlertDialog/AlertDialog.tsx
new file mode 100644
index 00000000000..8b4fdf6a396
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialog.tsx
@@ -0,0 +1,5 @@
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+
+const AlertDialog = AlertDialogPrimitive.Root
+
+export {AlertDialog}
diff --git a/packages/client/ui/AlertDialog/AlertDialogAction.tsx b/packages/client/ui/AlertDialog/AlertDialogAction.tsx
new file mode 100644
index 00000000000..75b93fb02a9
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogAction.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react'
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+import clsx from 'clsx'
+
+const AlertDialogAction = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
+>(({className, ...props}, ref) => (
+  <AlertDialogPrimitive.Action
+    ref={ref}
+    className={clsx(
+      'bg-gradient-to-r from-tomato-600 to-rose-500 font-semibold text-white hover:opacity-90',
+      className
+    )}
+    {...props}
+  />
+))
+AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName
diff --git a/packages/client/ui/AlertDialog/AlertDialogCancel.tsx b/packages/client/ui/AlertDialog/AlertDialogCancel.tsx
new file mode 100644
index 00000000000..201ca648679
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogCancel.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react'
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+import clsx from 'clsx'
+
+const AlertDialogCancel = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
+>(({className, ...props}, ref) => (
+  <AlertDialogPrimitive.Cancel
+    ref={ref}
+    className={clsx(
+      'border border-slate-400 bg-transparent px-2.5 py-1 font-semibold text-slate-900 hover:bg-slate-200',
+      className
+    )}
+    {...props}
+  />
+))
+AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName
diff --git a/packages/client/ui/AlertDialog/AlertDialogContent.tsx b/packages/client/ui/AlertDialog/AlertDialogContent.tsx
new file mode 100644
index 00000000000..dbcd0de0582
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogContent.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react'
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+import clsx from 'clsx'
+import {AlertDialogOverlay} from './AlertDialogOverlay'
+import {AlertDialogPortal} from './AlertDialog'
+
+const AlertDialogContent = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
+>(({className, ...props}, ref) => (
+  <AlertDialogPortal>
+    <AlertDialogOverlay />
+    <AlertDialogPrimitive.Content
+      ref={ref}
+      className={clsx(
+        'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg',
+        className
+      )}
+      {...props}
+    />
+  </AlertDialogPortal>
+))
+AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName
diff --git a/packages/client/ui/AlertDialog/AlertDialogDescription.tsx b/packages/client/ui/AlertDialog/AlertDialogDescription.tsx
new file mode 100644
index 00000000000..7c940b02fec
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogDescription.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react'
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+import clsx from 'clsx'
+
+const AlertDialogDescription = React.forwardRef<
+  HTMLParagraphElement,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
+>(({className, ...props}, ref) => (
+  <AlertDialogPrimitive.Description
+    ref={ref}
+    className={clsx('text-muted-foreground text-sm', className)}
+    {...props}
+  />
+))
+AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName
diff --git a/packages/client/ui/AlertDialog/AlertDialogFooter.tsx b/packages/client/ui/AlertDialog/AlertDialogFooter.tsx
new file mode 100644
index 00000000000..0148d9a8c39
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogFooter.tsx
@@ -0,0 +1,10 @@
+import * as React from 'react'
+import clsx from 'clsx'
+
+const AlertDialogFooter = ({className, ...props}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={clsx('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)}
+    {...props}
+  />
+)
+AlertDialogFooter.displayName = 'AlertDialogFooter'
diff --git a/packages/client/ui/AlertDialog/AlertDialogHeader.tsx b/packages/client/ui/AlertDialog/AlertDialogHeader.tsx
new file mode 100644
index 00000000000..869b09ccfc3
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogHeader.tsx
@@ -0,0 +1,7 @@
+import * as React from 'react'
+import clsx from 'clsx'
+
+const AlertDialogHeader = ({className, ...props}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div className={clsx('flex flex-col space-y-2 text-center sm:text-left', className)} {...props} />
+)
+AlertDialogHeader.displayName = 'AlertDialogHeader'
diff --git a/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx b/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx
new file mode 100644
index 00000000000..e867c7ed363
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react'
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+import clsx from 'clsx'
+
+export const AlertDialogOverlay = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
+>(({className, ...props}, ref) => (
+  <AlertDialogPrimitive.Overlay
+    className={clsx(
+      'bg-background/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 backdrop-blur-sm',
+      className
+    )}
+    {...props}
+    ref={ref}
+  />
+))
+AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName
diff --git a/packages/client/ui/AlertDialog/AlertDialogPortal.tsx b/packages/client/ui/AlertDialog/AlertDialogPortal.tsx
new file mode 100644
index 00000000000..c4e8d56916f
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogPortal.tsx
@@ -0,0 +1,3 @@
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+
+const AlertDialogPortal = AlertDialogPrimitive.Portal
diff --git a/packages/client/ui/AlertDialog/AlertDialogTitle.tsx b/packages/client/ui/AlertDialog/AlertDialogTitle.tsx
new file mode 100644
index 00000000000..c7c14e011c5
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogTitle.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react'
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+import clsx from 'clsx'
+
+const AlertDialogTitle = React.forwardRef<
+  HTMLHeadingElement,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
+>(({className, ...props}, ref) => (
+  <AlertDialogPrimitive.Title
+    ref={ref}
+    className={clsx('text-lg font-semibold', className)}
+    {...props}
+  />
+))
+AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName
diff --git a/packages/client/ui/AlertDialog/AlertDialogTrigger.tsx b/packages/client/ui/AlertDialog/AlertDialogTrigger.tsx
new file mode 100644
index 00000000000..0a20feddfc1
--- /dev/null
+++ b/packages/client/ui/AlertDialog/AlertDialogTrigger.tsx
@@ -0,0 +1,3 @@
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
+
+const AlertDialogTrigger = AlertDialogPrimitive.Trigger
diff --git a/packages/client/ui/Avatar/Avatar.tsx b/packages/client/ui/Avatar/Avatar.tsx
new file mode 100644
index 00000000000..23bbecd22a6
--- /dev/null
+++ b/packages/client/ui/Avatar/Avatar.tsx
@@ -0,0 +1,16 @@
+import React from 'react'
+import * as AvatarPrimitive from '@radix-ui/react-avatar'
+import clsx from 'clsx'
+
+export const Avatar = React.forwardRef<
+  HTMLSpanElement,
+  React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
+>(({className, ...props}, ref) => (
+  <AvatarPrimitive.Root
+    ref={ref}
+    className={clsx('relative flex shrink-0 overflow-hidden rounded-full', className)}
+    {...props}
+  />
+))
+
+Avatar.displayName = AvatarPrimitive.Root.displayName
diff --git a/packages/client/ui/Avatar/AvatarFallback.tsx b/packages/client/ui/Avatar/AvatarFallback.tsx
new file mode 100644
index 00000000000..482648102a8
--- /dev/null
+++ b/packages/client/ui/Avatar/AvatarFallback.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+import * as AvatarPrimitive from '@radix-ui/react-avatar'
+import clsx from 'clsx'
+
+export const AvatarFallback = React.forwardRef<
+  HTMLSpanElement,
+  React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback>
+>(({className, ...props}, ref) => (
+  <AvatarPrimitive.Fallback
+    ref={ref}
+    className={clsx(
+      'bg-muted flex h-full w-full items-center justify-center rounded-full',
+      className
+    )}
+    {...props}
+  />
+))
+
+AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName
diff --git a/packages/client/ui/Avatar/AvatarImage.tsx b/packages/client/ui/Avatar/AvatarImage.tsx
new file mode 100644
index 00000000000..66f41abad5d
--- /dev/null
+++ b/packages/client/ui/Avatar/AvatarImage.tsx
@@ -0,0 +1,16 @@
+import React from 'react'
+import * as AvatarPrimitive from '@radix-ui/react-avatar'
+import clsx from 'clsx'
+
+export const AvatarImage = React.forwardRef<
+  HTMLImageElement,
+  React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Image>
+>(({className, ...props}, ref) => (
+  <AvatarPrimitive.Image
+    ref={ref}
+    className={clsx('aspect-square h-full w-full', className)}
+    {...props}
+  />
+))
+
+AvatarImage.displayName = AvatarPrimitive.Image.displayName
diff --git a/packages/client/ui/Button/Button.tsx b/packages/client/ui/Button/Button.tsx
index a60c67700d7..90554dc662e 100644
--- a/packages/client/ui/Button/Button.tsx
+++ b/packages/client/ui/Button/Button.tsx
@@ -7,20 +7,21 @@ type Size = 'sm' | 'md' | 'lg' | 'default'
 type Shape = 'pill' | 'circle' | 'default'
 
 const BASE_STYLES =
-  'cursor-pointer inline-flex items-center justify-center whitespace-nowrap font-semibold transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50'
+  'cursor-pointer inline-flex items-center justify-center whitespace-nowrap  transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50'
 
 // TODO: make sure the styles match the designs
 const VARIANT_STYLES: Record<Variant, string> = {
-  primary: 'bg-primary text-white hover:bg-primary/90',
-  destructive: 'bg-tomato-500 text-white hover:bg-tomato-500/90',
-  outline: 'text-slate-900 border border-slate-400 hover:bg-slate-200 px-2.5 py-1  bg-transparent',
-  secondary: 'bg-sky-500 text-white hover:bg-sky-500/80',
-  ghost: 'hover:bg-accent',
+  primary: 'bg-gradient-to-r from-tomato-600 to-rose-500 text-white font-semibold hover:opacity-90',
+  destructive: 'bg-tomato-500 text-white font-semibold hover:bg-tomato-500/90',
+  outline:
+    'text-slate-900 border border-slate-400 hover:bg-slate-200 px-2.5 py-1 bg-transparent font-semibold',
+  secondary: 'bg-sky-500 text-white hover:bg-sky-500/80 font-semibold',
+  ghost: 'hover:opacity-80 bg-transparent font-semibold',
   link: 'text-primary underline-offset-4 hover:underline'
 }
 
 const SIZE_STYLES: Record<Size, string> = {
-  default: 'px-4 py-2 text-xs',
+  default: '',
   sm: 'h-7 px-3 text-xs',
   md: 'h-9 px-4 text-sm',
   lg: 'h-11 px-8 text-base'
@@ -29,18 +30,18 @@ const SIZE_STYLES: Record<Size, string> = {
 const SHAPE_STYLES: Record<Shape, string> = {
   pill: 'rounded-full',
   circle: 'rounded-full aspect-square',
-  default: 'rounded-md'
+  default: ''
 }
 
 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   asChild?: boolean
   variant: Variant
   size?: Size
-  shape: Shape
+  shape?: Shape
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({className, variant, size, shape, asChild = false, ...props}, ref) => {
+  ({className, variant, size = 'default', shape = 'default', asChild = false, ...props}, ref) => {
     const Comp = asChild ? Slot : 'button'
     return (
       <Comp
diff --git a/packages/server/graphql/types/Organization.ts b/packages/server/graphql/types/Organization.ts
index 18055a06e5b..2e51054649d 100644
--- a/packages/server/graphql/types/Organization.ts
+++ b/packages/server/graphql/types/Organization.ts
@@ -7,7 +7,12 @@ import {
   GraphQLObjectType,
   GraphQLString
 } from 'graphql'
-import {getUserId, isSuperUser, isUserBillingLeader} from '../../utils/authorization'
+import {
+  getUserId,
+  isSuperUser,
+  isUserBillingLeader,
+  isUserOrgAdmin
+} from '../../utils/authorization'
 import {GQLContext} from '../graphql'
 import getActiveTeamCountByOrgIds from '../public/types/helpers/getActiveTeamCountByOrgIds'
 import {resolveForBillingLeaders} from '../resolvers'
@@ -45,12 +50,20 @@ const Organization: GraphQLObjectType<any, GQLContext> = new GraphQLObjectType<a
     },
     isBillingLeader: {
       type: new GraphQLNonNull(GraphQLBoolean),
-      description: 'true if the viewer is the billing leader for the org',
+      description: 'true if the viewer holds the billing leader role on the org',
       resolve: async ({id: orgId}, _args: unknown, {authToken, dataLoader}) => {
         const viewerId = getUserId(authToken)
         return isUserBillingLeader(viewerId, orgId, dataLoader)
       }
     },
+    isOrgAdmin: {
+      type: new GraphQLNonNull(GraphQLBoolean),
+      description: 'true if the viewer holds the the org admin role on the org',
+      resolve: async ({id: orgId}, _args: unknown, {authToken, dataLoader}) => {
+        const viewerId = getUserId(authToken)
+        return isUserOrgAdmin(viewerId, orgId, dataLoader)
+      }
+    },
     name: {
       type: new GraphQLNonNull(GraphQLString),
       description: 'The name of the organization'
diff --git a/packages/server/utils/authorization.ts b/packages/server/utils/authorization.ts
index 4537f03e77c..dd873e6c885 100644
--- a/packages/server/utils/authorization.ts
+++ b/packages/server/utils/authorization.ts
@@ -4,6 +4,7 @@ import AuthToken from '../database/types/AuthToken'
 import OrganizationUser from '../database/types/OrganizationUser'
 import {DataLoaderWorker} from '../graphql/graphql'
 import {RDatum} from '../database/stricterR'
+import {OrgUserRole} from '../database/types/OrganizationUser'
 
 export const getUserId = (authToken: any) => {
   return authToken && typeof authToken === 'object' ? (authToken.sub as string) : ''
@@ -51,10 +52,12 @@ export const isTeamLead = async (userId: string, teamId: string, dataLoader: Dat
 interface Options {
   clearCache?: boolean
 }
-export const isUserBillingLeader = async (
+
+const isUserAnyRoleIn = async (
   userId: string,
   orgId: string,
   dataLoader: DataLoaderWorker,
+  roles: OrgUserRole[],
   options?: Options
 ) => {
   const organizationUser = await dataLoader
@@ -63,9 +66,23 @@ export const isUserBillingLeader = async (
   if (options && options.clearCache) {
     dataLoader.get('organizationUsersByUserId').clear(userId)
   }
-  return organizationUser
-    ? organizationUser.role === 'BILLING_LEADER' || organizationUser.role === 'ORG_ADMIN'
-    : false
+  return organizationUser && organizationUser.role ? roles.includes(organizationUser.role) : false
+}
+export const isUserBillingLeader = async (
+  userId: string,
+  orgId: string,
+  dataLoader: DataLoaderWorker,
+  options?: Options
+) => {
+  return isUserAnyRoleIn(userId, orgId, dataLoader, ['BILLING_LEADER', 'ORG_ADMIN'], options)
+}
+export const isUserOrgAdmin = async (
+  userId: string,
+  orgId: string,
+  dataLoader: DataLoaderWorker,
+  options?: Options
+) => {
+  return isUserAnyRoleIn(userId, orgId, dataLoader, ['ORG_ADMIN'], options)
 }
 
 export const isUserInOrg = async (userId: string, orgId: string, dataLoader: DataLoaderWorker) => {
diff --git a/yarn.lock b/yarn.lock
index af959f0896f..ffa47f0a625 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5704,6 +5704,19 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-alert-dialog@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.0.5.tgz#70dd529cbf1e4bff386814d3776901fcaa131b8c"
+  integrity sha512-OrVIOcZL0tl6xibeuGt5/+UxoT2N27KCFOPjFyfXMnchxSHZ/OW7cCX2nGlIYJrbHK/fczPcFzAwvNBB6XBNMA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-dialog" "1.0.5"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-slot" "1.0.2"
+
 "@radix-ui/react-arrow@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.0.3.tgz#c24f7968996ed934d57fe6cde5d6ec7266e1d25d"
@@ -5712,6 +5725,17 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
+"@radix-ui/react-avatar@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-avatar/-/react-avatar-1.0.4.tgz#de9a5349d9e3de7bbe990334c4d2011acbbb9623"
+  integrity sha512-kVK2K7ZD3wwj3qhle0ElXhOjbezIgyl2hVvgwfIdexL3rN6zJmy5AqqIf+D31lxVppdzV8CjAfZ6PklkmInZLw==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+    "@radix-ui/react-use-layout-effect" "1.0.1"
+
 "@radix-ui/react-collection@1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.0.2.tgz#d50da00bfa2ac14585319efdbbb081d4c5a29a97"
@@ -5762,6 +5786,27 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-dialog@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz#71657b1b116de6c7a0b03242d7d43e01062c7300"
+  integrity sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-dismissable-layer" "1.0.5"
+    "@radix-ui/react-focus-guards" "1.0.1"
+    "@radix-ui/react-focus-scope" "1.0.4"
+    "@radix-ui/react-id" "1.0.1"
+    "@radix-ui/react-portal" "1.0.4"
+    "@radix-ui/react-presence" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-slot" "1.0.2"
+    "@radix-ui/react-use-controllable-state" "1.0.1"
+    aria-hidden "^1.1.1"
+    react-remove-scroll "2.5.5"
+
 "@radix-ui/react-dialog@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.0.4.tgz#06bce6c16bb93eb36d7a8589e665a20f4c1c52c1"
@@ -5852,6 +5897,16 @@
     "@radix-ui/react-primitive" "1.0.3"
     "@radix-ui/react-use-callback-ref" "1.0.1"
 
+"@radix-ui/react-focus-scope@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz#2ac45fce8c5bb33eb18419cdc1905ef4f1906525"
+  integrity sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-callback-ref" "1.0.1"
+
 "@radix-ui/react-id@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.0.0.tgz#8d43224910741870a45a8c9d092f25887bb6d11e"
@@ -11230,6 +11285,7 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
+  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"

From 88bf97f6ff3e820d49a24e9a8a8cf4dbab46b22c Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:17:58 +0000
Subject: [PATCH 057/183] chore(ci): add capability to manually generate Docker
 Images (#9524)

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f340977a97..a19c552ac06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - "release-please--**"
+  workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true

From 9350b93b7a2a6f48e0af712cc0a6edbb8395004c Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 12 Mar 2024 12:31:03 +0100
Subject: [PATCH 058/183] fix: Make hasGCalError optional (#9526)

---
 packages/server/graphql/public/typeDefs/_legacy.graphql        | 2 +-
 packages/server/graphql/public/typeDefs/startCheckIn.graphql   | 2 +-
 .../server/graphql/public/typeDefs/startRetrospective.graphql  | 2 +-
 .../server/graphql/public/typeDefs/startTeamPrompt.graphql     | 2 +-
 .../server/graphql/public/types/StartRetrospectiveSuccess.ts   | 3 +--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/server/graphql/public/typeDefs/_legacy.graphql b/packages/server/graphql/public/typeDefs/_legacy.graphql
index 79e8797a2a3..75ba9203d1f 100644
--- a/packages/server/graphql/public/typeDefs/_legacy.graphql
+++ b/packages/server/graphql/public/typeDefs/_legacy.graphql
@@ -7863,7 +7863,7 @@ type StartSprintPokerSuccess {
   meeting: PokerMeeting!
   team: Team!
   teamId: ID!
-  hasGcalError: Boolean!
+  hasGcalError: Boolean
 }
 
 """
diff --git a/packages/server/graphql/public/typeDefs/startCheckIn.graphql b/packages/server/graphql/public/typeDefs/startCheckIn.graphql
index b21e52d3eb4..8fde46f9b80 100644
--- a/packages/server/graphql/public/typeDefs/startCheckIn.graphql
+++ b/packages/server/graphql/public/typeDefs/startCheckIn.graphql
@@ -7,7 +7,7 @@ type StartCheckInSuccess {
   meeting: ActionMeeting!
   meetingId: ID!
   team: Team!
-  hasGcalError: Boolean!
+  hasGcalError: Boolean
 }
 
 extend type Mutation {
diff --git a/packages/server/graphql/public/typeDefs/startRetrospective.graphql b/packages/server/graphql/public/typeDefs/startRetrospective.graphql
index 01f0a269fc1..91bb03261c2 100644
--- a/packages/server/graphql/public/typeDefs/startRetrospective.graphql
+++ b/packages/server/graphql/public/typeDefs/startRetrospective.graphql
@@ -27,7 +27,7 @@ type StartRetrospectiveSuccess {
   meeting: RetrospectiveMeeting!
   meetingId: ID!
   team: Team!
-  hasGcalError: Boolean!
+  hasGcalError: Boolean
 }
 
 input CreateGcalEventInput {
diff --git a/packages/server/graphql/public/typeDefs/startTeamPrompt.graphql b/packages/server/graphql/public/typeDefs/startTeamPrompt.graphql
index 42b2730b109..01bd98483b5 100644
--- a/packages/server/graphql/public/typeDefs/startTeamPrompt.graphql
+++ b/packages/server/graphql/public/typeDefs/startTeamPrompt.graphql
@@ -35,7 +35,7 @@ type StartTeamPromptSuccess {
   """
   True if there was an error creating the Google Calendar event. False if there was no error or no gcalInput was provided.
   """
-  hasGcalError: Boolean!
+  hasGcalError: Boolean
 }
 
 input CreateGcalEventInput {
diff --git a/packages/server/graphql/public/types/StartRetrospectiveSuccess.ts b/packages/server/graphql/public/types/StartRetrospectiveSuccess.ts
index 5005dd506c9..4ba4baef9be 100644
--- a/packages/server/graphql/public/types/StartRetrospectiveSuccess.ts
+++ b/packages/server/graphql/public/types/StartRetrospectiveSuccess.ts
@@ -13,8 +13,7 @@ const StartRetrospectiveSuccess: StartRetrospectiveSuccessResolvers = {
   },
   team: ({teamId}, _args: unknown, {dataLoader}) => {
     return dataLoader.get('teams').loadNonNull(teamId)
-  },
-  hasGcalError: ({hasGcalError}) => !!hasGcalError
+  }
 }
 
 export default StartRetrospectiveSuccess

From 37bd20cf8e073d353e3b3dffb5f3037c199adf67 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 12 Mar 2024 12:36:50 +0100
Subject: [PATCH 059/183] chore: Remove Add Activity button from discussions
 (#9528)

---
 .../client/components/AddActivityButton.tsx   | 43 -------------------
 .../components/DiscussionThreadInput.tsx      | 19 +-------
 packages/client/modules/demo/initDB.ts        |  1 -
 .../typeDefs/updateOrgFeatureFlag.graphql     |  1 -
 .../public/typeDefs/Organization.graphql      |  1 -
 .../public/types/OrganizationFeatureFlags.ts  |  1 -
 6 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 packages/client/components/AddActivityButton.tsx

diff --git a/packages/client/components/AddActivityButton.tsx b/packages/client/components/AddActivityButton.tsx
deleted file mode 100644
index 53899b38267..00000000000
--- a/packages/client/components/AddActivityButton.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import styled from '@emotion/styled'
-import {Add} from '@mui/icons-material'
-import React from 'react'
-import {PALETTE} from '~/styles/paletteV3'
-import PlainButton from './PlainButton/PlainButton'
-
-const StyledPlainButton = styled(PlainButton)({
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'center',
-  color: PALETTE.SKY_500,
-  fontWeight: 600,
-  fontSize: 14,
-  margin: '0 8px',
-  ':hover, :focus, :active': {
-    color: PALETTE.SKY_600
-  },
-  transition: 'color 0.1s ease'
-})
-
-const Icon = styled(Add)({
-  width: 20,
-  height: 20,
-  margin: '0 4px 0 0'
-})
-
-interface Props {
-  onClick: () => void
-  disabled?: boolean
-}
-
-const AddActivityButton = (props: Props) => {
-  const {onClick, disabled} = props
-
-  return (
-    <StyledPlainButton onClick={onClick} disabled={disabled}>
-      <Icon />
-      <div className='text-inherit'>Add an activity</div>
-    </StyledPlainButton>
-  )
-}
-
-export default AddActivityButton
diff --git a/packages/client/components/DiscussionThreadInput.tsx b/packages/client/components/DiscussionThreadInput.tsx
index 06f8a1a2fd5..ba7cd2f3778 100644
--- a/packages/client/components/DiscussionThreadInput.tsx
+++ b/packages/client/components/DiscussionThreadInput.tsx
@@ -29,8 +29,6 @@ import {createLocalPoll} from './Poll/local/newPoll'
 import SendCommentButton from './SendCommentButton'
 import CommentEditor from './TaskEditor/CommentEditor'
 import {ReplyMention, SetReplyMention} from './ThreadedItem'
-import AddActivityButton from '~/components/AddActivityButton'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 const Wrapper = styled('div')<{isReply: boolean; isDisabled: boolean}>(({isDisabled, isReply}) => ({
   display: 'flex',
@@ -106,9 +104,6 @@ const DiscussionThreadInput = forwardRef((props: Props, ref: any) => {
     graphql`
       fragment DiscussionThreadInput_viewer on User {
         picture
-        featureFlags {
-          retrosInDisguise
-        }
       }
     `,
     viewerRef
@@ -127,7 +122,7 @@ const DiscussionThreadInput = forwardRef((props: Props, ref: any) => {
     `,
     discussionRef
   )
-  const {picture, featureFlags} = viewer
+  const {picture} = viewer
   const isReply = !!props.isReply
   const isDisabled = !!props.isDisabled
   const {id: discussionId, meetingId, isAnonymousComment, team, discussionTopicType} = discussion
@@ -298,8 +293,7 @@ const DiscussionThreadInput = forwardRef((props: Props, ref: any) => {
     }
   }, [])
 
-  const allowAddActivity = featureFlags.retrosInDisguise
-  const isActionsContainerVisible = allowTasks || allowPolls || allowAddActivity
+  const isActionsContainerVisible = allowTasks || allowPolls
   const isActionsContainerDisabled = isCreatingTask || isCreatingPoll
   const avatar = isAnonymousComment ? anonymousAvatar : picture
 
@@ -345,15 +339,6 @@ const DiscussionThreadInput = forwardRef((props: Props, ref: any) => {
               disabled={isActionsContainerDisabled}
             />
           )}
-          {allowAddActivity && (
-            <AddActivityButton
-              onClick={() => {
-                window.open(`/activity-library/category/recommended`, '_blank', 'noreferrer')
-                SendClientSideEvent(atmosphere, 'Add Activity Button Clicked')
-              }}
-              disabled={isActionsContainerDisabled}
-            />
-          )}
         </ActionsContainer>
       )}
     </Wrapper>
diff --git a/packages/client/modules/demo/initDB.ts b/packages/client/modules/demo/initDB.ts
index 73089695412..6e7954ef5a4 100644
--- a/packages/client/modules/demo/initDB.ts
+++ b/packages/client/modules/demo/initDB.ts
@@ -304,7 +304,6 @@ const initDemoOrg = () => {
       teamsLimit: false,
       noPromptToJoinOrg: false,
       AIGeneratedDiscussionPrompt: false,
-      meetingInception: false,
       publicTeams: false
     },
     showConversionModal: false
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
index fffa8ee086e..211113f9903 100644
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
@@ -14,7 +14,6 @@ enum OrganizationFeatureFlagsEnum {
   oneOnOne
   singleColumnStandups
   publicTeams
-  meetingInception
   kudos
   aiIcebreakers
   aiTemplate
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index 005ced3a3ab..485adcac9f6 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -194,7 +194,6 @@ type OrganizationFeatureFlags {
   oneOnOne: Boolean!
   singleColumnStandups: Boolean!
   publicTeams: Boolean!
-  meetingInception: Boolean!
   kudos: Boolean!
   aiIcebreakers: Boolean!
   aiTemplate: Boolean!
diff --git a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
index efca8fb9406..14f4d59e6a4 100644
--- a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
+++ b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
@@ -13,7 +13,6 @@ const OrganizationFeatureFlags: OrganizationFeatureFlagsResolvers = {
   oneOnOne: ({oneOnOne}) => !!oneOnOne,
   publicTeams: ({publicTeams}) => !!publicTeams,
   singleColumnStandups: ({singleColumnStandups}) => !!singleColumnStandups,
-  meetingInception: ({meetingInception}) => !!meetingInception,
   kudos: ({kudos}) => !!kudos,
   aiIcebreakers: ({aiIcebreakers}) => !!aiIcebreakers,
   aiTemplate: ({aiTemplate}) => !!aiTemplate,

From 10c6f6932008fcca434d1b6a73c288aea88768d5 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Tue, 12 Mar 2024 10:37:11 -0700
Subject: [PATCH 060/183] fix: Korean greeting corrected (#9525)

eat: added additional greetings
feat: added additinal check-in questions
---
 packages/client/utils/makeCheckinGreeting.ts | 44 +++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/packages/client/utils/makeCheckinGreeting.ts b/packages/client/utils/makeCheckinGreeting.ts
index c7618d32e3b..09203e4595f 100644
--- a/packages/client/utils/makeCheckinGreeting.ts
+++ b/packages/client/utils/makeCheckinGreeting.ts
@@ -40,7 +40,7 @@ const greetings = [
     language: 'Chinese'
   },
   {
-    content: 'Yeoboseyo',
+    content: 'Annyeong',
     language: 'Korean'
   },
   {
@@ -70,6 +70,42 @@ const greetings = [
   {
     content: 'Lei Ho',
     language: 'Cantonese'
+  },
+  {
+    content: 'Salaam',
+    language: 'Arabic'
+  },
+  {
+    content: 'Filipino',
+    language: 'Kumusta'
+  },
+  {
+    content: 'Pryvit',
+    language: 'Ukranian'
+  },
+  {
+    content: 'Habari',
+    language: 'Swahili'
+  },
+  {
+    content: 'Vanakkam',
+    language: 'Tamil'
+  },
+  {
+    content: 'Chào',
+    language: 'Vietnamese'
+  },
+  {
+    content: 'Gamardjoba',
+    language: 'Georgian'
+  },
+  {
+    content: 'Selam',
+    language: 'Amharic'
+  },
+  {
+    content: 'Iska warran',
+    language: 'Somalian'
   }
 ]
 
@@ -294,7 +330,11 @@ const questions = [
   'If buying groceries were a game, what would be one of the loading screen tips?',
   'What’s one of your recent pet peeves?',
   'How would your best friend describe you?',
-  'Congratulations! You’ve been chosen to represent your country in a global competition. What sport or activity are you doing?'
+  'Congratulations! You’ve been chosen to represent your country in a global competition. What sport or activity are you doing?',
+  'What’s a small victory you had this week that might seem trivial but was important to you?',
+  'If you could have any author, living or dead, write the story of your life, who would it be and why?',
+  'Imagine you could teleport to any place in the world for your next meal. Where would you go and what would you eat?',
+  'What’s one song that always boosts your mood, no matter how many times you hear it?'
 ]
 
 export const makeCheckinGreeting = (meetingCount: number, seedId = '') => {

From fc4429c85dd9610d3fdadf83882c2dbdd88f424f Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 13 Mar 2024 09:22:27 +0100
Subject: [PATCH 061/183] feat: Recurring GCal event dialog (#9506)

---
 .../ActivityDetailsRecurrenceSettings.tsx     |  42 ----
 .../ActivityDetailsSidebar.tsx                |  68 +++---
 .../ActivityLibrary/ScheduleMeetingButton.tsx |  70 +++---
 .../NewMeetingRecurrenceSettings.tsx          |  32 ++-
 .../Recurrence/RecurrenceSettings.tsx         |  90 ++------
 .../UpdateRecurrenceSettingsModal.tsx         |  85 ++++---
 packages/client/components/ScheduleDialog.tsx | 217 ++++++++++++++++++
 .../components/GcalModal/GcalSettings.tsx     | 164 +++++++++++++
 packages/client/package.json                  |   3 +-
 yarn.lock                                     |  16 +-
 10 files changed, 577 insertions(+), 210 deletions(-)
 delete mode 100644 packages/client/components/ActivityLibrary/ActivityDetailsRecurrenceSettings.tsx
 create mode 100644 packages/client/components/ScheduleDialog.tsx
 create mode 100644 packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx

diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsRecurrenceSettings.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsRecurrenceSettings.tsx
deleted file mode 100644
index 7fe8efeeb21..00000000000
--- a/packages/client/components/ActivityLibrary/ActivityDetailsRecurrenceSettings.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react'
-import {RecurrenceSettings} from '../Recurrence/RecurrenceSettings'
-import NewMeetingDropdown from '../NewMeetingDropdown'
-import {toHumanReadable} from '../Recurrence/HumanReadableRecurrenceRule'
-import useModal from '../../hooks/useModal'
-import DialogContainer from '../DialogContainer'
-
-interface Props {
-  onRecurrenceSettingsUpdated: (recurrenceSettings: RecurrenceSettings) => void
-  recurrenceSettings: RecurrenceSettings
-  placeholder: string
-}
-
-export const ActivityDetailsRecurrenceSettings = (props: Props) => {
-  const {onRecurrenceSettingsUpdated, recurrenceSettings, placeholder} = props
-  const {togglePortal, modalPortal} = useModal({
-    id: 'activityDetailsRecurrenceSettings'
-  })
-
-  return (
-    <>
-      <NewMeetingDropdown
-        label={
-          recurrenceSettings.rrule
-            ? toHumanReadable(recurrenceSettings.rrule, {useShortNames: true, shortDayNameAfter: 1})
-            : 'Does not restart'
-        }
-        title={'Recurrence'}
-        onClick={togglePortal}
-      />
-      {modalPortal(
-        <DialogContainer className='bg-white'>
-          <RecurrenceSettings
-            onRecurrenceSettingsUpdated={onRecurrenceSettingsUpdated}
-            recurrenceSettings={recurrenceSettings}
-            placeholder={placeholder}
-          />
-        </DialogContainer>
-      )}
-    </>
-  )
-}
diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index 645fd319fab..a686ca89c36 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -20,10 +20,12 @@ import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import StartCheckInMutation from '../../mutations/StartCheckInMutation'
 import StartTeamPromptMutation from '../../mutations/StartTeamPromptMutation'
 import {PALETTE} from '../../styles/paletteV3'
-import {CreateGcalEventInput} from '../../__generated__/StartRetrospectiveMutation.graphql'
+import {
+  CreateGcalEventInput,
+  RecurrenceSettingsInput
+} from '../../__generated__/StartRetrospectiveMutation.graphql'
 import sortByTier from '../../utils/sortByTier'
 import {MeetingTypeEnum} from '../../__generated__/ActivityDetailsQuery.graphql'
-import {RecurrenceSettings} from '../Recurrence/RecurrenceSettings'
 import NewMeetingSettingsToggleAnonymity from '../NewMeetingSettingsToggleAnonymity'
 import NewMeetingSettingsToggleTeamHealth from '../NewMeetingSettingsToggleTeamHealth'
 import NewMeetingSettingsToggleCheckIn from '../NewMeetingSettingsToggleCheckIn'
@@ -32,7 +34,6 @@ import FlatPrimaryButton from '../FlatPrimaryButton'
 import NewMeetingActionsCurrentMeetings from '../NewMeetingActionsCurrentMeetings'
 import RaisedButton from '../RaisedButton'
 import NewMeetingTeamPicker from '../NewMeetingTeamPicker'
-import {ActivityDetailsRecurrenceSettings} from './ActivityDetailsRecurrenceSettings'
 import {AdhocTeamMultiSelect, Option} from '../AdhocTeamMultiSelect/AdhocTeamMultiSelect'
 import {Select} from '../../ui/Select/Select'
 import {SelectTrigger} from '../../ui/Select/SelectTrigger'
@@ -119,17 +120,13 @@ const ActivityDetailsSidebar = (props: Props) => {
         ...NewMeetingTeamPicker_teams
         ...NewMeetingActionsCurrentMeetings_team
         ...ScheduleMeetingButton_team
+        ...ScheduleDialog_team
       }
     `,
     teamsRef
   )
 
   const atmosphere = useAtmosphere()
-  const [recurrenceSettings, setRecurrenceSettings] = useState<RecurrenceSettings>({
-    name: '',
-    rrule: null
-  })
-
   const templateTeam = teams.find((team) => team.id === selectedTemplate.teamId)
 
   const availableTeams =
@@ -193,7 +190,10 @@ const ActivityDetailsSidebar = (props: Props) => {
       }
     : null
 
-  const handleStartActivity = (gcalInput?: CreateGcalEventInput) => {
+  const handleStartActivity = (
+    gcalInput?: CreateGcalEventInput,
+    recurrenceSettings?: RecurrenceSettingsInput
+  ) => {
     if (submitting) return
     submitMutation()
     if (type === 'teamPrompt') {
@@ -201,10 +201,12 @@ const ActivityDetailsSidebar = (props: Props) => {
         atmosphere,
         {
           teamId: selectedTeam.id,
-          recurrenceSettings: {
-            rrule: recurrenceSettings.rrule?.toString(),
-            name: recurrenceSettings.name
-          },
+          recurrenceSettings: recurrenceSettings
+            ? {
+                rrule: recurrenceSettings.rrule?.toString(),
+                name: recurrenceSettings.name
+              }
+            : undefined,
           gcalInput
         },
         {history, onError, onCompleted}
@@ -238,10 +240,12 @@ const ActivityDetailsSidebar = (props: Props) => {
                 atmosphere,
                 {
                   teamId: selectedTeam.id,
-                  recurrenceSettings: {
-                    rrule: recurrenceSettings.rrule?.toString(),
-                    name: recurrenceSettings.name
-                  },
+                  recurrenceSettings: recurrenceSettings
+                    ? {
+                        rrule: recurrenceSettings.rrule?.toString(),
+                        name: recurrenceSettings.name
+                      }
+                    : undefined,
                   gcalInput
                 },
                 {history, onError, onCompleted}
@@ -299,6 +303,20 @@ const ActivityDetailsSidebar = (props: Props) => {
     history.push(`/me/organizations/${selectedTeam.orgId}/billing`)
   }
 
+  const meetingNamePlaceholder =
+    type === 'retrospective'
+      ? 'Retro'
+      : type === 'teamPrompt'
+      ? 'Standup'
+      : type === 'poker'
+      ? 'Poker'
+      : type === 'action'
+      ? 'Check-in'
+      : 'Meeting'
+  const withRecurrence =
+    type === 'teamPrompt' ||
+    (selectedTeam.organization.featureFlags.recurringRetros && type === 'retrospective')
+
   return (
     <>
       {isOpen && <div className='w-96' />}
@@ -404,13 +422,6 @@ const ActivityDetailsSidebar = (props: Props) => {
                         teamRef={selectedTeam}
                       />
                       <NewMeetingSettingsToggleAnonymity settingsRef={selectedTeam.retroSettings} />
-                      {selectedTeam.organization.featureFlags.recurringRetros && (
-                        <ActivityDetailsRecurrenceSettings
-                          onRecurrenceSettingsUpdated={setRecurrenceSettings}
-                          recurrenceSettings={recurrenceSettings}
-                          placeholder='Retro'
-                        />
-                      )}
                     </>
                   )}
                   {type === 'poker' && (
@@ -419,13 +430,6 @@ const ActivityDetailsSidebar = (props: Props) => {
                   {type === 'action' && (
                     <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.actionSettings} />
                   )}
-                  {type === 'teamPrompt' && (
-                    <ActivityDetailsRecurrenceSettings
-                      onRecurrenceSettingsUpdated={setRecurrenceSettings}
-                      recurrenceSettings={recurrenceSettings}
-                      placeholder='Standup'
-                    />
-                  )}
                 </>
               )}
             </div>
@@ -449,6 +453,8 @@ const ActivityDetailsSidebar = (props: Props) => {
                 handleStartActivity={handleStartActivity}
                 mutationProps={mutationProps}
                 teamRef={selectedTeam}
+                placeholder={meetingNamePlaceholder}
+                withRecurrence={withRecurrence}
               />
             </>
           )}
diff --git a/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx b/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
index a756aa9bccc..319187dd742 100644
--- a/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
+++ b/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
@@ -1,26 +1,35 @@
-import React, {useEffect, useState} from 'react'
+import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
 import SecondaryButton from '../SecondaryButton'
-import GcalModal from '../../modules/userDashboard/components/GcalModal/GcalModal'
-import {CreateGcalEventInput} from '../../__generated__/StartRetrospectiveMutation.graphql'
-import GcalClientManager from '../../utils/GcalClientManager'
-import useAtmosphere from '../../hooks/useAtmosphere'
+import {
+  CreateGcalEventInput,
+  RecurrenceSettingsInput
+} from '../../__generated__/StartRetrospectiveMutation.graphql'
 import {useFragment} from 'react-relay'
 import {ScheduleMeetingButton_team$key} from '~/__generated__/ScheduleMeetingButton_team.graphql'
 import {MenuMutationProps} from '../../hooks/useMutationProps'
 import useModal from '../../hooks/useModal'
+import {ScheduleDialog} from '../ScheduleDialog'
+import DialogContainer from '../DialogContainer'
 
 type Props = {
   mutationProps: MenuMutationProps
-  handleStartActivity: (gcalInput?: CreateGcalEventInput) => void
+  handleStartActivity: (
+    gcalInput?: CreateGcalEventInput,
+    recurrenceInput?: RecurrenceSettingsInput
+  ) => void
   teamRef: ScheduleMeetingButton_team$key
+  placeholder: string
+  withRecurrence?: boolean
 }
 
 const ScheduleMeetingButton = (props: Props) => {
-  const {mutationProps, handleStartActivity, teamRef} = props
-  const atmosphere = useAtmosphere()
-  const [hasStartedGcalAuthTeamId, setHasStartedGcalAuthTeamId] = useState<null | string>(null)
-  const {togglePortal: toggleModal, modalPortal} = useModal({
+  const {mutationProps, handleStartActivity, teamRef, placeholder, withRecurrence} = props
+  const {
+    togglePortal: toggleModal,
+    closePortal: closeModal,
+    modalPortal
+  } = useModal({
     id: 'createGcalEventModal'
   })
   const {submitting} = mutationProps
@@ -43,32 +52,26 @@ const ScheduleMeetingButton = (props: Props) => {
             }
           }
         }
-        ...GcalModal_team
+        ...ScheduleDialog_team
       }
     `,
     teamRef
   )
-  const {id: teamId, viewerTeamMember} = team
-  const hasStartedGcalAuth = hasStartedGcalAuthTeamId === teamId
+  const {viewerTeamMember} = team
 
   const viewerGcalIntegration = viewerTeamMember?.integrations.gcal
   const cloudProvider = viewerGcalIntegration?.cloudProvider
 
   const handleClick = () => {
-    if (viewerGcalIntegration?.auth) {
-      toggleModal()
-    } else if (cloudProvider) {
-      const {clientId, id: providerId} = cloudProvider
-      GcalClientManager.openOAuth(atmosphere, providerId, clientId, teamId, mutationProps)
-      setHasStartedGcalAuthTeamId(teamId)
-    }
+    toggleModal()
+  }
+  const onStartActivity = (
+    gcalInput?: CreateGcalEventInput,
+    recurrenceInput?: RecurrenceSettingsInput
+  ) => {
+    handleStartActivity(gcalInput, recurrenceInput)
+    closeModal()
   }
-
-  useEffect(() => {
-    if (hasStartedGcalAuth && viewerGcalIntegration?.auth) {
-      toggleModal()
-    }
-  }, [hasStartedGcalAuth, viewerGcalIntegration])
 
   if (!cloudProvider) return null
   return (
@@ -77,11 +80,16 @@ const ScheduleMeetingButton = (props: Props) => {
         <div className='text-lg'>Schedule</div>
       </SecondaryButton>
       {modalPortal(
-        <GcalModal
-          closeModal={toggleModal}
-          handleStartActivityWithGcalEvent={handleStartActivity}
-          teamRef={team}
-        />
+        <DialogContainer className='bg-white'>
+          <ScheduleDialog
+            teamRef={team}
+            placeholder={placeholder}
+            onStartActivity={onStartActivity}
+            onCancel={closeModal}
+            mutationProps={mutationProps}
+            withRecurrence={withRecurrence}
+          />
+        </DialogContainer>
       )}
     </>
   )
diff --git a/packages/client/components/NewMeetingRecurrenceSettings.tsx b/packages/client/components/NewMeetingRecurrenceSettings.tsx
index 6b85c650a51..51206d0f3d0 100644
--- a/packages/client/components/NewMeetingRecurrenceSettings.tsx
+++ b/packages/client/components/NewMeetingRecurrenceSettings.tsx
@@ -1,4 +1,5 @@
-import React from 'react'
+import React, {ChangeEvent} from 'react'
+import {RRule} from 'rrule'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {PortalStatus} from '../hooks/usePortal'
@@ -14,6 +15,17 @@ interface Props {
 
 export const NewMeetingRecurrenceSettings = (props: Props) => {
   const {onRecurrenceSettingsUpdated, recurrenceSettings, placeholder} = props
+  const {rrule, name} = recurrenceSettings
+
+  const onNameChange = (e: ChangeEvent<HTMLInputElement>) => {
+    const title = e.target.value || placeholder
+    onRecurrenceSettingsUpdated({...recurrenceSettings, name: title})
+  }
+
+  const onRruleChange = (rrule: RRule | null) => {
+    onRecurrenceSettingsUpdated({...recurrenceSettings, rrule})
+  }
+
   const {togglePortal, menuPortal, originRef, portalStatus} = useMenu<HTMLDivElement>(
     MenuPosition.LOWER_RIGHT,
     {
@@ -39,11 +51,19 @@ export const NewMeetingRecurrenceSettings = (props: Props) => {
         ref={originRef}
       />
       {menuPortal(
-        <RecurrenceSettings
-          onRecurrenceSettingsUpdated={onRecurrenceSettingsUpdated}
-          recurrenceSettings={recurrenceSettings}
-          placeholder={placeholder}
-        />
+        <div className='flex flex-col'>
+          <input
+            className='form-input m-2 rounded border border-solid border-slate-500 p-2 font-sans text-base hover:border-slate-600 focus:border-slate-600 focus:outline-none focus:ring-1 focus:ring-slate-600'
+            type='text'
+            name='title'
+            placeholder={placeholder}
+            value={name}
+            onChange={onNameChange}
+            min={1}
+            max={50}
+          />
+          <RecurrenceSettings title={name} rrule={rrule} onRruleUpdated={onRruleChange} />
+        </div>
       )}
     </>
   )
diff --git a/packages/client/components/Recurrence/RecurrenceSettings.tsx b/packages/client/components/Recurrence/RecurrenceSettings.tsx
index f90f734500a..8015c6a7772 100644
--- a/packages/client/components/Recurrence/RecurrenceSettings.tsx
+++ b/packages/client/components/Recurrence/RecurrenceSettings.tsx
@@ -10,8 +10,6 @@ import DropdownMenuToggle from '../DropdownMenuToggle'
 import {toHumanReadable} from './HumanReadableRecurrenceRule'
 import {Day, RecurrenceDayCheckbox} from './RecurrenceDayCheckbox'
 import {RecurrenceTimePicker} from './RecurrenceTimePicker'
-import Legitity from '../../validation/Legitity'
-import {isNotNull} from '../../utils/predicates'
 import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from '../../shared/rruleUtil'
 dayjs.extend(utcPlugin)
 
@@ -133,10 +131,7 @@ const Description = ({
   ...rest
 }: PropsWithChildren<React.HTMLAttributes<HTMLDivElement>>) => {
   return (
-    <div
-      className={clsx('max-w-xs break-words text-sm italic text-slate-600', className)}
-      {...rest}
-    >
+    <div className={clsx('break-words text-sm italic text-slate-600', className)} {...rest}>
       {children}
     </div>
   )
@@ -157,46 +152,31 @@ const validateInterval = (interval: number) => {
   return undefined
 }
 
-const validateMeetingSeriesName = (name: string) => {
-  const legitity = new Legitity(name)
-  legitity.trim().max(50, 'Meeting series name must be less than 50 characters')
-
-  return legitity.error
-}
-
 export interface RecurrenceSettings {
   name: string
   rrule: RRule | null
 }
 
 interface Props {
-  onRecurrenceSettingsUpdated: (
-    recurrenceSettings: RecurrenceSettings,
-    validationErrors: string[] | undefined
-  ) => void
-  recurrenceSettings: RecurrenceSettings
-  placeholder: string
+  onRruleUpdated: (rrule: RRule | null) => void
+  rrule: RRule | null
+  title: string
 }
 
 export const RecurrenceSettings = (props: Props) => {
-  const {onRecurrenceSettingsUpdated, recurrenceSettings, placeholder} = props
-  const {name: meetingSeriesName, rrule: recurrenceRule} = recurrenceSettings
-  const [name, setName] = React.useState(meetingSeriesName)
-  const [nameError, setNameError] = React.useState<string | undefined>()
+  const {onRruleUpdated, rrule, title} = props
   const [recurrenceInterval, setRecurrenceInterval] = React.useState(
-    recurrenceRule ? recurrenceRule.options.interval : 1
+    rrule ? rrule.options.interval : 1
   )
   const [intervalError, setIntervalError] = React.useState<string | undefined>()
   const [recurrenceDays, setRecurrenceDays] = React.useState<Day[]>(
-    recurrenceRule
-      ? recurrenceRule.options.byweekday.map(
-          (weekday) => ALL_DAYS.find((day) => day.intVal === weekday)!
-        )
+    rrule
+      ? rrule.options.byweekday.map((weekday) => ALL_DAYS.find((day) => day.intVal === weekday)!)
       : []
   )
   const [recurrenceStartTime, setRecurrenceStartTime] = React.useState<Date>(
-    recurrenceRule
-      ? getJSDateFromRRuleDate(recurrenceRule.options.dtstart)
+    rrule
+      ? getJSDateFromRRuleDate(rrule.options.dtstart)
       : dayjs()
           .add(1, 'day')
           .set('hour', 6)
@@ -235,14 +215,6 @@ export const RecurrenceSettings = (props: Props) => {
     }
   }
 
-  const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const name = e.target.value
-    const res = validateMeetingSeriesName(name)
-
-    setName(e.target.value)
-    setNameError(res)
-  }
-
   useEffect(() => {
     const rrule =
       recurrenceDays.length > 0 && !intervalError
@@ -255,41 +227,21 @@ export const RecurrenceSettings = (props: Props) => {
           })
         : null
 
-    onRecurrenceSettingsUpdated({name, rrule}, [nameError, intervalError].filter(isNotNull))
-  }, [recurrenceDays, recurrenceInterval, recurrenceStartTime, name])
-  const hasErrors = !!nameError || !!intervalError
+    onRruleUpdated(rrule)
+  }, [recurrenceDays, recurrenceInterval, recurrenceStartTime])
 
   return (
     <div className='space-y-4 p-4'>
-      <div className='text-lg font-semibold leading-none'>Recurrence</div>
       <div className='space-y-1'>
         <div className='flex items-center gap-2'>
-          <Input
-            className='h-[34px] w-[210px]'
-            hasError={!!nameError}
-            id='series-title'
-            type='text'
-            placeholder={placeholder}
-            value={meetingSeriesName}
-            onChange={handleNameChange}
-            min={1}
-            max={50}
-            label={
-              <Label className='block ' htmlFor='series-title'>
-                Series title
-              </Label>
-            }
-          />
+          <label className='block text-sm text-slate-800' htmlFor='series-interval'>
+            Restarts every
+          </label>
           <Input
             className={'h-[34px] w-[100px]'}
             hasError={!!intervalError}
             id='series-interval'
             type='number'
-            label={
-              <Label className='block' htmlFor='series-interval'>
-                Restarts every
-              </Label>
-            }
             onChange={handleIntervalChange}
             value={recurrenceInterval}
             min={1}
@@ -297,15 +249,13 @@ export const RecurrenceSettings = (props: Props) => {
           />
           <div className='self-end py-2 text-sm'>{plural(recurrenceInterval, 'week')}</div>
         </div>
-        {hasErrors ? (
-          [nameError, intervalError]
-            .filter(isNotNull)
-            .map((error) => <Error key={error}>{error}</Error>)
+        {intervalError ? (
+          <Error key={intervalError}>{intervalError}</Error>
         ) : (
           <Description>
             The next meeting in this series will be called{' '}
             <span className='font-semibold'>
-              "{meetingSeriesName || placeholder} - {dayjs(recurrenceStartTime).format('MMM DD')}"
+              "{title} - {dayjs(recurrenceStartTime).format('MMM DD')}"
             </span>
           </Description>
         )}
@@ -332,8 +282,8 @@ export const RecurrenceSettings = (props: Props) => {
         <Description>
           Your meeting{' '}
           <span className='font-semibold'>
-            {recurrenceRule
-              ? `will restart ${toHumanReadable(recurrenceRule, {isPartOfSentence: true})}`
+            {rrule
+              ? `will restart ${toHumanReadable(rrule, {isPartOfSentence: true})}`
               : 'will not restart'}
           </span>
         </Description>
diff --git a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
index 227fc8667fe..e3e82f88859 100644
--- a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
+++ b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
@@ -1,18 +1,21 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import React, {useMemo, useState} from 'react'
+import React, {ChangeEvent, useMemo, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
 import UpdateRecurrenceSettingsMutation from '~/mutations/UpdateRecurrenceSettingsMutation'
 import {UpdateRecurrenceSettingsModal_meeting$key} from '~/__generated__/UpdateRecurrenceSettingsModal_meeting.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
+import useForm from '../../hooks/useForm'
 import useMutationProps, {getOnCompletedError} from '../../hooks/useMutationProps'
 import {PALETTE} from '../../styles/paletteV3'
 import {CompletedHandler} from '../../types/relayMutations'
+import Legitity from '../../validation/Legitity'
 import {UpdateRecurrenceSettingsMutation as TUpdateRecurrenceSettingsMutation} from '../../__generated__/UpdateRecurrenceSettingsMutation.graphql'
 import DialogContainer from '../DialogContainer'
 import PlainButton from '../PlainButton/PlainButton'
+import StyledError from '../StyledError'
 import {RecurrenceSettings} from './RecurrenceSettings'
 
 const UpdateRecurrenceSettingsModalRoot = styled(DialogContainer)({
@@ -80,6 +83,9 @@ const ErrorContainer = styled('div')({
   padding: '0px 16px 16px 16px'
 })
 
+const validateTitle = (title: string) =>
+  new Legitity(title).trim().min(2, `C’mon, you call that a title?`)
+
 interface Props {
   meeting: UpdateRecurrenceSettingsModal_meeting$key
   closeModal: () => void
@@ -114,14 +120,10 @@ export const UpdateRecurrenceSettingsModal = (props: Props) => {
   const currentRecurrenceRule = meeting.meetingSeries?.recurrenceRule
   const atmosphere = useAtmosphere()
   const isMeetingSeriesActive = meeting.meetingSeries?.cancelledAt === null
-  const [newRecurrenceSettings, setNewRecurrenceSettings] = useState<RecurrenceSettings>(() => ({
-    name: meeting.meetingSeries?.title || '',
-    rrule:
-      isMeetingSeriesActive && currentRecurrenceRule
-        ? RRule.fromString(currentRecurrenceRule)
-        : null
-  }))
-  const [validationErrors, setValidationErrors] = useState<string[] | undefined>(undefined)
+
+  const [rrule, setRrule] = useState<RRule | null>(
+    isMeetingSeriesActive && currentRecurrenceRule ? RRule.fromString(currentRecurrenceRule) : null
+  )
 
   const {submitting, onError, onCompleted, submitMutation, error} = useMutationProps()
   const onRecurrenceSettingsUpdated: CompletedHandler<
@@ -142,8 +144,31 @@ export const UpdateRecurrenceSettingsModal = (props: Props) => {
     closeModal()
   }
 
+  const {fields, onChange} = useForm({
+    title: {
+      getDefault: () => meeting.meetingSeries?.title || ''
+    }
+  })
+  const title = fields.title.value
+  const titleErr = fields.title.error
+
+  const onNameChange = (event: ChangeEvent<HTMLInputElement>) => {
+    if (titleErr) {
+      fields.title.setError('')
+    }
+    onChange(event)
+  }
+
   const onUpdateRecurrenceClicked = () => {
     if (submitting) return
+
+    const title = fields.title.value || placeholder
+    const titleRes = validateTitle(title)
+    if (titleRes.error) {
+      fields.title.setError(titleRes.error)
+      return
+    }
+
     submitMutation()
 
     UpdateRecurrenceSettingsMutation(
@@ -151,8 +176,8 @@ export const UpdateRecurrenceSettingsModal = (props: Props) => {
       {
         meetingId: meeting.id,
         recurrenceSettings: {
-          rrule: newRecurrenceSettings.rrule?.toString(),
-          name: newRecurrenceSettings.name
+          rrule: rrule?.toString(),
+          name: title
         }
       },
       {onError, onCompleted: onRecurrenceSettingsUpdated}
@@ -170,37 +195,41 @@ export const UpdateRecurrenceSettingsModal = (props: Props) => {
     )
   }
 
-  const handleNewRecurrenceSettings = (
-    newRecurrenceSettings: RecurrenceSettings,
-    errors: string[] | undefined
-  ) => {
-    setNewRecurrenceSettings(newRecurrenceSettings)
-    setValidationErrors(errors)
-  }
-
   const canUpdate = useMemo(() => {
-    if (validationErrors?.length) return false
-    const isRecurrenceReenabled = !isMeetingSeriesActive && newRecurrenceSettings.rrule
+    const title = fields.title.value || placeholder
+    const titleRes = validateTitle(title)
+    if (titleRes.error) {
+      fields.title.setError(titleRes.error)
+      return
+    }
+
+    const isRecurrenceReenabled = !isMeetingSeriesActive && rrule
     if (isRecurrenceReenabled) return true
 
     const hasRecurrenceSettingsChanged =
-      isMeetingSeriesActive && currentRecurrenceRule !== newRecurrenceSettings.rrule?.toString()
+      isMeetingSeriesActive && currentRecurrenceRule !== rrule?.toString()
     if (hasRecurrenceSettingsChanged) return true
 
-    const hasNameChanged =
-      isMeetingSeriesActive && meeting.meetingSeries?.title !== newRecurrenceSettings.name
+    const hasNameChanged = isMeetingSeriesActive && meeting.meetingSeries?.title !== title
     if (hasNameChanged) return true
 
     return false
-  }, [meeting, newRecurrenceSettings, currentRecurrenceRule, isMeetingSeriesActive])
+  }, [meeting, title, rrule, currentRecurrenceRule, isMeetingSeriesActive])
 
   return (
     <UpdateRecurrenceSettingsModalRoot>
-      <RecurrenceSettings
-        recurrenceSettings={newRecurrenceSettings}
-        onRecurrenceSettingsUpdated={handleNewRecurrenceSettings}
+      <input
+        className='form-input rounded border border-solid border-slate-500 p-2 font-sans text-base hover:border-slate-600 focus:border-slate-600 focus:outline-none focus:ring-1 focus:ring-slate-600'
+        type='text'
+        name='title'
         placeholder={placeholder}
+        value={title}
+        onChange={onNameChange}
+        min={1}
+        max={50}
       />
+      {titleErr && <StyledError>{titleErr}</StyledError>}
+      <RecurrenceSettings title={title} rrule={rrule} onRruleUpdated={setRrule} />
       <StyledCloseButton onClick={closeModal}>
         <CloseIcon />
       </StyledCloseButton>
diff --git a/packages/client/components/ScheduleDialog.tsx b/packages/client/components/ScheduleDialog.tsx
new file mode 100644
index 00000000000..39f484dbff1
--- /dev/null
+++ b/packages/client/components/ScheduleDialog.tsx
@@ -0,0 +1,217 @@
+import React, {ChangeEvent, useState} from 'react'
+import {RecurrenceSettings} from './Recurrence/RecurrenceSettings'
+import * as Collapsible from '@radix-ui/react-collapsible'
+import {EventRepeat, ExpandMore} from '@mui/icons-material'
+import PrimaryButton from './PrimaryButton'
+import {DialogActions} from '../ui/Dialog/DialogActions'
+import SecondaryButton from './SecondaryButton'
+import GcalSettings, {
+  GcalEventInput
+} from '../modules/userDashboard/components/GcalModal/GcalSettings'
+import logo from '../styles/theme/images/graphics/google.svg'
+import gcalLogo from '../styles/theme/images/graphics/google-calendar.svg'
+import useForm from '../hooks/useForm'
+import StyledError from './StyledError'
+import GcalClientManager from '../utils/GcalClientManager'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
+import graphql from 'babel-plugin-relay/macro'
+import {useFragment} from 'react-relay'
+import {ScheduleDialog_team$key} from '~/__generated__/ScheduleDialog_team.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import {MenuMutationProps} from '../hooks/useMutationProps'
+import Legitity from '../validation/Legitity'
+import {
+  CreateGcalEventInput,
+  RecurrenceSettingsInput
+} from '../__generated__/StartRetrospectiveMutation.graphql'
+import {RRule} from 'rrule'
+import dayjs from 'dayjs'
+import {toHumanReadable} from './Recurrence/HumanReadableRecurrenceRule'
+import clsx from 'clsx'
+import plural from '../utils/plural'
+
+const validateTitle = (title: string) =>
+  new Legitity(title).trim().min(2, `C’mon, you call that a title?`)
+
+interface Props {
+  onStartActivity: (gcalInput?: CreateGcalEventInput, recurrence?: RecurrenceSettingsInput) => void
+  placeholder: string
+  teamRef: ScheduleDialog_team$key
+  onCancel: () => void
+  mutationProps: MenuMutationProps
+  withRecurrence?: boolean
+}
+
+export const ScheduleDialog = (props: Props) => {
+  const {placeholder, teamRef, onCancel, mutationProps, withRecurrence} = props
+  const [rrule, setRrule] = useState<RRule | null>(null)
+  const [openRecurrence, setOpenRecurrence] = React.useState(!!rrule)
+  const [openGcalEvent, setOpenGcalEvent] = React.useState(true)
+  const [addedInvite, setAddedInvite] = React.useState(false)
+
+  const [gcalInput, setGcalInput] = useState<GcalEventInput>({
+    start: dayjs().add(1, 'hour').startOf('hour'),
+    end: dayjs().add(2, 'hour').startOf('hour'),
+    invitees: [],
+    videoType: null
+  })
+
+  const team = useFragment(
+    graphql`
+      fragment ScheduleDialog_team on Team {
+        id
+        viewerTeamMember {
+          isSelf
+          integrations {
+            gcal {
+              auth {
+                id
+              }
+              cloudProvider {
+                id
+                clientId
+              }
+            }
+          }
+        }
+        ...GcalModal_team
+        ...GcalSettings_team
+      }
+    `,
+    teamRef
+  )
+
+  const {id: teamId, viewerTeamMember} = team
+  const {gcal} = viewerTeamMember?.integrations ?? {}
+
+  const atmosphere = useAtmosphere()
+  const {fields, onChange} = useForm({
+    title: {
+      getDefault: () => ''
+    }
+  })
+  const title = fields.title.value
+  const titleErr = fields.title.error
+
+  const onNameChange = (event: ChangeEvent<HTMLInputElement>) => {
+    if (titleErr) {
+      fields.title.setError('')
+    }
+    onChange(event)
+  }
+
+  const handleSubmit = () => {
+    const title = fields.title.value || placeholder
+    const titleRes = validateTitle(title)
+    if (titleRes.error) {
+      fields.title.setError(titleRes.error)
+      return
+    }
+
+    const gcalEventInput = addedInvite
+      ? {
+          title,
+          startTimestamp: gcalInput.start.unix(),
+          endTimestamp: gcalInput.end.unix(),
+          timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+          invitees: gcalInput.invitees,
+          videoType: gcalInput.videoType ?? undefined
+        }
+      : undefined
+    props.onStartActivity(gcalEventInput, rrule ? {rrule} : undefined)
+  }
+
+  const onAddInvite = () => {
+    if (!gcal?.cloudProvider) {
+      return
+    }
+    if (!gcal?.auth) {
+      const {clientId, id: providerId} = gcal.cloudProvider
+      GcalClientManager.openOAuth(atmosphere, providerId, clientId, teamId, mutationProps)
+
+      SendClientSideEvent(atmosphere, 'Schedule meeting add gcal clicked', {
+        teamId: teamId,
+        service: 'gcal'
+      })
+      setAddedInvite(true)
+    } else {
+      setAddedInvite(true)
+    }
+  }
+
+  return (
+    <div className='space-y-4 overflow-auto p-4'>
+      <div className='text-lg font-semibold leading-none'>Schedule Your Meeting</div>
+      <div className='text-sm text-slate-800'>
+        Create a recurring meeting series or add the meeting to your calendar.
+      </div>
+      <div className='flex flex-col'>
+        <input
+          className='form-input rounded border border-solid border-slate-500 p-2 font-sans text-base hover:border-slate-600 focus:border-slate-600 focus:outline-none focus:ring-1 focus:ring-slate-600'
+          type='text'
+          name='title'
+          placeholder={placeholder}
+          value={title}
+          onChange={onNameChange}
+          min={1}
+          max={50}
+        />
+        {titleErr && <StyledError>{titleErr}</StyledError>}
+      </div>
+      {gcal?.cloudProvider &&
+        (gcal?.auth && addedInvite ? (
+          <Collapsible.Root
+            className='flex flex-col rounded border border-slate-500'
+            open={openGcalEvent}
+            onOpenChange={setOpenGcalEvent}
+          >
+            <Collapsible.Trigger className='flex cursor-pointer items-center bg-transparent p-2'>
+              <img src={gcalLogo} className='mr-2 h-6 w-6' />
+              <div className='grow text-left text-lg font-semibold leading-none'>
+                {gcalInput.start.format('MMM D, h:mm A')} - {gcalInput.end.format('h:mm A')}
+                {gcalInput.invitees.length > 0 &&
+                  `, ${gcalInput.invitees.length} ${plural(gcalInput.invitees.length, 'invitee')}`}
+              </div>
+              <ExpandMore className={clsx(openGcalEvent && 'rotate-180')} />
+            </Collapsible.Trigger>
+            <Collapsible.Content className='space-y-4'>
+              <GcalSettings teamRef={team} settings={gcalInput} onSettingsChanged={setGcalInput} />
+            </Collapsible.Content>
+          </Collapsible.Root>
+        ) : (
+          <div>
+            <SecondaryButton className='h-11 pl-3 pr-4' onClick={onAddInvite}>
+              <img src={logo} className='mr-2' />
+              {gcal?.auth ? 'Add Calendar Event' : 'Connect to Google Calendar'}
+            </SecondaryButton>
+          </div>
+        ))}
+      {withRecurrence && (
+        <Collapsible.Root
+          className='flex flex-col rounded border border-slate-500'
+          open={openRecurrence}
+          onOpenChange={setOpenRecurrence}
+        >
+          <Collapsible.Trigger className='flex cursor-pointer items-center justify-between bg-transparent p-2'>
+            <EventRepeat className='mr-2 text-slate-600' />
+            <div className='grow text-left text-lg font-semibold leading-none'>
+              {rrule
+                ? toHumanReadable(rrule, {useShortNames: true, shortDayNameAfter: 1})
+                : 'Does not restart'}
+            </div>
+            <ExpandMore className={clsx(openRecurrence && 'rotate-180')} />
+          </Collapsible.Trigger>
+          <Collapsible.Content className='space-y-4'>
+            <RecurrenceSettings title={title} rrule={rrule} onRruleUpdated={setRrule} />
+          </Collapsible.Content>
+        </Collapsible.Root>
+      )}
+      <DialogActions>
+        <SecondaryButton onClick={onCancel}>Cancel</SecondaryButton>
+        <PrimaryButton size='medium' onClick={handleSubmit}>
+          Create Meeting
+        </PrimaryButton>
+      </DialogActions>
+    </div>
+  )
+}
diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
new file mode 100644
index 00000000000..de4c3c70be1
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
@@ -0,0 +1,164 @@
+import styled from '@emotion/styled'
+import graphql from 'babel-plugin-relay/macro'
+import dayjs from 'dayjs'
+import React, {useEffect, useState} from 'react'
+import DateTimePickers from './DateTimePickers'
+import Checkbox from '../../../../components/Checkbox'
+import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
+import BasicTextArea from '../../../../components/InputField/BasicTextArea'
+import parseEmailAddressList from '../../../../utils/parseEmailAddressList'
+import {useFragment} from 'react-relay'
+import StyledError from '../../../../components/StyledError'
+import VideoConferencing from './VideoConferencing'
+import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
+
+const ErrorMessage = styled(StyledError)({
+  textAlign: 'left',
+  paddingBottom: 8
+})
+
+export interface GcalEventInput {
+  start: dayjs.Dayjs
+  end: dayjs.Dayjs
+  invitees: string[]
+  videoType: GcalVideoTypeEnum | null
+}
+
+interface Props {
+  teamRef: GcalModal_team$key
+  onSettingsChanged: (input: GcalEventInput) => void
+  settings: GcalEventInput
+}
+
+const GcalSettings = (props: Props) => {
+  const {teamRef, settings, onSettingsChanged} = props
+  const {invitees, start, end, videoType} = settings
+  const [rawInvitees, setRawInvitees] = useState(invitees.join(', '))
+  const [inviteAll, setInviteAll] = useState(true)
+
+  const [inviteError, setInviteError] = useState<null | string>(null)
+
+  const setInvitees = (invitees: string[]) => {
+    onSettingsChanged({...settings, invitees})
+  }
+  const setVideoType = (videoType: GcalVideoTypeEnum | null) => {
+    onSettingsChanged({...settings, videoType})
+  }
+
+  const setStart = (start: dayjs.Dayjs) => {
+    onSettingsChanged({...settings, start})
+  }
+  const setEnd = (end: dayjs.Dayjs) => {
+    onSettingsChanged({...settings, end})
+  }
+
+  const team = useFragment(
+    graphql`
+      fragment GcalSettings_team on Team {
+        name
+        teamMembers {
+          email
+          isSelf
+        }
+      }
+    `,
+    teamRef
+  )
+  const {teamMembers, name: teamName} = team ?? {}
+  const teamMemberEmails = teamMembers?.filter(({isSelf}) => !isSelf).map(({email}) => email)
+  const hasTeamMemberEmails = teamMemberEmails?.length > 0
+
+  const onInvitesChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    const nextValue = e.target.value
+    if (rawInvitees === nextValue) return
+    const {parsedInvitees, invalidEmailExists} = parseEmailAddressList(nextValue)
+    const allInvitees = parsedInvitees
+      ? (parsedInvitees.map((invitee: any) => invitee.address) as string[])
+      : []
+    const uniqueInvitees = Array.from(new Set(allInvitees))
+    if (invalidEmailExists) {
+      const lastValidEmail = uniqueInvitees[uniqueInvitees.length - 1]
+      lastValidEmail
+        ? setInviteError(`Invalid email(s) after ${lastValidEmail}`)
+        : setInviteError(`Invalid email(s)`)
+    } else {
+      setInviteError(null)
+    }
+    setRawInvitees(nextValue)
+    setInvitees(uniqueInvitees)
+  }
+
+  const addAllTeamMembers = () => {
+    const {parsedInvitees} = parseEmailAddressList(rawInvitees)
+    const currentInvitees = parsedInvitees
+      ? (parsedInvitees as emailAddresses.ParsedMailbox[]).map((invitee) => invitee.address)
+      : []
+    const emailsToAdd = teamMemberEmails.filter((email) => !currentInvitees.includes(email))
+    const lastInvitee = currentInvitees[currentInvitees.length - 1]
+    const formattedCurrentInvitees =
+      currentInvitees.length && lastInvitee && !lastInvitee.endsWith(',')
+        ? `${currentInvitees.join(', ')}, `
+        : currentInvitees.join(', ')
+    setRawInvitees(`${formattedCurrentInvitees}${emailsToAdd.join(', ')}`)
+    setInvitees([...currentInvitees, ...emailsToAdd])
+  }
+
+  useEffect(() => {
+    if (hasTeamMemberEmails) {
+      addAllTeamMembers()
+    }
+  }, [hasTeamMemberEmails])
+
+  const removeAllTeamMembers = () => {
+    const {parsedInvitees} = parseEmailAddressList(rawInvitees)
+    const currentInvitees = parsedInvitees
+      ? (parsedInvitees.map((invitee: any) => invitee.address) as string[])
+      : []
+    const remainingInvitees = currentInvitees.filter((email) => !teamMemberEmails.includes(email))
+    setRawInvitees(remainingInvitees.join(', '))
+    setInvitees(remainingInvitees)
+  }
+
+  const handleToggleInviteAll = () => {
+    if (!inviteAll) {
+      addAllTeamMembers()
+    } else {
+      removeAllTeamMembers()
+    }
+    setInviteAll((inviteAll) => !inviteAll)
+  }
+
+  const handleChangeVideoType = (option: GcalVideoTypeEnum | null) => {
+    setVideoType(option)
+  }
+
+  return (
+    <div className='space-y-4 p-4'>
+      <div className='pt-1'>
+        <DateTimePickers startValue={start} endValue={end} setStart={setStart} setEnd={setEnd} />
+      </div>
+      <VideoConferencing
+        videoType={videoType ?? null}
+        handleChangeVideoType={handleChangeVideoType}
+      />
+      <p className='pt-2 text-xs leading-4'>{'Invite others to your Google Calendar event'}</p>
+      <BasicTextArea
+        name='rawInvitees'
+        onChange={onInvitesChange}
+        placeholder='email@example.co, another@example.co'
+        value={rawInvitees}
+      />
+      {hasTeamMemberEmails && (
+        <div className='flex cursor-pointer items-center pt-1' onClick={handleToggleInviteAll}>
+          <Checkbox active={inviteAll} />
+          <label htmlFor='checkbox' className='text-gray-700 ml-2 cursor-pointer'>
+            {`Invite team members from ${teamName}`}
+          </label>
+        </div>
+      )}
+      {inviteError && <ErrorMessage>{inviteError}</ErrorMessage>}
+    </div>
+  )
+}
+
+export default GcalSettings
diff --git a/packages/client/package.json b/packages/client/package.json
index 81691d805d0..757226203fe 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -75,15 +75,16 @@
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.9.2",
     "@mui/x-date-pickers": "^6.3.1",
+    "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-dropdown-menu": "^2.0.4",
     "@radix-ui/react-radio-group": "^1.1.2",
     "@radix-ui/react-scroll-area": "^1.0.3",
     "@radix-ui/react-select": "^1.2.2",
-    "@radix-ui/react-tooltip": "^1.0.7",
     "@radix-ui/react-slot": "^1.0.2",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-alert-dialog": "1.0.5",
+    "@radix-ui/react-tooltip": "^1.0.7",
     "@sentry/browser": "^5.8.0",
     "@stripe/react-stripe-js": "^1.16.5",
     "@stripe/stripe-js": "^1.47.0",
diff --git a/yarn.lock b/yarn.lock
index ffa47f0a625..38410b42173 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5736,6 +5736,21 @@
     "@radix-ui/react-use-callback-ref" "1.0.1"
     "@radix-ui/react-use-layout-effect" "1.0.1"
 
+"@radix-ui/react-collapsible@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-collapsible/-/react-collapsible-1.0.3.tgz#df0e22e7a025439f13f62d4e4a9e92c4a0df5b81"
+  integrity sha512-UBmVDkmR6IvDsloHVN+3rtx4Mi5TFvylYXpluuv0f37dtaz3H99bp8No0LGXRigVpl3UAT4l9j6bIchh42S/Gg==
+  dependencies:
+    "@babel/runtime" "^7.13.10"
+    "@radix-ui/primitive" "1.0.1"
+    "@radix-ui/react-compose-refs" "1.0.1"
+    "@radix-ui/react-context" "1.0.1"
+    "@radix-ui/react-id" "1.0.1"
+    "@radix-ui/react-presence" "1.0.1"
+    "@radix-ui/react-primitive" "1.0.3"
+    "@radix-ui/react-use-controllable-state" "1.0.1"
+    "@radix-ui/react-use-layout-effect" "1.0.1"
+
 "@radix-ui/react-collection@1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.0.2.tgz#d50da00bfa2ac14585319efdbbb081d4c5a29a97"
@@ -11285,7 +11300,6 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
-  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"

From 1ed279673fdaa7a21a995677c7e2b0e6a7c41f96 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 13 Mar 2024 13:20:17 +0100
Subject: [PATCH 062/183] feat: Release MS Teams integration (#9527)

---
 packages/client/modules/demo/DemoUser.ts                    | 3 +--
 .../teamDashboard/components/ProviderList/ProviderList.tsx  | 6 ++----
 .../graphql/public/typeDefs/updateFeatureFlag.graphql       | 2 --
 packages/server/graphql/public/types/UserFeatureFlags.ts    | 1 -
 packages/server/graphql/types/UserFlagEnum.ts               | 1 -
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/client/modules/demo/DemoUser.ts b/packages/client/modules/demo/DemoUser.ts
index 65a6761e8cd..d875eb2bbcb 100644
--- a/packages/client/modules/demo/DemoUser.ts
+++ b/packages/client/modules/demo/DemoUser.ts
@@ -8,8 +8,7 @@ export default class DemoUser {
   createdAt = new Date().toJSON()
   email: string
   featureFlags = {
-    azureDevOps: false,
-    msTeams: false
+    azureDevOps: false
   }
   facilitatorUserId: string
   facilitatorName: string
diff --git a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
index a10e921a271..d8eb7a84485 100644
--- a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
@@ -109,7 +109,6 @@ const query = graphql`
       }
       featureFlags {
         azureDevOps
-        msTeams
       }
     }
   }
@@ -120,7 +119,7 @@ const ProviderList = (props: Props) => {
   const data = usePreloadedQuery<ProviderListQuery>(query, queryRef)
   const {viewer} = data
   const {
-    featureFlags: {azureDevOps: allowAzureDevOps, msTeams: allowMSTeams}
+    featureFlags: {azureDevOps: allowAzureDevOps}
   } = viewer
 
   const integrations = viewer.teamMember?.integrations
@@ -166,8 +165,7 @@ const ProviderList = (props: Props) => {
     {
       name: 'MS Teams',
       connected: !!integrations?.msTeams.auth,
-      component: <MSTeamsProviderRow teamId={teamId} viewerRef={viewer} />,
-      hidden: !allowMSTeams
+      component: <MSTeamsProviderRow teamId={teamId} viewerRef={viewer} />
     },
     {
       name: 'Gcal Integration',
diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
index fe47e6f40f4..ba9506cf4cd 100644
--- a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
+++ b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
@@ -4,7 +4,6 @@ A flag to give an individual user super powers
 enum UserFlagEnum {
   standups
   azureDevOps
-  msTeams
   insights
   recurrence
   noAISummary
@@ -21,7 +20,6 @@ The types of flags that give an individual user super powers
 type UserFeatureFlags {
   standups: Boolean!
   azureDevOps: Boolean!
-  msTeams: Boolean!
   insights: Boolean!
   recurrence: Boolean!
   noAISummary: Boolean!
diff --git a/packages/server/graphql/public/types/UserFeatureFlags.ts b/packages/server/graphql/public/types/UserFeatureFlags.ts
index 84bdbd8f5ec..806a33b7c8a 100644
--- a/packages/server/graphql/public/types/UserFeatureFlags.ts
+++ b/packages/server/graphql/public/types/UserFeatureFlags.ts
@@ -2,7 +2,6 @@ import {UserFeatureFlagsResolvers} from '../resolverTypes'
 
 const UserFeatureFlags: UserFeatureFlagsResolvers = {
   azureDevOps: ({azureDevOps}) => !!azureDevOps,
-  msTeams: ({msTeams}) => !!msTeams,
   insights: ({insights}) => !!insights,
   noAISummary: ({noAISummary}) => !!noAISummary,
   noMeetingHistoryLimit: ({noMeetingHistoryLimit}) => !!noMeetingHistoryLimit,
diff --git a/packages/server/graphql/types/UserFlagEnum.ts b/packages/server/graphql/types/UserFlagEnum.ts
index 94827237ab3..09c6c59140a 100644
--- a/packages/server/graphql/types/UserFlagEnum.ts
+++ b/packages/server/graphql/types/UserFlagEnum.ts
@@ -5,7 +5,6 @@ const UserFlagEnum = new GraphQLEnumType({
   description: 'A flag to give an individual user super powers',
   values: {
     azureDevOps: {},
-    msTeams: {},
     noAISummary: {},
     noMeetingHistoryLimit: {},
     adHocTeams: {},

From 470e0179a21f088eaaec8784f7d84f6833948a26 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 18:33:59 +0100
Subject: [PATCH 063/183] chore(release): release v7.22.0 (#9513)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 25 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 3107bf4b240..16cdb1218de 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.21.0"
+  ".": "7.22.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c613055fc36..9a8e8c93017 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,31 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.22.0](https://github.com/ParabolInc/parabol/compare/v7.21.0...v7.22.0) (2024-03-13)
+
+
+### Added
+
+* Add team sections to the Custom category in activity library ([#9511](https://github.com/ParabolInc/parabol/issues/9511)) ([2338414](https://github.com/ParabolInc/parabol/commit/233841498bf997343f3d94e443104973078bf736))
+* added additinal check-in questions ([10c6f69](https://github.com/ParabolInc/parabol/commit/10c6f6932008fcca434d1b6a73c288aea88768d5))
+* managing teams ([#9285](https://github.com/ParabolInc/parabol/issues/9285)) ([f351cf9](https://github.com/ParabolInc/parabol/commit/f351cf9f5a894fe019f331cc0ec6f012a0779c42))
+* Recurring GCal event dialog ([#9506](https://github.com/ParabolInc/parabol/issues/9506)) ([fc4429c](https://github.com/ParabolInc/parabol/commit/fc4429c85dd9610d3fdadf83882c2dbdd88f424f))
+* Release MS Teams integration ([#9527](https://github.com/ParabolInc/parabol/issues/9527)) ([1ed2796](https://github.com/ParabolInc/parabol/commit/1ed279673fdaa7a21a995677c7e2b0e6a7c41f96))
+
+
+### Fixed
+
+* Korean greeting corrected ([#9525](https://github.com/ParabolInc/parabol/issues/9525)) ([10c6f69](https://github.com/ParabolInc/parabol/commit/10c6f6932008fcca434d1b6a73c288aea88768d5))
+* Make hasGCalError optional ([#9526](https://github.com/ParabolInc/parabol/issues/9526)) ([9350b93](https://github.com/ParabolInc/parabol/commit/9350b93b7a2a6f48e0af712cc0a6edbb8395004c))
+* recreate lockfile ([#9516](https://github.com/ParabolInc/parabol/issues/9516)) ([af47966](https://github.com/ParabolInc/parabol/commit/af47966d6c07b295536327a3ee4d6bac1fece57b))
+
+
+### Changed
+
+* **ci:** add capability to manually generate Docker Images ([#9524](https://github.com/ParabolInc/parabol/issues/9524)) ([88bf97f](https://github.com/ParabolInc/parabol/commit/88bf97f6ff3e820d49a24e9a8a8cf4dbab46b22c))
+* **gh-actions:** reporting status to Slack if test or build GH Actions fail ([#9512](https://github.com/ParabolInc/parabol/issues/9512)) ([e7539d1](https://github.com/ParabolInc/parabol/commit/e7539d152ccfb5fbe12bdcb9b5ce3cc64fd2955c))
+* Remove Add Activity button from discussions ([#9528](https://github.com/ParabolInc/parabol/issues/9528)) ([37bd20c](https://github.com/ParabolInc/parabol/commit/37bd20cf8e073d353e3b3dffb5f3037c199adf67))
+
 ## [7.21.0](https://github.com/ParabolInc/parabol/compare/v7.20.0...v7.21.0) (2024-03-06)
 
 
diff --git a/package.json b/package.json
index dc0564d2e8c..d9ee48e96e0 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index ab2130ca1fe..1cffb8860a9 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.21.0"
+    "parabol-server": "7.22.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 757226203fe..407e0cf4d90 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index db8f577b591..328c41ca21a 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.21.0",
-    "parabol-server": "7.21.0",
+    "parabol-client": "7.22.0",
+    "parabol-server": "7.22.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index b1a78c0c54a..60ffcae17c9 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 8fcf641b27d..ca2e5ca1895 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.21.0",
+  "version": "7.22.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.21.0",
+    "parabol-client": "7.22.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From c417b453bc032a6bf813f477c9f1857205ffc767 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 14 Mar 2024 13:17:55 +0100
Subject: [PATCH 064/183] lint exceptions

---
 .../ActivityLibrary/ActivityDetails/ActivityDetails.tsx         | 1 +
 .../client/modules/summary/components/NewMeetingSummary.tsx     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
index 9fcca27d12c..7f1706645c2 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -74,6 +74,7 @@ const ActivityDetails = (props: Props) => {
   if (!activity) {
     return <Redirect to='/activity-library' />
   }
+  // eslint-disable react-hooks/rules-of-hooks -- return above violates these rules, but is just a safeguard and not normal usage
   useEffect(() => {
     SendClientSideEvent(atmosphere, 'Viewed Template', {
       meetingType: activity.type,
diff --git a/packages/client/modules/summary/components/NewMeetingSummary.tsx b/packages/client/modules/summary/components/NewMeetingSummary.tsx
index 3e891548124..11e11406a67 100644
--- a/packages/client/modules/summary/components/NewMeetingSummary.tsx
+++ b/packages/client/modules/summary/components/NewMeetingSummary.tsx
@@ -60,10 +60,10 @@ const NewMeetingSummary = (props: Props) => {
   if (!newMeeting) {
     return null
   }
+  // eslint-disable react-hooks/rules-of-hooks -- return above violates these rules, but is just a safeguard and not normal usage
   const {id: meetingId, name: meetingName, team} = newMeeting
   const {id: teamId, name: teamName} = team
   const title = `${meetingName} ${MEETING_SUMMARY_LABEL} | ${teamName}`
-  // eslint-disable-next-line react-hooks/rules-of-hooks
   useDocumentTitle(title, 'Summary')
   const meetingUrl = makeHref(`/meet/${meetingId}`)
   const teamDashUrl = `/team/${teamId}/tasks`

From efc0dc9d090f2bcd03d5abedc04a5507addb2f6e Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Thu, 14 Mar 2024 13:14:16 -0700
Subject: [PATCH 065/183] chore: migrate FailedAuthRequest to pg (#9500)

---
 packages/server/__tests__/globalSetup.ts      |  2 +-
 .../database/types/FailedAuthRequest.ts       |  7 +--
 .../graphql/mutations/helpers/attemptLogin.ts | 52 ++++++++++++-------
 .../server/graphql/mutations/resetPassword.ts |  4 +-
 .../1709927369000_addFailedAuthRequest.ts     | 28 ++++++++++
 yarn.lock                                     |  1 +
 6 files changed, 66 insertions(+), 28 deletions(-)
 create mode 100644 packages/server/postgres/migrations/1709927369000_addFailedAuthRequest.ts

diff --git a/packages/server/__tests__/globalSetup.ts b/packages/server/__tests__/globalSetup.ts
index b4cba0d381f..69df2a89fdd 100644
--- a/packages/server/__tests__/globalSetup.ts
+++ b/packages/server/__tests__/globalSetup.ts
@@ -9,7 +9,7 @@ async function setup() {
   // so the safety checks will eventually fail if run too much
 
   await Promise.all([
-    r.table('FailedAuthRequest').delete().run(),
+    pg.deleteFrom('FailedAuthRequest').execute(),
     r.table('PasswordResetRequest').delete().run(),
     pg.deleteFrom('SAMLDomain').where('domain', '=', 'example.com').execute()
   ])
diff --git a/packages/server/database/types/FailedAuthRequest.ts b/packages/server/database/types/FailedAuthRequest.ts
index 7f6d165d9a2..fe30f30aafe 100644
--- a/packages/server/database/types/FailedAuthRequest.ts
+++ b/packages/server/database/types/FailedAuthRequest.ts
@@ -1,20 +1,15 @@
-import generateUID from '../../generateUID'
-
 interface Input {
-  id?: string
   ip: string
   email: string
   time?: Date
 }
 
 export default class FailedAuthRequest {
-  id: string
   ip: string
   email: string
   time: Date
   constructor(input: Input) {
-    const {id, email, ip, time} = input
-    this.id = id ?? generateUID()
+    const {email, ip, time} = input
     this.email = email
     this.ip = ip
     this.time = time ?? new Date()
diff --git a/packages/server/graphql/mutations/helpers/attemptLogin.ts b/packages/server/graphql/mutations/helpers/attemptLogin.ts
index 0952c6bd26a..9afe4f20641 100644
--- a/packages/server/graphql/mutations/helpers/attemptLogin.ts
+++ b/packages/server/graphql/mutations/helpers/attemptLogin.ts
@@ -1,44 +1,56 @@
 import bcrypt from 'bcryptjs'
+import {sql} from 'kysely'
 import ms from 'ms'
 import {AuthenticationError, Threshold} from 'parabol-client/types/constEnums'
 import sleep from 'parabol-client/utils/sleep'
 import {AuthIdentityTypeEnum} from '../../../../client/types/constEnums'
-import getRethink from '../../../database/rethinkDriver'
-import {RDatum} from '../../../database/stricterR'
+import getKysely from '../../../postgres/getKysely'
 import AuthIdentityLocal from '../../../database/types/AuthIdentityLocal'
 import AuthToken from '../../../database/types/AuthToken'
 import FailedAuthRequest from '../../../database/types/FailedAuthRequest'
 import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
 
 const logFailedLogin = async (ip: string, email: string) => {
-  const r = await getRethink()
+  const pg = getKysely()
   if (ip) {
     const failedAuthRequest = new FailedAuthRequest({ip, email})
-    await r.table('FailedAuthRequest').insert(failedAuthRequest).run()
+    await pg.insertInto('FailedAuthRequest').values(failedAuthRequest).execute()
   }
 }
 
 const attemptLogin = async (denormEmail: string, password: string, ip = '') => {
-  const r = await getRethink()
+  const pg = getKysely()
   const yesterday = new Date(Date.now() - ms('1d'))
   const email = denormEmail.toLowerCase().trim()
 
   const existingUser = await getUserByEmail(email)
-  const {failOnAccount, failOnTime} = await r({
-    failOnAccount: r
-      .table('FailedAuthRequest')
-      .getAll(ip, {index: 'ip'})
-      .filter({email})
-      .filter((row: RDatum) => row('time').ge(yesterday))
-      .count()
-      .ge(Threshold.MAX_ACCOUNT_PASSWORD_ATTEMPTS) as unknown as boolean,
-    failOnTime: r
-      .table('FailedAuthRequest')
-      .getAll(ip, {index: 'ip'})
-      .filter((row: RDatum) => row('time').ge(yesterday))
-      .count()
-      .ge(Threshold.MAX_DAILY_PASSWORD_ATTEMPTS) as unknown as boolean
-  }).run()
+  const {failOnAccount, failOnTime} = (await pg
+    .with('byAccount', (qb) =>
+      qb
+        .selectFrom('FailedAuthRequest')
+        .select((eb) => eb.fn.count<number>('id').as('attempts'))
+        .where('ip', '=', ip)
+        .where('email', '=', email)
+        .where('time', '>=', yesterday)
+    )
+    .with('byTime', (qb) =>
+      qb
+        .selectFrom('FailedAuthRequest')
+        .select((eb) => eb.fn.count<number>('id').as('attempts'))
+        .where('ip', '=', ip)
+        .where('time', '>=', yesterday)
+    )
+    .selectFrom(['byAccount', 'byTime'])
+    .select(({ref}) => [
+      sql<boolean>`${ref('byAccount.attempts')} >= ${Threshold.MAX_ACCOUNT_PASSWORD_ATTEMPTS}`.as(
+        'failOnAccount'
+      ),
+      sql<boolean>`${ref('byTime.attempts')} >= ${Threshold.MAX_DAILY_PASSWORD_ATTEMPTS}`.as(
+        'failOnTime'
+      )
+    ])
+    .executeTakeFirst()) as {failOnAccount: boolean; failOnTime: boolean}
+
   if (failOnAccount || failOnTime) {
     await sleep(1000)
     // silently fail to trick security researchers
diff --git a/packages/server/graphql/mutations/resetPassword.ts b/packages/server/graphql/mutations/resetPassword.ts
index 8d4f86bc6ae..bc221f06279 100644
--- a/packages/server/graphql/mutations/resetPassword.ts
+++ b/packages/server/graphql/mutations/resetPassword.ts
@@ -2,6 +2,7 @@ import bcrypt from 'bcryptjs'
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {Security, Threshold} from 'parabol-client/types/constEnums'
 import {AuthIdentityTypeEnum} from '../../../client/types/constEnums'
+import getKysely from '../../postgres/getKysely'
 import getRethink from '../../database/rethinkDriver'
 import AuthIdentityLocal from '../../database/types/AuthIdentityLocal'
 import AuthToken from '../../database/types/AuthToken'
@@ -37,6 +38,7 @@ const resetPassword = {
       if (process.env.AUTH_INTERNAL_DISABLED === 'true') {
         return {error: {message: 'Resetting password is disabled'}}
       }
+      const pg = getKysely()
       const r = await getRethink()
       const resetRequest = (await r
         .table('PasswordResetRequest')
@@ -73,7 +75,7 @@ const resetPassword = {
       localIdentity.isEmailVerified = true
       await Promise.all([
         updateUser({identities}, userId),
-        r.table('FailedAuthRequest').getAll(email, {index: 'email'}).delete().run()
+        pg.deleteFrom('FailedAuthRequest').where('email', '=', email).execute()
       ])
       context.authToken = new AuthToken({sub: userId, tms, rol})
       await blacklistJWT(userId, context.authToken.iat, context.socketId)
diff --git a/packages/server/postgres/migrations/1709927369000_addFailedAuthRequest.ts b/packages/server/postgres/migrations/1709927369000_addFailedAuthRequest.ts
new file mode 100644
index 00000000000..b58461c7b94
--- /dev/null
+++ b/packages/server/postgres/migrations/1709927369000_addFailedAuthRequest.ts
@@ -0,0 +1,28 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    CREATE TABLE "FailedAuthRequest" (
+      "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+      "email" "citext" NOT NULL,
+      "ip" "inet" NOT NULL,
+      "time" TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS "idx_FailedAuthRequest_email" ON "FailedAuthRequest"("email");
+    CREATE INDEX IF NOT EXISTS "idx_FailedAuthRequest_ip" ON "FailedAuthRequest"("ip");
+  `)
+  await client.end()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DROP TABLE IF EXISTS "FailedAuthRequest";
+  `)
+  await client.end()
+}
diff --git a/yarn.lock b/yarn.lock
index 38410b42173..74d28b2fb23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11300,6 +11300,7 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
+  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"

From 5c39fde04c6e8b5c31d70258d4ef7f548aa28298 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Thu, 14 Mar 2024 13:14:41 -0700
Subject: [PATCH 066/183] chore: migrate ScheduledJob from rethinkdb to pg
 (#9490)

---
 .../helpers/removeTeamsLimitObjects.ts        | 17 +++---
 .../server/database/types/ScheduledJob.ts     |  3 -
 .../database/types/scheduleTeamLimitsJobs.ts  | 20 ++++---
 .../mutations/helpers/removeScheduledJobs.ts  | 19 ++++--
 .../server/graphql/mutations/setStageTimer.ts | 10 ++--
 .../private/mutations/runScheduledJobs.ts     | 22 ++++---
 .../1709927822000_addScheduledJob.ts          | 38 ++++++++++++
 .../1709927835000_moveScheduledJob.ts         | 59 +++++++++++++++++++
 8 files changed, 151 insertions(+), 37 deletions(-)
 create mode 100644 packages/server/postgres/migrations/1709927822000_addScheduledJob.ts
 create mode 100644 packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts

diff --git a/packages/server/billing/helpers/removeTeamsLimitObjects.ts b/packages/server/billing/helpers/removeTeamsLimitObjects.ts
index 2f38ee51122..2f112a11077 100644
--- a/packages/server/billing/helpers/removeTeamsLimitObjects.ts
+++ b/packages/server/billing/helpers/removeTeamsLimitObjects.ts
@@ -1,20 +1,21 @@
+import getKysely from '../../postgres/getKysely'
 import {r} from 'rethinkdb-ts'
 import {RValue} from '../../database/stricterR'
 import {DataLoaderWorker} from '../../graphql/graphql'
 import updateNotification from '../../graphql/public/mutations/helpers/updateNotification'
 
 const removeTeamsLimitObjects = async (orgId: string, dataLoader: DataLoaderWorker) => {
-  const removeJobTypes = ['LOCK_ORGANIZATION', 'WARN_ORGANIZATION']
-  const removeNotificationTypes = ['TEAMS_LIMIT_EXCEEDED', 'TEAMS_LIMIT_REMINDER']
+  const removeJobTypes = ['LOCK_ORGANIZATION', 'WARN_ORGANIZATION'] as const
+  const removeNotificationTypes = ['TEAMS_LIMIT_EXCEEDED', 'TEAMS_LIMIT_REMINDER'] as const
+  const pg = getKysely()
 
   // Remove team limits jobs and existing notifications
   const [, updateNotificationsChanges] = await Promise.all([
-    r
-      .table('ScheduledJob')
-      .getAll(orgId, {index: 'orgId'})
-      .filter((row: RValue) => r.expr(removeJobTypes).contains(row('type')))
-      .delete()
-      .run(),
+    pg
+      .deleteFrom('ScheduledJob')
+      .where('orgId', '=', orgId)
+      .where('type', 'in', removeJobTypes)
+      .execute(),
     r
       .table('Notification')
       .getAll(orgId, {index: 'orgId'})
diff --git a/packages/server/database/types/ScheduledJob.ts b/packages/server/database/types/ScheduledJob.ts
index 06071851a89..ad42dce95a6 100644
--- a/packages/server/database/types/ScheduledJob.ts
+++ b/packages/server/database/types/ScheduledJob.ts
@@ -1,11 +1,8 @@
-import generateUID from '../../generateUID'
-
 export type ScheduledJobType =
   | 'MEETING_STAGE_TIME_LIMIT_END'
   | 'LOCK_ORGANIZATION'
   | 'WARN_ORGANIZATION'
 
 export default abstract class ScheduledJob {
-  id = generateUID()
   protected constructor(public type: ScheduledJobType, public runAt: Date) {}
 }
diff --git a/packages/server/database/types/scheduleTeamLimitsJobs.ts b/packages/server/database/types/scheduleTeamLimitsJobs.ts
index 368d75edc6a..427d328e608 100644
--- a/packages/server/database/types/scheduleTeamLimitsJobs.ts
+++ b/packages/server/database/types/scheduleTeamLimitsJobs.ts
@@ -1,21 +1,23 @@
 import ms from 'ms'
-import {r} from 'rethinkdb-ts'
+import getKysely from '../../postgres/getKysely'
 import {Threshold} from '../../../client/types/constEnums'
 import ScheduledTeamLimitsJob from './ScheduledTeamLimitsJob'
 
 const scheduleTeamLimitsJobs = async (scheduledLockAt: Date, orgId: string) => {
-  const scheduledLock = r
-    .table('ScheduledJob')
-    .insert(new ScheduledTeamLimitsJob(scheduledLockAt, orgId, 'LOCK_ORGANIZATION'))
-    .run()
+  const pg = getKysely()
+  const scheduledLock = pg
+    .insertInto('ScheduledJob')
+    .values(new ScheduledTeamLimitsJob(scheduledLockAt, orgId, 'LOCK_ORGANIZATION'))
+    .execute()
 
   const oneWeekBeforeLock = new Date(
     scheduledLockAt.getTime() - ms(`${Threshold.FINAL_WARNING_DAYS_BEFORE_LOCK}d`)
   )
-  const scheduledWarn = r
-    .table('ScheduledJob')
-    .insert(new ScheduledTeamLimitsJob(oneWeekBeforeLock, orgId, 'WARN_ORGANIZATION'))
-    .run()
+
+  const scheduledWarn = pg
+    .insertInto('ScheduledJob')
+    .values(new ScheduledTeamLimitsJob(oneWeekBeforeLock, orgId, 'WARN_ORGANIZATION'))
+    .execute()
 
   await Promise.all([scheduledLock, scheduledWarn])
 }
diff --git a/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts b/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts
index cd6a5eef813..b4931f9ca3b 100644
--- a/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts
+++ b/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts
@@ -1,8 +1,19 @@
-import getRethink from '../../../database/rethinkDriver'
+import {Updateable} from 'kysely'
+import {DB} from '../../../postgres/pg'
+import getKysely from '../../../postgres/getKysely'
 
-const removeScheduledJobs = async (runAt: Date, filter: {[key: string]: any}) => {
-  const r = await getRethink()
-  return r.table('ScheduledJob').getAll(runAt, {index: 'runAt'}).filter(filter).delete().run()
+type FilterType = Omit<Updateable<DB['ScheduledJob']>, 'runAt'>
+
+const removeScheduledJobs = async (runAt: Date, filter?: FilterType) => {
+  const pg = getKysely()
+  let query = pg.deleteFrom('ScheduledJob').where('runAt', '=', runAt)
+  if (filter) {
+    Object.keys(filter).forEach((key) => {
+      const value = filter[key as keyof FilterType]
+      if (value) query = query.where(key as keyof FilterType, '=', value)
+    })
+  }
+  return query.execute()
 }
 
 export default removeScheduledJobs
diff --git a/packages/server/graphql/mutations/setStageTimer.ts b/packages/server/graphql/mutations/setStageTimer.ts
index 81d262d220e..40901c6baa0 100644
--- a/packages/server/graphql/mutations/setStageTimer.ts
+++ b/packages/server/graphql/mutations/setStageTimer.ts
@@ -1,6 +1,7 @@
 import {GraphQLFloat, GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import findStageById from 'parabol-client/utils/meetings/findStageById'
+import getKysely from '../../postgres/getKysely'
 import getRethink from '../../database/rethinkDriver'
 import ScheduledJobMeetingStageTimeLimit from '../../database/types/ScheduledJobMetingStageTimeLimit'
 import {getUserId, isTeamMember} from '../../utils/authorization'
@@ -90,12 +91,13 @@ export default {
           ? new Date(now.getTime() + timeRemaining - AVG_PING)
           : newScheduledEndTime
       } else {
+        const pg = getKysely()
         stage.isAsync = true
         stage.scheduledEndTime = newScheduledEndTime
-        await r
-          .table('ScheduledJob')
-          .insert(new ScheduledJobMeetingStageTimeLimit(newScheduledEndTime, meetingId))
-          .run()
+        await pg
+          .insertInto('ScheduledJob')
+          .values(new ScheduledJobMeetingStageTimeLimit(newScheduledEndTime, meetingId))
+          .execute()
         IntegrationNotifier.startTimeLimit(dataLoader, newScheduledEndTime, meetingId, teamId)
       }
     } else {
diff --git a/packages/server/graphql/private/mutations/runScheduledJobs.ts b/packages/server/graphql/private/mutations/runScheduledJobs.ts
index faee38517ec..aebb1e5eafe 100644
--- a/packages/server/graphql/private/mutations/runScheduledJobs.ts
+++ b/packages/server/graphql/private/mutations/runScheduledJobs.ts
@@ -1,4 +1,7 @@
+import {Selectable} from 'kysely'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
+import getKysely from '../../../postgres/getKysely'
+import {DB} from '../../../postgres/pg'
 import getRethink from '../../../database/rethinkDriver'
 import NotificationMeetingStageTimeLimitEnd from '../../../database/types/NotificationMeetingStageTimeLimitEnd'
 import processTeamsLimitsJob from '../../../database/types/processTeamsLimitsJob'
@@ -39,11 +42,11 @@ const processMeetingStageTimeLimits = async (
 
 export type ScheduledJobUnion = ScheduledJobMeetingStageTimeLimit | ScheduledTeamLimitsJob
 
-const processJob = async (job: ScheduledJobUnion, dataLoader: DataLoaderWorker) => {
-  const r = await getRethink()
-  const res = await r.table('ScheduledJob').get(job.id).delete().run()
+const processJob = async (job: Selectable<DB['ScheduledJob']>, dataLoader: DataLoaderWorker) => {
+  const pg = getKysely()
+  const res = await pg.deleteFrom('ScheduledJob').where('id', '=', job.id).executeTakeFirst()
   // prevent duplicates. after this point, we assume the job finishes to completion (ignores server crashes, etc.)
-  if (res.deleted !== 1) return
+  if (res.numDeletedRows !== BigInt(1)) return
 
   if (job.type === 'MEETING_STAGE_TIME_LIMIT_END') {
     return processMeetingStageTimeLimits(
@@ -60,15 +63,16 @@ const runScheduledJobs: MutationResolvers['runScheduledJobs'] = async (
   {seconds},
   {dataLoader}
 ) => {
-  const r = await getRethink()
+  const pg = getKysely()
   const now = new Date()
 
   // RESOLUTION
   const before = new Date(now.getTime() + seconds * 1000)
-  const upcomingJobs = (await r
-    .table('ScheduledJob')
-    .between(r.minval, before, {index: 'runAt'})
-    .run()) as ScheduledJobUnion[]
+  const upcomingJobs = await pg
+    .selectFrom('ScheduledJob')
+    .selectAll()
+    .where('runAt', '<', before)
+    .execute()
 
   upcomingJobs.forEach((job) => {
     const {runAt} = job
diff --git a/packages/server/postgres/migrations/1709927822000_addScheduledJob.ts b/packages/server/postgres/migrations/1709927822000_addScheduledJob.ts
new file mode 100644
index 00000000000..dffd9217014
--- /dev/null
+++ b/packages/server/postgres/migrations/1709927822000_addScheduledJob.ts
@@ -0,0 +1,38 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DO $$
+    BEGIN
+      IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'ScheduledJobTypeEnum') THEN
+            EXECUTE 'CREATE TYPE "ScheduledJobTypeEnum" AS ENUM (''MEETING_STAGE_TIME_LIMIT_END'', ''LOCK_ORGANIZATION'', ''WARN_ORGANIZATION'')';
+      END IF;
+    END $$;
+
+    CREATE TABLE "ScheduledJob" (
+      "id" SERIAL PRIMARY KEY,
+      "runAt" TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL,
+      "type" "ScheduledJobTypeEnum" NOT NULL,
+      "orgId" VARCHAR(100),
+      "meetingId" VARCHAR(100)
+    );
+
+    CREATE INDEX IF NOT EXISTS "idx_ScheduledJob_orgId" ON "ScheduledJob"("orgId");
+    CREATE INDEX IF NOT EXISTS "idx_ScheduledJob_runAt" ON "ScheduledJob"("runAt");
+    CREATE INDEX IF NOT EXISTS "idx_ScheduledJob_type" ON "ScheduledJob"("type");
+  `)
+  await client.end()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DROP TABLE IF EXISTS "ScheduledJob";
+    DROP TYPE IF EXISTS "ScheduledJobTypeEnum";
+  `)
+  await client.end()
+}
diff --git a/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts b/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts
new file mode 100644
index 00000000000..1a1c6950d64
--- /dev/null
+++ b/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts
@@ -0,0 +1,59 @@
+import {FirstParam} from 'parabol-client/types/generics'
+import {Client} from 'pg'
+import {r} from 'rethinkdb-ts'
+import getPgConfig from '../getPgConfig'
+import connectRethinkDB from '../../database/connectRethinkDB'
+import getPgp from '../getPgp'
+
+export async function up() {
+  await connectRethinkDB()
+  const {pgp, pg} = getPgp()
+  const batchSize = 1000
+
+  const columnSet = new pgp.helpers.ColumnSet(
+    ['runAt', 'type', {name: 'orgId', def: null}, {name: 'meetingId', def: null}],
+    {table: 'ScheduledJob'}
+  )
+
+  const getNextData = async (leftBoundCursor: Date | undefined) => {
+    const startAt = leftBoundCursor || r.minval
+    const nextBatch = await r
+      .table('ScheduledJob')
+      .between(startAt, r.maxval, {index: 'runAt', leftBound: 'open'})
+      .orderBy({index: 'runAt'})
+      .limit(batchSize)
+      .run()
+    if (nextBatch.length === 0) return null
+    if (nextBatch.length < batchSize) return nextBatch
+    const lastItem = nextBatch.pop()
+    const lastMatchingRunAt = nextBatch.findLastIndex((item) => item.runAt !== lastItem!.runAt)
+    if (lastMatchingRunAt === -1) {
+      throw new Error(
+        'batchSize is smaller than the number of items that share the same cursor. Increase batchSize'
+      )
+    }
+    return nextBatch.slice(0, lastMatchingRunAt)
+  }
+
+  await pg.tx('ScheduledJob', (task) => {
+    const fetchAndProcess: FirstParam<typeof task.sequence> = async (
+      _index,
+      leftBoundCursor: undefined | Date
+    ) => {
+      const nextData = await getNextData(leftBoundCursor)
+      if (!nextData) return undefined
+      const insert = pgp.helpers.insert(nextData, columnSet)
+      await task.none(insert)
+      return nextData.at(-1)!.runAt
+    }
+    return task.sequence(fetchAndProcess)
+  })
+  await r.getPoolMaster()?.drain()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`DELETE FROM "ScheduledJob"`)
+  await client.end()
+}

From 1009edefba19b1caec0b8f9708aa468d565fc225 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 14 Mar 2024 16:40:04 -0700
Subject: [PATCH 067/183] fix: node-loader that ignores public path (#9537)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 scripts/webpack/prod.servers.config.js        | 11 ++++--
 .../webpack/utils/node-loader-private/cjs.js  |  6 ++++
 .../utils/node-loader-private/index.js        | 36 +++++++++++++++++++
 .../utils/node-loader-private/options.json    | 20 +++++++++++
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 scripts/webpack/utils/node-loader-private/cjs.js
 create mode 100644 scripts/webpack/utils/node-loader-private/index.js
 create mode 100644 scripts/webpack/utils/node-loader-private/options.json

diff --git a/scripts/webpack/prod.servers.config.js b/scripts/webpack/prod.servers.config.js
index b1b914ba7c2..4f11b012db4 100644
--- a/scripts/webpack/prod.servers.config.js
+++ b/scripts/webpack/prod.servers.config.js
@@ -36,8 +36,12 @@ module.exports = (config) => {
         path.join(SERVER_ROOT, 'server.ts')
       ],
       embedder: [DOTENV, path.join(EMBEDDER_ROOT, 'embedder.ts')],
-      gqlExecutor: [DOTENV, path.join(GQL_ROOT, 'gqlExecutor.ts')],
-      preDeploy: [DOTENV, path.join(PROJECT_ROOT, 'scripts/toolboxSrc/preDeploy.ts')],
+      gqlExecutor: [DOTENV, INIT_PUBLIC_PATH, path.join(GQL_ROOT, 'gqlExecutor.ts')],
+      preDeploy: [
+        DOTENV,
+        INIT_PUBLIC_PATH,
+        path.join(PROJECT_ROOT, 'scripts/toolboxSrc/preDeploy.ts')
+      ],
       pushToCDN: [DOTENV, path.join(PROJECT_ROOT, 'scripts/toolboxSrc/pushToCDN.ts')],
       migrate: [DOTENV, path.join(PROJECT_ROOT, 'scripts/toolboxSrc/standaloneMigrations.ts')],
       assignSURole: [DOTENV, path.join(PROJECT_ROOT, 'scripts/toolboxSrc/assignSURole.ts')]
@@ -120,7 +124,8 @@ module.exports = (config) => {
           test: /\.node$/,
           use: [
             {
-              loader: 'node-loader',
+              // use our fork of node-loader to exclude the public path from the script
+              loader: path.resolve(__dirname, './utils/node-loader-private/cjs.js'),
               options: {
                 // sharp's bindings.gyp is hardcoded to look for libvips 2 directories up
                 // rather than do a custom build, we just output it 2 directories down (/node/binaries)
diff --git a/scripts/webpack/utils/node-loader-private/cjs.js b/scripts/webpack/utils/node-loader-private/cjs.js
new file mode 100644
index 00000000000..9ad6efe69c2
--- /dev/null
+++ b/scripts/webpack/utils/node-loader-private/cjs.js
@@ -0,0 +1,6 @@
+"use strict";
+
+const loader = require("./index");
+
+module.exports = loader.default;
+module.exports.raw = loader.raw;
\ No newline at end of file
diff --git a/scripts/webpack/utils/node-loader-private/index.js b/scripts/webpack/utils/node-loader-private/index.js
new file mode 100644
index 00000000000..1bdea848355
--- /dev/null
+++ b/scripts/webpack/utils/node-loader-private/index.js
@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = loader;
+exports.raw = void 0;
+
+var _loaderUtils = require("loader-utils");
+
+var _options = _interopRequireDefault(require("./options.json"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/*
+  MIT License http://www.opensource.org/licenses/mit-license.php
+  Author Tobias Koppers @sokra
+*/
+function loader(content) {
+  const options = this.getOptions(_options.default);
+  const name = (0, _loaderUtils.interpolateName)(this, typeof options.name !== "undefined" ? options.name : "[contenthash].[ext]", {
+    context: this.rootContext,
+    content
+  });
+  this.emitFile(name, content);
+  return `
+try {
+  process.dlopen(module, __dirname + require("path").sep + ${JSON.stringify(name)}${typeof options.flags !== "undefined" ? `, ${JSON.stringify(options.flags)}` : ""});
+} catch (error) {
+  throw new Error('node-loader:\\n' + error);
+}
+`;
+}
+
+const raw = true;
+exports.raw = raw;
diff --git a/scripts/webpack/utils/node-loader-private/options.json b/scripts/webpack/utils/node-loader-private/options.json
new file mode 100644
index 00000000000..d8322360ca9
--- /dev/null
+++ b/scripts/webpack/utils/node-loader-private/options.json
@@ -0,0 +1,20 @@
+{
+  "title": "Node Loader options",
+  "type": "object",
+  "properties": {
+    "name": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "Function"
+        }
+      ]
+    },
+    "flags": {
+      "type": "integer"
+    }
+  },
+  "additionalProperties": false
+}

From 09302e65ce528987d4e61b48a5f903eb6f591d6d Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 16:45:26 -0700
Subject: [PATCH 068/183] chore(release): release v7.22.1 (#9535)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 13 +++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 16cdb1218de..478dcbd2dfd 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.22.0"
+  ".": "7.22.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a8e8c93017..777d5c240fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.22.1](https://github.com/ParabolInc/parabol/compare/v7.22.0...v7.22.1) (2024-03-14)
+
+
+### Fixed
+
+* node-loader that ignores public path ([#9537](https://github.com/ParabolInc/parabol/issues/9537)) ([1009ede](https://github.com/ParabolInc/parabol/commit/1009edefba19b1caec0b8f9708aa468d565fc225))
+
+
+### Changed
+
+* migrate FailedAuthRequest to pg ([#9500](https://github.com/ParabolInc/parabol/issues/9500)) ([efc0dc9](https://github.com/ParabolInc/parabol/commit/efc0dc9d090f2bcd03d5abedc04a5507addb2f6e))
+* migrate ScheduledJob from rethinkdb to pg ([#9490](https://github.com/ParabolInc/parabol/issues/9490)) ([5c39fde](https://github.com/ParabolInc/parabol/commit/5c39fde04c6e8b5c31d70258d4ef7f548aa28298))
+
 ## [7.22.0](https://github.com/ParabolInc/parabol/compare/v7.21.0...v7.22.0) (2024-03-13)
 
 
diff --git a/package.json b/package.json
index d9ee48e96e0..d9362d8031e 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 1cffb8860a9..b20b12fd946 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.22.0"
+    "parabol-server": "7.22.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 407e0cf4d90..01aa07e3f41 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 328c41ca21a..9b6a0a443f4 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.22.0",
-    "parabol-server": "7.22.0",
+    "parabol-client": "7.22.1",
+    "parabol-server": "7.22.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 60ffcae17c9..0c43beca5f7 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index ca2e5ca1895..243e73e2400 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.0",
+  "version": "7.22.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.22.0",
+    "parabol-client": "7.22.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From bd907a915a1848b17ff9385c70de072390f54cf5 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Thu, 14 Mar 2024 17:02:50 -0700
Subject: [PATCH 069/183] chore: add GH Action, on Snyk PRs commit yarn.lock
 (#9534)

---
 .github/workflows/snyk-yarn-lock-commit.yml | 29 +++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/snyk-yarn-lock-commit.yml

diff --git a/.github/workflows/snyk-yarn-lock-commit.yml b/.github/workflows/snyk-yarn-lock-commit.yml
new file mode 100644
index 00000000000..02de198e665
--- /dev/null
+++ b/.github/workflows/snyk-yarn-lock-commit.yml
@@ -0,0 +1,29 @@
+name: Update Snyk PR to add yarn.lock
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  update-snyk-pr:
+    if: contains(github.event.pull_request.title.toLowerCase(), '[snyk]')
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}  # This token is provided by Actions, no need to create one
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Commit yarn.lock to the PR branch
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "GitHub Action"
+          git add yarn.lock
+          git commit -m "Update yarn.lock" || echo "No changes to commit"
+          git push
+

From 2c98ca1c71bb223d736a9d259f1d6314b8579c35 Mon Sep 17 00:00:00 2001
From: Rafael Romero <rafael@parabol.co>
Date: Mon, 18 Mar 2024 11:40:02 +0000
Subject: [PATCH 070/183] fix(snyk-ci): removed toLowerCase function as it does
 not exit

---
 .github/workflows/snyk-yarn-lock-commit.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/snyk-yarn-lock-commit.yml b/.github/workflows/snyk-yarn-lock-commit.yml
index 02de198e665..f4705ec4b79 100644
--- a/.github/workflows/snyk-yarn-lock-commit.yml
+++ b/.github/workflows/snyk-yarn-lock-commit.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   update-snyk-pr:
-    if: contains(github.event.pull_request.title.toLowerCase(), '[snyk]')
+    if: contains(github.event.pull_request.title, '[Snyk]')
     runs-on: ubuntu-latest
 
     steps:
@@ -26,4 +26,3 @@ jobs:
           git add yarn.lock
           git commit -m "Update yarn.lock" || echo "No changes to commit"
           git push
-

From 0217e11147201759db85a1df010bc3d4d291b202 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 18 Mar 2024 15:42:01 +0100
Subject: [PATCH 071/183] fix: use base ref for migrition order check (#9542)

---
 .github/workflows/migration-order.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/migration-order.yml b/.github/workflows/migration-order.yml
index a026ac8892f..9bce03582a5 100644
--- a/.github/workflows/migration-order.yml
+++ b/.github/workflows/migration-order.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Checkout master
         uses: actions/checkout@v3
         with:
-          ref: master
+          ref: ${{ github.base_ref }}
 
       - name: Get newest migration on master
         run: |

From 081f7a09a94a3ce2d23816e801c745040737364f Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 18 Mar 2024 21:56:37 +0100
Subject: [PATCH 072/183] fix: Only read the first ip of the x-forwarded-for
 header (#9545)

---
 packages/server/utils/uwsGetIP.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/utils/uwsGetIP.ts b/packages/server/utils/uwsGetIP.ts
index 0151cbd55f5..034b266a3c9 100644
--- a/packages/server/utils/uwsGetIP.ts
+++ b/packages/server/utils/uwsGetIP.ts
@@ -1,7 +1,7 @@
 import {HttpRequest, HttpResponse} from 'uWebSockets.js'
 
 const uwsGetIP = (res: HttpResponse, req: HttpRequest) => {
-  const clientIp = req.getHeader('x-forwarded-for')
+  const clientIp = req.getHeader('x-forwarded-for')?.split(',')[0]
   if (clientIp) return clientIp
   // returns ipv6 e.g. '0000:0000:0000:0000:0000:ffff:ac11:0001'
   return Buffer.from(res.getRemoteAddressAsText()).toString()

From 66b09600b9fd879696b039347bcfaf2306638bb1 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:03:36 +0100
Subject: [PATCH 073/183] chore(release): release v7.22.2 (#9539)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 14 ++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 478dcbd2dfd..a5e4e701ea7 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.22.1"
+  ".": "7.22.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 777d5c240fa..e40f96936c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.22.2](https://github.com/ParabolInc/parabol/compare/v7.22.1...v7.22.2) (2024-03-18)
+
+
+### Fixed
+
+* Only read the first ip of the x-forwarded-for header ([#9545](https://github.com/ParabolInc/parabol/issues/9545)) ([081f7a0](https://github.com/ParabolInc/parabol/commit/081f7a09a94a3ce2d23816e801c745040737364f))
+* **snyk-ci:** removed toLowerCase function as it does not exit ([2c98ca1](https://github.com/ParabolInc/parabol/commit/2c98ca1c71bb223d736a9d259f1d6314b8579c35))
+* use base ref for migrition order check ([#9542](https://github.com/ParabolInc/parabol/issues/9542)) ([0217e11](https://github.com/ParabolInc/parabol/commit/0217e11147201759db85a1df010bc3d4d291b202))
+
+
+### Changed
+
+* add GH Action, on Snyk PRs commit yarn.lock ([#9534](https://github.com/ParabolInc/parabol/issues/9534)) ([bd907a9](https://github.com/ParabolInc/parabol/commit/bd907a915a1848b17ff9385c70de072390f54cf5))
+
 ## [7.22.1](https://github.com/ParabolInc/parabol/compare/v7.22.0...v7.22.1) (2024-03-14)
 
 
diff --git a/package.json b/package.json
index d9362d8031e..d228664dd0c 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.1",
+  "version": "7.22.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index b20b12fd946..cc50069e63f 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.22.1",
+  "version": "7.22.2",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.22.1"
+    "parabol-server": "7.22.2"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 01aa07e3f41..82271ce03b8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.1",
+  "version": "7.22.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 9b6a0a443f4..9c8df6f3f95 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.22.1",
+  "version": "7.22.2",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.22.1",
-    "parabol-server": "7.22.1",
+    "parabol-client": "7.22.2",
+    "parabol-server": "7.22.2",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 0c43beca5f7..fed0f57a2eb 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.1",
+  "version": "7.22.2",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 243e73e2400..4fa8018c480 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.1",
+  "version": "7.22.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.22.1",
+    "parabol-client": "7.22.2",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From fe128f017f01148ebd132fd532a771c6ab80ef16 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 19 Mar 2024 09:44:32 +0100
Subject: [PATCH 074/183] chore: Remove random team names (#9543)

---
 packages/client/utils/makeDefaultTeamName.ts  | 54 -------------------
 .../mutations/helpers/bootstrapNewUser.ts     |  3 +-
 .../graphql/mutations/updateTeamName.ts       |  9 +---
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 packages/client/utils/makeDefaultTeamName.ts

diff --git a/packages/client/utils/makeDefaultTeamName.ts b/packages/client/utils/makeDefaultTeamName.ts
deleted file mode 100644
index a9dfbfa857f..00000000000
--- a/packages/client/utils/makeDefaultTeamName.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-export const DEFAULT_TEAM_NAMES = [
-  'Bug Writers 🪲',
-  'Long Meeting Lovers ❣️',
-  'Work Procrastinators ⏱️',
-  'Eat Lunch at 11AM 🥪',
-  'Midday Nap 😴',
-  'Show Us Your Cat 🐱',
-  'Comb Your Hair for Zoom 💅',
-  'Pajama Pants🌛',
-  'Highly Caffeinated ☕',
-  'Mute Slack & Chill 😎',
-  'Friday Afternoon Meetings Should Be Illegal 🙈',
-  'MacGuyvers of Fixing Bugs 🛠️',
-  'Verified Swifties 🤠',
-  'Excel is Hell 🔥',
-  'Ice Cold Seltzer ✨',
-  '5 Minutes Late 😏',
-  'Top Chefs 🧑‍🍳',
-  'Clean Code or Bust 🧽',
-  'Google It 👨‍💻',
-  'AI-Generated Image 🦄',
-  'Circling Back ⭕',
-  'As Per My Last Email 😐',
-  'Mute Button 🔕',
-  'Comfy Socks 🧦',
-  'Show Me the Data ‼️',
-  "Shakira's Strawberry Jam 🍓",
-  "5 O'clock Somewhere 🍻",
-  'Trending on TikTok 🕺',
-  'Sourdough Starter 🍞',
-  'Collaboration Station 🤝',
-  'Keyboard Warriors 🤺',
-  'Sprinting Squirrels 🐿️',
-  'Desk Jockeys 🎵',
-  'Agenda Avengers 📝',
-  'More Cheese 🧀',
-  'Make it Work 💁‍♀️',
-  'We ❤️ Dogs',
-  'Extra Guac 🥑',
-  'Copy/Paste 👬',
-  'SEO Optimized 🔍',
-  'Experience Architects 🏰',
-  'User Interfacers 💡',
-  '404 Error 👾',
-  'Commit and Push 🤓',
-  'Crocs 4 Life 🐊',
-  'Special Coffee Mug ☕'
-]
-
-export const makeDefaultTeamName = (teamId: string) => {
-  const seed = [...teamId].reduce((prev, cur) => prev + cur.charCodeAt(0), 0)
-  const idx = seed % DEFAULT_TEAM_NAMES.length
-  return `Team ${DEFAULT_TEAM_NAMES[idx]!}`
-}
diff --git a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
index a19f962661a..cb4fc7095f6 100644
--- a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
+++ b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
@@ -14,7 +14,6 @@ import createNewOrg from './createNewOrg'
 import createTeamAndLeader from './createTeamAndLeader'
 import getUsersbyDomain from '../../../postgres/queries/getUsersByDomain'
 import sendPromptToJoinOrg from '../../../utils/sendPromptToJoinOrg'
-import {makeDefaultTeamName} from 'parabol-client/utils/makeDefaultTeamName'
 import {DataLoaderWorker} from '../../graphql'
 import acceptTeamInvitation from '../../../safeMutations/acceptTeamInvitation'
 import isValid from '../../isValid'
@@ -137,7 +136,7 @@ const bootstrapNewUser = async (
     const validNewTeam = {
       id: teamId,
       orgId,
-      name: makeDefaultTeamName(teamId),
+      name: `${preferredName}’s Team`,
       isOnboardTeam: true
     }
     const orgName = `${newUser.preferredName}’s Org`
diff --git a/packages/server/graphql/mutations/updateTeamName.ts b/packages/server/graphql/mutations/updateTeamName.ts
index 0788f2d9895..834c7d59318 100644
--- a/packages/server/graphql/mutations/updateTeamName.ts
+++ b/packages/server/graphql/mutations/updateTeamName.ts
@@ -10,7 +10,6 @@ import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import UpdatedTeamInput, {UpdatedTeamInputType} from '../types/UpdatedTeamInput'
 import UpdateTeamNamePayload from '../types/UpdateTeamNamePayload'
-import {makeDefaultTeamName} from 'parabol-client/utils/makeDefaultTeamName'
 
 export default {
   type: UpdateTeamNamePayload,
@@ -60,13 +59,7 @@ export default {
       updatedAt: now
     }
     await updateTeamByTeamId(dbUpdate, teamId)
-    analytics.teamNameChanged(
-      viewer,
-      teamId,
-      oldName,
-      newName,
-      makeDefaultTeamName(teamId) === oldName
-    )
+    analytics.teamNameChanged(viewer, teamId, oldName, newName, oldName.endsWith('’s Team'))
 
     const data = {teamId}
     publish(SubscriptionChannel.TEAM, teamId, 'UpdateTeamNamePayload', data, subOptions)

From 6fca12c814f471ef33954381ee562cbbb4b93d67 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:23:32 +0000
Subject: [PATCH 075/183] chore(repo-structure): Docker images and stacks
 organized and clarified (#9530)

---
 .env.example                                  |  12 +-
 .github/workflows/README.md                   |   2 +-
 .github/workflows/build.yml                   |   9 +-
 .github/workflows/test.yml                    |   2 +-
 docker-compose.yml                            |  53 ----
 docker/Dockerfile.prod                        |  41 ---
 docker/README.md                              |  19 --
 docker/docker-compose.selfHosted.yml          |   6 -
 docker/entrypoint.prod.sh                     |   4 -
 .../parabol-ubi}/.gitignore                   |   0
 .../parabol-ubi}/README.md                    |   8 +-
 .../parabol-ubi}/cloudbuild.yaml              |   0
 .../parabol-ubi}/docker-compose.yml           |   0
 .../parabol-ubi}/dockerfiles/basic.dockerfile |   4 +-
 .../dockerfiles/parabol.dockerfile            |   0
 .../entrypoints/docker-entrypoint.sh          |   0
 .../parabol-ubi}/environments/basic-env       |   2 +-
 .../parabol-ubi}/environments/legacy-build    |   0
 .../parabol-ubi}/environments/pipeline        |   2 +-
 ...rule_account_disable_post_pw_expiration.sh |   0
 ....content_rule_accounts_logon_fail_delay.sh |   0
 ..._accounts_max_concurrent_login_sessions.sh |   0
 ...nt_rule_accounts_maximum_age_login_defs.sh |   0
 ...nt_rule_accounts_minimum_age_login_defs.sh |   0
 ...e_accounts_password_all_shadowed_sha512.sh |   0
 ...ule_accounts_password_minlen_login_defs.sh |   0
 ...tent_rule_accounts_password_pam_dcredit.sh |   0
 ...nt_rule_accounts_password_pam_dictcheck.sh |   0
 ...ontent_rule_accounts_password_pam_difok.sh |   0
 ...tent_rule_accounts_password_pam_lcredit.sh |   0
 ...le_accounts_password_pam_maxclassrepeat.sh |   0
 ...nt_rule_accounts_password_pam_maxrepeat.sh |   0
 ...ent_rule_accounts_password_pam_minclass.sh |   0
 ...ntent_rule_accounts_password_pam_minlen.sh |   0
 ...tent_rule_accounts_password_pam_ocredit.sh |   0
 ...rd_pam_pwhistory_remember_password_auth.sh |   0
 ...word_pam_pwhistory_remember_system_auth.sh |   0
 ...tent_rule_accounts_password_pam_ucredit.sh |   0
 ...ule_accounts_password_pam_unix_remember.sh |   0
 ...nt_rule_accounts_passwords_pam_faillock.sh |   0
 ...le_accounts_passwords_pam_faillock_deny.sh |   0
 ...counts_passwords_pam_faillock_deny_root.sh |   0
 ...ccounts_passwords_pam_faillock_interval.sh |   0
 ...unts_passwords_pam_faillock_unlock_time.sh |   0
 ....content_rule_accounts_umask_etc_bashrc.sh |   0
 ...ntent_rule_accounts_umask_etc_csh_cshrc.sh |   0
 ...tent_rule_accounts_umask_etc_login_defs.sh |   0
 ...content_rule_accounts_umask_etc_profile.sh |   0
 ...sgproject.content_rule_banner_etc_issue.sh |   0
 ...ct.content_rule_configure_crypto_policy.sh |   0
 ...t_rule_configure_kerberos_crypto_policy.sh |   0
 ...nt_rule_configure_openssl_crypto_policy.sh |   0
 ...nt_rule_configure_usbguard_auditbackend.sh |   0
 ...ontent_rule_coredump_disable_backtraces.sh |   0
 ...t.content_rule_coredump_disable_storage.sh |   0
 ...ent_rule_disable_ctrlaltdel_burstaction.sh |   0
 ...ct.content_rule_disable_users_coredumps.sh |   0
 ...ect.content_rule_display_login_attempts.sh |   0
 ...ent_rule_ensure_gpgcheck_local_packages.sh |   0
 ...t_rule_file_groupowner_var_log_messages.sh |   0
 ...ile_groupownership_system_commands_dirs.sh |   0
 ...ontent_rule_file_owner_var_log_messages.sh |   0
 ...content_rule_kernel_module_atm_disabled.sh |   0
 ...content_rule_kernel_module_can_disabled.sh |   0
 ...tent_rule_kernel_module_cramfs_disabled.sh |   0
 ...le_kernel_module_firewire-core_disabled.sh |   0
 ...ontent_rule_kernel_module_sctp_disabled.sh |   0
 ...ontent_rule_kernel_module_tipc_disabled.sh |   0
 ...project.content_rule_no_empty_passwords.sh |   0
 ...content_rule_openssl_use_strong_entropy.sh |   0
 ..._rule_package_crypto-policies_installed.sh |   0
 ...content_rule_package_iptables_installed.sh |   0
 ...ontent_rule_package_rng-tools_installed.sh |   0
 ...ect.content_rule_package_sudo_installed.sh |   0
 ...content_rule_package_usbguard_installed.sh |   0
 ...tent_rule_sudo_require_reauthentication.sh |   0
 ...ct.content_rule_sudoers_validate_passwd.sh |   0
 .../tools/ip-to-server_id/index.js            |   0
 .../tools/ip-to-server_id/package.json        |   0
 .../images}/postgres/Dockerfile               |   8 +-
 docker/images/postgres/extensions/install.sql |   1 +
 docker/stacks/development/README.md           |  43 +++
 .../datadog}/dd-conf.d/gqlExecutor.yml        |   0
 .../development/datadog}/dd-conf.d/web.yml    |   0
 .../development/docker-compose.yml}           |  26 +-
 .../stacks/development/redis/certs}/README.md |  10 +-
 .../redis/certs}/gen-redis-certs.sh           |   0
 .../stacks/development/redis/certs}/redis.crt |   0
 .../stacks/development/redis/certs}/redis.key |   0
 .../development/redis/certs}/redisCA.crt      |   0
 .../single-tenant-host}/.env.example          |   0
 .../single-tenant-host}/README.md             |  10 +-
 .../single-tenant-host}/docker-compose.yaml   |  52 ++--
 .../us-department-of-defense/README.md        |   2 +-
 package.json                                  |   4 +-
 packages/server/database/README.md            |   1 -
 packages/server/postgres/README.md            |  23 --
 .../server/postgres/extensions/install.sql    |   2 -
 .../extensions/postgres-json-schema/Makefile  |   7 -
 .../postgres-json-schema--0.1.1.sql           | 259 ------------------
 .../postgres-json-schema.control              |   3 -
 packages/server/postgres/postgres.conf        |   1 -
 102 files changed, 121 insertions(+), 495 deletions(-)
 delete mode 100644 docker-compose.yml
 delete mode 100644 docker/Dockerfile.prod
 delete mode 100644 docker/README.md
 delete mode 100644 docker/docker-compose.selfHosted.yml
 delete mode 100644 docker/entrypoint.prod.sh
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/.gitignore (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/README.md (95%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/cloudbuild.yaml (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/docker-compose.yml (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/dockerfiles/basic.dockerfile (75%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/dockerfiles/parabol.dockerfile (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/entrypoints/docker-entrypoint.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/environments/basic-env (81%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/environments/legacy-build (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/environments/pipeline (93%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/tools/ip-to-server_id/index.js (100%)
 rename docker/{parabol-ubi/docker-build => images/parabol-ubi}/tools/ip-to-server_id/package.json (100%)
 rename {packages/server => docker/images}/postgres/Dockerfile (72%)
 create mode 100644 docker/images/postgres/extensions/install.sql
 create mode 100644 docker/stacks/development/README.md
 rename docker/{ => stacks/development/datadog}/dd-conf.d/gqlExecutor.yml (100%)
 rename docker/{ => stacks/development/datadog}/dd-conf.d/web.yml (100%)
 rename docker/{dev.yml => stacks/development/docker-compose.yml} (76%)
 rename {certs => docker/stacks/development/redis/certs}/README.md (74%)
 rename {certs => docker/stacks/development/redis/certs}/gen-redis-certs.sh (100%)
 rename {certs => docker/stacks/development/redis/certs}/redis.crt (100%)
 rename {certs => docker/stacks/development/redis/certs}/redis.key (100%)
 rename {certs => docker/stacks/development/redis/certs}/redisCA.crt (100%)
 rename docker/{parabol-ubi/docker-host-st => stacks/single-tenant-host}/.env.example (100%)
 rename docker/{parabol-ubi/docker-host-st => stacks/single-tenant-host}/README.md (88%)
 rename docker/{parabol-ubi/docker-host-st => stacks/single-tenant-host}/docker-compose.yaml (83%)
 delete mode 100644 packages/server/postgres/extensions/install.sql
 delete mode 100644 packages/server/postgres/extensions/postgres-json-schema/Makefile
 delete mode 100644 packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema--0.1.1.sql
 delete mode 100644 packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema.control
 delete mode 100644 packages/server/postgres/postgres.conf

diff --git a/.env.example b/.env.example
index 0d0a44b41f0..97dc499d644 100644
--- a/.env.example
+++ b/.env.example
@@ -74,9 +74,9 @@ POSTGRES_USE_PGVECTOR=true
 # POSTGRES_SSL_DIR='/var/lib/postgresql'
 REDIS_PASSWORD=''
 REDIS_URL='redis://localhost:6379'
-# REDIS_TLS_CERT_FILE=./certs/redis.crt
-# REDIS_TLS_KEY_FILE=./certs/redis.key
-# REDIS_TLS_CA_FILE=./certs/redisCA.crt
+# REDIS_TLS_CERT_FILE=./docker/stacks/development/redis/certs/redis.crt
+# REDIS_TLS_KEY_FILE=./docker/stacks/development/redis/certs/redis.key
+# REDIS_TLS_CA_FILE=./docker/stacks/development/redis/certs/redisCA.crt
 # REDIS_TLS_REJECT_UNAUTHORIZED='false'
 RETHINKDB_URL='rethinkdb://localhost:28015/actionDevelopment'
 RETHINKDB_SSL='false'
@@ -119,9 +119,9 @@ RETHINKDB_SSL='false'
 # RECALL_AI_KEY=''
 # SLACK_CLIENT_ID='key_SLACK_CLIENT_ID'
 # SLACK_CLIENT_SECRET='key_SLACK_CLIENT_SECRET'
-# STRIPE_SECRET_KEY='sk_test_4eC39HqLyjWDarjtT1zdp7dc'
-# STRIPE_PUBLISHABLE_KEY='pk_test_TYooMQauvdEDq54NiTphI7jx'
-# STRIPE_WEBHOOK_SECRET='sk_test_4eC39HqLyjWDarjtT1zdp7dc'
+# STRIPE_SECRET_KEY=''
+# STRIPE_PUBLISHABLE_KEY=''
+# STRIPE_WEBHOOK_SECRET=''
 
 # MAIL
 # MAIL GLOBALS. PROVIDER: mailgun | google | debug | smtp
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 244f4efb0da..0076af84bab 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -2,7 +2,7 @@
 
 ## Runners
 
-To run `docker-build.yml`, GitHub requires using a larger runner.
+To run `build.yml`, GitHub requires using a larger runner.
 This is because we're webpackifying all the code in node_modules into a single `.js.`.
 Doing all that transpiling can take a LOT of memory. 8GB+.
 At this time, large GitHub-hosted runners are in beta.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a19c552ac06..32dab47c748 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,8 +12,8 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 env:
-  PARABOL_DOCKERFILE: ./docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
-  PARABOL_BUILD_ENV_PATH: docker/parabol-ubi/docker-build/environments/pipeline
+  PARABOL_DOCKERFILE: ./docker/images/parabol-ubi/dockerfiles/basic.dockerfile
+  PARABOL_BUILD_ENV_PATH: docker/images/parabol-ubi/environments/pipeline
 jobs:
   build:
     runs-on: ubuntu-8cores
@@ -22,8 +22,7 @@ jobs:
       id-token: "write"
     services:
       postgres:
-        # Image is pinned to v15, OK since it's just for testing
-        image: ankane/pgvector
+        image: pgvector/pgvector:pg15
         # This env variables must be the same in the file PARABOL_BUILD_ENV_PATH
         env:
           POSTGRES_PASSWORD: "temppassword"
@@ -106,7 +105,7 @@ jobs:
           username: "oauth2accesstoken"
           password: "${{ steps.auth.outputs.access_token }}"
       - name: Push build to dev
-        uses: docker/build-push-action@v4
+        uses: docker/images-push-action@v4
         with:
           network: host
           allow: network.host
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cb6c94bd9a4..8378696b622 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 env:
-  PARABOL_BUILD_ENV_PATH: docker/parabol-ubi/docker-build/environments/pipeline
+  PARABOL_BUILD_ENV_PATH: docker/images/parabol-ubi/environments/pipeline
 jobs:
   test:
     runs-on: ubuntu-8cores
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 941a0178a80..00000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-version: "3.7"
-
-services:
-  db:
-    image: rethinkdb:2.4.2
-    ports:
-      - "8080:8080"
-      - "29015:29015"
-      - "28015:28015"
-    volumes:
-      - rethink-data:/data
-    networks:
-      - parabol-network
-  postgres:
-    image: postgres:15.4
-    restart: always
-    env_file: .env
-    ports:
-      - "5432:5432"
-    volumes:
-      - "./packages/server/postgres/postgres.conf:/usr/local/etc/postgres/postgres.conf"
-      - "postgres-data:/data"
-    command: "postgres -c config_file=/usr/local/etc/postgres/postgres.conf"
-    networks:
-      - parabol-network
-  redis:
-    image: redis:7.0-alpine
-    ports:
-      - "6379:6379"
-    volumes:
-      - redis-data:/data
-    networks:
-      - parabol-network
-  app:
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile.prod
-      target: prod
-    env_file: .env
-    ports:
-      - "3000:3000"
-    depends_on:
-      - db
-      - redis
-      - postgres
-    networks:
-      - parabol-network
-networks:
-  parabol-network:
-volumes:
-  redis-data: {}
-  rethink-data: {}
-  postgres-data: {}
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
deleted file mode 100644
index c070ef1e02d..00000000000
--- a/docker/Dockerfile.prod
+++ /dev/null
@@ -1,41 +0,0 @@
-# First, install all dependencies, including devDependencies, to run the build process
-FROM node:20.11.0 as build
-
-WORKDIR /parabol
-
-# Only copy dependency-related files here (vs. COPY . .) to avoid breaking the cache and running
-# the slow `yarn install` more than necessary
-COPY package.json yarn.lock ./
-COPY packages/client/package.json ./packages/client/package.json
-COPY packages/gql-executor/package.json packages/gql-executor/package.json
-COPY packages/integration-tests/package.json packages/integration-tests/package.json
-COPY packages/server/package.json packages/server/package.json
-RUN yarn install --frozen-lockfile && \
-      yarn cache clean
-
-COPY . .
-RUN yarn build
-
-# Now, start over with a new stage so we don't pull over devDependencies
-FROM node:20.11.0 as prod
-
-WORKDIR /parabol
-
-COPY package.json yarn.lock ./
-COPY packages/client/package.json ./packages/client/package.json
-COPY packages/gql-executor/package.json packages/gql-executor/package.json
-COPY packages/integration-tests/package.json packages/integration-tests/package.json
-COPY packages/server/package.json packages/server/package.json
-# Only install production dependencies
-RUN yarn install --prod --frozen-lockfile && \
-      yarn cache clean
-
-COPY . .
-COPY --from=build /parabol/build ./build
-COPY --from=build /parabol/dist ./dist
-
-RUN cp docker/entrypoint.prod.sh /bin/entrypoint && \
-      chmod +x /bin/entrypoint
-EXPOSE 80
-ENTRYPOINT [ "entrypoint" ]
-CMD ["yarn", "start"]
diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index b2ab1cefb56..00000000000
--- a/docker/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Usage of Docker in Different Envs
-
-### Development
-
-In development, docker handles all db services for us. This is done by calling `docker-compose` on the Compose file `./docker/dev.yml`. The web app itself is not containerized; it simply runs on the host machine by calling `yarn && yarn dev`
-
-### Production
-
-In production, dokku creates a Docker container using the [default Node.js heroku buildpack](https://dokku.com/docs~v0.5.1/deployment/buildpacks/). While it's possible to do so, we don't yet provide any [custom Dockerfile to dokku](https://dokku.com/docs~v0.5.1/deployment/dockerfiles/).
-
-### Self-Hosted
-
-Self-hosted instances may use the `docker-compose.yml` file in the root of the project directory. All services, including databases and the web app, will be containerized.
-
-If the owner of the self-hosted instance wants to use local file storage (instead of cloud storage such as AWS or GCP) for user uploaded images, make sure `FILE_STORE_PROVIDER='local'` in the root `.env` file. Additionally, the app must be deployed using the following command:
-
-`docker-compose -f docker-compose.yml -f ./docker/docker-compose.selfHosted.yml up -d`
-
-This ensures that the images will be persisted in a Docker volume.
diff --git a/docker/docker-compose.selfHosted.yml b/docker/docker-compose.selfHosted.yml
deleted file mode 100644
index 1c6598e42a3..00000000000
--- a/docker/docker-compose.selfHosted.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  app:
-    volumes:
-      - app-data:/parabol/self-hosted
-volumes:
-  app-data: {}
diff --git a/docker/entrypoint.prod.sh b/docker/entrypoint.prod.sh
deleted file mode 100644
index 4ce89f9bce8..00000000000
--- a/docker/entrypoint.prod.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-yarn predeploy
-exec "$@"
diff --git a/docker/parabol-ubi/docker-build/.gitignore b/docker/images/parabol-ubi/.gitignore
similarity index 100%
rename from docker/parabol-ubi/docker-build/.gitignore
rename to docker/images/parabol-ubi/.gitignore
diff --git a/docker/parabol-ubi/docker-build/README.md b/docker/images/parabol-ubi/README.md
similarity index 95%
rename from docker/parabol-ubi/docker-build/README.md
rename to docker/images/parabol-ubi/README.md
index 85c1a2d42b3..920c6d48fd8 100644
--- a/docker/parabol-ubi/docker-build/README.md
+++ b/docker/images/parabol-ubi/README.md
@@ -21,9 +21,9 @@ Recommended:
 | `postgresql_tag`     | PostgreSQL version from the [Docker image](https://hub.docker.com/_/postgres)                                           | `Any tag`                                             | `15.4`                                                              |
 | `rethinkdb_tag`      | RethinkDB version from the [Docker image](https://hub.docker.com/_/rethinkdb)                                           | `Any tag`                                             | `2.4.2`                                                             |
 | `redis_tag`          | Redis version from the [Docker image](https://hub.docker.com/_/redis)                                                   | `Any tag`                                             | `7.0-alpine`                                                        |
-| `_BUILD_ENV_PATH`    | File `.env` used by the application during the build process                                                            | `Relative path from the root level of the repository` | `docker/parabol-ubi/docker-build/environments/basic-env`             |
+| `_BUILD_ENV_PATH`    | File `.env` used by the application during the build process                                                            | `Relative path from the root level of the repository` | `docker/parabol-ubi/environments/basic-env`             |
 | `_NODE_VERSION`      | Node version, used by Docker to use the Docker image node:\_NODE_VERSION as base image to build                         | `Same as in root package.json`                        |                                                                     |
-| `_DOCKERFILE`        | Dockerfile used to build the image                                                                                      | `Relative path from the root level of the repository` | `./docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile` |
+| `_DOCKERFILE`        | Dockerfile used to build the image                                                                                      | `Relative path from the root level of the repository` | `./docker/parabol-ubi/dockerfiles/basic.dockerfile` |
 | `_DOCKER_REPOSITORY` | The destination repository                                                                                              | `String`                                              | `parabol`                                                           |
 | `_DOCKER_TAG`        | Tag for the produced image                                                                                              | `String`                                              |                                                                     |
 
@@ -33,9 +33,9 @@ Example of variables:
 export postgresql_tag=15.4; \
 export rethinkdb_tag=2.4.2; \
 export redis_tag=7.0-alpine; \
-export _BUILD_ENV_PATH=docker/parabol-ubi/docker-build/environments/basic-env; \
+export _BUILD_ENV_PATH=docker/parabol-ubi/environments/basic-env; \
 export _NODE_VERSION=$(jq -r -j '.engines.node|ltrimstr("^")' package.json); \
-export _DOCKERFILE=./docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile; \
+export _DOCKERFILE=./docker/parabol-ubi/dockerfiles/basic.dockerfile; \
 export _DOCKER_REPOSITORY=parabol; \
 export _DOCKER_TAG=test-image
 ```
diff --git a/docker/parabol-ubi/docker-build/cloudbuild.yaml b/docker/images/parabol-ubi/cloudbuild.yaml
similarity index 100%
rename from docker/parabol-ubi/docker-build/cloudbuild.yaml
rename to docker/images/parabol-ubi/cloudbuild.yaml
diff --git a/docker/parabol-ubi/docker-build/docker-compose.yml b/docker/images/parabol-ubi/docker-compose.yml
similarity index 100%
rename from docker/parabol-ubi/docker-build/docker-compose.yml
rename to docker/images/parabol-ubi/docker-compose.yml
diff --git a/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile b/docker/images/parabol-ubi/dockerfiles/basic.dockerfile
similarity index 75%
rename from docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
rename to docker/images/parabol-ubi/dockerfiles/basic.dockerfile
index 077d95a8fb6..a2bbbe8c1bb 100644
--- a/docker/parabol-ubi/docker-build/dockerfiles/basic.dockerfile
+++ b/docker/images/parabol-ubi/dockerfiles/basic.dockerfile
@@ -7,8 +7,8 @@ ENV HOME=/home/node \
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 ENV PORT=3000
 
-COPY --chown=node --chmod=755 docker/parabol-ubi/docker-build/entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-COPY --chown=node docker/parabol-ubi/docker-build/tools/ip-to-server_id ${HOME}/tools/ip-to-server_id
+COPY --chown=node --chmod=755 docker/parabol-ubi/entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY --chown=node docker/parabol-ubi/tools/ip-to-server_id ${HOME}/tools/ip-to-server_id
 
 # Required for pushToCDN to work with FILE_STORE_PROVIDER set to 'local'
 RUN mkdir -p ${HOME}/parabol/self-hosted && \
diff --git a/docker/parabol-ubi/docker-build/dockerfiles/parabol.dockerfile b/docker/images/parabol-ubi/dockerfiles/parabol.dockerfile
similarity index 100%
rename from docker/parabol-ubi/docker-build/dockerfiles/parabol.dockerfile
rename to docker/images/parabol-ubi/dockerfiles/parabol.dockerfile
diff --git a/docker/parabol-ubi/docker-build/entrypoints/docker-entrypoint.sh b/docker/images/parabol-ubi/entrypoints/docker-entrypoint.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/entrypoints/docker-entrypoint.sh
rename to docker/images/parabol-ubi/entrypoints/docker-entrypoint.sh
diff --git a/docker/parabol-ubi/docker-build/environments/basic-env b/docker/images/parabol-ubi/environments/basic-env
similarity index 81%
rename from docker/parabol-ubi/docker-build/environments/basic-env
rename to docker/images/parabol-ubi/environments/basic-env
index 86bbad9252d..7141dd3f371 100644
--- a/docker/parabol-ubi/docker-build/environments/basic-env
+++ b/docker/images/parabol-ubi/environments/basic-env
@@ -4,7 +4,7 @@ NODE_ENV='production'
 NODE_EXTRA_CA_CERTS=''
 PROTO='https'
 PORT='3000'
-# Database configurations must be the same used in the docker-build.yml Github workflow
+# Database configurations must be the same used in the build.yml Github workflow
 POSTGRES_PASSWORD='temppassword'
 POSTGRES_USER='tempuser'
 POSTGRES_DB='tempdb'
diff --git a/docker/parabol-ubi/docker-build/environments/legacy-build b/docker/images/parabol-ubi/environments/legacy-build
similarity index 100%
rename from docker/parabol-ubi/docker-build/environments/legacy-build
rename to docker/images/parabol-ubi/environments/legacy-build
diff --git a/docker/parabol-ubi/docker-build/environments/pipeline b/docker/images/parabol-ubi/environments/pipeline
similarity index 93%
rename from docker/parabol-ubi/docker-build/environments/pipeline
rename to docker/images/parabol-ubi/environments/pipeline
index 5641d43725f..cfc707c746b 100644
--- a/docker/parabol-ubi/docker-build/environments/pipeline
+++ b/docker/images/parabol-ubi/environments/pipeline
@@ -36,7 +36,7 @@ PGADMIN_DEFAULT_EMAIL=''
 PGADMIN_DEFAULT_PASSWORD=''
 PGSSLMODE=''
 PORT='3000'
-# Database configurations must be the same used in the docker-build.yml Github workflow
+# Database configurations must be the same used in the build.yml Github workflow
 POSTGRES_PASSWORD='temppassword'
 POSTGRES_USER='tempuser'
 POSTGRES_DB='tempdb'
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh
diff --git a/docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh
similarity index 100%
rename from docker/parabol-ubi/docker-build/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh
rename to docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh
diff --git a/docker/parabol-ubi/docker-build/tools/ip-to-server_id/index.js b/docker/images/parabol-ubi/tools/ip-to-server_id/index.js
similarity index 100%
rename from docker/parabol-ubi/docker-build/tools/ip-to-server_id/index.js
rename to docker/images/parabol-ubi/tools/ip-to-server_id/index.js
diff --git a/docker/parabol-ubi/docker-build/tools/ip-to-server_id/package.json b/docker/images/parabol-ubi/tools/ip-to-server_id/package.json
similarity index 100%
rename from docker/parabol-ubi/docker-build/tools/ip-to-server_id/package.json
rename to docker/images/parabol-ubi/tools/ip-to-server_id/package.json
diff --git a/packages/server/postgres/Dockerfile b/docker/images/postgres/Dockerfile
similarity index 72%
rename from packages/server/postgres/Dockerfile
rename to docker/images/postgres/Dockerfile
index e37b75a097e..3ce8d5d5185 100644
--- a/packages/server/postgres/Dockerfile
+++ b/docker/images/postgres/Dockerfile
@@ -1,15 +1,17 @@
 FROM postgres:15.4
+ARG PGVECTOR_VERSION=v0.6.1
+ARG PSQL_MAJOR_VERSION=15
 
 ADD extensions /extensions
 
 RUN apt-get update && apt-get install -y \
     build-essential \
     locales \
-    postgresql-server-dev-15 \
+    postgresql-server-dev-${PSQL_MAJOR_VERSION} \
     git
 
-RUN cd /extensions/postgres-json-schema && make install && make installcheck
-RUN git clone --branch v0.5.0 \
+# PGVector
+RUN git clone --branch ${PGVECTOR_VERSION} \
        https://github.com/pgvector/pgvector.git /extensions/pgvector && \
        cd extensions/pgvector && make clean && make && make install
 
diff --git a/docker/images/postgres/extensions/install.sql b/docker/images/postgres/extensions/install.sql
new file mode 100644
index 00000000000..5e2d0c13454
--- /dev/null
+++ b/docker/images/postgres/extensions/install.sql
@@ -0,0 +1 @@
+CREATE EXTENSION IF NOT EXISTS "vector";
diff --git a/docker/stacks/development/README.md b/docker/stacks/development/README.md
new file mode 100644
index 00000000000..a14d00d59cb
--- /dev/null
+++ b/docker/stacks/development/README.md
@@ -0,0 +1,43 @@
+# Development stack
+
+> ⚠️ **Parabol does not provide any support on this stack**. Use it under your own resposibility.
+
+## General notes
+
+- **This stack is not meant for production use.** It is our development stack and can change at any moment, have errors and incorporate and remove components we are testing without any notice.
+- This stack is designed to be managed using `yarn db:start` and `yarn db:stop` to start the databases. The application can use it, starting with either `yarn dev` or building the application and using `yarn start`.
+
+## Components
+
+- **Datadog agent:** additional configuration can be added in the folder `datadog/dd-conf.d`.
+- **RethinkDB:** ports 28015 and 8080 (console) exposed to communicate with the cluster. Data mounted in a volume rethinkdb-data.
+- **Postgres:** container built from a Dockerfile in [docker/images/postgres](docker/images/postgres), that incorporates some extra extensions used by the application. Exposed through port 5432 and with the data mounted in a volume postgres-data.
+- **PGAdmin:** available on 5050 with credentials on the `.env` file. Connect using the values of `PGADMIN_DEFAULT_EMAIL` and `PGADMIN_DEFAULT_PASSWORD` from the `.env`. Data mounted on a volume pgadmin-data.
+- **Redis:** available on 6379 with the data mounted on a volume redis-data.
+- **Redis Commander:** available on 8081.
+- **Text Embedding Inference:** toolkit to deploy and serve open source text embeddings and sequence classification models. Exposed on 3040. More information in [their Github](https://github.com/huggingface/text-embeddings-inference).
+
+### Configue PGAdmin
+
+- pgadmin is at [http://localhost:5050](http://localhost:5050)
+- Connect using the values of `PGADMIN_DEFAULT_EMAIL` and `PGADMIN_DEFAULT_PASSWORD` from your `.env`
+- Click **Add New Server** and fill out the forms with your `.env` values
+
+  - General.name = POSTGRES_DB
+  - Connection.host = 'postgres' (hardcoded from docker-compose dev.yml, not from .env!)
+  - Connection.username = POSTGRES_USER
+  - Connection.password = POSTGRES_PASSWORD
+  - Connection.maintenanceDatabase = POSTGRES_DB
+  - Connection.port = POSTGRES_PORT
+
+### Postgres
+
+#### Too many connections
+
+Sometimes pg pool will hit its connection limit. This should never happen in prod, but happens on occassion in dev.
+You'll know it's happening because PG will say there are too many connections.
+To fix, you can run the following SQL to remove all the connections except the one that is running the script
+
+```sql
+select pg_terminate_backend(pid) from pg_stat_activity where datname='parabol-saas' AND pid <> pg_backend_pid();
+```
diff --git a/docker/dd-conf.d/gqlExecutor.yml b/docker/stacks/development/datadog/dd-conf.d/gqlExecutor.yml
similarity index 100%
rename from docker/dd-conf.d/gqlExecutor.yml
rename to docker/stacks/development/datadog/dd-conf.d/gqlExecutor.yml
diff --git a/docker/dd-conf.d/web.yml b/docker/stacks/development/datadog/dd-conf.d/web.yml
similarity index 100%
rename from docker/dd-conf.d/web.yml
rename to docker/stacks/development/datadog/dd-conf.d/web.yml
diff --git a/docker/dev.yml b/docker/stacks/development/docker-compose.yml
similarity index 76%
rename from docker/dev.yml
rename to docker/stacks/development/docker-compose.yml
index c45ba6b6f6b..91adbbb6578 100644
--- a/docker/dev.yml
+++ b/docker/stacks/development/docker-compose.yml
@@ -1,10 +1,11 @@
-version: "3.7"
+version: "3.9"
+name: parabol-dev
 
 services:
   datadog:
     image: gcr.io/datadoghq/agent:7
     restart: unless-stopped
-    env_file: ../.env
+    env_file: ../../../.env
     ports:
       - "8126:8126"
     networks:
@@ -13,7 +14,9 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /proc/:/host/proc/:ro
       - /sys/fs/cgroup:/host/sys/fs/cgroup:ro
-  db:
+      - ".datadog/dd-conf.d:/etc/datadog-agent/conf.d/local.d/"
+      - "../../../dev/logs:/var/log/datadog/logs"
+  rethinkdb:
     image: rethinkdb:2.4.2
     restart: unless-stopped
     ports:
@@ -26,23 +29,20 @@ services:
       - parabol-network
   postgres:
     build:
-      context: "../packages/server/postgres"
+      context: "../../images/postgres"
     restart: unless-stopped
-    env_file: ../.env
+    env_file: ../../../.env
     ports:
       - "5432:5432"
     volumes:
-      - "../packages/server/postgres/postgres.conf:/usr/local/etc/postgres/postgres.conf"
       - "postgres-data:/var/lib/postgresql/data"
-    command: "postgres -c config_file=/usr/local/etc/postgres/postgres.conf"
     networks:
       - parabol-network
   pgadmin:
-    container_name: pgadmin_container
-    image: dpage/pgadmin4:latest
+    image: dpage/pgadmin4:8.3
     depends_on:
       - postgres
-    env_file: ../.env
+    env_file: ../../../.env
     volumes:
       - "pgadmin-data:/var/lib/pgadmin"
     ports:
@@ -60,18 +60,16 @@ services:
     networks:
       - parabol-network
   redis-commander:
-    container_name: redis_commander
-    image: ghcr.io/joeferner/redis-commander:latest
+    image: ghcr.io/joeferner/redis-commander:0.8.1
     hostname: redis-commander
     restart: unless-stopped
     environment:
       - REDIS_HOSTS=local:redis:6379
     ports:
-      - "8082:8081"
+      - "8081:8081"
     networks:
       parabol-network:
   text-embeddings-inference:
-    container_name: text-embeddings-inference
     image: ghcr.io/huggingface/text-embeddings-inference:cpu-0.6
     command:
       - "--model-id=llmrails/ember-v1"
diff --git a/certs/README.md b/docker/stacks/development/redis/certs/README.md
similarity index 74%
rename from certs/README.md
rename to docker/stacks/development/redis/certs/README.md
index 3059e90eead..0a2e2972912 100644
--- a/certs/README.md
+++ b/docker/stacks/development/redis/certs/README.md
@@ -8,8 +8,10 @@ The certs that are checked into version control are self-signed and safe to shar
 All env vars should correspond with the vars in the redis instance.
 
 In development, that means:
-- In the `docker/dev.yml`, add a volume: `bitnami-redis-data: {}`
-- In the `docker/dev.yml`, replace the Redis container sections with the following:
+
+- In the `docker/stacks/development/docker-compose.yml`, add a volume: `bitnami-redis-data: {}`
+- In the `docker/stacks/development/docker-compose.yml`, replace the Redis container sections with the following:
+
   ```yaml
   image: bitnami/redis:7.0-debian-11
   environment:
@@ -25,9 +27,9 @@ In development, that means:
     - ../certs:/opt/bitnami/redis/certs
   ```
 
-- Vars in .env should match the vars in dev.yml
+- Vars in .env should match the vars in `docker/stacks/development/docker-compose.yml`
 
-Any changes to dev.yml require running `yarn db:start`
+Any changes to `docker/stacks/development/docker-compose.yml` require running `yarn db:start`
 
 REDIS_PASSWORD: Use this if you'd like our app to connect to redis using a password
 REDIS_TLS_CERT_FILE: The cert file used to authorize clients. Not available in GCP
diff --git a/certs/gen-redis-certs.sh b/docker/stacks/development/redis/certs/gen-redis-certs.sh
similarity index 100%
rename from certs/gen-redis-certs.sh
rename to docker/stacks/development/redis/certs/gen-redis-certs.sh
diff --git a/certs/redis.crt b/docker/stacks/development/redis/certs/redis.crt
similarity index 100%
rename from certs/redis.crt
rename to docker/stacks/development/redis/certs/redis.crt
diff --git a/certs/redis.key b/docker/stacks/development/redis/certs/redis.key
similarity index 100%
rename from certs/redis.key
rename to docker/stacks/development/redis/certs/redis.key
diff --git a/certs/redisCA.crt b/docker/stacks/development/redis/certs/redisCA.crt
similarity index 100%
rename from certs/redisCA.crt
rename to docker/stacks/development/redis/certs/redisCA.crt
diff --git a/docker/parabol-ubi/docker-host-st/.env.example b/docker/stacks/single-tenant-host/.env.example
similarity index 100%
rename from docker/parabol-ubi/docker-host-st/.env.example
rename to docker/stacks/single-tenant-host/.env.example
diff --git a/docker/parabol-ubi/docker-host-st/README.md b/docker/stacks/single-tenant-host/README.md
similarity index 88%
rename from docker/parabol-ubi/docker-host-st/README.md
rename to docker/stacks/single-tenant-host/README.md
index af3a0b244ec..59a6a4a8a3e 100644
--- a/docker/parabol-ubi/docker-host-st/README.md
+++ b/docker/stacks/single-tenant-host/README.md
@@ -1,8 +1,8 @@
 # Docker Host Single Tenant (ST)
 
-To run Parabol in single tenant mode (e.g. simple docker-compose on a docker host).
+To run Parabol in single tenant mode (e.g. simple docker-compose on a docker host):
 
-1. Build your Parabol UBI using instructions in `docker/ubi/docker-build/README.md`
+1. Build your Parabol UBI using instructions in `docker/images/parabol-ubi/README.md`
 2. Create a working `.env` from `.env.example`
 3. Update docker-compose.yaml `image: #image:tag` with your built image tag from `step (1.)`
 4. Run `docker compose --profile databases --profile parabol up -d` to deploy the local stack. You can run `docker compose --profile databases --profile parabol down` to terminate the local stack
@@ -31,12 +31,12 @@ This will run `pre-deploy` and thus it will recreate the `web-server` and the `g
 
 Some tools are available to debug the databases is needed:
 
-- pgadmin
-- redis-commander
+- [pgadmin](https://www.pgadmin.org/)
+- [redis-commander](https://github.com/joeferner/redis-commander)
 
 To operate them use `docker compose up --profile databases --profile database-debug`.
 
 ## Running the whole stack
 
 - Start the whole stack: `docker compose --profile databases --profile parabol --profile database-debug --profile chronos up -d`.
-- Stop the stack: `docker compose --profile databases --profile parabol --profile database-debug --profile chronos down`
+- Stop the stack: `docker compose --profile databases --profile parabol --profile database-debug --profile chronos down`.
diff --git a/docker/parabol-ubi/docker-host-st/docker-compose.yaml b/docker/stacks/single-tenant-host/docker-compose.yaml
similarity index 83%
rename from docker/parabol-ubi/docker-host-st/docker-compose.yaml
rename to docker/stacks/single-tenant-host/docker-compose.yaml
index 52bb8c76a7d..e5f662ed74a 100644
--- a/docker/parabol-ubi/docker-host-st/docker-compose.yaml
+++ b/docker/stacks/single-tenant-host/docker-compose.yaml
@@ -1,6 +1,19 @@
-version: '3.9'
+version: "3.9"
 
 services:
+  rethinkdb:
+    container_name: rethinkdb
+    profiles: ["databases"]
+    image: rethinkdb:2.4.2
+    restart: always
+    ports:
+      - "8080:8080"
+      - "29015:29015"
+      - "28015:28015"
+    volumes:
+      - ./data/rethink:/data
+    networks:
+      - parabol-network
   postgres:
     container_name: postgres
     profiles: ["databases"]
@@ -10,9 +23,9 @@ services:
     environment:
       - PGUSER=$POSTGRES_USER
     ports:
-      - '5432:5432'
+      - "5432:5432"
     volumes:
-      - './data/postgres/pgdata:/var/lib/postgresql/data'
+      - "./data/postgres/pgdata:/var/lib/postgresql/data"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready", "-d", "$POSTGRES_DB", "-U", "$POSTGRES_USER"]
       interval: 10s
@@ -32,19 +45,6 @@ services:
       - "5050:80"
     networks:
       - parabol-network
-  rethinkdb:
-    container_name: rethinkdb
-    profiles: ["databases"]
-    image: rethinkdb:2.4.2
-    restart: always
-    ports:
-      - '8080:8080'
-      - '29015:29015'
-      - '28015:28015'
-    volumes:
-      - ./data/rethink:/data
-    networks:
-      - parabol-network
   redis:
     container_name: redis
     profiles: ["databases"]
@@ -56,7 +56,7 @@ services:
       retries: 5
     restart: always
     ports:
-      - '6379:6379'
+      - "6379:6379"
     volumes:
       - ./data/redis:/data
     networks:
@@ -78,13 +78,13 @@ services:
   pre-deploy:
     container_name: pre-deploy
     profiles: ["parabol"]
-    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
+    image: #image:tag
     command: bash -c "node dist/preDeploy.js"
     env_file: .env
     environment:
       - SERVER_ID=0
     volumes:
-      - './.env:/parabol/.env'
+      - "./.env:/parabol/.env"
     depends_on:
       rethinkdb:
         condition: service_started
@@ -97,14 +97,14 @@ services:
   chronos:
     container_name: chronos
     profiles: ["chronos"]
-    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
+    image: #image:tag
     restart: always
     command: bash -c "node dist/chronos.js"
     env_file: .env
     environment:
       - SERVER_ID=1
     volumes:
-      - './.env:/parabol/.env'
+      - "./.env:/parabol/.env"
     depends_on:
       pre-deploy:
         condition: service_completed_successfully
@@ -119,16 +119,16 @@ services:
   web-server:
     container_name: web-server
     profiles: ["parabol"]
-    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
+    image: #image:tag
     restart: always
     command: bash -c "node dist/web.js"
     env_file: .env
     environment:
       - SERVER_ID=5
     ports:
-      - '3000:3000'
+      - "3000:3000"
     volumes:
-      - './.env:/parabol/.env'
+      - "./.env:/parabol/.env"
     depends_on:
       pre-deploy:
         condition: service_completed_successfully
@@ -143,14 +143,14 @@ services:
   gql-executor:
     container_name: gql-executor
     profiles: ["parabol"]
-    image: us-central1-docker.pkg.dev/prbl-tooling/parabol-production/parabol:v7.15.2
+    image: #image:tag
     restart: always
     command: bash -c "node dist/gqlExecutor.js"
     env_file: .env
     environment:
       - SERVER_ID=10
     volumes:
-      - './.env:/parabol/.env'
+      - "./.env:/parabol/.env"
     depends_on:
       pre-deploy:
         condition: service_completed_successfully
diff --git a/docs/alternative-licenses/us-department-of-defense/README.md b/docs/alternative-licenses/us-department-of-defense/README.md
index efbdc1d9f1d..330f56931d5 100644
--- a/docs/alternative-licenses/us-department-of-defense/README.md
+++ b/docs/alternative-licenses/us-department-of-defense/README.md
@@ -82,7 +82,7 @@ $ yarn && yarn build && yarn start
 - Click "Add New Server" and fill out the forms with your `.env` values
 
   - General.name = POSTGRES_DB
-  - Connection.host = 'postgres' (hardcoded from docker-compose dev.yml, not from .env!)
+  - Connection.host = 'postgres' (hardcoded from docker-compose `docker/stacks/development/docker-compose.yml`, not from .env!)
   - Connection.username = POSTGRES_USER
   - Connection.password = POSTGRES_PASSWORD
   - Connection.maintenanceDatabase = POSTGRES_DB
diff --git a/package.json b/package.json
index d228664dd0c..e19d16f1941 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "pg:migrate": "node-pg-migrate -f ./packages/server/postgres/pgmConfig.js",
     "pg:generate": "export $(grep ^POSTGRES_ .env | tr -d \"'\"); yarn kysely-codegen --exclude-pattern \"(PgMigrations|StripeQuantityMismatchLogging)\" --out-file ./packages/server/postgres/pg.d.ts --dialect postgres --url postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:$POSTGRES_PORT/$POSTGRES_DB && prettier --write ./packages/server/postgres/pg.d.ts",
     "pg:restore": "node ./scripts/toolbox/pgRestore.js",
-    "db:start": "docker compose -f docker/dev.yml up -d",
-    "db:stop": "docker compose -f docker/dev.yml down",
+    "db:start": "docker compose -f docker/stacks/development/docker-compose.yml up -d",
+    "db:stop": "docker compose -f docker/stacks/development/docker-compose.yml down",
     "db:migrate": "node scripts/migrate.js",
     "deduplicate": "yarn yarn-deduplicate yarn.lock",
     "predeploy": "node dist/preDeploy.js",
diff --git a/packages/server/database/README.md b/packages/server/database/README.md
index 43981c7b19b..13d527b63d7 100644
--- a/packages/server/database/README.md
+++ b/packages/server/database/README.md
@@ -10,4 +10,3 @@ Since that time, RethinkDB has occassionally been unstable for us under high loa
 Since our data is very relational, it made sense to move PostgresQL, which we are actively doing.
 
 - Migrations are stored in [`packages/server/database/migrations`](./migrations/)
-- RethinkDB Dashboard is at [http://localhost:8080](http://localhost:8080)
diff --git a/packages/server/postgres/README.md b/packages/server/postgres/README.md
index 07047ec37c6..303ec662993 100644
--- a/packages/server/postgres/README.md
+++ b/packages/server/postgres/README.md
@@ -1,18 +1,5 @@
 # PostgreSQL
 
-## Setup
-
-- pgadmin is at [http://localhost:5050](http://localhost:5050)
-- Connect using the values of `PGADMIN_DEFAULT_EMAIL` and `PGADMIN_DEFAULT_PASSWORD` from your `.env`
-- Click "Add New Server" and fill out the forms with your `.env` values
-
-  - General.name = POSTGRES_DB
-  - Connection.host = 'postgres' (hardcoded from docker-compose dev.yml, not from .env!)
-  - Connection.username = POSTGRES_USER
-  - Connection.password = POSTGRES_PASSWORD
-  - Connection.maintenanceDatabase = POSTGRES_DB
-  - Connection.port = POSTGRES_PORT
-
 ## Migrations
 
 This folder contains all the postgres migrations that have been run on the database.
@@ -56,13 +43,3 @@ Parameters are capped at 16-bit, so if you're doing a bulk insert, you'll need t
 In other words, if `# rows * columns per row > 65,535` you need to do it in batches.
 `pg-protocol` shows this here: <https://github.com/brianc/node-postgres/blob/master/packages/pg-protocol/src/serializer.ts#L155>
 Issue here: <https://github.com/brianc/node-postgres/issues/581>
-
-#### Too many connections
-
-Sometimes pg pool will hit its connection limit. This should never happen in prod, but happens on occassion in dev.
-You'll know it's happening because PG will say there are too many connections.
-To fix, you can run the following SQL to remove all the connections except the one that is running the script
-
-```sql
-select pg_terminate_backend(pid) from pg_stat_activity where datname='parabol-saas' AND pid <> pg_backend_pid();
-```
diff --git a/packages/server/postgres/extensions/install.sql b/packages/server/postgres/extensions/install.sql
deleted file mode 100644
index b2670548069..00000000000
--- a/packages/server/postgres/extensions/install.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS "postgres-json-schema";
-CREATE EXTENSION IF NOT EXISTS "vector";
diff --git a/packages/server/postgres/extensions/postgres-json-schema/Makefile b/packages/server/postgres/extensions/postgres-json-schema/Makefile
deleted file mode 100644
index 52ea8ab56d5..00000000000
--- a/packages/server/postgres/extensions/postgres-json-schema/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTENSION = postgres-json-schema
-DATA = postgres-json-schema--0.1.1.sql
-
-# postgres build stuff
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
diff --git a/packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema--0.1.1.sql b/packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema--0.1.1.sql
deleted file mode 100644
index 5c2ba846fff..00000000000
--- a/packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema--0.1.1.sql
+++ /dev/null
@@ -1,259 +0,0 @@
-CREATE OR REPLACE FUNCTION _validate_json_schema_type(type text, data jsonb) RETURNS boolean AS $f$
-BEGIN
-  IF type = 'integer' THEN
-    IF jsonb_typeof(data) != 'number' THEN
-      RETURN false;
-    END IF;
-    IF trunc(data::text::numeric) != data::text::numeric THEN
-      RETURN false;
-    END IF;
-  ELSE
-    IF type != jsonb_typeof(data) THEN
-      RETURN false;
-    END IF;
-  END IF;
-  RETURN true;
-END;
-$f$ LANGUAGE 'plpgsql' IMMUTABLE;
-
-
-CREATE OR REPLACE FUNCTION validate_json_schema(schema jsonb, data jsonb, root_schema jsonb DEFAULT NULL) RETURNS boolean AS $f$
-DECLARE
-  prop text;
-  item jsonb;
-  path text[];
-  types text[];
-  pattern text;
-  props text[];
-BEGIN
-  IF root_schema IS NULL THEN
-    root_schema = schema;
-  END IF;
-
-  IF schema ? 'type' THEN
-    IF jsonb_typeof(schema->'type') = 'array' THEN
-      types = ARRAY(SELECT jsonb_array_elements_text(schema->'type'));
-    ELSE
-      types = ARRAY[schema->>'type'];
-    END IF;
-    IF (SELECT NOT bool_or(@extschema@._validate_json_schema_type(type, data)) FROM unnest(types) type) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'properties' THEN
-    FOR prop IN SELECT jsonb_object_keys(schema->'properties') LOOP
-      IF data ? prop AND NOT @extschema@.validate_json_schema(schema->'properties'->prop, data->prop, root_schema) THEN
-        RETURN false;
-      END IF;
-    END LOOP;
-  END IF;
-
-  IF schema ? 'required' AND jsonb_typeof(data) = 'object' THEN
-    IF NOT ARRAY(SELECT jsonb_object_keys(data)) @>
-           ARRAY(SELECT jsonb_array_elements_text(schema->'required')) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'items' AND jsonb_typeof(data) = 'array' THEN
-    IF jsonb_typeof(schema->'items') = 'object' THEN
-      FOR item IN SELECT jsonb_array_elements(data) LOOP
-        IF NOT @extschema@.validate_json_schema(schema->'items', item, root_schema) THEN
-          RETURN false;
-        END IF;
-      END LOOP;
-    ELSE
-      IF NOT (
-        SELECT bool_and(i > jsonb_array_length(schema->'items') OR @extschema@.validate_json_schema(schema->'items'->(i::int - 1), elem, root_schema))
-        FROM jsonb_array_elements(data) WITH ORDINALITY AS t(elem, i)
-      ) THEN
-        RETURN false;
-      END IF;
-    END IF;
-  END IF;
-
-  IF jsonb_typeof(schema->'additionalItems') = 'boolean' and NOT (schema->'additionalItems')::text::boolean AND jsonb_typeof(schema->'items') = 'array' THEN
-    IF jsonb_array_length(data) > jsonb_array_length(schema->'items') THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF jsonb_typeof(schema->'additionalItems') = 'object' THEN
-    IF NOT (
-        SELECT bool_and(@extschema@.validate_json_schema(schema->'additionalItems', elem, root_schema))
-        FROM jsonb_array_elements(data) WITH ORDINALITY AS t(elem, i)
-        WHERE i > jsonb_array_length(schema->'items')
-      ) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'minimum' AND jsonb_typeof(data) = 'number' THEN
-    IF data::text::numeric < (schema->>'minimum')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'maximum' AND jsonb_typeof(data) = 'number' THEN
-    IF data::text::numeric > (schema->>'maximum')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF COALESCE((schema->'exclusiveMinimum')::text::bool, FALSE) THEN
-    IF data::text::numeric = (schema->>'minimum')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF COALESCE((schema->'exclusiveMaximum')::text::bool, FALSE) THEN
-    IF data::text::numeric = (schema->>'maximum')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'anyOf' THEN
-    IF NOT (SELECT bool_or(@extschema@.validate_json_schema(sub_schema, data, root_schema)) FROM jsonb_array_elements(schema->'anyOf') sub_schema) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'allOf' THEN
-    IF NOT (SELECT bool_and(@extschema@.validate_json_schema(sub_schema, data, root_schema)) FROM jsonb_array_elements(schema->'allOf') sub_schema) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'oneOf' THEN
-    IF 1 != (SELECT COUNT(*) FROM jsonb_array_elements(schema->'oneOf') sub_schema WHERE @extschema@.validate_json_schema(sub_schema, data, root_schema)) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF COALESCE((schema->'uniqueItems')::text::boolean, false) THEN
-    IF (SELECT COUNT(*) FROM jsonb_array_elements(data)) != (SELECT count(DISTINCT val) FROM jsonb_array_elements(data) val) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'additionalProperties' AND jsonb_typeof(data) = 'object' THEN
-    props := ARRAY(
-      SELECT key
-      FROM jsonb_object_keys(data) key
-      WHERE key NOT IN (SELECT jsonb_object_keys(schema->'properties'))
-        AND NOT EXISTS (SELECT * FROM jsonb_object_keys(schema->'patternProperties') pat WHERE key ~ pat)
-    );
-    IF jsonb_typeof(schema->'additionalProperties') = 'boolean' THEN
-      IF NOT (schema->'additionalProperties')::text::boolean AND jsonb_typeof(data) = 'object' AND NOT props <@ ARRAY(SELECT jsonb_object_keys(schema->'properties')) THEN
-        RETURN false;
-      END IF;
-    ELSEIF NOT (
-      SELECT bool_and(@extschema@.validate_json_schema(schema->'additionalProperties', data->key, root_schema))
-      FROM unnest(props) key
-    ) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? '$ref' THEN
-    path := ARRAY(
-      SELECT regexp_replace(regexp_replace(path_part, '~1', '/'), '~0', '~')
-      FROM UNNEST(regexp_split_to_array(schema->>'$ref', '/')) path_part
-    );
-    -- ASSERT path[1] = '#', 'only refs anchored at the root are supported';
-    IF NOT @extschema@.validate_json_schema(root_schema #> path[2:array_length(path, 1)], data, root_schema) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'enum' THEN
-    IF NOT EXISTS (SELECT * FROM jsonb_array_elements(schema->'enum') val WHERE val = data) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'minLength' AND jsonb_typeof(data) = 'string' THEN
-    IF char_length(data #>> '{}') < (schema->>'minLength')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'maxLength' AND jsonb_typeof(data) = 'string' THEN
-    IF char_length(data #>> '{}') > (schema->>'maxLength')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'not' THEN
-    IF @extschema@.validate_json_schema(schema->'not', data, root_schema) THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'maxProperties' AND jsonb_typeof(data) = 'object' THEN
-    IF (SELECT count(*) FROM jsonb_object_keys(data)) > (schema->>'maxProperties')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'minProperties' AND jsonb_typeof(data) = 'object' THEN
-    IF (SELECT count(*) FROM jsonb_object_keys(data)) < (schema->>'minProperties')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'maxItems' AND jsonb_typeof(data) = 'array' THEN
-    IF (SELECT count(*) FROM jsonb_array_elements(data)) > (schema->>'maxItems')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'minItems' AND jsonb_typeof(data) = 'array' THEN
-    IF (SELECT count(*) FROM jsonb_array_elements(data)) < (schema->>'minItems')::numeric THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'dependencies' THEN
-    FOR prop IN SELECT jsonb_object_keys(schema->'dependencies') LOOP
-      IF data ? prop THEN
-        IF jsonb_typeof(schema->'dependencies'->prop) = 'array' THEN
-          IF NOT (SELECT bool_and(data ? dep) FROM jsonb_array_elements_text(schema->'dependencies'->prop) dep) THEN
-            RETURN false;
-          END IF;
-        ELSE
-          IF NOT @extschema@.validate_json_schema(schema->'dependencies'->prop, data, root_schema) THEN
-            RETURN false;
-          END IF;
-        END IF;
-      END IF;
-    END LOOP;
-  END IF;
-
-  IF schema ? 'pattern' AND jsonb_typeof(data) = 'string' THEN
-    IF (data #>> '{}') !~ (schema->>'pattern') THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  IF schema ? 'patternProperties' AND jsonb_typeof(data) = 'object' THEN
-    FOR prop IN SELECT jsonb_object_keys(data) LOOP
-      FOR pattern IN SELECT jsonb_object_keys(schema->'patternProperties') LOOP
-        RAISE NOTICE 'prop %s, pattern %, schema %', prop, pattern, schema->'patternProperties'->pattern;
-        IF prop ~ pattern AND NOT @extschema@.validate_json_schema(schema->'patternProperties'->pattern, data->prop, root_schema) THEN
-          RETURN false;
-        END IF;
-      END LOOP;
-    END LOOP;
-  END IF;
-
-  IF schema ? 'multipleOf' AND jsonb_typeof(data) = 'number' THEN
-    IF data::text::numeric % (schema->>'multipleOf')::numeric != 0 THEN
-      RETURN false;
-    END IF;
-  END IF;
-
-  RETURN true;
-END;
-$f$ LANGUAGE 'plpgsql' IMMUTABLE;
diff --git a/packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema.control b/packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema.control
deleted file mode 100644
index eaaf496b08a..00000000000
--- a/packages/server/postgres/extensions/postgres-json-schema/postgres-json-schema.control
+++ /dev/null
@@ -1,3 +0,0 @@
-comment = 'Validate JSON schemas'
-relocatable = false
-default_version = '0.1.1'
diff --git a/packages/server/postgres/postgres.conf b/packages/server/postgres/postgres.conf
deleted file mode 100644
index 81a24496bf9..00000000000
--- a/packages/server/postgres/postgres.conf
+++ /dev/null
@@ -1 +0,0 @@
-listen_addresses='*'

From f16c21ffcfd99f98b49846951e561c4afeebbdf2 Mon Sep 17 00:00:00 2001
From: Rafael Romero <rafael@parabol.co>
Date: Tue, 19 Mar 2024 11:28:52 +0000
Subject: [PATCH 076/183] fix(build-ci): docker-build-push action fixed

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32dab47c748..709f0a2d818 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,7 +105,7 @@ jobs:
           username: "oauth2accesstoken"
           password: "${{ steps.auth.outputs.access_token }}"
       - name: Push build to dev
-        uses: docker/images-push-action@v4
+        uses: docker/build-push-action@v4
         with:
           network: host
           allow: network.host

From 41f5654bc3046f770893c6840d4843ff58bce087 Mon Sep 17 00:00:00 2001
From: Rafael Romero <rafael@parabol.co>
Date: Tue, 19 Mar 2024 11:35:24 +0000
Subject: [PATCH 077/183] fix(parabol-ubi): references to local files corrected

---
 docker/images/parabol-ubi/dockerfiles/basic.dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/images/parabol-ubi/dockerfiles/basic.dockerfile b/docker/images/parabol-ubi/dockerfiles/basic.dockerfile
index a2bbbe8c1bb..f74101cf9cc 100644
--- a/docker/images/parabol-ubi/dockerfiles/basic.dockerfile
+++ b/docker/images/parabol-ubi/dockerfiles/basic.dockerfile
@@ -7,8 +7,8 @@ ENV HOME=/home/node \
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 ENV PORT=3000
 
-COPY --chown=node --chmod=755 docker/parabol-ubi/entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-COPY --chown=node docker/parabol-ubi/tools/ip-to-server_id ${HOME}/tools/ip-to-server_id
+COPY --chown=node --chmod=755 docker/images/parabol-ubi/entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY --chown=node docker/images/parabol-ubi/tools/ip-to-server_id ${HOME}/tools/ip-to-server_id
 
 # Required for pushToCDN to work with FILE_STORE_PROVIDER set to 'local'
 RUN mkdir -p ${HOME}/parabol/self-hosted && \

From 00a1ca2977cd1117b030aa538f526a24ca395ac9 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 19 Mar 2024 18:02:29 +0100
Subject: [PATCH 078/183] fix: Activity library illustrations in Firefox
 (#9549)

---
 packages/client/components/ActivityLibrary/ActivityCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityCard.tsx b/packages/client/components/ActivityLibrary/ActivityCard.tsx
index 5d671b49b3e..59a955d6249 100644
--- a/packages/client/components/ActivityLibrary/ActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityCard.tsx
@@ -35,8 +35,8 @@ export const ActivityCardImage = (props: PropsWithChildren<ActivityCardImageProp
         'relative flex h-full w-full items-center justify-center overflow-hidden',
         className
       )}
-      style={{backgroundImage: `url(${backgroundSrc})`, backgroundSize: 'cover'}}
     >
+      <img className='object-contain' src={backgroundSrc} alt='' />
       <img
         className='absolute top-0 left-0 z-10 h-full w-full object-contain p-10'
         src={src}

From 24df17bf3f0979ab65f785e95711ba53158ecb42 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 19 Mar 2024 18:02:45 +0100
Subject: [PATCH 079/183] fix: Configure trusted proxies (#9548)

---
 .env.example                      | 3 +++
 packages/server/utils/uwsGetIP.ts | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 97dc499d644..2aa11780748 100644
--- a/.env.example
+++ b/.env.example
@@ -5,6 +5,9 @@ PROTO='http'
 SERVER_SECRET='key_SERVER_SECRET'
 # Cluster node number 0 - 1023. Must be unique per process.
 SERVER_ID='1'
+# Used to read the client IP from the X-Forwarded-For header, if not set, it will use the first IP in the list.
+# If configured, it must match the number of proxies in the stack, otherwise it might rate limit all traffic coming from the proxy.
+# TRUSTED_PROXY_COUNT='1'
 # Websocket port for the websocket server, only used in development (yarn dev)
 SOCKET_PORT='3001'
 
diff --git a/packages/server/utils/uwsGetIP.ts b/packages/server/utils/uwsGetIP.ts
index 034b266a3c9..b41765b100d 100644
--- a/packages/server/utils/uwsGetIP.ts
+++ b/packages/server/utils/uwsGetIP.ts
@@ -1,7 +1,11 @@
 import {HttpRequest, HttpResponse} from 'uWebSockets.js'
 
+const TRUSTED_PROXY_COUNT = Number(process.env.TRUSTED_PROXY_COUNT)
+// if TRUSTED_PROXY_COUNT is not configured correctly we fall back to reading the first IP to avoid rate limiting our proxy
+const CLIENT_IP_POS = isNaN(TRUSTED_PROXY_COUNT) ? 0 : -1 - TRUSTED_PROXY_COUNT
+
 const uwsGetIP = (res: HttpResponse, req: HttpRequest) => {
-  const clientIp = req.getHeader('x-forwarded-for')?.split(',')[0]
+  const clientIp = req.getHeader('x-forwarded-for')?.split(',').at(CLIENT_IP_POS)
   if (clientIp) return clientIp
   // returns ipv6 e.g. '0000:0000:0000:0000:0000:ffff:ac11:0001'
   return Buffer.from(res.getRemoteAddressAsText()).toString()

From b4ac8741f0f36cfb074cfa3b896407636785a276 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 18:11:43 +0100
Subject: [PATCH 080/183] chore(release): release v7.22.3 (#9547)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 16 ++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index a5e4e701ea7..f9343c64067 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.22.2"
+  ".": "7.22.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e40f96936c3..b4b60c13d98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.22.3](https://github.com/ParabolInc/parabol/compare/v7.22.2...v7.22.3) (2024-03-19)
+
+
+### Fixed
+
+* Activity library illustrations in Firefox ([#9549](https://github.com/ParabolInc/parabol/issues/9549)) ([00a1ca2](https://github.com/ParabolInc/parabol/commit/00a1ca2977cd1117b030aa538f526a24ca395ac9))
+* **build-ci:** docker-build-push action fixed ([f16c21f](https://github.com/ParabolInc/parabol/commit/f16c21ffcfd99f98b49846951e561c4afeebbdf2))
+* Configure trusted proxies ([#9548](https://github.com/ParabolInc/parabol/issues/9548)) ([24df17b](https://github.com/ParabolInc/parabol/commit/24df17bf3f0979ab65f785e95711ba53158ecb42))
+* **parabol-ubi:** references to local files corrected ([41f5654](https://github.com/ParabolInc/parabol/commit/41f5654bc3046f770893c6840d4843ff58bce087))
+
+
+### Changed
+
+* Remove random team names ([#9543](https://github.com/ParabolInc/parabol/issues/9543)) ([fe128f0](https://github.com/ParabolInc/parabol/commit/fe128f017f01148ebd132fd532a771c6ab80ef16))
+* **repo-structure:** Docker images and stacks organized and clarified ([#9530](https://github.com/ParabolInc/parabol/issues/9530)) ([6fca12c](https://github.com/ParabolInc/parabol/commit/6fca12c814f471ef33954381ee562cbbb4b93d67))
+
 ## [7.22.2](https://github.com/ParabolInc/parabol/compare/v7.22.1...v7.22.2) (2024-03-18)
 
 
diff --git a/package.json b/package.json
index e19d16f1941..27e1d48c0e2 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.2",
+  "version": "7.22.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index cc50069e63f..bd4099d0ee5 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.22.2",
+  "version": "7.22.3",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.22.2"
+    "parabol-server": "7.22.3"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 82271ce03b8..2c2882a25a8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.2",
+  "version": "7.22.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 9c8df6f3f95..51da1395eb3 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.22.2",
+  "version": "7.22.3",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.22.2",
-    "parabol-server": "7.22.2",
+    "parabol-client": "7.22.3",
+    "parabol-server": "7.22.3",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index fed0f57a2eb..20fcc803893 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.2",
+  "version": "7.22.3",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 4fa8018c480..25a503e3254 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.2",
+  "version": "7.22.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.22.2",
+    "parabol-client": "7.22.3",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 4ba2c9eb059325aedfaf6a4b87fae9054245f83a Mon Sep 17 00:00:00 2001
From: Rafael Romero <rafael@parabol.co>
Date: Wed, 20 Mar 2024 10:26:01 +0000
Subject: [PATCH 081/183] chore(ci): Gitlab deployment access token changed

---
 .github/workflows/release-to-prod.yml    |  4 ++--
 .github/workflows/release-to-staging.yml | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-to-prod.yml b/.github/workflows/release-to-prod.yml
index 9e964a20718..037676e4f62 100644
--- a/.github/workflows/release-to-prod.yml
+++ b/.github/workflows/release-to-prod.yml
@@ -31,14 +31,14 @@ jobs:
           command: |
             RES=$(curl "https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/jobs/${{ env.JOB_ID }}/play" \
               --request POST \
-              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_API_TOKEN }}')
+              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}')
             echo $RES
             JOB_ID_DONE=$(echo $RES | jq '.id // empty')
             [ -z "$JOB_ID_DONE" ] && exit 1 || exit 0
       - name: Poll Production Release
         uses: artiz/poll-endpoint@1.0.2
         with:
-          url: https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/jobs/${{ env.JOB_ID }}?access_token=${{ secrets.GITLAB_API_TOKEN }}
+          url: https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/jobs/${{ env.JOB_ID }}?access_token=${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}
           method: GET
           expect-status: 200
           expect-response-regex: '"status":"success"'
diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
index c6e3601f2ff..bc30de202b3 100644
--- a/.github/workflows/release-to-staging.yml
+++ b/.github/workflows/release-to-staging.yml
@@ -42,7 +42,7 @@ jobs:
         run: |
           COMMIT_ID=$(curl  "https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/repository/commits" \
             --request POST \
-            --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_API_TOKEN }}' \
+            --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}' \
             --form "branch=main" \
             --form "commit_message=release v${{ env.ACTION_VERSION }}" \
             --form "actions[][action]=update" \
@@ -67,11 +67,11 @@ jobs:
           command: |
             echo ${{ env.COMMIT_ID }}
             PIPELINES=$(curl "https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/pipelines" \
-              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_API_TOKEN }}')
+              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}')
             PIPELINE_ID=$(echo $PIPELINES | jq ".[] | select(.sha == \"${{ env.COMMIT_ID }}\")" | jq .id)
             [ -z "$PIPELINE_ID" ] && exit 1
             JOBS=$(curl "https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/pipelines/$PIPELINE_ID/jobs" \
-              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_API_TOKEN }}')
+              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}')
             JOB_ID=$(echo $JOBS | jq '.[] | select(.name == "${{ env.STAGING_JOB }}")' | jq .id)
             PROD_JOB_ID=$(echo $JOBS | jq '.[] | select(.name == "${{ env.PRODUCTION_JOB}}")' | jq .id)
             echo "JOB_ID=${JOB_ID}" >> $GITHUB_ENV
@@ -86,7 +86,7 @@ jobs:
           command: |
             RES=$(curl "https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/jobs/${{ env.JOB_ID }}/play" \
               --request POST \
-              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_API_TOKEN }}')
+              --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}')
             echo $RES
             JOB_ID_DONE=$(echo $RES | jq '.id // empty')
             [ -z "$JOB_ID_DONE" ] && exit 1 || exit 0
@@ -114,7 +114,7 @@ jobs:
       - name: Poll Staging Release
         uses: artiz/poll-endpoint@1.0.2
         with:
-          url: https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/jobs/${{ env.JOB_ID }}?access_token=${{ secrets.GITLAB_API_TOKEN }}
+          url: https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/jobs/${{ env.JOB_ID }}?access_token=${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}
           method: GET
           expect-status: 200
           expect-response-regex: '"status":"success"'

From 94513aee044fe6f2e5eb21c62d82fb333193ac73 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 10:33:17 +0000
Subject: [PATCH 082/183] chore(release): release v7.22.4 (#9552)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index f9343c64067..4a2437d9945 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.22.3"
+  ".": "7.22.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4b60c13d98..440fc75fbfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.22.4](https://github.com/ParabolInc/parabol/compare/v7.22.3...v7.22.4) (2024-03-20)
+
+
+### Changed
+
+* **ci:** Gitlab deployment access token changed ([4ba2c9e](https://github.com/ParabolInc/parabol/commit/4ba2c9eb059325aedfaf6a4b87fae9054245f83a))
+
 ## [7.22.3](https://github.com/ParabolInc/parabol/compare/v7.22.2...v7.22.3) (2024-03-19)
 
 
diff --git a/package.json b/package.json
index 27e1d48c0e2..034f26d340e 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.3",
+  "version": "7.22.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index bd4099d0ee5..66bfb9f4458 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.22.3",
+  "version": "7.22.4",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.22.3"
+    "parabol-server": "7.22.4"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 2c2882a25a8..0a468113a2f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.3",
+  "version": "7.22.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 51da1395eb3..c4470e61f05 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.22.3",
+  "version": "7.22.4",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.22.3",
-    "parabol-server": "7.22.3",
+    "parabol-client": "7.22.4",
+    "parabol-server": "7.22.4",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 20fcc803893..a3d12e08429 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.3",
+  "version": "7.22.4",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 25a503e3254..9138ece5b9a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.3",
+  "version": "7.22.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.22.3",
+    "parabol-client": "7.22.4",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 9be96eb206d367e550b97831621c8b2aee4fc355 Mon Sep 17 00:00:00 2001
From: Bruce Tian <tianrunhe@gmail.com>
Date: Thu, 21 Mar 2024 11:05:07 -0700
Subject: [PATCH 083/183] feat: make invoice row title more clear to understand
 (#9551)

---
 .../components/InvoiceRow/InvoiceRow.tsx      | 21 ++++++++++++++++---
 packages/client/utils/makeMonthDateString.ts  | 10 +++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 packages/client/utils/makeMonthDateString.ts

diff --git a/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx b/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
index 479cca7a33d..6651c90663a 100644
--- a/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
+++ b/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
@@ -9,7 +9,7 @@ import RowInfo from '../../../../components/Row/RowInfo'
 import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
 import {PALETTE} from '../../../../styles/paletteV3'
 import makeDateString from '../../../../utils/makeDateString'
-import makeMonthString from '../../../../utils/makeMonthString'
+import makeMonthDateString from '../../../../utils/makeMonthDateString'
 import invoiceLineFormat from '../../../invoice/helpers/invoiceLineFormat'
 
 const InvoiceAmount = styled('span')({
@@ -70,6 +70,9 @@ const InvoiceRow = (props: Props) => {
           brand
         }
         endAt
+        nextPeriodCharges {
+          nextPeriodEnd
+        }
         paidAt
         payUrl
         status
@@ -77,7 +80,17 @@ const InvoiceRow = (props: Props) => {
     `,
     invoiceRef
   )
-  const {id: invoiceId, amountDue, creditCard, endAt, paidAt, payUrl, status} = invoice
+  const {
+    id: invoiceId,
+    amountDue,
+    creditCard,
+    endAt,
+    nextPeriodCharges,
+    paidAt,
+    payUrl,
+    status
+  } = invoice
+  const {nextPeriodEnd} = nextPeriodCharges
   const isEstimate = status === 'UPCOMING'
 
   return (
@@ -91,7 +104,9 @@ const InvoiceRow = (props: Props) => {
         <FileIcon isEstimate={isEstimate} />
         <InvoiceInfo>
           <InfoRow>
-            <InvoiceTitle>{makeMonthString(endAt)}</InvoiceTitle>
+            <InvoiceTitle>
+              {makeMonthDateString(endAt)} to {makeMonthDateString(nextPeriodEnd)}
+            </InvoiceTitle>
             <InfoRowRight>
               <InvoiceAmount>
                 {isEstimate && '*'}
diff --git a/packages/client/utils/makeMonthDateString.ts b/packages/client/utils/makeMonthDateString.ts
new file mode 100644
index 00000000000..fd242ebffcc
--- /dev/null
+++ b/packages/client/utils/makeMonthDateString.ts
@@ -0,0 +1,10 @@
+import ensureDate from './ensureDate'
+
+export default function makeMonthDateString(datetime: Date | string | null) {
+  const timestamp = ensureDate(datetime)
+  return timestamp.toLocaleDateString('en-US', {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric'
+  })
+}

From 2352669ea516a3d764d63af77211fbb4c0a02563 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Fri, 22 Mar 2024 00:34:03 +0000
Subject: [PATCH 084/183] feat: allow 2 custom templates for every user (#9518)

---
 .../ActivityDetailsSidebar.tsx                | 56 +++++--------------
 .../CreateNewActivity/CreateNewActivity.tsx   | 29 ++++++----
 .../components/AddNewPokerTemplate.tsx        | 10 ++--
 .../components/AddNewReflectTemplate.tsx      |  9 +--
 .../mutations/AddPokerTemplateMutation.ts     |  3 +
 .../mutations/AddReflectTemplateMutation.ts   |  3 +
 .../graphql/mutations/addPokerTemplate.ts     | 15 +++--
 .../graphql/mutations/addReflectTemplate.ts   | 15 +++--
 .../graphql/public/typeDefs/User.graphql      |  8 +++
 .../graphql/types/AddPokerTemplatePayload.ts  | 10 ++++
 .../types/AddReflectTemplatePayload.ts        | 10 ++++
 ...3510511_addFreeCustomTemplatesRemaining.ts | 34 +++++++++++
 .../decrementFreeTemplatesRemaining.ts        | 18 ++++++
 13 files changed, 150 insertions(+), 70 deletions(-)
 create mode 100644 packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
 create mode 100644 packages/server/postgres/queries/decrementFreeTemplatesRemaining.ts

diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index a686ca89c36..20574555b3b 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -32,7 +32,6 @@ import NewMeetingSettingsToggleCheckIn from '../NewMeetingSettingsToggleCheckIn'
 import StyledError from '../StyledError'
 import FlatPrimaryButton from '../FlatPrimaryButton'
 import NewMeetingActionsCurrentMeetings from '../NewMeetingActionsCurrentMeetings'
-import RaisedButton from '../RaisedButton'
 import NewMeetingTeamPicker from '../NewMeetingTeamPicker'
 import {AdhocTeamMultiSelect, Option} from '../AdhocTeamMultiSelect/AdhocTeamMultiSelect'
 import {Select} from '../../ui/Select/Select'
@@ -78,7 +77,6 @@ const ActivityDetailsSidebar = (props: Props) => {
       fragment ActivityDetailsSidebar_viewer on User {
         featureFlags {
           adHocTeams
-          noTemplateLimit
         }
         ...AdhocTeamMultiSelect_viewer
         organizations {
@@ -295,14 +293,6 @@ const ActivityDetailsSidebar = (props: Props) => {
     </div>
   )
 
-  const handleUpgrade = () => {
-    SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', {
-      upgradeCTALocation: 'publicTemplate',
-      meetingType: type
-    })
-    history.push(`/me/organizations/${selectedTeam.orgId}/billing`)
-  }
-
   const meetingNamePlaceholder =
     type === 'retrospective'
       ? 'Retro'
@@ -396,42 +386,22 @@ const ActivityDetailsSidebar = (props: Props) => {
                 />
               )}
 
-              {selectedTeam.tier === 'starter' &&
-              !viewer.featureFlags.noTemplateLimit &&
-              !selectedTemplate.isFree ? (
-                <div className='flex grow flex-col'>
-                  <div className='my-auto text-center'>
-                    Upgrade to the <b>Team Plan</b> to create custom activities unlocking your
-                    team’s ideal workflow.
-                  </div>
-                  <RaisedButton
-                    palette='pink'
-                    className='h-12 w-full text-lg font-semibold text-white focus:outline-none focus:ring-2 focus:ring-offset-2'
-                    onClick={handleUpgrade}
-                  >
-                    Upgrade to Team Plan
-                  </RaisedButton>
-                </div>
-              ) : (
+              {type === 'retrospective' && (
                 <>
-                  {type === 'retrospective' && (
-                    <>
-                      <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.retroSettings} />
-                      <NewMeetingSettingsToggleTeamHealth
-                        settingsRef={selectedTeam.retroSettings}
-                        teamRef={selectedTeam}
-                      />
-                      <NewMeetingSettingsToggleAnonymity settingsRef={selectedTeam.retroSettings} />
-                    </>
-                  )}
-                  {type === 'poker' && (
-                    <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.pokerSettings} />
-                  )}
-                  {type === 'action' && (
-                    <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.actionSettings} />
-                  )}
+                  <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.retroSettings} />
+                  <NewMeetingSettingsToggleTeamHealth
+                    settingsRef={selectedTeam.retroSettings}
+                    teamRef={selectedTeam}
+                  />
+                  <NewMeetingSettingsToggleAnonymity settingsRef={selectedTeam.retroSettings} />
                 </>
               )}
+              {type === 'poker' && (
+                <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.pokerSettings} />
+              )}
+              {type === 'action' && (
+                <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.actionSettings} />
+              )}
             </div>
           </div>
         </div>
diff --git a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
index 8346b47a252..f105e0e1aab 100644
--- a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
+++ b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
@@ -95,9 +95,8 @@ const SUPPORTED_CUSTOM_ACTIVITIES: SupportedActivity[] = [
 const query = graphql`
   query CreateNewActivityQuery {
     viewer {
-      featureFlags {
-        noTemplateLimit
-      }
+      freeCustomRetroTemplatesRemaining
+      freeCustomPokerTemplatesRemaining
       preferredTeamId
       teams {
         id
@@ -135,12 +134,21 @@ export const CreateNewActivity = (props: Props) => {
     return selectedActivity
   })
   const {viewer} = data
-  const {teams, preferredTeamId, featureFlags} = viewer
+  const {
+    teams,
+    preferredTeamId,
+    freeCustomRetroTemplatesRemaining,
+    freeCustomPokerTemplatesRemaining
+  } = viewer
   const [selectedTeam, setSelectedTeam] = useState(
     teams.find((team) => team.id === preferredTeamId) ?? sortByTier(teams)[0]!
   )
   const {submitting, error, submitMutation, onError, onCompleted} = useMutationProps()
   const history = useHistory()
+  const freeCustomTemplatesRemaining =
+    selectedActivity.type === 'retrospective'
+      ? freeCustomRetroTemplatesRemaining
+      : freeCustomPokerTemplatesRemaining
 
   const handleCreateRetroTemplate = () => {
     if (submitting) {
@@ -284,16 +292,15 @@ export const CreateNewActivity = (props: Props) => {
         </div>
         {error && <div className='px-4 text-tomato-500'>{error.message}</div>}
         <div className='mt-auto flex w-full bg-slate-200 p-2 shadow-card-1'>
-          {selectedTeam.tier === 'starter' && !featureFlags.noTemplateLimit ? (
-            <div className='mx-auto flex h-12 items-center gap-24'>
-              <div className='w-96'>
-                Upgrade to the <b>Team Plan</b> to create custom activities unlocking your team’s
-                ideal workflow.
-              </div>
+          {selectedTeam.tier === 'starter' && freeCustomTemplatesRemaining === 0 ? (
+            <div className='flex w-full items-center justify-center gap-4'>
+              <span className='pr-4 text-center'>
+                Upgrade to the <b>Team Plan</b> to create more custom activities
+              </span>
 
               <RaisedButton
                 palette='pink'
-                className='mx-auto h-12 text-lg font-semibold text-white focus:outline-none focus:ring-2 focus:ring-offset-2'
+                className='h-12 px-4 text-lg font-semibold text-white focus:outline-none focus:ring-2 focus:ring-offset-2'
                 onClick={handleUpgrade}
               >
                 Upgrade to Team Plan
diff --git a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
index 053684315a3..b1e4c9e5206 100644
--- a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
+++ b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
@@ -53,9 +53,7 @@ const AddNewPokerTemplate = (props: Props) => {
           id
           user {
             id
-            featureFlags {
-              noTemplateLimit
-            }
+            freeCustomPokerTemplatesRemaining
           }
         }
       }
@@ -63,6 +61,9 @@ const AddNewPokerTemplate = (props: Props) => {
     teamRef
   )
   const {id: teamId, tier, viewerTeamMember} = team
+  const {user} = viewerTeamMember || {}
+  const {freeCustomPokerTemplatesRemaining} = user || {}
+
   const {onError, onCompleted, submitMutation, submitting, error} = useMutationProps()
   const errorTimerId = useRef<undefined | number>()
   useEffect(() => {
@@ -71,7 +72,8 @@ const AddNewPokerTemplate = (props: Props) => {
     }
   }, [])
   const canEditTemplates =
-    tier !== 'starter' || viewerTeamMember?.user?.featureFlags?.noTemplateLimit
+    tier !== 'starter' ||
+    (freeCustomPokerTemplatesRemaining && freeCustomPokerTemplatesRemaining > 0)
   const addNewTemplate = () => {
     if (submitting) return
     if (!canEditTemplates) {
diff --git a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
index 61429332903..4e1bff87056 100644
--- a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
+++ b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
@@ -53,9 +53,7 @@ const AddNewReflectTemplate = (props: Props) => {
           id
           user {
             id
-            featureFlags {
-              noTemplateLimit
-            }
+            freeCustomRetroTemplatesRemaining
           }
         }
       }
@@ -63,6 +61,8 @@ const AddNewReflectTemplate = (props: Props) => {
     teamRef
   )
   const {id: teamId, tier, viewerTeamMember} = team
+  const {user} = viewerTeamMember || {}
+  const {freeCustomRetroTemplatesRemaining} = user || {}
   const {onError, onCompleted, submitMutation, submitting, error} = useMutationProps()
   const errorTimerId = useRef<undefined | number>()
   useEffect(() => {
@@ -71,7 +71,8 @@ const AddNewReflectTemplate = (props: Props) => {
     }
   }, [])
   const canEditTemplates =
-    tier !== 'starter' || viewerTeamMember?.user?.featureFlags?.noTemplateLimit
+    tier !== 'starter' ||
+    (freeCustomRetroTemplatesRemaining && freeCustomRetroTemplatesRemaining > 0)
   const addNewTemplate = () => {
     if (submitting) return
     if (!canEditTemplates) {
diff --git a/packages/client/mutations/AddPokerTemplateMutation.ts b/packages/client/mutations/AddPokerTemplateMutation.ts
index f8fca48eda5..fa0b1a61769 100644
--- a/packages/client/mutations/AddPokerTemplateMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateMutation.ts
@@ -10,6 +10,9 @@ import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate'
 
 graphql`
   fragment AddPokerTemplateMutation_team on AddPokerTemplatePayload {
+    user {
+      freeCustomPokerTemplatesRemaining
+    }
     pokerTemplate {
       ...TemplateSharing_template
       ...PokerTemplateDetailsTemplate
diff --git a/packages/client/mutations/AddReflectTemplateMutation.ts b/packages/client/mutations/AddReflectTemplateMutation.ts
index 4bea393ac0a..caf3000057e 100644
--- a/packages/client/mutations/AddReflectTemplateMutation.ts
+++ b/packages/client/mutations/AddReflectTemplateMutation.ts
@@ -9,6 +9,9 @@ import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate'
 
 graphql`
   fragment AddReflectTemplateMutation_team on AddReflectTemplatePayload {
+    user {
+      freeCustomRetroTemplatesRemaining
+    }
     reflectTemplate {
       ...TemplateSharing_template
       ...ReflectTemplateDetailsTemplate
diff --git a/packages/server/graphql/mutations/addPokerTemplate.ts b/packages/server/graphql/mutations/addPokerTemplate.ts
index 3b4e6dbccc0..cb6d7f390bb 100644
--- a/packages/server/graphql/mutations/addPokerTemplate.ts
+++ b/packages/server/graphql/mutations/addPokerTemplate.ts
@@ -12,6 +12,7 @@ import AddPokerTemplatePayload from '../types/AddPokerTemplatePayload'
 import getTemplateIllustrationUrl from './helpers/getTemplateIllustrationUrl'
 import {analytics} from '../../utils/analytics/analytics'
 import {getFeatureTier} from '../types/helpers/getFeatureTier'
+import decrementFreeTemplatesRemaining from '../../postgres/queries/decrementFreeTemplatesRemaining'
 
 const addPokerTemplate = {
   description: 'Add a new poker template with a default dimension created',
@@ -51,9 +52,11 @@ const addPokerTemplate = {
     }
     if (
       getFeatureTier(viewerTeam) === 'starter' &&
-      !viewer.featureFlags.includes('noTemplateLimit')
+      viewer.freeCustomPokerTemplatesRemaining === 0
     ) {
-      return standardError(new Error('Creating templates is a premium feature'), {userId: viewerId})
+      return standardError(new Error('You have reached the limit of free custom templates.'), {
+        userId: viewerId
+      })
     }
     let data
     if (parentTemplateId) {
@@ -102,8 +105,10 @@ const addPokerTemplate = {
 
       await Promise.all([
         r.table('TemplateDimension').insert(newTemplateDimensions).run(),
-        insertMeetingTemplate(newTemplate)
+        insertMeetingTemplate(newTemplate),
+        decrementFreeTemplatesRemaining(viewerId, 'poker')
       ])
+      viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
       analytics.templateMetrics(viewer, newTemplate, 'Template Cloned')
       data = {templateId: newTemplate.id}
     } else {
@@ -129,8 +134,10 @@ const addPokerTemplate = {
 
       await Promise.all([
         r.table('TemplateDimension').insert(newDimension).run(),
-        insertMeetingTemplate(newTemplate)
+        insertMeetingTemplate(newTemplate),
+        decrementFreeTemplatesRemaining(viewerId, 'poker')
       ])
+      viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
       analytics.templateMetrics(viewer, newTemplate, 'Template Created')
       data = {templateId}
     }
diff --git a/packages/server/graphql/mutations/addReflectTemplate.ts b/packages/server/graphql/mutations/addReflectTemplate.ts
index d4c3825338a..88fd88cad46 100644
--- a/packages/server/graphql/mutations/addReflectTemplate.ts
+++ b/packages/server/graphql/mutations/addReflectTemplate.ts
@@ -13,6 +13,7 @@ import AddReflectTemplatePayload from '../types/AddReflectTemplatePayload'
 import makeRetroTemplates from './helpers/makeRetroTemplates'
 import {analytics} from '../../utils/analytics/analytics'
 import {getFeatureTier} from '../types/helpers/getFeatureTier'
+import decrementFreeCustomTemplatesRemaining from '../../postgres/queries/decrementFreeTemplatesRemaining'
 
 const addReflectTemplate = {
   description: 'Add a new template full of prompts',
@@ -52,9 +53,11 @@ const addReflectTemplate = {
     }
     if (
       getFeatureTier(viewerTeam) === 'starter' &&
-      !viewer.featureFlags.includes('noTemplateLimit')
+      viewer.freeCustomRetroTemplatesRemaining === 0
     ) {
-      return standardError(new Error('Creating templates is a premium feature'), {userId: viewerId})
+      return standardError(new Error('You have reached the limit of free custom templates.'), {
+        userId: viewerId
+      })
     }
     let data
     if (parentTemplateId) {
@@ -102,8 +105,10 @@ const addReflectTemplate = {
 
       await Promise.all([
         r.table('ReflectPrompt').insert(newTemplatePrompts).run(),
-        insertMeetingTemplate(newTemplate)
+        insertMeetingTemplate(newTemplate),
+        decrementFreeCustomTemplatesRemaining(viewerId, 'retro')
       ])
+      viewer.freeCustomRetroTemplatesRemaining = viewer.freeCustomRetroTemplatesRemaining - 1
       analytics.templateMetrics(viewer, newTemplate, 'Template Cloned')
       data = {templateId: newTemplate.id}
     } else {
@@ -129,8 +134,10 @@ const addReflectTemplate = {
       const {id: templateId} = newTemplate
       await Promise.all([
         r.table('ReflectPrompt').insert(newTemplatePrompts).run(),
-        insertMeetingTemplate(newTemplate)
+        insertMeetingTemplate(newTemplate),
+        decrementFreeCustomTemplatesRemaining(viewerId, 'retro')
       ])
+      viewer.freeCustomRetroTemplatesRemaining = viewer.freeCustomRetroTemplatesRemaining - 1
       analytics.templateMetrics(viewer, newTemplate, 'Template Created')
       data = {templateId}
     }
diff --git a/packages/server/graphql/public/typeDefs/User.graphql b/packages/server/graphql/public/typeDefs/User.graphql
index 232c2027391..e204127f142 100644
--- a/packages/server/graphql/public/typeDefs/User.graphql
+++ b/packages/server/graphql/public/typeDefs/User.graphql
@@ -458,4 +458,12 @@ type User {
     """
     domain: String!
   ): ParseSAMLMetadataPayload!
+  """
+  The number of free custom retro templates remaining
+  """
+  freeCustomRetroTemplatesRemaining: Int!
+  """
+  The number of free custom poker templates remaining
+  """
+  freeCustomPokerTemplatesRemaining: Int!
 }
diff --git a/packages/server/graphql/types/AddPokerTemplatePayload.ts b/packages/server/graphql/types/AddPokerTemplatePayload.ts
index 2616e83a8ff..0536e3203cf 100644
--- a/packages/server/graphql/types/AddPokerTemplatePayload.ts
+++ b/packages/server/graphql/types/AddPokerTemplatePayload.ts
@@ -2,6 +2,8 @@ import {GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import PokerTemplate from './PokerTemplate'
 import StandardMutationError from './StandardMutationError'
+import {getUserId} from '../../utils/authorization'
+import User from './User'
 
 const AddPokerTemplatePayload = new GraphQLObjectType<any, GQLContext>({
   name: 'AddPokerTemplatePayload',
@@ -15,6 +17,14 @@ const AddPokerTemplatePayload = new GraphQLObjectType<any, GQLContext>({
         if (!templateId) return null
         return dataLoader.get('meetingTemplates').load(templateId)
       }
+    },
+    user: {
+      type: User,
+      resolve: (_, _args: unknown, {dataLoader, authToken}) => {
+        const userId = getUserId(authToken)
+        if (!userId) return null
+        return dataLoader.get('users').load(userId)
+      }
     }
   })
 })
diff --git a/packages/server/graphql/types/AddReflectTemplatePayload.ts b/packages/server/graphql/types/AddReflectTemplatePayload.ts
index 3c6e4bcf5bf..07de89347a2 100644
--- a/packages/server/graphql/types/AddReflectTemplatePayload.ts
+++ b/packages/server/graphql/types/AddReflectTemplatePayload.ts
@@ -2,6 +2,8 @@ import {GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import ReflectTemplate from './ReflectTemplate'
 import StandardMutationError from './StandardMutationError'
+import User from './User'
+import {getUserId} from '../../utils/authorization'
 
 const AddReflectTemplatePayload = new GraphQLObjectType<any, GQLContext>({
   name: 'AddReflectTemplatePayload',
@@ -15,6 +17,14 @@ const AddReflectTemplatePayload = new GraphQLObjectType<any, GQLContext>({
         if (!templateId) return null
         return dataLoader.get('meetingTemplates').load(templateId)
       }
+    },
+    user: {
+      type: User,
+      resolve: (_, _args: unknown, {dataLoader, authToken}) => {
+        const userId = getUserId(authToken)
+        if (!userId) return null
+        return dataLoader.get('users').load(userId)
+      }
     }
   })
 })
diff --git a/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts b/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
new file mode 100644
index 00000000000..cb378a1ad4b
--- /dev/null
+++ b/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
@@ -0,0 +1,34 @@
+import {Kysely, PostgresDialect} from 'kysely'
+import getPg from '../getPg'
+
+export async function up() {
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+
+  await pg.schema
+    .alterTable('User')
+    .addColumn('freeCustomRetroTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
+    .addColumn('freeCustomPokerTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
+    .execute()
+
+  await pg.destroy()
+}
+
+export async function down() {
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+
+  await pg.schema
+    .alterTable('User')
+    .dropColumn('freeCustomRetroTemplatesRemaining')
+    .dropColumn('freeCustomPokerTemplatesRemaining')
+    .execute()
+
+  await pg.destroy()
+}
diff --git a/packages/server/postgres/queries/decrementFreeTemplatesRemaining.ts b/packages/server/postgres/queries/decrementFreeTemplatesRemaining.ts
new file mode 100644
index 00000000000..2eef866348b
--- /dev/null
+++ b/packages/server/postgres/queries/decrementFreeTemplatesRemaining.ts
@@ -0,0 +1,18 @@
+import getKysely from '../getKysely'
+
+const decrementFreeTemplatesRemaining = async (userId: string, templateType: 'retro' | 'poker') => {
+  const pg = getKysely()
+  const customTemplateType =
+    templateType === 'retro'
+      ? 'freeCustomRetroTemplatesRemaining'
+      : 'freeCustomPokerTemplatesRemaining'
+
+  await pg
+    .updateTable('User')
+    .set((eb) => ({[customTemplateType]: eb(customTemplateType, '-', 1)}))
+    .where('id', '=', userId)
+    .where(customTemplateType, '>', 0)
+    .executeTakeFirst()
+}
+
+export default decrementFreeTemplatesRemaining

From ef0fbc2da853e2248a16ff2a2ce37c1f85f07f1a Mon Sep 17 00:00:00 2001
From: Bruce Tian <tianrunhe@gmail.com>
Date: Fri, 22 Mar 2024 11:11:43 -0700
Subject: [PATCH 085/183] fix(admin): fix an issue where ORG_ADMIN cannot see
 members from team they are not in (#9560)

---
 packages/server/graphql/queries/team.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/server/graphql/queries/team.ts b/packages/server/graphql/queries/team.ts
index 40af63c637d..45c55e50764 100644
--- a/packages/server/graphql/queries/team.ts
+++ b/packages/server/graphql/queries/team.ts
@@ -22,7 +22,13 @@ export default {
     {authToken, dataLoader}: GQLContext,
     {operation}: GraphQLResolveInfo
   ) {
-    if (!isTeamMember(authToken, teamId) && !isSuperUser(authToken)) {
+    const team = await dataLoader.get('teams').loadNonNull(teamId)
+    const {orgId} = team
+    const viewerId = getUserId(authToken)
+    const {role} =
+      (await dataLoader.get('organizationUsersByUserIdOrgId').load({userId: viewerId, orgId})) ?? {}
+    const isOrgAdmin = role === 'ORG_ADMIN'
+    if (!isOrgAdmin && !isTeamMember(authToken, teamId) && !isSuperUser(authToken)) {
       const viewerId = getUserId(authToken)
       if (!HANDLED_OPS.includes(operation?.name?.value ?? '')) {
         standardError(new Error('Team not found'), {userId: viewerId})

From d18d75485116c883d72456ac51b817a044a38b4d Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:05:02 +0000
Subject: [PATCH 086/183] chore(github): DevOps review if docker folder is
 modified or release-please-config is changed (#9562)

---
 .github/reviewers.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/reviewers.yml b/.github/reviewers.yml
index 8d2732ba714..84b51a4d067 100644
--- a/.github/reviewers.yml
+++ b/.github/reviewers.yml
@@ -34,8 +34,12 @@ files:
     - data
   "**/analytics/**":
     - data
+  "docker/**":
+    - devops
   ".env.example":
     - devops
+  "release-please-config.json":
+    - devops
 options:
   ignore_draft: true
   ignored_keywords:

From fe718413fa2d19afa660cc944d30a1284d6c2b18 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Mon, 25 Mar 2024 18:34:07 +0000
Subject: [PATCH 087/183] chore: refactor add template mutation to the new sdl
 pattern (#9533)

---
 codegen.json                                  |   2 +
 .../mutations/AddPokerTemplateMutation.ts     |   9 +-
 .../mutations/AddReflectTemplateMutation.ts   |   9 +-
 .../client/subscriptions/TeamSubscription.ts  |  11 +-
 .../graphql/mutations/addPokerTemplate.ts     | 149 ------------------
 .../graphql/mutations/addReflectTemplate.ts   | 149 ------------------
 .../public/mutations/addPokerTemplate.ts      | 135 ++++++++++++++++
 .../public/mutations/addReflectTemplate.ts    | 128 +++++++++++++++
 .../public/typeDefs/AddPokerTemplate.graphql  |  31 ++++
 .../typeDefs/AddReflectTemplate.graphql       |  31 ++++
 .../public/typeDefs/Subscriptions.graphql     |   4 +-
 .../graphql/public/typeDefs/_legacy.graphql   |  22 ---
 .../public/types/AddPokerTemplateSuccess.ts   |  18 +++
 .../public/types/AddReflectTemplateSuccess.ts |  18 +++
 packages/server/graphql/rootMutation.ts       |   4 -
 .../graphql/types/AddPokerTemplatePayload.ts  |  32 ----
 .../types/AddReflectTemplatePayload.ts        |  32 ----
 17 files changed, 387 insertions(+), 397 deletions(-)
 delete mode 100644 packages/server/graphql/mutations/addPokerTemplate.ts
 delete mode 100644 packages/server/graphql/mutations/addReflectTemplate.ts
 create mode 100644 packages/server/graphql/public/mutations/addPokerTemplate.ts
 create mode 100644 packages/server/graphql/public/mutations/addReflectTemplate.ts
 create mode 100644 packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql
 create mode 100644 packages/server/graphql/public/types/AddPokerTemplateSuccess.ts
 create mode 100644 packages/server/graphql/public/types/AddReflectTemplateSuccess.ts
 delete mode 100644 packages/server/graphql/types/AddPokerTemplatePayload.ts
 delete mode 100644 packages/server/graphql/types/AddReflectTemplatePayload.ts

diff --git a/codegen.json b/codegen.json
index f47587c90c1..a0a38ad29f0 100644
--- a/codegen.json
+++ b/codegen.json
@@ -49,6 +49,8 @@
           "ActionMeeting": "../../database/types/MeetingAction#default",
           "ActionMeetingMember": "../../database/types/ActionMeetingMember#default as ActionMeetingMemberDB",
           "AddApprovedOrganizationDomainsSuccess": "./types/AddApprovedOrganizationDomainsSuccess#AddApprovedOrganizationDomainsSuccessSource",
+          "AddReflectTemplateSuccess": "./types/AddReflectTemplateSuccess#AddReflectTemplateSuccessSource",
+          "AddPokerTemplateSuccess": "./types/AddPokerTemplateSuccess#AddPokerTemplateSuccessSource",
           "AddTranscriptionBotSuccess": "./types/AddTranscriptionBotSuccess#AddTranscriptionBotSuccessSource",
           "AddedNotification": "./types/AddedNotification#AddedNotificationSource",
           "AgendaItem": "../../database/types/AgendaItem#default as AgendaItemDB",
diff --git a/packages/client/mutations/AddPokerTemplateMutation.ts b/packages/client/mutations/AddPokerTemplateMutation.ts
index fa0b1a61769..7de55a43760 100644
--- a/packages/client/mutations/AddPokerTemplateMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateMutation.ts
@@ -9,7 +9,7 @@ import {AddPokerTemplateMutation_team$data} from '../__generated__/AddPokerTempl
 import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate'
 
 graphql`
-  fragment AddPokerTemplateMutation_team on AddPokerTemplatePayload {
+  fragment AddPokerTemplateMutation_team on AddPokerTemplateSuccess {
     user {
       freeCustomPokerTemplatesRemaining
     }
@@ -26,6 +26,11 @@ graphql`
 const mutation = graphql`
   mutation AddPokerTemplateMutation($teamId: ID!, $parentTemplateId: ID) {
     addPokerTemplate(teamId: $teamId, parentTemplateId: $parentTemplateId) {
+      ... on ErrorPayload {
+        error {
+          message
+        }
+      }
       ...AddPokerTemplateMutation_team @relay(mask: false)
     }
   }
@@ -58,7 +63,7 @@ const AddPokerTemplateMutation: StandardMutation<TAddPokerTemplateMutation> = (
     updater: (store) => {
       const payload = store.getRootField('addPokerTemplate')
       if (!payload) return
-      addPokerTemplateTeamUpdater(payload, {atmosphere, store})
+      addPokerTemplateTeamUpdater(payload as any, {atmosphere, store})
     },
     optimisticUpdater: (store) => {
       const {parentTemplateId, teamId} = variables
diff --git a/packages/client/mutations/AddReflectTemplateMutation.ts b/packages/client/mutations/AddReflectTemplateMutation.ts
index caf3000057e..0b74c28760a 100644
--- a/packages/client/mutations/AddReflectTemplateMutation.ts
+++ b/packages/client/mutations/AddReflectTemplateMutation.ts
@@ -8,7 +8,7 @@ import {AddReflectTemplateMutation_team$data} from '../__generated__/AddReflectT
 import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate'
 
 graphql`
-  fragment AddReflectTemplateMutation_team on AddReflectTemplatePayload {
+  fragment AddReflectTemplateMutation_team on AddReflectTemplateSuccess {
     user {
       freeCustomRetroTemplatesRemaining
     }
@@ -25,6 +25,11 @@ graphql`
 const mutation = graphql`
   mutation AddReflectTemplateMutation($teamId: ID!, $parentTemplateId: ID) {
     addReflectTemplate(teamId: $teamId, parentTemplateId: $parentTemplateId) {
+      ... on ErrorPayload {
+        error {
+          message
+        }
+      }
       ...AddReflectTemplateMutation_team @relay(mask: false)
     }
   }
@@ -57,7 +62,7 @@ const AddReflectTemplateMutation: StandardMutation<TAddReflectTemplateMutation>
     updater: (store) => {
       const payload = store.getRootField('addReflectTemplate')
       if (!payload) return
-      addReflectTemplateTeamUpdater(payload, {atmosphere, store})
+      addReflectTemplateTeamUpdater(payload as any, {atmosphere, store})
     },
     optimisticUpdater: (store) => {
       const {parentTemplateId, teamId} = variables
diff --git a/packages/client/subscriptions/TeamSubscription.ts b/packages/client/subscriptions/TeamSubscription.ts
index 6bce58cfa10..10e14740d4c 100644
--- a/packages/client/subscriptions/TeamSubscription.ts
+++ b/packages/client/subscriptions/TeamSubscription.ts
@@ -17,7 +17,6 @@ import {
   acceptTeamInvitationTeamUpdater
 } from '../mutations/AcceptTeamInvitationMutation'
 import {addAgendaItemUpdater} from '../mutations/AddAgendaItemMutation'
-import {addReflectTemplateTeamUpdater} from '../mutations/AddReflectTemplateMutation'
 import {addReflectTemplatePromptTeamUpdater} from '../mutations/AddReflectTemplatePromptMutation'
 import {addTeamTeamUpdater} from '../mutations/AddTeamMutation'
 import {archiveTeamTeamOnNext, archiveTeamTeamUpdater} from '../mutations/ArchiveTeamMutation'
@@ -40,6 +39,8 @@ import {updateAgendaItemUpdater} from '../mutations/UpdateAgendaItemMutation'
 import subscriptionOnNext from './subscriptionOnNext'
 import subscriptionUpdater from './subscriptionUpdater'
 import {batchArchiveTasksTaskUpdater} from '../mutations/BatchArchiveTasksMutation'
+import {addReflectTemplateTeamUpdater} from '../mutations/AddReflectTemplateMutation'
+import {addPokerTemplateTeamUpdater} from '../mutations/AddPokerTemplateMutation'
 
 const subscription = graphql`
   subscription TeamSubscription {
@@ -66,9 +67,12 @@ const subscription = graphql`
       AddAtlassianAuthPayload {
         ...AddAtlassianAuthMutation_team @relay(mask: false)
       }
-      AddReflectTemplatePayload {
+      AddReflectTemplateSuccess {
         ...AddReflectTemplateMutation_team @relay(mask: false)
       }
+      AddPokerTemplateSuccess {
+        ...AddPokerTemplateMutation_team @relay(mask: false)
+      }
       AddReflectTemplatePromptPayload {
         ...AddReflectTemplatePromptMutation_team @relay(mask: false)
       }
@@ -207,7 +211,8 @@ const updateHandlers = {
   RemoveAgendaItemPayload: removeAgendaItemUpdater,
   UpdateAgendaItemPayload: updateAgendaItemUpdater,
   AcceptTeamInvitationPayload: acceptTeamInvitationTeamUpdater,
-  AddReflectTemplatePayload: addReflectTemplateTeamUpdater,
+  AddReflectTemplateSuccess: addReflectTemplateTeamUpdater,
+  AddPokerTemplateSuccess: addPokerTemplateTeamUpdater,
   AddReflectTemplatePromptPayload: addReflectTemplatePromptTeamUpdater,
   AddTeamMutationPayload: addTeamTeamUpdater,
   ArchiveTeamPayload: archiveTeamTeamUpdater,
diff --git a/packages/server/graphql/mutations/addPokerTemplate.ts b/packages/server/graphql/mutations/addPokerTemplate.ts
deleted file mode 100644
index cb6d7f390bb..00000000000
--- a/packages/server/graphql/mutations/addPokerTemplate.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import {GraphQLID, GraphQLNonNull} from 'graphql'
-import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
-import PokerTemplate from '../../database/types/PokerTemplate'
-import TemplateDimension from '../../database/types/TemplateDimension'
-import insertMeetingTemplate from '../../postgres/queries/insertMeetingTemplate'
-import {getUserId, isTeamMember, isUserInOrg} from '../../utils/authorization'
-import publish from '../../utils/publish'
-import standardError from '../../utils/standardError'
-import {GQLContext} from '../graphql'
-import AddPokerTemplatePayload from '../types/AddPokerTemplatePayload'
-import getTemplateIllustrationUrl from './helpers/getTemplateIllustrationUrl'
-import {analytics} from '../../utils/analytics/analytics'
-import {getFeatureTier} from '../types/helpers/getFeatureTier'
-import decrementFreeTemplatesRemaining from '../../postgres/queries/decrementFreeTemplatesRemaining'
-
-const addPokerTemplate = {
-  description: 'Add a new poker template with a default dimension created',
-  type: new GraphQLNonNull(AddPokerTemplatePayload),
-  args: {
-    parentTemplateId: {
-      type: GraphQLID
-    },
-    teamId: {
-      type: new GraphQLNonNull(GraphQLID)
-    }
-  },
-  async resolve(
-    _source: unknown,
-    {parentTemplateId, teamId}: {parentTemplateId?: string | null; teamId: string},
-    {authToken, dataLoader, socketId: mutatorId}: GQLContext
-  ) {
-    const r = await getRethink()
-    const operationId = dataLoader.share()
-    const subOptions = {operationId, mutatorId}
-    const viewerId = getUserId(authToken)
-
-    // AUTH
-    if (!isTeamMember(authToken, teamId)) {
-      return standardError(new Error('Team not found'), {userId: viewerId})
-    }
-
-    // VALIDATION
-    const [allTemplates, viewerTeam, viewer] = await Promise.all([
-      dataLoader.get('meetingTemplatesByType').load({meetingType: 'poker', teamId}),
-      dataLoader.get('teams').load(teamId),
-      dataLoader.get('users').loadNonNull(viewerId)
-    ])
-
-    if (!viewerTeam) {
-      return standardError(new Error('Team not found'), {userId: viewerId})
-    }
-    if (
-      getFeatureTier(viewerTeam) === 'starter' &&
-      viewer.freeCustomPokerTemplatesRemaining === 0
-    ) {
-      return standardError(new Error('You have reached the limit of free custom templates.'), {
-        userId: viewerId
-      })
-    }
-    let data
-    if (parentTemplateId) {
-      const parentTemplate = await dataLoader.get('meetingTemplates').load(parentTemplateId)
-      if (!parentTemplate) {
-        return standardError(new Error('Parent template not found'), {userId: viewerId})
-      }
-      const {name, scope} = parentTemplate
-      if (scope === 'TEAM') {
-        if (!isTeamMember(authToken, parentTemplate.teamId))
-          return standardError(new Error('Template is scoped to team'), {userId: viewerId})
-      } else if (scope === 'ORGANIZATION') {
-        const parentTemplateTeam = await dataLoader.get('teams').load(parentTemplate.teamId)
-        const isInOrg =
-          parentTemplateTeam &&
-          (await isUserInOrg(getUserId(authToken), parentTemplateTeam?.orgId, dataLoader))
-        if (!isInOrg) {
-          return standardError(new Error('Template is scoped to organization'), {userId: viewerId})
-        }
-      }
-      const copyName = `${name} Copy`
-      const existingCopyCount = allTemplates.filter((template) =>
-        template.name.startsWith(copyName)
-      ).length
-      const newName = existingCopyCount === 0 ? copyName : `${copyName} #${existingCopyCount + 1}`
-      const newTemplate = new PokerTemplate({
-        name: newName,
-        teamId,
-        orgId: viewerTeam.orgId,
-        parentTemplateId,
-        mainCategory: parentTemplate.mainCategory,
-        illustrationUrl: parentTemplate.illustrationUrl
-      })
-
-      const dimensions = await dataLoader
-        .get('templateDimensionsByTemplateId')
-        .load(parentTemplate.id)
-      const activeDimensions = dimensions.filter(({removedAt}: TemplateDimension) => !removedAt)
-      const newTemplateDimensions = activeDimensions.map((dimension: TemplateDimension) => {
-        return new TemplateDimension({
-          ...dimension,
-          teamId,
-          templateId: newTemplate.id
-        })
-      })
-
-      await Promise.all([
-        r.table('TemplateDimension').insert(newTemplateDimensions).run(),
-        insertMeetingTemplate(newTemplate),
-        decrementFreeTemplatesRemaining(viewerId, 'poker')
-      ])
-      viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
-      analytics.templateMetrics(viewer, newTemplate, 'Template Cloned')
-      data = {templateId: newTemplate.id}
-    } else {
-      const {orgId} = viewerTeam
-
-      const templateCount = allTemplates.length
-      const newTemplate = new PokerTemplate({
-        name: `*New Template #${templateCount + 1}`,
-        teamId,
-        orgId,
-        mainCategory: 'estimation',
-        illustrationUrl: getTemplateIllustrationUrl('estimatedEffortTemplate.png')
-      })
-      const templateId = newTemplate.id
-      const newDimension = new TemplateDimension({
-        scaleId: SprintPokerDefaults.DEFAULT_SCALE_ID,
-        description: '',
-        sortOrder: 0,
-        name: '*New Dimension',
-        teamId,
-        templateId
-      })
-
-      await Promise.all([
-        r.table('TemplateDimension').insert(newDimension).run(),
-        insertMeetingTemplate(newTemplate),
-        decrementFreeTemplatesRemaining(viewerId, 'poker')
-      ])
-      viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
-      analytics.templateMetrics(viewer, newTemplate, 'Template Created')
-      data = {templateId}
-    }
-    publish(SubscriptionChannel.TEAM, teamId, 'AddPokerTemplatePayload', data, subOptions)
-    return data
-  }
-}
-
-export default addPokerTemplate
diff --git a/packages/server/graphql/mutations/addReflectTemplate.ts b/packages/server/graphql/mutations/addReflectTemplate.ts
deleted file mode 100644
index 88fd88cad46..00000000000
--- a/packages/server/graphql/mutations/addReflectTemplate.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import {GraphQLID, GraphQLNonNull} from 'graphql'
-import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import {PALETTE} from '../../../client/styles/paletteV3'
-import getRethink from '../../database/rethinkDriver'
-import ReflectTemplate from '../../database/types/ReflectTemplate'
-import RetrospectivePrompt from '../../database/types/RetrospectivePrompt'
-import insertMeetingTemplate from '../../postgres/queries/insertMeetingTemplate'
-import {getUserId, isTeamMember, isUserInOrg} from '../../utils/authorization'
-import publish from '../../utils/publish'
-import standardError from '../../utils/standardError'
-import {GQLContext} from '../graphql'
-import AddReflectTemplatePayload from '../types/AddReflectTemplatePayload'
-import makeRetroTemplates from './helpers/makeRetroTemplates'
-import {analytics} from '../../utils/analytics/analytics'
-import {getFeatureTier} from '../types/helpers/getFeatureTier'
-import decrementFreeCustomTemplatesRemaining from '../../postgres/queries/decrementFreeTemplatesRemaining'
-
-const addReflectTemplate = {
-  description: 'Add a new template full of prompts',
-  type: AddReflectTemplatePayload,
-  args: {
-    parentTemplateId: {
-      type: GraphQLID
-    },
-    teamId: {
-      type: new GraphQLNonNull(GraphQLID)
-    }
-  },
-  async resolve(
-    _source: unknown,
-    {parentTemplateId, teamId}: {parentTemplateId?: string | null; teamId: string},
-    {authToken, dataLoader, socketId: mutatorId}: GQLContext
-  ) {
-    const r = await getRethink()
-    const operationId = dataLoader.share()
-    const subOptions = {operationId, mutatorId}
-    const viewerId = getUserId(authToken)
-
-    // AUTH
-    if (!isTeamMember(authToken, teamId)) {
-      return standardError(new Error('Team not found'), {userId: viewerId})
-    }
-
-    // VALIDATION
-    const [allTemplates, viewerTeam, viewer] = await Promise.all([
-      dataLoader.get('meetingTemplatesByType').load({meetingType: 'retrospective', teamId}),
-      dataLoader.get('teams').load(teamId),
-      dataLoader.get('users').loadNonNull(viewerId)
-    ])
-
-    if (!viewerTeam) {
-      return standardError(new Error('Team not found'), {userId: viewerId})
-    }
-    if (
-      getFeatureTier(viewerTeam) === 'starter' &&
-      viewer.freeCustomRetroTemplatesRemaining === 0
-    ) {
-      return standardError(new Error('You have reached the limit of free custom templates.'), {
-        userId: viewerId
-      })
-    }
-    let data
-    if (parentTemplateId) {
-      const parentTemplate = await dataLoader.get('meetingTemplates').load(parentTemplateId)
-      if (!parentTemplate) {
-        return standardError(new Error('Parent template not found'), {userId: viewerId})
-      }
-      const {name, scope} = parentTemplate
-      if (scope === 'TEAM') {
-        if (!isTeamMember(authToken, parentTemplate.teamId))
-          return standardError(new Error('Template is scoped to team'), {userId: viewerId})
-      } else if (scope === 'ORGANIZATION') {
-        const parentTemplateTeam = await dataLoader.get('teams').load(parentTemplate.teamId)
-        const isInOrg =
-          parentTemplateTeam &&
-          (await isUserInOrg(getUserId(authToken), parentTemplateTeam?.orgId, dataLoader))
-        if (!isInOrg) {
-          return standardError(new Error('Template is scoped to organization'), {userId: viewerId})
-        }
-      }
-      const copyName = `${name} Copy`
-      const existingCopyCount = allTemplates.filter((template) =>
-        template.name.startsWith(copyName)
-      ).length
-      const newName = existingCopyCount === 0 ? copyName : `${copyName} #${existingCopyCount + 1}`
-      const newTemplate = new ReflectTemplate({
-        name: newName,
-        teamId,
-        orgId: viewerTeam.orgId,
-        parentTemplateId,
-        illustrationUrl: parentTemplate.illustrationUrl,
-        mainCategory: parentTemplate.mainCategory
-      })
-      const prompts = await dataLoader.get('reflectPromptsByTemplateId').load(parentTemplate.id)
-      const activePrompts = prompts.filter(({removedAt}: RetrospectivePrompt) => !removedAt)
-      const newTemplatePrompts = activePrompts.map((prompt: RetrospectivePrompt) => {
-        return new RetrospectivePrompt({
-          ...prompt,
-          teamId,
-          templateId: newTemplate.id,
-          parentPromptId: prompt.id,
-          removedAt: null
-        })
-      })
-
-      await Promise.all([
-        r.table('ReflectPrompt').insert(newTemplatePrompts).run(),
-        insertMeetingTemplate(newTemplate),
-        decrementFreeCustomTemplatesRemaining(viewerId, 'retro')
-      ])
-      viewer.freeCustomRetroTemplatesRemaining = viewer.freeCustomRetroTemplatesRemaining - 1
-      analytics.templateMetrics(viewer, newTemplate, 'Template Cloned')
-      data = {templateId: newTemplate.id}
-    } else {
-      const {orgId} = viewerTeam
-      // RESOLUTION
-      const templateCount = allTemplates.length
-      const base = {
-        [`*New Template #${templateCount + 1}`]: [
-          {
-            question: 'New prompt',
-            description: '',
-            groupColor: PALETTE.JADE_400
-          }
-        ]
-      } as const
-      const {reflectPrompts: newTemplatePrompts, templates} = makeRetroTemplates(
-        teamId,
-        orgId,
-        base
-      )
-      // guaranteed since base has 1 key
-      const newTemplate = templates[0]!
-      const {id: templateId} = newTemplate
-      await Promise.all([
-        r.table('ReflectPrompt').insert(newTemplatePrompts).run(),
-        insertMeetingTemplate(newTemplate),
-        decrementFreeCustomTemplatesRemaining(viewerId, 'retro')
-      ])
-      viewer.freeCustomRetroTemplatesRemaining = viewer.freeCustomRetroTemplatesRemaining - 1
-      analytics.templateMetrics(viewer, newTemplate, 'Template Created')
-      data = {templateId}
-    }
-    publish(SubscriptionChannel.TEAM, teamId, 'AddReflectTemplatePayload', data, subOptions)
-    return data
-  }
-}
-
-export default addReflectTemplate
diff --git a/packages/server/graphql/public/mutations/addPokerTemplate.ts b/packages/server/graphql/public/mutations/addPokerTemplate.ts
new file mode 100644
index 00000000000..2141a7e5833
--- /dev/null
+++ b/packages/server/graphql/public/mutations/addPokerTemplate.ts
@@ -0,0 +1,135 @@
+import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/constEnums'
+import getRethink from '../../../database/rethinkDriver'
+import PokerTemplate from '../../../database/types/PokerTemplate'
+import TemplateDimension from '../../../database/types/TemplateDimension'
+import insertMeetingTemplate from '../../../postgres/queries/insertMeetingTemplate'
+import {getUserId, isTeamMember, isUserInOrg} from '../../../utils/authorization'
+import publish from '../../../utils/publish'
+import standardError from '../../../utils/standardError'
+import getTemplateIllustrationUrl from '../../mutations/helpers/getTemplateIllustrationUrl'
+import {analytics} from '../../../utils/analytics/analytics'
+import {getFeatureTier} from '../../types/helpers/getFeatureTier'
+import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining'
+import {MutationResolvers} from '../resolverTypes'
+
+const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async (
+  _source,
+  {teamId, parentTemplateId},
+  {authToken, dataLoader, socketId: mutatorId}
+) => {
+  const r = await getRethink()
+  const operationId = dataLoader.share()
+  const subOptions = {operationId, mutatorId}
+  const viewerId = getUserId(authToken)
+
+  // AUTH
+  if (!isTeamMember(authToken, teamId)) {
+    return standardError(new Error('Team not found'), {userId: viewerId})
+  }
+
+  // VALIDATION
+  const [allTemplates, viewerTeam, viewer] = await Promise.all([
+    dataLoader.get('meetingTemplatesByType').load({meetingType: 'poker', teamId}),
+    dataLoader.get('teams').load(teamId),
+    dataLoader.get('users').loadNonNull(viewerId)
+  ])
+
+  if (!viewerTeam) {
+    return standardError(new Error('Team not found'), {userId: viewerId})
+  }
+  if (getFeatureTier(viewerTeam) === 'starter' && viewer.freeCustomPokerTemplatesRemaining === 0) {
+    return standardError(new Error('You have reached the limit of free custom templates.'), {
+      userId: viewerId
+    })
+  } else {
+    decrementFreeTemplatesRemaining(viewerId, 'poker')
+    viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
+  }
+  let data
+  if (parentTemplateId) {
+    const parentTemplate = await dataLoader.get('meetingTemplates').load(parentTemplateId)
+    if (!parentTemplate) {
+      return standardError(new Error('Parent template not found'), {userId: viewerId})
+    }
+    const {name, scope} = parentTemplate
+    if (scope === 'TEAM') {
+      if (!isTeamMember(authToken, parentTemplate.teamId))
+        return standardError(new Error('Template is scoped to team'), {userId: viewerId})
+    } else if (scope === 'ORGANIZATION') {
+      const parentTemplateTeam = await dataLoader.get('teams').load(parentTemplate.teamId)
+      const isInOrg =
+        parentTemplateTeam &&
+        (await isUserInOrg(getUserId(authToken), parentTemplateTeam?.orgId, dataLoader))
+      if (!isInOrg) {
+        return standardError(new Error('Template is scoped to organization'), {userId: viewerId})
+      }
+    }
+    const copyName = `${name} Copy`
+    const existingCopyCount = allTemplates.filter((template) =>
+      template.name.startsWith(copyName)
+    ).length
+    const newName = existingCopyCount === 0 ? copyName : `${copyName} #${existingCopyCount + 1}`
+    const newTemplate = new PokerTemplate({
+      name: newName,
+      teamId,
+      orgId: viewerTeam.orgId,
+      parentTemplateId,
+      mainCategory: parentTemplate.mainCategory,
+      illustrationUrl: parentTemplate.illustrationUrl
+    })
+
+    const dimensions = await dataLoader
+      .get('templateDimensionsByTemplateId')
+      .load(parentTemplate.id)
+    const activeDimensions = dimensions.filter(({removedAt}: TemplateDimension) => !removedAt)
+    const newTemplateDimensions = activeDimensions.map((dimension: TemplateDimension) => {
+      return new TemplateDimension({
+        ...dimension,
+        teamId,
+        templateId: newTemplate.id
+      })
+    })
+
+    await Promise.all([
+      r.table('TemplateDimension').insert(newTemplateDimensions).run(),
+      insertMeetingTemplate(newTemplate),
+      decrementFreeTemplatesRemaining(viewerId, 'poker')
+    ])
+    viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
+    analytics.templateMetrics(viewer, newTemplate, 'Template Cloned')
+    data = {templateId: newTemplate.id}
+  } else {
+    const {orgId} = viewerTeam
+
+    const templateCount = allTemplates.length
+    const newTemplate = new PokerTemplate({
+      name: `*New Template #${templateCount + 1}`,
+      teamId,
+      orgId,
+      mainCategory: 'estimation',
+      illustrationUrl: getTemplateIllustrationUrl('estimatedEffortTemplate.png')
+    })
+    const templateId = newTemplate.id
+    const newDimension = new TemplateDimension({
+      scaleId: SprintPokerDefaults.DEFAULT_SCALE_ID,
+      description: '',
+      sortOrder: 0,
+      name: '*New Dimension',
+      teamId,
+      templateId
+    })
+
+    await Promise.all([
+      r.table('TemplateDimension').insert(newDimension).run(),
+      insertMeetingTemplate(newTemplate),
+      decrementFreeTemplatesRemaining(viewerId, 'poker')
+    ])
+    viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
+    analytics.templateMetrics(viewer, newTemplate, 'Template Created')
+    data = {templateId}
+  }
+  publish(SubscriptionChannel.TEAM, teamId, 'AddPokerTemplateSuccess', data, subOptions)
+  return data
+}
+
+export default addPokerTemplate
diff --git a/packages/server/graphql/public/mutations/addReflectTemplate.ts b/packages/server/graphql/public/mutations/addReflectTemplate.ts
new file mode 100644
index 00000000000..b2c5c7479a4
--- /dev/null
+++ b/packages/server/graphql/public/mutations/addReflectTemplate.ts
@@ -0,0 +1,128 @@
+import {SubscriptionChannel} from 'parabol-client/types/constEnums'
+import getRethink from '../../../database/rethinkDriver'
+import insertMeetingTemplate from '../../../postgres/queries/insertMeetingTemplate'
+import {getUserId, isTeamMember, isUserInOrg} from '../../../utils/authorization'
+import publish from '../../../utils/publish'
+import standardError from '../../../utils/standardError'
+import {analytics} from '../../../utils/analytics/analytics'
+import {getFeatureTier} from '../../types/helpers/getFeatureTier'
+import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining'
+import {MutationResolvers} from '../resolverTypes'
+import ReflectTemplate from '../../../database/types/ReflectTemplate'
+import {PALETTE} from '../../../../client/styles/paletteV3'
+import makeRetroTemplates from '../../mutations/helpers/makeRetroTemplates'
+import RetrospectivePrompt from '../../../database/types/RetrospectivePrompt'
+
+const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async (
+  _source,
+  {teamId, parentTemplateId},
+  {authToken, dataLoader, socketId: mutatorId}
+) => {
+  const r = await getRethink()
+  const operationId = dataLoader.share()
+  const subOptions = {operationId, mutatorId}
+  const viewerId = getUserId(authToken)
+
+  // AUTH
+  if (!isTeamMember(authToken, teamId)) {
+    return standardError(new Error('Team not found'), {userId: viewerId})
+  }
+
+  // VALIDATION
+  const [allTemplates, viewerTeam, viewer] = await Promise.all([
+    dataLoader.get('meetingTemplatesByType').load({meetingType: 'retrospective', teamId}),
+    dataLoader.get('teams').load(teamId),
+    dataLoader.get('users').loadNonNull(viewerId)
+  ])
+
+  if (!viewerTeam) {
+    return standardError(new Error('Team not found'), {userId: viewerId})
+  }
+  if (getFeatureTier(viewerTeam) === 'starter' && viewer.freeCustomRetroTemplatesRemaining === 0) {
+    return standardError(new Error('You have reached the limit of free custom templates.'), {
+      userId: viewerId
+    })
+  }
+  let data
+  if (parentTemplateId) {
+    const parentTemplate = await dataLoader.get('meetingTemplates').load(parentTemplateId)
+    if (!parentTemplate) {
+      return standardError(new Error('Parent template not found'), {userId: viewerId})
+    }
+    const {name, scope} = parentTemplate
+    if (scope === 'TEAM') {
+      if (!isTeamMember(authToken, parentTemplate.teamId))
+        return standardError(new Error('Template is scoped to team'), {userId: viewerId})
+    } else if (scope === 'ORGANIZATION') {
+      const parentTemplateTeam = await dataLoader.get('teams').load(parentTemplate.teamId)
+      const isInOrg =
+        parentTemplateTeam &&
+        (await isUserInOrg(getUserId(authToken), parentTemplateTeam?.orgId, dataLoader))
+      if (!isInOrg) {
+        return standardError(new Error('Template is scoped to organization'), {userId: viewerId})
+      }
+    }
+    const copyName = `${name} Copy`
+    const existingCopyCount = allTemplates.filter((template) =>
+      template.name.startsWith(copyName)
+    ).length
+    const newName = existingCopyCount === 0 ? copyName : `${copyName} #${existingCopyCount + 1}`
+    const newTemplate = new ReflectTemplate({
+      name: newName,
+      teamId,
+      orgId: viewerTeam.orgId,
+      parentTemplateId,
+      illustrationUrl: parentTemplate.illustrationUrl,
+      mainCategory: parentTemplate.mainCategory
+    })
+    const prompts = await dataLoader.get('reflectPromptsByTemplateId').load(parentTemplate.id)
+    const activePrompts = prompts.filter(({removedAt}: RetrospectivePrompt) => !removedAt)
+    const newTemplatePrompts = activePrompts.map((prompt: RetrospectivePrompt) => {
+      return new RetrospectivePrompt({
+        ...prompt,
+        teamId,
+        templateId: newTemplate.id,
+        parentPromptId: prompt.id,
+        removedAt: null
+      })
+    })
+
+    await Promise.all([
+      r.table('ReflectPrompt').insert(newTemplatePrompts).run(),
+      insertMeetingTemplate(newTemplate),
+      decrementFreeTemplatesRemaining(viewerId, 'retro')
+    ])
+    viewer.freeCustomRetroTemplatesRemaining = viewer.freeCustomRetroTemplatesRemaining - 1
+    analytics.templateMetrics(viewer, newTemplate, 'Template Cloned')
+    data = {templateId: newTemplate.id}
+  } else {
+    const {orgId} = viewerTeam
+    // RESOLUTION
+    const templateCount = allTemplates.length
+    const base = {
+      [`*New Template #${templateCount + 1}`]: [
+        {
+          question: 'New prompt',
+          description: '',
+          groupColor: PALETTE.JADE_400
+        }
+      ]
+    } as const
+    const {reflectPrompts: newTemplatePrompts, templates} = makeRetroTemplates(teamId, orgId, base)
+    // guaranteed since base has 1 key
+    const newTemplate = templates[0]!
+    const {id: templateId} = newTemplate
+    await Promise.all([
+      r.table('ReflectPrompt').insert(newTemplatePrompts).run(),
+      insertMeetingTemplate(newTemplate),
+      decrementFreeTemplatesRemaining(viewerId, 'retro')
+    ])
+    viewer.freeCustomRetroTemplatesRemaining = viewer.freeCustomRetroTemplatesRemaining - 1
+    analytics.templateMetrics(viewer, newTemplate, 'Template Created')
+    data = {templateId}
+  }
+  publish(SubscriptionChannel.TEAM, teamId, 'AddReflectTemplateSuccess', data, subOptions)
+  return data
+}
+
+export default addPokerTemplate
diff --git a/packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql b/packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql
new file mode 100644
index 00000000000..e9c6926d8eb
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql
@@ -0,0 +1,31 @@
+extend type Mutation {
+  """
+  Adds a new poker template with a default dimension created.
+  """
+  addPokerTemplate(
+    """
+    The ID of the parent template, if this is a clone operation.
+    """
+    parentTemplateId: ID
+    """
+    The ID of the team for which the template is being created.
+    """
+    teamId: ID!
+  ): AddPokerTemplatePayload!
+}
+
+"""
+Return value for addPokerTemplate, which could be an error
+"""
+union AddPokerTemplatePayload = ErrorPayload | AddPokerTemplateSuccess
+
+type AddPokerTemplateSuccess {
+  """
+  The poker template that was created
+  """
+  pokerTemplate: PokerTemplate!
+  """
+  The user that created the template
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql b/packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql
new file mode 100644
index 00000000000..ec7e1660e91
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql
@@ -0,0 +1,31 @@
+extend type Mutation {
+  """
+  Adds a new reflect template with a default dimension created.
+  """
+  addReflectTemplate(
+    """
+    The ID of the parent template, if this is a clone operation.
+    """
+    parentTemplateId: ID
+    """
+    The ID of the team for which the template is being created.
+    """
+    teamId: ID!
+  ): AddReflectTemplatePayload!
+}
+
+"""
+Return value for addReflectTemplate, which could be an error
+"""
+union AddReflectTemplatePayload = ErrorPayload | AddReflectTemplateSuccess
+
+type AddReflectTemplateSuccess {
+  """
+  The reflect template that was created
+  """
+  reflectTemplate: ReflectTemplate!
+  """
+  The user that created the template
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/Subscriptions.graphql b/packages/server/graphql/public/typeDefs/Subscriptions.graphql
index 8e48da50750..f3391104caf 100644
--- a/packages/server/graphql/public/typeDefs/Subscriptions.graphql
+++ b/packages/server/graphql/public/typeDefs/Subscriptions.graphql
@@ -151,8 +151,8 @@ type TeamSubscriptionPayload {
   UpdateTeamNamePayload: UpdateTeamNamePayload
   OldUpgradeToTeamTierPayload: OldUpgradeToTeamTierPayload
   UpgradeToTeamTierSuccess: UpgradeToTeamTierSuccess
-  AddReflectTemplatePayload: AddReflectTemplatePayload
-  AddPokerTemplatePayload: AddPokerTemplatePayload
+  AddReflectTemplateSuccess: AddReflectTemplateSuccess
+  AddPokerTemplateSuccess: AddPokerTemplateSuccess
   AddReflectTemplatePromptPayload: AddReflectTemplatePromptPayload
   AddPokerTemplateDimensionPayload: AddPokerTemplateDimensionPayload
   AddPokerTemplateScalePayload: AddPokerTemplateScalePayload
diff --git a/packages/server/graphql/public/typeDefs/_legacy.graphql b/packages/server/graphql/public/typeDefs/_legacy.graphql
index 75ba9203d1f..e0e09d93056 100644
--- a/packages/server/graphql/public/typeDefs/_legacy.graphql
+++ b/packages/server/graphql/public/typeDefs/_legacy.graphql
@@ -5168,11 +5168,6 @@ type Mutation {
     comment: AddCommentInput!
   ): AddCommentPayload!
 
-  """
-  Add a new poker template with a default dimension created
-  """
-  addPokerTemplate(parentTemplateId: ID, teamId: ID!): AddPokerTemplatePayload!
-
   """
   Add a new dimension for the poker template
   """
@@ -5191,11 +5186,6 @@ type Mutation {
     scaleValue: AddTemplateScaleInput!
   ): AddPokerTemplateScaleValuePayload!
 
-  """
-  Add a new template full of prompts
-  """
-  addReflectTemplate(parentTemplateId: ID, teamId: ID!): AddReflectTemplatePayload
-
   """
   Add a new template full of prompts
   """
@@ -6215,7 +6205,6 @@ type Mutation {
   pokerResetDimension(meetingId: ID!, stageId: ID!): PokerResetDimensionPayload!
 
   """
-
   """
   pokerAnnounceDeckHover(
     meetingId: ID!
@@ -6262,7 +6251,6 @@ type Mutation {
   ): SetPokerSpectatePayload!
 
   """
-
   """
   persistGitHubSearchQuery(
     """
@@ -6497,11 +6485,6 @@ input AddCommentInput {
   threadParentId: ID
 }
 
-type AddPokerTemplatePayload {
-  error: StandardMutationError
-  pokerTemplate: PokerTemplate
-}
-
 type AddPokerTemplateDimensionPayload {
   error: StandardMutationError
   dimension: TemplateDimension
@@ -6546,11 +6529,6 @@ enum GcalVideoTypeEnum {
   zoom
 }
 
-type AddReflectTemplatePayload {
-  error: StandardMutationError
-  reflectTemplate: ReflectTemplate
-}
-
 type AddReflectTemplatePromptPayload {
   error: StandardMutationError
   prompt: ReflectPrompt
diff --git a/packages/server/graphql/public/types/AddPokerTemplateSuccess.ts b/packages/server/graphql/public/types/AddPokerTemplateSuccess.ts
new file mode 100644
index 00000000000..f6d2b3d9146
--- /dev/null
+++ b/packages/server/graphql/public/types/AddPokerTemplateSuccess.ts
@@ -0,0 +1,18 @@
+import {getUserId} from '../../../utils/authorization'
+import {AddPokerTemplateSuccessResolvers, PokerTemplate} from '../resolverTypes'
+
+export type AddPokerTemplateSuccessSource = {
+  templateId: string
+}
+
+const AddPokerTemplateSuccess: AddPokerTemplateSuccessResolvers = {
+  pokerTemplate: async ({templateId}, _args, {dataLoader}) => {
+    return (await dataLoader.get('meetingTemplates').load(templateId)) as PokerTemplate
+  },
+  user: async (_src, _args, {authToken, dataLoader}) => {
+    const viewerId = getUserId(authToken)
+    return dataLoader.get('users').loadNonNull(viewerId)
+  }
+}
+
+export default AddPokerTemplateSuccess
diff --git a/packages/server/graphql/public/types/AddReflectTemplateSuccess.ts b/packages/server/graphql/public/types/AddReflectTemplateSuccess.ts
new file mode 100644
index 00000000000..eff41da3848
--- /dev/null
+++ b/packages/server/graphql/public/types/AddReflectTemplateSuccess.ts
@@ -0,0 +1,18 @@
+import {getUserId} from '../../../utils/authorization'
+import {AddReflectTemplateSuccessResolvers, ReflectTemplate} from '../resolverTypes'
+
+export type AddPokerTemplateSuccessSource = {
+  templateId: string
+}
+
+const AddPokerTemplateSuccess: AddReflectTemplateSuccessResolvers = {
+  reflectTemplate: async ({templateId}, _args, {dataLoader}) => {
+    return (await dataLoader.get('meetingTemplates').load(templateId)) as ReflectTemplate
+  },
+  user: async (_src, _args, {authToken, dataLoader}) => {
+    const viewerId = getUserId(authToken)
+    return dataLoader.get('users').loadNonNull(viewerId)
+  }
+}
+
+export default AddPokerTemplateSuccess
diff --git a/packages/server/graphql/rootMutation.ts b/packages/server/graphql/rootMutation.ts
index e82930a04ca..1fd42b72e43 100644
--- a/packages/server/graphql/rootMutation.ts
+++ b/packages/server/graphql/rootMutation.ts
@@ -6,11 +6,9 @@ import addComment from './mutations/addComment'
 import addGitHubAuth from './mutations/addGitHubAuth'
 import addIntegrationProvider from './mutations/addIntegrationProvider'
 import addOrg from './mutations/addOrg'
-import addPokerTemplate from './mutations/addPokerTemplate'
 import addPokerTemplateDimension from './mutations/addPokerTemplateDimension'
 import addPokerTemplateScale from './mutations/addPokerTemplateScale'
 import addPokerTemplateScaleValue from './mutations/addPokerTemplateScaleValue'
-import addReflectTemplate from './mutations/addReflectTemplate'
 import addReflectTemplatePrompt from './mutations/addReflectTemplatePrompt'
 import addSlackAuth from './mutations/addSlackAuth'
 import addTeam from './mutations/addTeam'
@@ -129,11 +127,9 @@ export default new GraphQLObjectType<any, GQLContext>({
       addAgendaItem,
       addAtlassianAuth,
       addComment,
-      addPokerTemplate,
       addPokerTemplateDimension,
       addPokerTemplateScale,
       addPokerTemplateScaleValue,
-      addReflectTemplate,
       addReflectTemplatePrompt,
       addSlackAuth,
       addGitHubAuth,
diff --git a/packages/server/graphql/types/AddPokerTemplatePayload.ts b/packages/server/graphql/types/AddPokerTemplatePayload.ts
deleted file mode 100644
index 0536e3203cf..00000000000
--- a/packages/server/graphql/types/AddPokerTemplatePayload.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {GraphQLObjectType} from 'graphql'
-import {GQLContext} from '../graphql'
-import PokerTemplate from './PokerTemplate'
-import StandardMutationError from './StandardMutationError'
-import {getUserId} from '../../utils/authorization'
-import User from './User'
-
-const AddPokerTemplatePayload = new GraphQLObjectType<any, GQLContext>({
-  name: 'AddPokerTemplatePayload',
-  fields: () => ({
-    error: {
-      type: StandardMutationError
-    },
-    pokerTemplate: {
-      type: PokerTemplate,
-      resolve: ({templateId}, _args: unknown, {dataLoader}) => {
-        if (!templateId) return null
-        return dataLoader.get('meetingTemplates').load(templateId)
-      }
-    },
-    user: {
-      type: User,
-      resolve: (_, _args: unknown, {dataLoader, authToken}) => {
-        const userId = getUserId(authToken)
-        if (!userId) return null
-        return dataLoader.get('users').load(userId)
-      }
-    }
-  })
-})
-
-export default AddPokerTemplatePayload
diff --git a/packages/server/graphql/types/AddReflectTemplatePayload.ts b/packages/server/graphql/types/AddReflectTemplatePayload.ts
deleted file mode 100644
index 07de89347a2..00000000000
--- a/packages/server/graphql/types/AddReflectTemplatePayload.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {GraphQLObjectType} from 'graphql'
-import {GQLContext} from '../graphql'
-import ReflectTemplate from './ReflectTemplate'
-import StandardMutationError from './StandardMutationError'
-import User from './User'
-import {getUserId} from '../../utils/authorization'
-
-const AddReflectTemplatePayload = new GraphQLObjectType<any, GQLContext>({
-  name: 'AddReflectTemplatePayload',
-  fields: () => ({
-    error: {
-      type: StandardMutationError
-    },
-    reflectTemplate: {
-      type: ReflectTemplate,
-      resolve: ({templateId}, _args: unknown, {dataLoader}) => {
-        if (!templateId) return null
-        return dataLoader.get('meetingTemplates').load(templateId)
-      }
-    },
-    user: {
-      type: User,
-      resolve: (_, _args: unknown, {dataLoader, authToken}) => {
-        const userId = getUserId(authToken)
-        if (!userId) return null
-        return dataLoader.get('users').load(userId)
-      }
-    }
-  })
-})
-
-export default AddReflectTemplatePayload

From 21710656b6d689b286759ea495ff334b7ce86adf Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Mon, 25 Mar 2024 19:05:50 +0000
Subject: [PATCH 088/183] feat: switch template UI (#9093)

---
 packages/client/components/MeetingOptions.tsx |  62 ++++++++++
 packages/client/components/MeetingTopBar.tsx  |  17 ++-
 packages/client/components/RetroDrawer.tsx    | 108 ++++++++++++++++++
 .../client/components/RetroDrawerRoot.tsx     |  28 +++++
 .../components/RetroDrawerTemplateCard.tsx    |  55 +++++++++
 .../RetroReflectPhase/RetroReflectPhase.tsx   |   2 +
 .../TeamPrompt/TeamPromptDrawer.tsx           |   2 +-
 .../TeamPrompt/TeamPromptOptions.tsx          |   2 +-
 packages/client/ui/Menu/Menu.tsx              |  32 ++++++
 packages/client/ui/Menu/MenuItem.tsx          |  28 +++++
 packages/client/ui/Tooltip/TooltipContent.tsx |   2 +-
 packages/client/ui/Tooltip/TooltipTrigger.tsx |   2 +-
 .../{fordwardRadix.tsx => forwardRadix.tsx}   |   0
 .../graphql/public/typeDefs/User.graphql      |   4 +
 packages/server/graphql/public/types/User.ts  |   3 +-
 15 files changed, 340 insertions(+), 7 deletions(-)
 create mode 100644 packages/client/components/MeetingOptions.tsx
 create mode 100644 packages/client/components/RetroDrawer.tsx
 create mode 100644 packages/client/components/RetroDrawerRoot.tsx
 create mode 100644 packages/client/components/RetroDrawerTemplateCard.tsx
 create mode 100644 packages/client/ui/Menu/Menu.tsx
 create mode 100644 packages/client/ui/Menu/MenuItem.tsx
 rename packages/client/ui/{fordwardRadix.tsx => forwardRadix.tsx} (100%)

diff --git a/packages/client/components/MeetingOptions.tsx b/packages/client/components/MeetingOptions.tsx
new file mode 100644
index 00000000000..d0fd3d97a7c
--- /dev/null
+++ b/packages/client/components/MeetingOptions.tsx
@@ -0,0 +1,62 @@
+import React, {useState} from 'react'
+import IconLabel from './IconLabel'
+import {Menu} from '../ui/Menu/Menu'
+import {MenuItem} from '../ui/Menu/MenuItem'
+import SwapHorizIcon from '@mui/icons-material/SwapHoriz'
+import {OptionsButton} from './TeamPrompt/TeamPromptOptions'
+import {Tooltip} from '../ui/Tooltip/Tooltip'
+import {TooltipTrigger} from '../ui/Tooltip/TooltipTrigger'
+import {TooltipContent} from '../ui/Tooltip/TooltipContent'
+
+type Props = {
+  setShowDrawer: (showDrawer: boolean) => void
+  showDrawer: boolean
+  hasReflections: boolean
+}
+
+const MeetingOptions = (props: Props) => {
+  const {setShowDrawer, showDrawer, hasReflections} = props
+  const [isOpen, setIsOpen] = useState(false)
+
+  const handleClick = () => {
+    if (hasReflections) return
+    setShowDrawer(!showDrawer)
+  }
+
+  const handleMouseEnter = () => {
+    if (hasReflections) {
+      setIsOpen(true)
+    }
+  }
+
+  const handleMouseLeave = () => {
+    setIsOpen(false)
+  }
+
+  return (
+    <Menu
+      trigger={
+        <OptionsButton>
+          <IconLabel icon='tune' iconLarge />
+          <div className='text-slate-700'>Options</div>
+        </OptionsButton>
+      }
+    >
+      <Tooltip open={isOpen}>
+        <div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
+          <TooltipTrigger asChild>
+            <MenuItem onClick={handleClick} isDisabled={hasReflections}>
+              <div className='mr-3 flex text-slate-700'>{<SwapHorizIcon />}</div>
+              Change template
+            </MenuItem>
+          </TooltipTrigger>
+        </div>
+        <TooltipContent>
+          {'You can only change the template if no reflections have been added.'}
+        </TooltipContent>
+      </Tooltip>
+    </Menu>
+  )
+}
+
+export default MeetingOptions
diff --git a/packages/client/components/MeetingTopBar.tsx b/packages/client/components/MeetingTopBar.tsx
index a9d37c7e096..287a53012b4 100644
--- a/packages/client/components/MeetingTopBar.tsx
+++ b/packages/client/components/MeetingTopBar.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Comment} from '@mui/icons-material'
-import React, {ReactElement, ReactNode} from 'react'
+import React, {ReactElement, ReactNode, useState} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import {meetingAvatarMediaQueries} from '../styles/meeting'
 import hasToken from '../utils/hasToken'
@@ -9,6 +9,7 @@ import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery'
 import DemoCreateAccountButton from './DemoCreateAccountButton'
 import PlainButton from './PlainButton/PlainButton'
 import SidebarToggle from './SidebarToggle'
+import RetroDrawerRoot from './RetroDrawerRoot'
 
 const localHeaderBreakpoint = makeMinWidthMediaQuery(600)
 
@@ -148,6 +149,7 @@ interface Props {
   isRightDrawerOpen?: boolean
   toggleSidebar: () => void
   toggleDrawer?: () => void
+  meetingId?: string
 }
 
 const MeetingTopBar = (props: Props) => {
@@ -158,10 +160,14 @@ const MeetingTopBar = (props: Props) => {
     isMeetingSidebarCollapsed,
     isRightDrawerOpen,
     toggleDrawer,
-    toggleSidebar
+    toggleSidebar,
+    meetingId
   } = props
   const showButton = isDemoRoute() && !hasToken()
   const showDiscussionButton = toggleDrawer && !isRightDrawerOpen
+  const [showDrawer, setShowDrawer] = useState(false)
+  const isOptionsVisible = !!meetingId && !isDemoRoute()
+
   return (
     <MeetingTopBarStyles>
       <HeadingBlock isMeetingSidebarCollapsed={isMeetingSidebarCollapsed}>
@@ -177,6 +183,13 @@ const MeetingTopBar = (props: Props) => {
           </PrimaryActionBlock>
         )}
         {avatarGroup}
+        {isOptionsVisible && (
+          <RetroDrawerRoot
+            meetingId={meetingId}
+            setShowDrawer={setShowDrawer}
+            showDrawer={showDrawer}
+          />
+        )}
         {showDiscussionButton && toggleDrawer && (
           <ButtonContainer>
             <Badge>
diff --git a/packages/client/components/RetroDrawer.tsx b/packages/client/components/RetroDrawer.tsx
new file mode 100644
index 00000000000..8d6404ada0e
--- /dev/null
+++ b/packages/client/components/RetroDrawer.tsx
@@ -0,0 +1,108 @@
+import {Close} from '@mui/icons-material'
+import graphql from 'babel-plugin-relay/macro'
+import React, {useEffect} from 'react'
+import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {Breakpoint, DiscussionThreadEnum} from '../types/constEnums'
+import ResponsiveDashSidebar from './ResponsiveDashSidebar'
+import MeetingOptions from './MeetingOptions'
+import RetroDrawerTemplateCard from './RetroDrawerTemplateCard'
+import {Drawer} from './TeamPrompt/TeamPromptDrawer'
+import {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql'
+import useBreakpoint from '../hooks/useBreakpoint'
+
+interface Props {
+  setShowDrawer: (showDrawer: boolean) => void
+  showDrawer: boolean
+  queryRef: PreloadedQuery<RetroDrawerQuery>
+}
+
+const RetroDrawer = (props: Props) => {
+  const {queryRef, showDrawer, setShowDrawer} = props
+  const {viewer} = usePreloadedQuery<RetroDrawerQuery>(
+    graphql`
+      query RetroDrawerQuery($first: Int!, $type: MeetingTypeEnum!, $meetingId: ID!) {
+        viewer {
+          meeting(meetingId: $meetingId) {
+            ... on RetrospectiveMeeting {
+              reflectionGroups {
+                id
+              }
+              localPhase {
+                ... on ReflectPhase {
+                  phaseType
+                }
+              }
+            }
+          }
+          availableTemplates(first: $first, type: $type)
+            @connection(key: "RetroDrawer_availableTemplates") {
+            edges {
+              node {
+                ...RetroDrawerTemplateCard_template
+                id
+              }
+            }
+          }
+        }
+      }
+    `,
+    queryRef
+  )
+
+  const templates = viewer.availableTemplates.edges
+  const meeting = viewer.meeting
+  const hasReflections = !!(meeting?.reflectionGroups && meeting.reflectionGroups.length > 0)
+  const phaseType = meeting?.localPhase?.phaseType
+  const isMobile = !useBreakpoint(Breakpoint.FUZZY_TABLET)
+  const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
+
+  const toggleDrawer = () => {
+    setShowDrawer(!showDrawer)
+  }
+
+  useEffect(() => {
+    if (hasReflections && showDrawer) {
+      setShowDrawer(false)
+    }
+  }, [hasReflections])
+
+  if (!phaseType || phaseType !== 'reflect') return null
+  return (
+    <>
+      <MeetingOptions
+        hasReflections={hasReflections}
+        showDrawer={showDrawer}
+        setShowDrawer={setShowDrawer}
+      />
+      <ResponsiveDashSidebar
+        isOpen={showDrawer}
+        isRightDrawer
+        onToggle={toggleDrawer}
+        sidebarWidth={DiscussionThreadEnum.WIDTH}
+      >
+        <Drawer
+          className='overflow-scroll'
+          isDesktop={isDesktop}
+          isMobile={isMobile}
+          isOpen={showDrawer}
+        >
+          <div className='py-4'>
+            <div className='flex justify-between px-4'>
+              <div className='pb-4 text-base font-semibold'>Templates</div>
+              <div
+                className='cursor-pointer text-slate-600 hover:opacity-50'
+                onClick={toggleDrawer}
+              >
+                <Close />
+              </div>
+            </div>
+            {templates.map((template) => (
+              <RetroDrawerTemplateCard key={template.node.id} templateRef={template.node} />
+            ))}
+          </div>
+        </Drawer>
+      </ResponsiveDashSidebar>
+    </>
+  )
+}
+export default RetroDrawer
diff --git a/packages/client/components/RetroDrawerRoot.tsx b/packages/client/components/RetroDrawerRoot.tsx
new file mode 100644
index 00000000000..58bf63544ff
--- /dev/null
+++ b/packages/client/components/RetroDrawerRoot.tsx
@@ -0,0 +1,28 @@
+import React, {Suspense} from 'react'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import retroDrawerQuery, {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql'
+import RetroDrawer from './RetroDrawer'
+
+type Props = {
+  showDrawer: boolean
+  setShowDrawer: (showDrawer: boolean) => void
+  meetingId: string
+}
+
+const RetroDrawerRoot = (props: Props) => {
+  const {showDrawer, setShowDrawer, meetingId} = props
+  const queryRef = useQueryLoaderNow<RetroDrawerQuery>(retroDrawerQuery, {
+    first: 200,
+    type: 'retrospective',
+    meetingId
+  })
+  return (
+    <Suspense fallback={''}>
+      {queryRef && (
+        <RetroDrawer showDrawer={showDrawer} setShowDrawer={setShowDrawer} queryRef={queryRef} />
+      )}
+    </Suspense>
+  )
+}
+
+export default RetroDrawerRoot
diff --git a/packages/client/components/RetroDrawerTemplateCard.tsx b/packages/client/components/RetroDrawerTemplateCard.tsx
new file mode 100644
index 00000000000..c126f6d0d6c
--- /dev/null
+++ b/packages/client/components/RetroDrawerTemplateCard.tsx
@@ -0,0 +1,55 @@
+import {ActivityBadge} from './ActivityLibrary/ActivityBadge'
+import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription'
+import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
+import {useFragment} from 'react-relay'
+import {ActivityLibraryCard} from './ActivityLibrary/ActivityLibraryCard'
+import {ActivityCardImage} from './ActivityLibrary/ActivityCard'
+import {RetroDrawerTemplateCard_template$key} from '~/__generated__/RetroDrawerTemplateCard_template.graphql'
+import {CategoryID, CATEGORY_THEMES} from '././ActivityLibrary/Categories'
+
+interface Props {
+  templateRef: RetroDrawerTemplateCard_template$key
+}
+
+const RetroDrawerTemplateCard = (props: Props) => {
+  const {templateRef} = props
+  const template = useFragment(
+    graphql`
+      fragment RetroDrawerTemplateCard_template on MeetingTemplate {
+        ...ActivityLibraryCardDescription_template
+        name
+        category
+        illustrationUrl
+        isFree
+      }
+    `,
+    templateRef
+  )
+
+  return (
+    <div className='px-4 py-2'>
+      <ActivityLibraryCard
+        className='group aspect-[256/160] flex-1 hover:cursor-pointer'
+        theme={CATEGORY_THEMES[template.category as CategoryID]}
+        title={template.name}
+        badge={
+          !template.isFree ? (
+            <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>
+          ) : null
+        }
+      >
+        <ActivityCardImage
+          category='retrospective'
+          className='group-hover/card:hidden'
+          src={template.illustrationUrl}
+        />
+        <ActivityLibraryCardDescription
+          className='hidden group-hover/card:flex'
+          templateRef={template}
+        />
+      </ActivityLibraryCard>
+    </div>
+  )
+}
+export default RetroDrawerTemplateCard
diff --git a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
index 74a5f422cb3..493ae73247c 100644
--- a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
+++ b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
@@ -30,6 +30,7 @@ const RetroReflectPhase = (props: Props) => {
         ...StageTimerDisplay_meeting
         ...StageTimerControl_meeting
         ...PhaseItemColumn_meeting
+        id
         endedAt
         localPhase {
           ...RetroReflectPhase_phase @relay(mask: false)
@@ -59,6 +60,7 @@ const RetroReflectPhase = (props: Props) => {
     <MeetingContent ref={callbackRef}>
       <MeetingHeaderAndPhase hideBottomBar={!!endedAt}>
         <MeetingTopBar
+          meetingId={meeting.id}
           avatarGroup={avatarGroup}
           isMeetingSidebarCollapsed={!showSidebar}
           toggleSidebar={toggleSidebar}
diff --git a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
index e74efce1d6b..df0281c13b3 100644
--- a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
@@ -13,7 +13,7 @@ import useBreakpoint from '../../hooks/useBreakpoint'
 import findStageById from '../../utils/meetings/findStageById'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
 
-const Drawer = styled('div')<{isDesktop: boolean; isMobile: boolean; isOpen: boolean}>(
+export const Drawer = styled('div')<{isDesktop: boolean; isMobile: boolean; isOpen: boolean}>(
   ({isDesktop, isMobile, isOpen}) => ({
     boxShadow: isDesktop ? desktopSidebarShadow : undefined,
     backgroundColor: '#FFFFFF',
diff --git a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
index f34a7530830..bef32e09be0 100644
--- a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
@@ -14,7 +14,7 @@ import TeamPromptOptionsMenu from './TeamPromptOptionsMenu'
 
 const COPIED_TOOLTIP_DURATION_MS = 2000
 
-const OptionsButton = styled(BaseButton)({
+export const OptionsButton = styled(BaseButton)({
   color: PALETTE.SKY_500,
   display: 'flex',
   flexDirection: 'column',
diff --git a/packages/client/ui/Menu/Menu.tsx b/packages/client/ui/Menu/Menu.tsx
new file mode 100644
index 00000000000..47afbbbf35b
--- /dev/null
+++ b/packages/client/ui/Menu/Menu.tsx
@@ -0,0 +1,32 @@
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
+import React from 'react'
+import {twMerge} from 'tailwind-merge'
+
+interface MenuProps {
+  trigger: React.ReactNode
+  className?: string
+  children: React.ReactNode
+}
+
+export const Menu = React.forwardRef<HTMLDivElement, MenuProps>(
+  ({trigger, className, children}, ref) => {
+    return (
+      <DropdownMenu.Root>
+        <DropdownMenu.Trigger asChild>{trigger}</DropdownMenu.Trigger>
+        <DropdownMenu.Portal>
+          <DropdownMenu.Content
+            align='end'
+            className={twMerge(
+              'border-rad w-auto min-w-[200px] max-w-[400px] rounded-md bg-white shadow-lg outline-none',
+              className
+            )}
+            sideOffset={10}
+            ref={ref}
+          >
+            {children}
+          </DropdownMenu.Content>
+        </DropdownMenu.Portal>
+      </DropdownMenu.Root>
+    )
+  }
+)
diff --git a/packages/client/ui/Menu/MenuItem.tsx b/packages/client/ui/Menu/MenuItem.tsx
new file mode 100644
index 00000000000..fe117676eb0
--- /dev/null
+++ b/packages/client/ui/Menu/MenuItem.tsx
@@ -0,0 +1,28 @@
+import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
+import React from 'react'
+import {twMerge} from 'tailwind-merge'
+
+interface MenuItemProps {
+  onClick: (event: Event) => void
+  isDisabled?: boolean
+  className?: string
+  children: React.ReactNode
+}
+
+export const MenuItem = React.forwardRef<HTMLDivElement, MenuItemProps>(
+  ({onClick, isDisabled, className, children}, ref) => {
+    return (
+      <DropdownMenu.Item
+        className={twMerge(
+          'flex w-full items-center rounded-md px-4 py-3 text-sm text-slate-700 outline-none hover:bg-slate-100 focus:bg-slate-100',
+          isDisabled ? 'cursor-not-allowed opacity-50' : 'cursor-pointer',
+          className
+        )}
+        onSelect={onClick}
+        ref={ref}
+      >
+        {children}
+      </DropdownMenu.Item>
+    )
+  }
+)
diff --git a/packages/client/ui/Tooltip/TooltipContent.tsx b/packages/client/ui/Tooltip/TooltipContent.tsx
index 03f77bea4ef..c119f4a2b70 100644
--- a/packages/client/ui/Tooltip/TooltipContent.tsx
+++ b/packages/client/ui/Tooltip/TooltipContent.tsx
@@ -1,7 +1,7 @@
 import {Content, Portal} from '@radix-ui/react-tooltip'
 import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
-import {forwardRadix} from '../fordwardRadix'
+import {forwardRadix} from '../forwardRadix'
 
 export const TooltipContent = forwardRadix<typeof Content>(
   ({className, children, ...props}, ref) => (
diff --git a/packages/client/ui/Tooltip/TooltipTrigger.tsx b/packages/client/ui/Tooltip/TooltipTrigger.tsx
index b364812034c..2a0b7b0ca36 100644
--- a/packages/client/ui/Tooltip/TooltipTrigger.tsx
+++ b/packages/client/ui/Tooltip/TooltipTrigger.tsx
@@ -1,6 +1,6 @@
 import {Trigger} from '@radix-ui/react-tooltip'
 import * as React from 'react'
-import {forwardRadix} from '../fordwardRadix'
+import {forwardRadix} from '../forwardRadix'
 
 export const TooltipTrigger = forwardRadix<typeof Trigger>(
   ({className, children, ...props}, ref) => (
diff --git a/packages/client/ui/fordwardRadix.tsx b/packages/client/ui/forwardRadix.tsx
similarity index 100%
rename from packages/client/ui/fordwardRadix.tsx
rename to packages/client/ui/forwardRadix.tsx
diff --git a/packages/server/graphql/public/typeDefs/User.graphql b/packages/server/graphql/public/typeDefs/User.graphql
index e204127f142..bd29eaf1c02 100644
--- a/packages/server/graphql/public/typeDefs/User.graphql
+++ b/packages/server/graphql/public/typeDefs/User.graphql
@@ -433,6 +433,10 @@ type User {
     The cursor, which is the templateId
     """
     after: ID
+    """
+    An optional argument to filter by template type
+    """
+    type: MeetingTypeEnum
   ): MeetingTemplateConnection!
 
   """
diff --git a/packages/server/graphql/public/types/User.ts b/packages/server/graphql/public/types/User.ts
index cd396dd8963..f46afe30511 100644
--- a/packages/server/graphql/public/types/User.ts
+++ b/packages/server/graphql/public/types/User.ts
@@ -114,7 +114,7 @@ const User: UserResolvers = {
     const invoice = await manager.retrieveInvoice(invoiceId)
     return generateInvoice(invoice, stripeLineItems, orgId, invoiceId, dataLoader)
   },
-  availableTemplates: async ({id: userId}, {first, after}, {authToken, dataLoader}) => {
+  availableTemplates: async ({id: userId}, {first, after, type}, {authToken, dataLoader}) => {
     const viewerId = getUserId(authToken)
     const user = await dataLoader.get('users').loadNonNull(userId)
     const teamIds =
@@ -175,6 +175,7 @@ const User: UserResolvers = {
         ...activity,
         sortOrder: getScore(activity, teamIds)
       }))
+      .filter((activity) => !type || activity.type === type)
       .sort((a, b) => (a.sortOrder > b.sortOrder ? -1 : 1))
 
     return connectionFromTemplateArray(allActivities, first, after)

From e6434e181a864b2e61428f55a98994fb1137ac8f Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Mon, 25 Mar 2024 19:17:13 +0000
Subject: [PATCH 089/183] feat: add functionality to change templates during a
 retro (#9544)

---
 codegen.json                                  | 11 ++--
 packages/client/components/RetroDrawer.tsx    | 14 ++++-
 .../components/RetroDrawerTemplateCard.tsx    | 29 +++++++++--
 .../UpdateMeetingTemplateMutation.ts          | 51 +++++++++++++++++++
 .../subscriptions/MeetingSubscription.ts      |  3 ++
 .../public/mutations/updateMeetingTemplate.ts | 49 ++++++++++++++++++
 .../public/typeDefs/Subscriptions.graphql     |  1 +
 .../typeDefs/updateMeetingTemplate.graphql    | 27 ++++++++++
 .../types/UpdateMeetingTemplateSuccess.ts     | 14 +++++
 9 files changed, 188 insertions(+), 11 deletions(-)
 create mode 100644 packages/client/mutations/UpdateMeetingTemplateMutation.ts
 create mode 100644 packages/server/graphql/public/mutations/updateMeetingTemplate.ts
 create mode 100644 packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql
 create mode 100644 packages/server/graphql/public/types/UpdateMeetingTemplateSuccess.ts

diff --git a/codegen.json b/codegen.json
index a0a38ad29f0..83f9993f249 100644
--- a/codegen.json
+++ b/codegen.json
@@ -49,6 +49,7 @@
           "ActionMeeting": "../../database/types/MeetingAction#default",
           "ActionMeetingMember": "../../database/types/ActionMeetingMember#default as ActionMeetingMemberDB",
           "AddApprovedOrganizationDomainsSuccess": "./types/AddApprovedOrganizationDomainsSuccess#AddApprovedOrganizationDomainsSuccessSource",
+          "AddReactjiToReactableSuccess": "./types/AddReactjiToReactableSuccess#AddReactjiToReactableSuccessSource",
           "AddReflectTemplateSuccess": "./types/AddReflectTemplateSuccess#AddReflectTemplateSuccessSource",
           "AddPokerTemplateSuccess": "./types/AddPokerTemplateSuccess#AddPokerTemplateSuccessSource",
           "AddTranscriptionBotSuccess": "./types/AddTranscriptionBotSuccess#AddTranscriptionBotSuccessSource",
@@ -74,8 +75,8 @@
           "InviteToTeamPayload": "./types/InviteToTeamPayload#InviteToTeamPayloadSource",
           "JiraIssue": "./types/JiraIssue#JiraIssueSource",
           "JiraRemoteProject": "../types/JiraRemoteProject#JiraRemoteProjectSource",
-          "MeetingSeries": "../../postgres/types/MeetingSeries#MeetingSeries",
           "Kudos": "../../postgres/types/Kudos#Kudos",
+          "MeetingSeries": "../../postgres/types/MeetingSeries#MeetingSeries",
           "MeetingTemplate": "../../database/types/MeetingTemplate#default",
           "NewMeeting": "../../postgres/types/Meeting#AnyMeeting",
           "NewMeetingPhase": "../../database/types/GenericMeetingPhase #default as GenericMeetingPhaseDB",
@@ -83,11 +84,11 @@
           "NotificationTeamInvitation": "../../database/types/NotificationTeamInvitation#default as NotificationTeamInvitationDB",
           "NotifyDiscussionMentioned": "../../database/types/NotificationDiscussionMentioned#default as NotificationDiscussionMentionedDB",
           "NotifyKickedOut": "../../database/types/NotificationKickedOut#default",
+          "NotifyMentioned": "../../database/types/NotificationMentioned#default as NotificationMentionedDB",
           "NotifyPaymentRejected": "../../database/types/NotificationPaymentRejected#default",
           "NotifyPromoteToOrgLeader": "../../database/types/NotificationPromoteToBillingLeader#default",
           "NotifyRequestToJoinOrg": "../../database/types/NotificationRequestToJoinOrg#default",
           "NotifyResponseMentioned": "../../database/types/NotificationResponseMentioned#default as NotificationResponseMentionedDB",
-          "NotifyMentioned": "../../database/types/NotificationMentioned#default as NotificationMentionedDB",
           "NotifyResponseReplied": "../../database/types/NotifyResponseReplied#default as NotifyResponseRepliedDB",
           "NotifyTaskInvolves": "../../database/types/NotificationTaskInvolves#default",
           "NotifyTeamArchived": "../../database/types/NotificationTeamArchived#default",
@@ -96,6 +97,7 @@
           "PokerMeeting": "../../database/types/MeetingPoker#default as MeetingPoker",
           "PokerMeetingMember": "../../database/types/MeetingPokerMeetingMember#default as PokerMeetingMemberDB",
           "RRule": "rrule#RRule",
+          "Reactable": "../../database/types/Reactable#Reactable",
           "ReflectPrompt": "../../database/types/RetrospectivePrompt#default",
           "ReflectTemplate": "../../database/types/ReflectTemplate#default",
           "RemoveApprovedOrganizationDomainsSuccess": "./types/RemoveApprovedOrganizationDomainsSuccess#RemoveApprovedOrganizationDomainsSuccessSource",
@@ -103,11 +105,10 @@
           "RemoveTeamMemberPayload": "./types/RemoveTeamMemberPayload#RemoveTeamMemberPayloadSource",
           "RequestToJoinDomainSuccess": "./types/RequestToJoinDomainSuccess#RequestToJoinDomainSuccessSource",
           "ResetReflectionGroupsSuccess": "./types/ResetReflectionGroupsSuccess#ResetReflectionGroupsSuccessSource",
-          "RetroReflectionGroup": "../../database/types/RetroReflectionGroup#default as RetroReflectionGroupDB",
           "RetroReflection": "../../database/types/RetroReflection#default as RetroReflectionDB",
+          "RetroReflectionGroup": "../../database/types/RetroReflectionGroup#default as RetroReflectionGroupDB",
           "RetrospectiveMeeting": "../../database/types/MeetingRetrospective#default",
           "RetrospectiveMeetingMember": "../../database/types/RetroMeetingMember#default",
-          "Reactable": "../../database/types/Reactable#Reactable",
           "RetrospectiveMeetingSettings": "../../database/types/MeetingSettingsRetrospective#default",
           "SAML": "./types/SAML#SAMLSource",
           "SetMeetingSettingsPayload": "../types/SetMeetingSettingsPayload#SetMeetingSettingsPayloadSource",
@@ -141,13 +142,13 @@
           "UpdateMeetingPromptSuccess": "./types/UpdateMeetingPromptSuccess#UpdateMeetingPromptSuccessSource",
           "UpdateOrgPayload": "./types/UpdateOrgPayload#UpdateOrgPayloadSource",
           "UpdateRecurrenceSettingsSuccess": "./types/UpdateRecurrenceSettingsSuccess#UpdateRecurrenceSettingsSuccessSource",
+          "UpdateMeetingTemplateSuccess": "./types/UpdateMeetingTemplateSuccess#UpdateMeetingTemplateSuccessSource",
           "UpdateTaskPayload": "./types/UpdateTaskPayload#UpdateTaskPayloadSource",
           "UpdateTemplateCategorySuccess": "./types/UpdateTemplateCategorySuccess#UpdateTemplateCategorySuccessSource",
           "UpdateUserProfilePayload": "./types/UpdateUserProfilePayload#UpdateUserProfilePayloadSource",
           "UpdatedNotification": "./types/AddedNotification#UpdatedNotificationSource",
           "UpgradeToTeamTierSuccess": "./types/UpgradeToTeamTierSuccess#UpgradeToTeamTierSuccessSource",
           "UpsertTeamPromptResponseSuccess": "./types/UpsertTeamPromptResponseSuccess#UpsertTeamPromptResponseSuccessSource",
-          "AddReactjiToReactableSuccess": "./types/AddReactjiToReactableSuccess#AddReactjiToReactableSuccessSource",
           "User": "../../postgres/types/IUser#default as IUser",
           "UserLogInPayload": "./types/UserLogInPayload#UserLogInPayloadSource"
         }
diff --git a/packages/client/components/RetroDrawer.tsx b/packages/client/components/RetroDrawer.tsx
index 8d6404ada0e..6249386cabf 100644
--- a/packages/client/components/RetroDrawer.tsx
+++ b/packages/client/components/RetroDrawer.tsx
@@ -24,6 +24,7 @@ const RetroDrawer = (props: Props) => {
         viewer {
           meeting(meetingId: $meetingId) {
             ... on RetrospectiveMeeting {
+              id
               reflectionGroups {
                 id
               }
@@ -60,9 +61,13 @@ const RetroDrawer = (props: Props) => {
     setShowDrawer(!showDrawer)
   }
 
+  const handleCloseDrawer = () => {
+    setShowDrawer(false)
+  }
+
   useEffect(() => {
     if (hasReflections && showDrawer) {
-      setShowDrawer(false)
+      handleCloseDrawer()
     }
   }, [hasReflections])
 
@@ -97,7 +102,12 @@ const RetroDrawer = (props: Props) => {
               </div>
             </div>
             {templates.map((template) => (
-              <RetroDrawerTemplateCard key={template.node.id} templateRef={template.node} />
+              <RetroDrawerTemplateCard
+                key={template.node.id}
+                meetingId={meeting.id!}
+                templateRef={template.node}
+                handleCloseDrawer={handleCloseDrawer}
+              />
             ))}
           </div>
         </Drawer>
diff --git a/packages/client/components/RetroDrawerTemplateCard.tsx b/packages/client/components/RetroDrawerTemplateCard.tsx
index c126f6d0d6c..73fa7c30e3e 100644
--- a/packages/client/components/RetroDrawerTemplateCard.tsx
+++ b/packages/client/components/RetroDrawerTemplateCard.tsx
@@ -7,17 +7,25 @@ import {ActivityLibraryCard} from './ActivityLibrary/ActivityLibraryCard'
 import {ActivityCardImage} from './ActivityLibrary/ActivityCard'
 import {RetroDrawerTemplateCard_template$key} from '~/__generated__/RetroDrawerTemplateCard_template.graphql'
 import {CategoryID, CATEGORY_THEMES} from '././ActivityLibrary/Categories'
+import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation'
+import useMutationProps from '../hooks/useMutationProps'
+import useAtmosphere from '../hooks/useAtmosphere'
 
 interface Props {
   templateRef: RetroDrawerTemplateCard_template$key
+  meetingId: string
+  handleCloseDrawer: () => void
 }
 
 const RetroDrawerTemplateCard = (props: Props) => {
-  const {templateRef} = props
+  const {templateRef, meetingId, handleCloseDrawer} = props
+  const {onError, onCompleted} = useMutationProps()
+  const atmosphere = useAtmosphere()
   const template = useFragment(
     graphql`
       fragment RetroDrawerTemplateCard_template on MeetingTemplate {
         ...ActivityLibraryCardDescription_template
+        id
         name
         category
         illustrationUrl
@@ -27,12 +35,25 @@ const RetroDrawerTemplateCard = (props: Props) => {
     templateRef
   )
 
+  const handleClick = () => {
+    UpdateMeetingTemplateMutation(
+      atmosphere,
+      {
+        meetingId: meetingId,
+        templateId: template.id
+      },
+      {onError, onCompleted}
+    )
+    handleCloseDrawer()
+  }
+
   return (
-    <div className='px-4 py-2'>
+    <form className='px-4 py-2' onClick={handleClick}>
       <ActivityLibraryCard
         className='group aspect-[256/160] flex-1 hover:cursor-pointer'
         theme={CATEGORY_THEMES[template.category as CategoryID]}
         title={template.name}
+        type='retrospective'
         badge={
           !template.isFree ? (
             <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>
@@ -40,16 +61,16 @@ const RetroDrawerTemplateCard = (props: Props) => {
         }
       >
         <ActivityCardImage
-          category='retrospective'
           className='group-hover/card:hidden'
           src={template.illustrationUrl}
+          category='retrospective'
         />
         <ActivityLibraryCardDescription
           className='hidden group-hover/card:flex'
           templateRef={template}
         />
       </ActivityLibraryCard>
-    </div>
+    </form>
   )
 }
 export default RetroDrawerTemplateCard
diff --git a/packages/client/mutations/UpdateMeetingTemplateMutation.ts b/packages/client/mutations/UpdateMeetingTemplateMutation.ts
new file mode 100644
index 00000000000..c4dd1d6951b
--- /dev/null
+++ b/packages/client/mutations/UpdateMeetingTemplateMutation.ts
@@ -0,0 +1,51 @@
+import graphql from 'babel-plugin-relay/macro'
+import {commitMutation} from 'react-relay'
+import {StandardMutation} from '../types/relayMutations'
+import {UpdateMeetingTemplateMutation as TUpdateMeetingTemplateMutation} from '../__generated__/UpdateMeetingTemplateMutation.graphql'
+
+graphql`
+  fragment UpdateMeetingTemplateMutation_meeting on UpdateMeetingTemplateSuccess {
+    meeting {
+      ... on RetrospectiveMeeting {
+        id
+        templateId
+        phases {
+          id
+          ... on ReflectPhase {
+            reflectPrompts {
+              id
+            }
+          }
+        }
+      }
+    }
+  }
+`
+
+const mutation = graphql`
+  mutation UpdateMeetingTemplateMutation($meetingId: ID!, $templateId: ID!) {
+    updateMeetingTemplate(meetingId: $meetingId, templateId: $templateId) {
+      ... on ErrorPayload {
+        error {
+          message
+        }
+      }
+      ...UpdateMeetingTemplateMutation_meeting @relay(mask: false)
+    }
+  }
+`
+
+const UpdateMeetingTemplateMutation: StandardMutation<TUpdateMeetingTemplateMutation> = (
+  atmosphere,
+  variables,
+  {onError, onCompleted}
+) => {
+  return commitMutation<TUpdateMeetingTemplateMutation>(atmosphere, {
+    mutation,
+    variables,
+    onCompleted,
+    onError
+  })
+}
+
+export default UpdateMeetingTemplateMutation
diff --git a/packages/client/subscriptions/MeetingSubscription.ts b/packages/client/subscriptions/MeetingSubscription.ts
index 65e3978b03c..d6f30e0a0f1 100644
--- a/packages/client/subscriptions/MeetingSubscription.ts
+++ b/packages/client/subscriptions/MeetingSubscription.ts
@@ -150,6 +150,9 @@ const subscription = graphql`
       UpdateRetroMaxVotesSuccess {
         ...UpdateRetroMaxVotesMutation_meeting @relay(mask: false)
       }
+      UpdateMeetingTemplateSuccess {
+        ...UpdateMeetingTemplateMutation_meeting @relay(mask: false)
+      }
       VoteForReflectionGroupPayload {
         ...VoteForReflectionGroupMutation_meeting @relay(mask: false)
       }
diff --git a/packages/server/graphql/public/mutations/updateMeetingTemplate.ts b/packages/server/graphql/public/mutations/updateMeetingTemplate.ts
new file mode 100644
index 00000000000..a0be265f8de
--- /dev/null
+++ b/packages/server/graphql/public/mutations/updateMeetingTemplate.ts
@@ -0,0 +1,49 @@
+import {SubscriptionChannel} from '../../../../client/types/constEnums'
+import getRethink from '../../../database/rethinkDriver'
+import MeetingRetrospective from '../../../database/types/MeetingRetrospective'
+import {getUserId, isTeamMember} from '../../../utils/authorization'
+import getPhase from '../../../utils/getPhase'
+import publish from '../../../utils/publish'
+import standardError from '../../../utils/standardError'
+import {MutationResolvers} from '../resolverTypes'
+
+const updateMeetingTemplate: MutationResolvers['updateMeetingTemplate'] = async (
+  _source,
+  {meetingId, templateId},
+  {authToken, dataLoader, socketId: mutatorId}
+) => {
+  const viewerId = getUserId(authToken)
+  const r = await getRethink()
+  const operationId = dataLoader.share()
+  const subOptions = {mutatorId, operationId}
+  const meeting = (await dataLoader.get('newMeetings').load(meetingId)) as MeetingRetrospective
+  if (!meeting) return standardError(new Error('Meeting not found'), {userId: viewerId})
+  if (!isTeamMember(authToken, meeting.teamId)) {
+    return standardError(new Error('Team not found'), {userId: viewerId})
+  }
+  const reflections = await dataLoader.get('retroReflectionsByMeetingId').load(meetingId)
+  if (reflections.length > 0) {
+    return standardError(new Error('Cannot change template after reflections have been created'), {
+      userId: viewerId
+    })
+  }
+  const reflectPhase = getPhase(meeting.phases, 'reflect')
+  const hasCompletedReflectPhase = reflectPhase.stages.every((stage) => stage.isComplete)
+  if (hasCompletedReflectPhase) {
+    return standardError(
+      new Error('Cannot change template after reflection phase has been completed'),
+      {
+        userId: viewerId
+      }
+    )
+  }
+
+  await r.table('NewMeeting').get(meetingId).update({templateId}).run()
+  meeting.templateId = templateId
+
+  const data = {meetingId, templateId}
+  publish(SubscriptionChannel.MEETING, meetingId, 'UpdateMeetingTemplateSuccess', data, subOptions)
+  return data
+}
+
+export default updateMeetingTemplate
diff --git a/packages/server/graphql/public/typeDefs/Subscriptions.graphql b/packages/server/graphql/public/typeDefs/Subscriptions.graphql
index f3391104caf..3f2e1a48de5 100644
--- a/packages/server/graphql/public/typeDefs/Subscriptions.graphql
+++ b/packages/server/graphql/public/typeDefs/Subscriptions.graphql
@@ -54,6 +54,7 @@ type MeetingSubscriptionPayload {
   SetPokerSpectateSuccess: SetPokerSpectateSuccess
   SetTaskEstimateSuccess: SetTaskEstimateSuccess
   UpsertTeamPromptResponseSuccess: UpsertTeamPromptResponseSuccess
+  UpdateMeetingTemplateSuccess: UpdateMeetingTemplateSuccess
 }
 
 type NotificationSubscriptionPayload {
diff --git a/packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql b/packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql
new file mode 100644
index 00000000000..1f378e42dbe
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql
@@ -0,0 +1,27 @@
+extend type Mutation {
+  """
+  Update a meeting template
+  """
+  updateMeetingTemplate(
+    """
+    The id of the meeting
+    """
+    meetingId: ID!
+    """
+    The id of the meeting template
+    """
+    templateId: ID!
+  ): UpdateMeetingTemplatePayload!
+}
+
+"""
+Return value for updateMeetingTemplate, which could be an error
+"""
+union UpdateMeetingTemplatePayload = ErrorPayload | UpdateMeetingTemplateSuccess
+
+type UpdateMeetingTemplateSuccess {
+  """
+  The updated meeting
+  """
+  meeting: NewMeeting!
+}
diff --git a/packages/server/graphql/public/types/UpdateMeetingTemplateSuccess.ts b/packages/server/graphql/public/types/UpdateMeetingTemplateSuccess.ts
new file mode 100644
index 00000000000..33a52658893
--- /dev/null
+++ b/packages/server/graphql/public/types/UpdateMeetingTemplateSuccess.ts
@@ -0,0 +1,14 @@
+import {UpdateMeetingTemplateSuccessResolvers} from '../resolverTypes'
+
+export type UpdateMeetingTemplateSuccessSource = {
+  meetingId: string
+}
+
+const UpdateMeetingTemplateSuccess: UpdateMeetingTemplateSuccessResolvers = {
+  meeting: async ({meetingId}, _args, {dataLoader}) => {
+    const meeting = await dataLoader.get('newMeetings').load(meetingId)
+    return meeting
+  }
+}
+
+export default UpdateMeetingTemplateSuccess

From 87c84a2cca1a4d94629291d1325948b3c6cfb790 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 25 Mar 2024 20:17:47 +0100
Subject: [PATCH 090/183] feat: release AzureDevOps integration (#9531)

---
 packages/client/components/ScopePhaseArea.tsx  |  9 +--------
 .../components/ProviderList/ProviderList.tsx   | 14 +++-----------
 .../client/utils/AzureDevOpsClientManager.ts   |  4 ++--
 .../server/__tests__/updateFeatureFlag.test.ts | 10 +++++-----
 .../public/typeDefs/updateFeatureFlag.graphql  |  2 --
 .../graphql/public/types/UserFeatureFlags.ts   |  1 -
 .../CreateAzureDevOpsAuthorizeUrlPayload.ts    | 18 ------------------
 .../server/utils/AzureDevOpsServerManager.ts   | 10 ++++------
 8 files changed, 15 insertions(+), 53 deletions(-)
 delete mode 100644 packages/server/graphql/types/CreateAzureDevOpsAuthorizeUrlPayload.ts

diff --git a/packages/client/components/ScopePhaseArea.tsx b/packages/client/components/ScopePhaseArea.tsx
index 651f86566a7..44702ccb239 100644
--- a/packages/client/components/ScopePhaseArea.tsx
+++ b/packages/client/components/ScopePhaseArea.tsx
@@ -130,11 +130,6 @@ const ScopePhaseArea = (props: Props) => {
               }
             }
           }
-          user {
-            featureFlags {
-              azureDevOps
-            }
-          }
         }
       }
     `,
@@ -142,13 +137,11 @@ const ScopePhaseArea = (props: Props) => {
   )
   const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
   const {viewerMeetingMember} = meeting
-  const featureFlags = viewerMeetingMember?.user.featureFlags
   const gitlabIntegration = viewerMeetingMember?.teamMember.integrations.gitlab
   const jiraServerIntegration = viewerMeetingMember?.teamMember.integrations.jiraServer
   const azureDevOpsIntegration = viewerMeetingMember?.teamMember.integrations.azureDevOps
   const allowAzureDevOps =
-    (!!azureDevOpsIntegration?.sharedProviders.length || !!azureDevOpsIntegration?.cloudProvider) &&
-    featureFlags?.azureDevOps
+    !!azureDevOpsIntegration?.sharedProviders.length || !!azureDevOpsIntegration?.cloudProvider
   const isGitLabProviderAvailable = !!(
     gitlabIntegration?.cloudProvider?.clientId || gitlabIntegration?.sharedProviders.length
   )
diff --git a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
index d8eb7a84485..6f2360fad6b 100644
--- a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
@@ -107,9 +107,6 @@ const query = graphql`
           }
         }
       }
-      featureFlags {
-        azureDevOps
-      }
     }
   }
 `
@@ -118,10 +115,6 @@ const ProviderList = (props: Props) => {
   const {queryRef, retry, teamId} = props
   const data = usePreloadedQuery<ProviderListQuery>(query, queryRef)
   const {viewer} = data
-  const {
-    featureFlags: {azureDevOps: allowAzureDevOps}
-  } = viewer
-
   const integrations = viewer.teamMember?.integrations
 
   const allIntegrations = [
@@ -159,8 +152,7 @@ const ProviderList = (props: Props) => {
     {
       name: 'Azure DevOps',
       connected: !!integrations?.azureDevOps.auth?.accessToken,
-      component: <AzureDevOpsProviderRow teamId={teamId} viewerRef={viewer} />,
-      hidden: !allowAzureDevOps
+      component: <AzureDevOpsProviderRow teamId={teamId} viewerRef={viewer} />
     },
     {
       name: 'MS Teams',
@@ -175,12 +167,12 @@ const ProviderList = (props: Props) => {
   ]
 
   const connectedIntegrations = allIntegrations
-    .filter((integration) => integration.connected && !integration.hidden)
+    .filter((integration) => integration.connected)
     .sort((a, b) => a.name.localeCompare(b.name))
     .map((integration) => integration.component)
 
   const availableIntegrations = allIntegrations
-    .filter((integration) => !integration.connected && !integration.hidden)
+    .filter((integration) => !integration.connected)
     .sort((a, b) => a.name.localeCompare(b.name))
     .map((integration) => integration.component)
 
diff --git a/packages/client/utils/AzureDevOpsClientManager.ts b/packages/client/utils/AzureDevOpsClientManager.ts
index 1ad3db655fb..09dc2e510bf 100644
--- a/packages/client/utils/AzureDevOpsClientManager.ts
+++ b/packages/client/utils/AzureDevOpsClientManager.ts
@@ -40,8 +40,8 @@ class AzureDevOpsClientManager {
     const providerState = Math.random().toString(36).substring(5)
     const verifier = AzureDevOpsClientManager.generateVerifier()
     const code = await AzureDevOpsClientManager.generateCodeChallenge(verifier)
-    const redirect = makeHref('/auth/ado')
-    const scope = '499b84ac-1321-427f-aa17-267ca6975798/.default'
+    const redirect = makeHref('/auth/ado2')
+    const scope = '499b84ac-1321-427f-aa17-267ca6975798/.default offline_access'
     const url = `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/authorize?client_id=${clientId}&response_type=code&redirect_uri=${redirect}&response_mode=query&scope=${scope}&state=${providerState}&code_challenge=${code}&code_challenge_method=S256`
 
     // Open synchronously because of Safari
diff --git a/packages/server/__tests__/updateFeatureFlag.test.ts b/packages/server/__tests__/updateFeatureFlag.test.ts
index 5bafe858aa4..f252e553b55 100644
--- a/packages/server/__tests__/updateFeatureFlag.test.ts
+++ b/packages/server/__tests__/updateFeatureFlag.test.ts
@@ -12,7 +12,7 @@ const UPDATE_FEATURE_FLAG = `
       users {
         id
         featureFlags {
-          azureDevOps
+          noAISummary
         }
       }
     }
@@ -27,7 +27,7 @@ test('Add feature flag by email', async () => {
     query: UPDATE_FEATURE_FLAG,
     variables: {
       emails: [email],
-      flag: 'azureDevOps',
+      flag: 'noAISummary',
       addFlag: true
     },
     authToken
@@ -41,7 +41,7 @@ test('Add feature flag by email', async () => {
           {
             id: userId,
             featureFlags: {
-              azureDevOps: true
+              noAISummary: true
             }
           }
         ]
@@ -58,7 +58,7 @@ test('Remove feature flag by email', async () => {
     query: UPDATE_FEATURE_FLAG,
     variables: {
       emails: [email],
-      flag: 'azureDevOps',
+      flag: 'noAISummary',
       addFlag: false
     },
     authToken
@@ -72,7 +72,7 @@ test('Remove feature flag by email', async () => {
           {
             id: userId,
             featureFlags: {
-              azureDevOps: false
+              noAISummary: false
             }
           }
         ]
diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
index ba9506cf4cd..411d2f484f6 100644
--- a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
+++ b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
@@ -3,7 +3,6 @@ A flag to give an individual user super powers
 """
 enum UserFlagEnum {
   standups
-  azureDevOps
   insights
   recurrence
   noAISummary
@@ -19,7 +18,6 @@ The types of flags that give an individual user super powers
 """
 type UserFeatureFlags {
   standups: Boolean!
-  azureDevOps: Boolean!
   insights: Boolean!
   recurrence: Boolean!
   noAISummary: Boolean!
diff --git a/packages/server/graphql/public/types/UserFeatureFlags.ts b/packages/server/graphql/public/types/UserFeatureFlags.ts
index 806a33b7c8a..f8c72854653 100644
--- a/packages/server/graphql/public/types/UserFeatureFlags.ts
+++ b/packages/server/graphql/public/types/UserFeatureFlags.ts
@@ -1,7 +1,6 @@
 import {UserFeatureFlagsResolvers} from '../resolverTypes'
 
 const UserFeatureFlags: UserFeatureFlagsResolvers = {
-  azureDevOps: ({azureDevOps}) => !!azureDevOps,
   insights: ({insights}) => !!insights,
   noAISummary: ({noAISummary}) => !!noAISummary,
   noMeetingHistoryLimit: ({noMeetingHistoryLimit}) => !!noMeetingHistoryLimit,
diff --git a/packages/server/graphql/types/CreateAzureDevOpsAuthorizeUrlPayload.ts b/packages/server/graphql/types/CreateAzureDevOpsAuthorizeUrlPayload.ts
deleted file mode 100644
index afd3caeb221..00000000000
--- a/packages/server/graphql/types/CreateAzureDevOpsAuthorizeUrlPayload.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {GraphQLObjectType, GraphQLString} from 'graphql'
-import {GQLContext} from '../graphql'
-import StandardMutationError from './StandardMutationError'
-
-export const CreateAzureDevOpsAuthorizeUrlPayload = new GraphQLObjectType<any, GQLContext>({
-  name: 'CreateAzureDevOpsAuthorizeUrlSuccess',
-  fields: () => ({
-    error: {
-      type: StandardMutationError
-    },
-    url: {
-      type: GraphQLString,
-      description: 'Authorization URL including oauth_token to start authorization flow'
-    }
-  })
-})
-
-export default CreateAzureDevOpsAuthorizeUrlPayload
diff --git a/packages/server/utils/AzureDevOpsServerManager.ts b/packages/server/utils/AzureDevOpsServerManager.ts
index 7f495fe771b..ba3cf7f04f3 100644
--- a/packages/server/utils/AzureDevOpsServerManager.ts
+++ b/packages/server/utils/AzureDevOpsServerManager.ts
@@ -266,7 +266,7 @@ class AzureDevOpsServerManager implements TaskIntegrationManager {
       grant_type: 'authorization_code',
       code: code,
       code_verifier: codeVerifier,
-      redirect_uri: makeAppURL(appOrigin, 'auth/ado')
+      redirect_uri: makeAppURL(appOrigin, 'auth/ado2')
     })
   }
 
@@ -702,16 +702,14 @@ class AzureDevOpsServerManager implements TaskIntegrationManager {
 
     const body = {
       ...params,
-      client_id: this.provider.clientId
+      client_id: this.provider.clientId,
+      client_secret: this.provider.clientSecret
     }
 
-    const additonalHeaders = {
-      Origin: appOrigin
-    }
     const tenantId = this.provider.tenantId
     const authUrl = `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`
     const contentType = 'application/x-www-form-urlencoded'
-    const oAuthRes = await authorizeOAuth2({authUrl, body, additonalHeaders, contentType})
+    const oAuthRes = await authorizeOAuth2({authUrl, body, contentType})
     if (!isError(oAuthRes)) {
       this.accessToken = oAuthRes.accessToken
     }

From b8fa7088e610ab1a920d1b5522cd46ad28e2f715 Mon Sep 17 00:00:00 2001
From: Bruce Tian <tianrunhe@gmail.com>
Date: Mon, 25 Mar 2024 14:31:31 -0700
Subject: [PATCH 091/183] chore: Roll out AIGeneratedDiscussion to all users
 (#9554)

---
 packages/client/modules/demo/initDB.ts               |  1 -
 .../SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx  | 12 ++++++------
 .../mutations/helpers/generateGroupSummaries.ts      |  8 +-------
 .../private/typeDefs/updateOrgFeatureFlag.graphql    |  1 -
 .../graphql/public/typeDefs/Organization.graphql     |  1 -
 .../graphql/public/types/OrganizationFeatureFlags.ts |  1 -
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/packages/client/modules/demo/initDB.ts b/packages/client/modules/demo/initDB.ts
index 6e7954ef5a4..7d1b673b94c 100644
--- a/packages/client/modules/demo/initDB.ts
+++ b/packages/client/modules/demo/initDB.ts
@@ -303,7 +303,6 @@ const initDemoOrg = () => {
       suggestGroups: false,
       teamsLimit: false,
       noPromptToJoinOrg: false,
-      AIGeneratedDiscussionPrompt: false,
       publicTeams: false
     },
     showConversionModal: false
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
index f6befe9bb30..abbfc8a2e67 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
@@ -90,7 +90,7 @@ const RetroTopic = (props: Props) => {
           reflections {
             ...EmailReflectionCard_reflection
           }
-          topicSummary: summary
+          discussionPromptQuestion
         }
         discussion {
           commentCount
@@ -121,7 +121,7 @@ const RetroTopic = (props: Props) => {
 
   const {reflectionGroup, discussion, id: stageId} = stage
   const {commentCount, discussionSummary} = discussion
-  const {reflections, title, voteCount, topicSummary} = reflectionGroup!
+  const {reflections, title, voteCount, discussionPromptQuestion} = reflectionGroup!
   const imageSource = isEmail ? 'static' : 'local'
   const icon = imageSource === 'local' ? 'thumb_up_18.svg' : 'thumb_up_18@3x.png'
   const src = `${ExternalLinks.EMAIL_CDN}${icon}`
@@ -143,16 +143,16 @@ const RetroTopic = (props: Props) => {
           </AnchorIfEmail>
         </td>
       </tr>
-      {(topicSummary || discussionSummary) && (
+      {(discussionPromptQuestion || discussionSummary) && (
         <tr>
           <td align='left' style={{lineHeight: '22px', fontSize: 14}}>
-            {topicSummary && (
+            {discussionPromptQuestion && (
               <>
                 <tr>
-                  <td style={topicTitleStyle}>{'🤖 Topic Summary'}</td>
+                  <td style={topicTitleStyle}>{'🤖 Discussion Question'}</td>
                 </tr>
                 <tr>
-                  <td style={textStyle}>{topicSummary}</td>
+                  <td style={textStyle}>{discussionPromptQuestion}</td>
                 </tr>
               </>
             )}
diff --git a/packages/server/graphql/mutations/helpers/generateGroupSummaries.ts b/packages/server/graphql/mutations/helpers/generateGroupSummaries.ts
index 86cd732709d..3a827ca20d1 100644
--- a/packages/server/graphql/mutations/helpers/generateGroupSummaries.ts
+++ b/packages/server/graphql/mutations/helpers/generateGroupSummaries.ts
@@ -15,7 +15,6 @@ const generateGroupSummaries = async (
     dataLoader.get('users').loadNonNull(facilitatorUserId),
     dataLoader.get('teams').loadNonNull(teamId)
   ])
-  const organization = await dataLoader.get('organizations').load(team.orgId)
   const isAISummaryAccessible = await canAccessAISummary(
     team,
     facilitator.featureFlags,
@@ -35,9 +34,6 @@ const generateGroupSummaries = async (
     sendToSentry(error, {userId: facilitator.id, tags: {meetingId}})
     return
   }
-  const aiGeneratedDiscussionPromptEnabled = organization.featureFlags?.includes(
-    'AIGeneratedDiscussionPrompt'
-  )
   await Promise.all(
     reflectionGroups.map(async (group) => {
       const reflectionsByGroupId = reflections.filter(
@@ -49,9 +45,7 @@ const generateGroupSummaries = async (
       )
       const [fullSummary, fullQuestion] = await Promise.all([
         manager.getSummary(reflectionTextByGroupId),
-        aiGeneratedDiscussionPromptEnabled
-          ? manager.getDiscussionPromptQuestion(group.title ?? 'Unknown', reflectionsByGroupId)
-          : undefined
+        manager.getDiscussionPromptQuestion(group.title ?? 'Unknown', reflectionsByGroupId)
       ])
       if (!fullSummary && !fullQuestion) return
       const summary = fullSummary?.slice(0, 2000)
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
index 211113f9903..925a360df83 100644
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
@@ -3,7 +3,6 @@ A flag to give an individual organization super powers
 """
 enum OrganizationFeatureFlagsEnum {
   noAISummary
-  AIGeneratedDiscussionPrompt
   standupAISummary
   noPromptToJoinOrg
   suggestGroups
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index 485adcac9f6..40fe0800f8a 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -183,7 +183,6 @@ The types of flags that give an individual organization super powers
 """
 type OrganizationFeatureFlags {
   noAISummary: Boolean!
-  AIGeneratedDiscussionPrompt: Boolean!
   standupAISummary: Boolean!
   noPromptToJoinOrg: Boolean!
   suggestGroups: Boolean!
diff --git a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
index 14f4d59e6a4..9903dc8dd4e 100644
--- a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
+++ b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
@@ -4,7 +4,6 @@ const OrganizationFeatureFlags: OrganizationFeatureFlagsResolvers = {
   noAISummary: ({noAISummary}) => !!noAISummary,
   standupAISummary: ({standupAISummary}) => !!standupAISummary,
   noPromptToJoinOrg: ({noPromptToJoinOrg}) => !!noPromptToJoinOrg,
-  AIGeneratedDiscussionPrompt: ({AIGeneratedDiscussionPrompt}) => !!AIGeneratedDiscussionPrompt,
   zoomTranscription: ({zoomTranscription}) => !!zoomTranscription,
   shareSummary: ({shareSummary}) => !!shareSummary,
   suggestGroups: ({suggestGroups}) => !!suggestGroups,

From 1e22931c25c297e4697ea0e585d888c7b2738cfc Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 25 Mar 2024 18:02:55 -0700
Subject: [PATCH 092/183] chore: [Snyk] Upgrade dotenv from 8.0.0 to 8.6.0
 (#9494)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
---
 packages/server/package.json | 2 +-
 yarn.lock                    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 9138ece5b9a..e65191586cc 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -94,7 +94,7 @@
     "cheerio": "^1.0.0-rc.10",
     "dataloader": "^2.0.0",
     "dd-trace": "^4.2.0",
-    "dotenv": "8.0.0",
+    "dotenv": "8.6.0",
     "dotenv-expand": "5.1.0",
     "draft-js": "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6",
     "draft-js-export-markdown": "^1.3.3",
diff --git a/yarn.lock b/yarn.lock
index 74d28b2fb23..afb8352abab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11269,6 +11269,11 @@ dotenv@8.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
   integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
 
+dotenv@8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
+  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
+
 dotenv@^16.0.0, dotenv@^16.0.3:
   version "16.0.3"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"

From 0ce1384b418f2a48971b732b548b9b93f8882e6c Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 25 Mar 2024 18:03:05 -0700
Subject: [PATCH 093/183] chore: [Snyk] Upgrade graphql-typed from 0.6.1 to
 0.7.2 (#9522)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
---
 packages/client/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 0a468113a2f..6fe6c57d163 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -113,7 +113,7 @@
     "fbjs": "^3.0.4",
     "flatted": "^2.0.1",
     "graphiql": "^3.0.0",
-    "graphql-typed": "^0.6.1",
+    "graphql-typed": "^0.7.2",
     "hoist-non-react-statics": "^3.3.0",
     "humanize-duration": "3.29.0",
     "immutable": "3.8.2",
diff --git a/yarn.lock b/yarn.lock
index afb8352abab..4123e63d769 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13048,10 +13048,10 @@ graphql-typed@^0.4.1:
   resolved "https://registry.yarnpkg.com/graphql-typed/-/graphql-typed-0.4.1.tgz#d612f1a8215fc5b14b51d5a88b06c0174d6a6e47"
   integrity sha512-6a4BHG/uXMkxY+UeqmsTrwCvTy3BbFAYlKsVC2MzvAISXh+FcbBaJEfXsbcZKrydCFnVD3Xlg74Esip5O3LyLA==
 
-graphql-typed@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/graphql-typed/-/graphql-typed-0.6.1.tgz#a305bad26cc1e6a5f7cf34e720d9cbd7bc57317d"
-  integrity sha512-41J/CLton6F6tt5AGmKbroU5RSyXOSH5My2D396yXcNuQynaehP8FFG9bx/XjLukJMgLHJ8pUSHOw+fAqcGklw==
+graphql-typed@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/graphql-typed/-/graphql-typed-0.7.2.tgz#c917eb79e58f340a842b204212e29506db481c2c"
+  integrity sha512-Np+YLzDCTY92ptXN5Rxi34fMJ4dy/vx0jZWnH0IVjpLW5SSoirve4ymIBy1UbkS//uEMCdNtvX4Y6loOJ3vyvA==
 
 graphql-ws@^5.14.0:
   version "5.14.0"

From 3e42d9b155e171ec54f8d4b0cfddc1ace67cb754 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 25 Mar 2024 18:03:16 -0700
Subject: [PATCH 094/183] chore: [Snyk] Upgrade react-swipeable-views-core from
 0.13.1 to 0.14.0 (#9521)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
---
 packages/client/package.json |  2 +-
 yarn.lock                    | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 6fe6c57d163..bcf23043650 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -134,7 +134,7 @@
     "react-router": "^5.0.1",
     "react-router-dom": "^5.0.1",
     "react-swipeable-views": "https://github.com/mattkrick/react-swipeable-views/tarball/4f1d3062d6f8939e9889bc6241bb46aa7bc5332d",
-    "react-swipeable-views-core": "0.13.1",
+    "react-swipeable-views-core": "0.14.0",
     "react-swipeable-views-utils": "^0.14.0",
     "react-textarea-autosize": "^7.1.0",
     "react-transition-group": "^4.3.0",
diff --git a/yarn.lock b/yarn.lock
index 4123e63d769..7429558d3e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18456,15 +18456,7 @@ react-style-singleton@^2.2.1:
     invariant "^2.2.4"
     tslib "^2.0.0"
 
-react-swipeable-views-core@0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.13.1.tgz#8829a922462a8bdd701709cd1b385393d38f1527"
-  integrity sha512-EP8sCvvD7VDiZLglPt9icMuMNu8qLRLk0ab/fB1HXv7lX8ClnwF3UMCM0ZrN3sguSY7CsX3LevducGGsT1VcDg==
-  dependencies:
-    "@babel/runtime" "7.0.0"
-    warning "^4.0.1"
-
-react-swipeable-views-core@^0.14.0, react-swipeable-views-core@^0.14.0-alpha.0:
+react-swipeable-views-core@0.14.0, react-swipeable-views-core@^0.14.0, react-swipeable-views-core@^0.14.0-alpha.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.14.0.tgz#6ac443a7cc7bc5ea022fbd549292bb5fff361cce"
   integrity sha512-0W/e9uPweNEOSPjmYtuKSC/SvKKg1sfo+WtPdnxeLF3t2L82h7jjszuOHz9C23fzkvLfdgkaOmcbAxE9w2GEjA==

From ef6891569f468469c64041d0c97555d76c2657d3 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 25 Mar 2024 18:03:23 -0700
Subject: [PATCH 095/183] chore: [Snyk] Upgrade react-dom-confetti from 0.0.10
 to 0.2.0 (#9520)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
---
 packages/client/package.json |  2 +-
 yarn.lock                    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index bcf23043650..d79a06254a8 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -128,7 +128,7 @@
     "react-copy-to-clipboard": "^5.0.0",
     "react-day-picker": "^8.3.7",
     "react-dom": "^17.0.2",
-    "react-dom-confetti": "^0.0.10",
+    "react-dom-confetti": "^0.2.0",
     "react-ga4": "^1.4.1",
     "react-relay": "^14.1.0",
     "react-router": "^5.0.1",
diff --git a/yarn.lock b/yarn.lock
index 7429558d3e6..3efedb60a12 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11168,10 +11168,10 @@ dogapi@2.8.4:
     minimist "^1.2.5"
     rc "^1.2.8"
 
-dom-confetti@~0.0.11:
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/dom-confetti/-/dom-confetti-0.0.15.tgz#fd7dd6888da3dc6b54fd53326c8fa826ef25106b"
-  integrity sha512-KJKrmHcydwoS6bTD0wVM/L7LZz1rQNJA+Y3Zw9ZVYNpx5efqoVwIY2rqY/F2sEpJuGGCRff/o8bAmfQ8KO4Grw==
+dom-confetti@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-confetti/-/dom-confetti-0.2.2.tgz#bdf2e7652d37b5cffb532c0a3263d108dd8a2363"
+  integrity sha512-+UVH9Y85qmpTnbmFURwLWjqLIykyIrsNSRkPX/eFlBuOURz9RDX8JoZHnajZHyFuCV0w/K3+tZK0ztfoTw6ejg==
 
 dom-converter@^0.2.0:
   version "0.2.0"
@@ -18321,12 +18321,12 @@ react-day-picker@^8.3.7:
   resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-8.3.7.tgz#35de1325376984e4dbaec1fed6888f45dc46ad1d"
   integrity sha512-sQvyJde6OKsXIB0ZFwUBmaDNb4IyKypv/uSyauQ6AUw4F6vmPijJsQNEVsxrxXQ4L3GZKIpcCD/7Pftz/sLegA==
 
-react-dom-confetti@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/react-dom-confetti/-/react-dom-confetti-0.0.10.tgz#6cde7af4af974ecf98ddf9da95c938144c68a4f0"
-  integrity sha512-EJMUmD9Z3/87wIjyQic5ZGd2beHE9K50vxouLdV+yPcBitlsVznBXKX900xEbzQ/DOMt+TycEg2CvB/V+pwJtQ==
+react-dom-confetti@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom-confetti/-/react-dom-confetti-0.2.0.tgz#76df26762da532057d5b1fbe38a8096f9dc33d40"
+  integrity sha512-+XRTi+WlCrcRN2dTjdEopOaPFtS7hpaHRRQ0sHiVRGqpchKz4QVh3i+6eLEEpNHYpN2VgPmhjvJ/vnjmUYhlIQ==
   dependencies:
-    dom-confetti "~0.0.11"
+    dom-confetti "0.2.2"
 
 react-dom@^17.0.2:
   version "17.0.2"

From ab47ce46c768f927c9d71d0a52a049df93b51ba4 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 25 Mar 2024 18:03:32 -0700
Subject: [PATCH 096/183] chore: [Snyk] Upgrade core-js from 3.8.1 to 3.36.0
 (#9519)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
---
 packages/client/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index d79a06254a8..1cdda75b5d6 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -101,7 +101,7 @@
     "chartjs-adapter-dayjs-3": "^1.2.3",
     "cleave.js": "^1.6.0",
     "clsx": "^1.2.1",
-    "core-js": "3.8.1",
+    "core-js": "3.36.0",
     "date-fns": "^2.29.3",
     "dayjs": "^1.11.3",
     "dompurify": "^2.4.1",
diff --git a/yarn.lock b/yarn.lock
index 3efedb60a12..dc34fd16fae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10505,10 +10505,10 @@ core-js-pure@^3.8.1:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.20.3.tgz#6cc4f36da06c61d95254efc54024fe4797fd5d02"
   integrity sha512-Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA==
 
-core-js@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
-  integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==
+core-js@3.36.0:
+  version "3.36.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.0.tgz#e752fa0b0b462a0787d56e9d73f80b0f7c0dde68"
+  integrity sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==
 
 core-util-is@~1.0.0:
   version "1.0.3"

From 092e5d95bf75ce2db772669971e28f22e6ee8679 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Mon, 25 Mar 2024 18:07:49 -0700
Subject: [PATCH 097/183] chore: fix update snyk pr action (#9564)

---
 .github/workflows/snyk-yarn-lock-commit.yml | 28 -----------
 .github/workflows/synk-yarn-lock-commit.yml | 52 +++++++++++++++++++++
 2 files changed, 52 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/snyk-yarn-lock-commit.yml
 create mode 100644 .github/workflows/synk-yarn-lock-commit.yml

diff --git a/.github/workflows/snyk-yarn-lock-commit.yml b/.github/workflows/snyk-yarn-lock-commit.yml
deleted file mode 100644
index f4705ec4b79..00000000000
--- a/.github/workflows/snyk-yarn-lock-commit.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Update Snyk PR to add yarn.lock
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  update-snyk-pr:
-    if: contains(github.event.pull_request.title, '[Snyk]')
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}  # This token is provided by Actions, no need to create one
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Commit yarn.lock to the PR branch
-        run: |
-          git config --global user.email "action@github.com"
-          git config --global user.name "GitHub Action"
-          git add yarn.lock
-          git commit -m "Update yarn.lock" || echo "No changes to commit"
-          git push
diff --git a/.github/workflows/synk-yarn-lock-commit.yml b/.github/workflows/synk-yarn-lock-commit.yml
new file mode 100644
index 00000000000..6ac67f37aa9
--- /dev/null
+++ b/.github/workflows/synk-yarn-lock-commit.yml
@@ -0,0 +1,52 @@
+name: Update Snyk PR to add yarn.lock
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  update-snyk-pr:
+    if: contains(github.event.pull_request.title, '[Snyk]')
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}  # This token is provided by Actions, no need to create one
+
+      - name: Setup environment variables
+        run: |
+          ACTION_VERSION=$(grep '"version":' package.json | cut -d\" -f4)
+          echo "ACTION_VERSION=${ACTION_VERSION}" >> $GITHUB_ENV
+          echo "NODE_VERSION=$(jq -r -j '.engines.node|ltrimstr("^")' package.json)" >> $GITHUB_ENV
+
+          DOCKER_REPOSITORY_FOR_REF=${{ secrets.GCP_AR_PARABOL_DEV }}
+          echo "DOCKER_REPOSITORY_FOR_REF=${{ secrets.GCP_AR_PARABOL_DEV }}" >> $GITHUB_ENV
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: package.json
+          # Caching yarn dir & running yarn install is too slow
+          # Instead, we aggressively cache node_modules below to avoid calling install
+
+      - name: Get cached node modules
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/node_modules
+          key: node_modules-${{ runner.arch }}-${{ env.NODE_VERSION }}-${{ hashFiles('yarn.lock') }}
+
+      - name: Install node_modules
+        run: yarn install
+
+      - name: Commit yarn.lock to the PR branch
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "GitHub Action"
+          git add yarn.lock
+          git commit -m "Update yarn.lock" || echo "No changes to commit"
+          git push

From 5e98234efca84e7ebcb653f3d71d229a88797a8d Mon Sep 17 00:00:00 2001
From: Marcus Wermuth <hello@marcuswermuth.com>
Date: Tue, 26 Mar 2024 17:14:40 +0100
Subject: [PATCH 098/183] fix: Removed broken Rally links and fixed Youtube
 links (#9332)

---
 .../userDashboard/helpers/getRallyLink.tsx     | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/packages/client/modules/userDashboard/helpers/getRallyLink.tsx b/packages/client/modules/userDashboard/helpers/getRallyLink.tsx
index 961f17965c8..ca7288ca227 100644
--- a/packages/client/modules/userDashboard/helpers/getRallyLink.tsx
+++ b/packages/client/modules/userDashboard/helpers/getRallyLink.tsx
@@ -40,7 +40,7 @@ const rallyList = [
   },
   {
     phrase: 'Don’t Stop Believin’',
-    link: 'https://youtu.be/Pw3GTTYgEV8'
+    link: 'https://youtu.be/1k8craCGpgs'
   },
   {
     phrase: 'Gimme Some New',
@@ -72,7 +72,7 @@ const rallyList = [
   },
   {
     phrase: 'On With The Show',
-    link: 'https://youtu.be/4ADh8Fs3YdU'
+    link: 'https://youtu.be/NijPVAu42aI'
   },
   {
     phrase: 'Rawr, Tiger',
@@ -80,7 +80,7 @@ const rallyList = [
   },
   {
     phrase: 'Right Here, Right Now',
-    link: 'https://youtu.be/F7jSp2xmmEE'
+    link: 'https://youtu.be/ub747pprmJ8'
   },
   {
     phrase: 'Ring That Bell',
@@ -94,10 +94,6 @@ const rallyList = [
     phrase: 'Serve It',
     link: 'https://youtu.be/0J2QdDbelmY'
   },
-  {
-    phrase: 'Sharpness Without Effort',
-    link: 'https://youtu.be/hpeTLTj2tww'
-  },
   {
     phrase: 'Stronger, Richer, Smarter',
     link: 'https://youtu.be/Wmc8bQoL-J0'
@@ -126,10 +122,6 @@ const rallyList = [
     phrase: 'You Bossy',
     link: 'https://youtu.be/SSgp-IIgr4I'
   },
-  {
-    phrase: 'You Came To Win',
-    link: 'https://youtu.be/KZaz7OqyTHQ'
-  },
   {
     phrase: 'You’re The Smart One',
     link: 'https://youtu.be/bKQYK7PYQpQ'
@@ -138,10 +130,6 @@ const rallyList = [
     phrase: 'You’ve Got A Bright Future',
     link: 'https://youtu.be/kZGvnI37mxk'
   },
-  {
-    phrase: 'You Must Go Pro',
-    link: 'https://youtu.be/9mSMTXYj7pQ'
-  },
   {
     phrase: 'Time To Begin',
     link: 'https://youtu.be/RYlCVwxoL_g'

From d9afe937184cfd19424c0288879208d21d709afe Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 09:43:58 +0000
Subject: [PATCH 099/183] chore(release): release v7.23.0 (#9556)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 30 +++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/gql-executor/package.json      |  6 ++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 8 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 4a2437d9945..c796b1344c4 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.22.4"
+  ".": "7.23.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 440fc75fbfd..72ecc601f8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,36 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.23.0](https://github.com/ParabolInc/parabol/compare/v7.22.4...v7.23.0) (2024-03-26)
+
+
+### Added
+
+* add functionality to change templates during a retro ([#9544](https://github.com/ParabolInc/parabol/issues/9544)) ([e6434e1](https://github.com/ParabolInc/parabol/commit/e6434e181a864b2e61428f55a98994fb1137ac8f))
+* allow 2 custom templates for every user ([#9518](https://github.com/ParabolInc/parabol/issues/9518)) ([2352669](https://github.com/ParabolInc/parabol/commit/2352669ea516a3d764d63af77211fbb4c0a02563))
+* make invoice row title more clear to understand ([#9551](https://github.com/ParabolInc/parabol/issues/9551)) ([9be96eb](https://github.com/ParabolInc/parabol/commit/9be96eb206d367e550b97831621c8b2aee4fc355))
+* release AzureDevOps integration ([#9531](https://github.com/ParabolInc/parabol/issues/9531)) ([87c84a2](https://github.com/ParabolInc/parabol/commit/87c84a2cca1a4d94629291d1325948b3c6cfb790))
+* switch template UI ([#9093](https://github.com/ParabolInc/parabol/issues/9093)) ([2171065](https://github.com/ParabolInc/parabol/commit/21710656b6d689b286759ea495ff334b7ce86adf))
+
+
+### Fixed
+
+* **admin:** fix an issue where ORG_ADMIN cannot see members from team they are not in ([#9560](https://github.com/ParabolInc/parabol/issues/9560)) ([ef0fbc2](https://github.com/ParabolInc/parabol/commit/ef0fbc2da853e2248a16ff2a2ce37c1f85f07f1a))
+* Removed broken Rally links and fixed Youtube links ([#9332](https://github.com/ParabolInc/parabol/issues/9332)) ([5e98234](https://github.com/ParabolInc/parabol/commit/5e98234efca84e7ebcb653f3d71d229a88797a8d))
+
+
+### Changed
+
+* [Snyk] Upgrade core-js from 3.8.1 to 3.36.0 ([#9519](https://github.com/ParabolInc/parabol/issues/9519)) ([ab47ce4](https://github.com/ParabolInc/parabol/commit/ab47ce46c768f927c9d71d0a52a049df93b51ba4))
+* [Snyk] Upgrade dotenv from 8.0.0 to 8.6.0 ([#9494](https://github.com/ParabolInc/parabol/issues/9494)) ([1e22931](https://github.com/ParabolInc/parabol/commit/1e22931c25c297e4697ea0e585d888c7b2738cfc))
+* [Snyk] Upgrade graphql-typed from 0.6.1 to 0.7.2 ([#9522](https://github.com/ParabolInc/parabol/issues/9522)) ([0ce1384](https://github.com/ParabolInc/parabol/commit/0ce1384b418f2a48971b732b548b9b93f8882e6c))
+* [Snyk] Upgrade react-dom-confetti from 0.0.10 to 0.2.0 ([#9520](https://github.com/ParabolInc/parabol/issues/9520)) ([ef68915](https://github.com/ParabolInc/parabol/commit/ef6891569f468469c64041d0c97555d76c2657d3))
+* [Snyk] Upgrade react-swipeable-views-core from 0.13.1 to 0.14.0 ([#9521](https://github.com/ParabolInc/parabol/issues/9521)) ([3e42d9b](https://github.com/ParabolInc/parabol/commit/3e42d9b155e171ec54f8d4b0cfddc1ace67cb754))
+* fix update snyk pr action ([#9564](https://github.com/ParabolInc/parabol/issues/9564)) ([092e5d9](https://github.com/ParabolInc/parabol/commit/092e5d95bf75ce2db772669971e28f22e6ee8679))
+* **github:** DevOps review if docker folder is modified or release-please-config is changed ([#9562](https://github.com/ParabolInc/parabol/issues/9562)) ([d18d754](https://github.com/ParabolInc/parabol/commit/d18d75485116c883d72456ac51b817a044a38b4d))
+* refactor add template mutation to the new sdl pattern ([#9533](https://github.com/ParabolInc/parabol/issues/9533)) ([fe71841](https://github.com/ParabolInc/parabol/commit/fe718413fa2d19afa660cc944d30a1284d6c2b18))
+* Roll out AIGeneratedDiscussion to all users ([#9554](https://github.com/ParabolInc/parabol/issues/9554)) ([b8fa708](https://github.com/ParabolInc/parabol/commit/b8fa7088e610ab1a920d1b5522cd46ad28e2f715))
+
 ## [7.22.4](https://github.com/ParabolInc/parabol/compare/v7.22.3...v7.22.4) (2024-03-20)
 
 
diff --git a/package.json b/package.json
index 034f26d340e..84ab320d908 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.4",
+  "version": "7.23.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 66bfb9f4458..9d6b749e83c 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.22.4",
+  "version": "7.23.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.22.4"
+    "parabol-server": "7.23.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 1cdda75b5d6..c0069eadabc 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.4",
+  "version": "7.23.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index c4470e61f05..75c98f09470 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.22.4",
+  "version": "7.23.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.22.4",
-    "parabol-server": "7.22.4",
+    "parabol-client": "7.23.0",
+    "parabol-server": "7.23.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index a3d12e08429..d590b2077ec 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.4",
+  "version": "7.23.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index e65191586cc..9e8744fc8df 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.22.4",
+  "version": "7.23.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.22.4",
+    "parabol-client": "7.23.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 5baf3b7584f8f578284baa7e47eb5e264e99ad53 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Wed, 27 Mar 2024 14:08:06 +0000
Subject: [PATCH 100/183] fix: remove destroyAll from add custom templates
 migration

---
 ...ng.ts => 1709933510512_addFreeCustomTemplatesRemaining.ts} | 4 ----
 1 file changed, 4 deletions(-)
 rename packages/server/postgres/migrations/{1709933510511_addFreeCustomTemplatesRemaining.ts => 1709933510512_addFreeCustomTemplatesRemaining.ts} (94%)

diff --git a/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts b/packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
similarity index 94%
rename from packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
rename to packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
index cb378a1ad4b..fd2ceae8931 100644
--- a/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
+++ b/packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
@@ -13,8 +13,6 @@ export async function up() {
     .addColumn('freeCustomRetroTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
     .addColumn('freeCustomPokerTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
     .execute()
-
-  await pg.destroy()
 }
 
 export async function down() {
@@ -29,6 +27,4 @@ export async function down() {
     .dropColumn('freeCustomRetroTemplatesRemaining')
     .dropColumn('freeCustomPokerTemplatesRemaining')
     .execute()
-
-  await pg.destroy()
 }

From 79e67cdffb6083267d9eb150aad2b682d9d7e924 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Wed, 27 Mar 2024 14:08:50 +0000
Subject: [PATCH 101/183] Revert "fix: remove destroyAll from add custom
 templates migration"

This reverts commit 5baf3b7584f8f578284baa7e47eb5e264e99ad53.
---
 ...ng.ts => 1709933510511_addFreeCustomTemplatesRemaining.ts} | 4 ++++
 1 file changed, 4 insertions(+)
 rename packages/server/postgres/migrations/{1709933510512_addFreeCustomTemplatesRemaining.ts => 1709933510511_addFreeCustomTemplatesRemaining.ts} (94%)

diff --git a/packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts b/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
similarity index 94%
rename from packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
rename to packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
index fd2ceae8931..cb378a1ad4b 100644
--- a/packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
+++ b/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
@@ -13,6 +13,8 @@ export async function up() {
     .addColumn('freeCustomRetroTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
     .addColumn('freeCustomPokerTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
     .execute()
+
+  await pg.destroy()
 }
 
 export async function down() {
@@ -27,4 +29,6 @@ export async function down() {
     .dropColumn('freeCustomRetroTemplatesRemaining')
     .dropColumn('freeCustomPokerTemplatesRemaining')
     .execute()
+
+  await pg.destroy()
 }

From 0d30206b154b60f11b23708c9315e9960d4825bb Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Thu, 28 Mar 2024 16:33:14 +0000
Subject: [PATCH 102/183] fix: ensure pool is callable after custom template
 migration (#9572)

---
 ...ng.ts => 1709933510512_addFreeCustomTemplatesRemaining.ts} | 4 ----
 1 file changed, 4 deletions(-)
 rename packages/server/postgres/migrations/{1709933510511_addFreeCustomTemplatesRemaining.ts => 1709933510512_addFreeCustomTemplatesRemaining.ts} (94%)

diff --git a/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts b/packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
similarity index 94%
rename from packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
rename to packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
index cb378a1ad4b..fd2ceae8931 100644
--- a/packages/server/postgres/migrations/1709933510511_addFreeCustomTemplatesRemaining.ts
+++ b/packages/server/postgres/migrations/1709933510512_addFreeCustomTemplatesRemaining.ts
@@ -13,8 +13,6 @@ export async function up() {
     .addColumn('freeCustomRetroTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
     .addColumn('freeCustomPokerTemplatesRemaining', 'int2', (col) => col.defaultTo(2).notNull())
     .execute()
-
-  await pg.destroy()
 }
 
 export async function down() {
@@ -29,6 +27,4 @@ export async function down() {
     .dropColumn('freeCustomRetroTemplatesRemaining')
     .dropColumn('freeCustomPokerTemplatesRemaining')
     .execute()
-
-  await pg.destroy()
 }

From cd229f7bba62a5a75f1efd0cbbc798f709069394 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 09:39:58 -0700
Subject: [PATCH 103/183] chore(release): release v7.23.1 (#9571)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 8 ++++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index c796b1344c4..bae38c98366 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.23.0"
+  ".": "7.23.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72ecc601f8f..294dbfc8830 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.23.1](https://github.com/ParabolInc/parabol/compare/v7.23.0...v7.23.1) (2024-03-28)
+
+
+### Fixed
+
+* ensure pool is callable after custom template migration ([#9572](https://github.com/ParabolInc/parabol/issues/9572)) ([0d30206](https://github.com/ParabolInc/parabol/commit/0d30206b154b60f11b23708c9315e9960d4825bb))
+* remove destroyAll from add custom templates migration ([5baf3b7](https://github.com/ParabolInc/parabol/commit/5baf3b7584f8f578284baa7e47eb5e264e99ad53))
+
 ## [7.23.0](https://github.com/ParabolInc/parabol/compare/v7.22.4...v7.23.0) (2024-03-26)
 
 
diff --git a/package.json b/package.json
index 84ab320d908..82179da713f 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 9d6b749e83c..b2e5061c6bc 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.23.0"
+    "parabol-server": "7.23.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index c0069eadabc..3f105e730fb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 75c98f09470..bed8c3473eb 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.23.0",
-    "parabol-server": "7.23.0",
+    "parabol-client": "7.23.1",
+    "parabol-server": "7.23.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index d590b2077ec..2cbc84391c1 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 9e8744fc8df..68cfcfbb846 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.0",
+  "version": "7.23.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.23.0",
+    "parabol-client": "7.23.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From d1af0f164c629e8fc075278cd63475e8913f4295 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 28 Mar 2024 16:32:47 -0700
Subject: [PATCH 104/183] chore: fix tsconfig problems (#9579)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/chronos/tsconfig.json                | 11 +--
 packages/client/components/AnimatedFade.tsx   | 74 -------------------
 .../AzureDevOpsScopingSelectAllIssues.tsx     |  6 +-
 packages/client/hooks/useAtlassianSites.ts    | 43 -----------
 .../components/MeetingSummaryEmailRootSSR.tsx |  1 -
 .../NotificationSummaryEmailRoot.tsx          |  2 +-
 .../MeetingSummaryEmail.tsx                   | 14 ----
 .../handlers/handleUpdateTeamMembers.ts       | 11 ++-
 packages/client/package.json                  |  6 +-
 packages/client/serviceWorker/tsconfig.json   |  4 +-
 packages/client/tsconfig.json                 |  9 +--
 packages/client/types/modules.d.ts            |  1 +
 packages/client/types/reactHTML4.d.ts         | 15 ++++
 .../ui/AlertDialog/AlertDialogContent.tsx     |  4 +-
 .../ui/AlertDialog/AlertDialogPortal.tsx      |  2 +-
 .../ui/AlertDialog/AlertDialogTrigger.tsx     |  2 +-
 .../__tests__/parseEmailAddressList.test.ts   |  7 +-
 ...etBezierTimePercentGivenDistancePercent.ts | 11 ++-
 packages/client/utils/screenBugs/Bug.ts       | 20 ++---
 .../client/utils/screenBugs/BugController.ts  | 22 +++---
 .../embedder/ai_models/OpenAIGeneration.ts    |  4 +-
 packages/embedder/embedder.ts                 | 22 +++---
 .../indexing/createEmbeddingTextFrom.ts       |  6 +-
 .../embedder/indexing/embeddingsTablesOps.ts  | 25 ++++---
 .../indexing/retrospectiveDiscussionTopic.ts  |  8 +-
 packages/embedder/modules.d.ts                |  2 +
 packages/embedder/tsconfig.json               | 11 +--
 packages/gql-executor/RedisStream.ts          |  6 +-
 packages/gql-executor/gqlExecutor.ts          |  7 +-
 packages/gql-executor/modules.d.ts            |  2 +
 packages/gql-executor/tsconfig.json           | 11 ++-
 packages/server/__tests__/autoJoin.test.ts    |  4 +-
 packages/server/__tests__/common.ts           |  2 +-
 .../server/__tests__/disableAnonymity.test.ts | 14 ++--
 packages/server/__tests__/loginSAML.test.ts   | 24 ------
 .../__tests__/processRecurrence.test.ts       | 11 ++-
 .../__tests__/startRetrospective.test.ts      | 18 ++---
 .../__tests__/isCompanyDomain.test.ts         |  2 -
 .../__tests__/isOrgVerified.test.ts           | 39 +++++-----
 .../__tests__/usersCustomRedisQueries.test.ts | 14 ++--
 packages/server/email/inlineImages.ts         |  6 +-
 packages/server/generateUID.ts                |  2 +-
 packages/server/graphql/executeGraphQL.ts     | 19 +----
 packages/server/package.json                  |  1 +
 packages/server/tsconfig.json                 | 20 ++---
 packages/server/types/custom.d.ts             | 18 +++++
 packages/server/types/modules.d.ts            |  1 +
 .../isRequestToJoinDomainAllowed.test.ts      | 65 ++++++++--------
 .../rateLimiters/InMemoryRateLimiter.test.ts  |  2 +-
 packages/server/utils/getGraphQLExecutor.ts   |  2 +-
 packages/server/utils/uwsGetHeaders.ts        |  2 +-
 scripts/webpack/utils/getProjectRoot.d.ts     |  2 +
 yarn.lock                                     | 34 +++++++--
 53 files changed, 280 insertions(+), 391 deletions(-)
 delete mode 100644 packages/client/components/AnimatedFade.tsx
 delete mode 100644 packages/client/hooks/useAtlassianSites.ts
 create mode 100644 packages/client/types/reactHTML4.d.ts
 create mode 100644 packages/embedder/modules.d.ts
 create mode 100644 packages/gql-executor/modules.d.ts
 create mode 100644 scripts/webpack/utils/getProjectRoot.d.ts

diff --git a/packages/chronos/tsconfig.json b/packages/chronos/tsconfig.json
index 00f66831a3b..87e7ef08687 100644
--- a/packages/chronos/tsconfig.json
+++ b/packages/chronos/tsconfig.json
@@ -9,13 +9,6 @@
       "~/*": ["client/*"]
     },
     "outDir": "lib",
-    "lib": ["esnext"],
-    "types": ["node"]
-  },
-  "files": [
-    "chronos.ts",
-    "../server/types/webpackEnv.ts",
-    "../server/types/modules.d.ts",
-    "../client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx"
-  ]
+    "lib": ["esnext"]
+  }
 }
diff --git a/packages/client/components/AnimatedFade.tsx b/packages/client/components/AnimatedFade.tsx
deleted file mode 100644
index f1f612ec4ff..00000000000
--- a/packages/client/components/AnimatedFade.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Deprecated. See internals of useMenuPortal */
-
-import {ClassNames} from '@emotion/core'
-import React, {Component, ReactNode} from 'react'
-import {CSSTransition} from 'react-transition-group'
-
-interface Props extends CSSTransition {
-  appear?: boolean
-  in?: boolean
-  onExited?: () => void
-  exit?: boolean
-  unmountOnExit?: boolean
-  children: ReactNode
-  duration?: number
-  slide?: number
-}
-
-// eslint-disable-next-line
-class AnimatedFade extends Component<Props> {
-  render() {
-    const {children, duration = 100, slide = 32, ...props} = this.props
-
-    const classNames = (css) => {
-      const enter = css({
-        opacity: 0,
-        transform: `translate3d(0, ${slide}px, 0)`
-      })
-      const enterActive = css({
-        opacity: '1 !important' as any,
-        transform: 'translate3d(0, 0, 0) !important',
-        transition: `all ${duration}ms ease-in !important`
-      })
-
-      const exit = css({
-        opacity: 1,
-        transform: 'translate3d(0, 0, 0)'
-      })
-
-      const exitActive = css({
-        opacity: '0 !important' as any,
-        transform: `translate3d(0, ${-slide}px, 0) !important`,
-        transition: `all ${duration}ms ease-in !important`
-      })
-      return {
-        appear: enter,
-        appearActive: enterActive,
-        enter,
-        enterActive,
-        exit,
-        exitActive
-      }
-    }
-    return (
-      <ClassNames>
-        {({css}) => {
-          return (
-            <CSSTransition
-              {...props}
-              classNames={classNames(css)}
-              timeout={{
-                enter: duration,
-                exit: duration
-              }}
-            >
-              {children}
-            </CSSTransition>
-          )
-        }}
-      </ClassNames>
-    )
-  }
-}
-
-export default AnimatedFade
diff --git a/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx b/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
index d4f80d54fe0..24c42792294 100644
--- a/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
+++ b/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
+import {AzureDevOpsScopingSelectAllIssues_workItems$key} from '../__generated__/AzureDevOpsScopingSelectAllIssues_workItems.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
@@ -11,7 +12,6 @@ import {PALETTE} from '../styles/paletteV3'
 import {Threshold} from '../types/constEnums'
 import AzureDevOpsClientManager from '../utils/AzureDevOpsClientManager'
 import getSelectAllTitle from '../utils/getSelectAllTitle'
-import {AzureDevOpsScopingSelectAllIssues_workItems$key} from '../__generated__/AzureDevOpsScopingSelectAllIssues_workItems.graphql'
 import Checkbox from './Checkbox'
 
 const Item = styled('div')({
@@ -42,7 +42,7 @@ interface Props {
 }
 
 const AzureDevOpsScopingSelectAllIssues = (props: Props) => {
-  const {meetingId, usedServiceTaskIds, workItems: workItemsRef, providerId} = props
+  const {meetingId, usedServiceTaskIds, workItems: workItemsRef} = props
   const workItems = useFragment(
     graphql`
       fragment AzureDevOpsScopingSelectAllIssues_workItems on AzureDevOpsWorkItemEdge
@@ -57,7 +57,7 @@ const AzureDevOpsScopingSelectAllIssues = (props: Props) => {
     workItemsRef
   )
   const atmosphere = useAtmosphere()
-  const {onCompleted, onError, submitMutation, submitting, error} = useMutationProps()
+  const {onCompleted, onError, submitMutation, error} = useMutationProps()
   const getProjectId = (url: URL) => {
     const firstIndex = url.pathname.indexOf('/', 1)
     const seconedIndex = url.pathname.indexOf('/', firstIndex + 1)
diff --git a/packages/client/hooks/useAtlassianSites.ts b/packages/client/hooks/useAtlassianSites.ts
deleted file mode 100644
index 8fdb3a66567..00000000000
--- a/packages/client/hooks/useAtlassianSites.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {useEffect, useRef, useState} from 'react'
-import {Unpromise} from '../types/generics'
-import AtlassianClientManager from '../utils/AtlassianClientManager'
-import {AccessibleResource} from '../utils/AtlassianManager'
-
-const useAtlassianSites = (accessToken?: string) => {
-  const isMountedRef = useRef(true)
-  const [sites, setSites] = useState<AccessibleResource[]>([])
-  const [status, setStatus] = useState<null | 'loading' | 'loaded' | 'error'>(null)
-  useEffect(() => {
-    const manager = new AtlassianClientManager(accessToken || '')
-    const fetchSites = async () => {
-      let res: Unpromise<ReturnType<typeof manager.getAccessibleResources>>
-      try {
-        res = await manager.getAccessibleResources()
-      } catch (e) {
-        if (isMountedRef.current) {
-          setStatus('error')
-        }
-        return
-      }
-      if (isMountedRef.current) {
-        if (Array.isArray(res)) {
-          setStatus('loaded')
-          setSites(res)
-        } else {
-          setStatus('error')
-        }
-      }
-    }
-
-    if (accessToken && isMountedRef.current) {
-      setStatus('loading')
-      fetchSites().catch()
-    }
-    return () => {
-      isMountedRef.current = false
-    }
-  }, [accessToken])
-  return {sites, status}
-}
-
-export default useAtlassianSites
diff --git a/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx b/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx
index 9ad3310cd7d..bd17389a344 100644
--- a/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx
+++ b/packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx
@@ -2,7 +2,6 @@ import graphql from 'babel-plugin-relay/macro'
 import {MeetingSummaryEmailRootSSRQuery} from 'parabol-client/__generated__/MeetingSummaryEmailRootSSRQuery.graphql'
 import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
-import {Environment} from 'relay-runtime'
 import {EMAIL_CORS_OPTIONS} from '../../../types/cors'
 import makeAppURL from '../../../utils/makeAppURL'
 import MeetingSummaryEmail from './SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail'
diff --git a/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx b/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx
index bcf16c49bb0..cd610f6758d 100644
--- a/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx
+++ b/packages/client/modules/email/components/NotificationSummaryEmailRoot.tsx
@@ -56,7 +56,7 @@ const NotificationSummaryEmailRoot = (props: NotificationSummaryRootProps) => {
       (edge) =>
         edge.node.status === 'UNREAD' &&
         new Date(edge.node.createdAt) > new Date(Date.now() - ms('1d')) &&
-        NOTIFICATION_TEMPLATE_TYPE[edge.node.type] // Filter down to the notifications that have been implemented.
+        NOTIFICATION_TEMPLATE_TYPE[edge.node.type as keyof typeof NOTIFICATION_TEMPLATE_TYPE] // Filter down to the notifications that have been implemented.
     )
     .map((edge) => edge.node)
     .slice(0, MAX_EMAIL_NOTIFICATIONS)
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx
index 5a2611456f8..b49644af0f5 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx
@@ -36,20 +36,6 @@ const pagePadding = {
   paddingTop: 24
 }
 
-declare module 'react' {
-  interface TdHTMLAttributes<T> {
-    height?: string | number
-    width?: string | number
-    bgcolor?: string
-  }
-  interface TableHTMLAttributes<T> {
-    align?: 'center' | 'left' | 'right'
-    bgcolor?: string
-    height?: string | number
-    width?: string | number
-  }
-}
-
 const PagePadding = () => {
   return (
     <table align='center' width='100%'>
diff --git a/packages/client/mutations/handlers/handleUpdateTeamMembers.ts b/packages/client/mutations/handlers/handleUpdateTeamMembers.ts
index f62a323f291..6ccecccea3c 100644
--- a/packages/client/mutations/handlers/handleUpdateTeamMembers.ts
+++ b/packages/client/mutations/handlers/handleUpdateTeamMembers.ts
@@ -1,8 +1,12 @@
+import {RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
 import fromTeamMemberId from '../../utils/relay/fromTeamMemberId'
 import safeRemoveNodeFromArray from '../../utils/relay/safeRemoveNodeFromArray'
 import pluralizeHandler from './pluralizeHandler'
 
-const handleUpdateTeamMember = (updatedTeamMember, store) => {
+const handleUpdateTeamMember = (
+  updatedTeamMember: RecordProxy<{id: string}>,
+  store: RecordSourceSelectorProxy
+) => {
   if (!updatedTeamMember) return
   const {teamId} = fromTeamMemberId(updatedTeamMember.getValue('id'))
   const isNotRemoved = updatedTeamMember.getValue('isNotRemoved')
@@ -11,7 +15,7 @@ const handleUpdateTeamMember = (updatedTeamMember, store) => {
   const sorts = ['preferredName']
   if (isNotRemoved) {
     sorts.forEach((sortBy) => {
-      const teamMembers = team.getLinkedRecords('teamMembers', {sortBy})
+      const teamMembers = team.getLinkedRecords<[]>('teamMembers', {sortBy})
       if (!teamMembers) return
       teamMembers.sort((a, b) => (a.getValue(sortBy) > b.getValue(sortBy) ? 1 : -1))
       team.setLinkedRecords(teamMembers, 'teamMembers', {sortBy})
@@ -19,8 +23,7 @@ const handleUpdateTeamMember = (updatedTeamMember, store) => {
   } else {
     const teamMemberId = updatedTeamMember.getValue('id')
     sorts.forEach((sortBy) => {
-      const teamMembers = team.getLinkedRecords('teamMembers', {sortBy})
-      safeRemoveNodeFromArray(teamMemberId, teamMembers, 'teamMembers', {
+      safeRemoveNodeFromArray(teamMemberId, team, 'teamMembers', {
         storageKeyArgs: {sortBy}
       })
     })
diff --git a/packages/client/package.json b/packages/client/package.json
index 3f105e730fb..5775dc743ab 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -31,7 +31,7 @@
     "@types/draft-js": "^0.10.24",
     "@types/fbjs": "^3.0.4",
     "@types/humanize-duration": "3.27.1",
-    "@types/jest": "^29.5.1",
+    "@types/jest": "^29.5.12",
     "@types/json2csv": "^4.4.0",
     "@types/jwt-decode": "^2.1.0",
     "@types/linkify-it": "^3.0.2",
@@ -75,6 +75,8 @@
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.9.2",
     "@mui/x-date-pickers": "^6.3.1",
+    "@radix-ui/react-alert-dialog": "1.0.5",
+    "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-dropdown-menu": "^2.0.4",
@@ -82,8 +84,6 @@
     "@radix-ui/react-scroll-area": "^1.0.3",
     "@radix-ui/react-select": "^1.2.2",
     "@radix-ui/react-slot": "^1.0.2",
-    "@radix-ui/react-avatar": "^1.0.4",
-    "@radix-ui/react-alert-dialog": "1.0.5",
     "@radix-ui/react-tooltip": "^1.0.7",
     "@sentry/browser": "^5.8.0",
     "@stripe/react-stripe-js": "^1.16.5",
diff --git a/packages/client/serviceWorker/tsconfig.json b/packages/client/serviceWorker/tsconfig.json
index ec0c5fb0b28..f393dcadb5f 100644
--- a/packages/client/serviceWorker/tsconfig.json
+++ b/packages/client/serviceWorker/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-//    "composite": true,
     "lib": ["esnext", "webworker"],
     "target": "esnext",
     "module": "commonjs",
@@ -11,6 +10,5 @@
         "*" // resolve all absolute imports as imports relative to the client package
       ]
     }
-  },
-//  "references": [{"path":  "../"}]
+  }
 }
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index 58280d064ea..32bb2473e60 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -3,15 +3,10 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "~/*": ["*"],
-      "static/*": ["../../static/*"]
+      "~/*": ["*"]
     },
     "outDir": "lib",
-    "lib": ["esnext", "dom"],
-    "types": ["node"]
+    "lib": ["esnext", "dom"]
   },
-  "files": [
-    "client.tsx",
-  ],
   "exclude": ["serviceWorker", "**/node_modules"]
 }
diff --git a/packages/client/types/modules.d.ts b/packages/client/types/modules.d.ts
index 92293d0cbbd..28b06e27aa7 100644
--- a/packages/client/types/modules.d.ts
+++ b/packages/client/types/modules.d.ts
@@ -20,6 +20,7 @@ declare module 'emoji-mart/dist-modern/utils/data.js'
 declare module 'emoji-mart/dist-modern/components/picker/nimble-picker'
 declare module 'react-textarea-autosize'
 declare module 'react-copy-to-clipboard'
+declare module 'tayden-clusterfck'
 
 declare let __webpack_public_path__: string
 declare const __PRODUCTION__: string
diff --git a/packages/client/types/reactHTML4.d.ts b/packages/client/types/reactHTML4.d.ts
new file mode 100644
index 00000000000..995d555df4a
--- /dev/null
+++ b/packages/client/types/reactHTML4.d.ts
@@ -0,0 +1,15 @@
+import 'react'
+
+declare module 'react' {
+  export interface TdHTMLAttributes<T> {
+    height?: string | number
+    width?: string | number
+    bgcolor?: string
+  }
+  export interface TableHTMLAttributes<T> {
+    align?: 'center' | 'left' | 'right'
+    bgcolor?: string
+    height?: string | number
+    width?: string | number
+  }
+}
diff --git a/packages/client/ui/AlertDialog/AlertDialogContent.tsx b/packages/client/ui/AlertDialog/AlertDialogContent.tsx
index dbcd0de0582..12d5a79355c 100644
--- a/packages/client/ui/AlertDialog/AlertDialogContent.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogContent.tsx
@@ -1,8 +1,8 @@
-import * as React from 'react'
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 import clsx from 'clsx'
+import * as React from 'react'
 import {AlertDialogOverlay} from './AlertDialogOverlay'
-import {AlertDialogPortal} from './AlertDialog'
+import {AlertDialogPortal} from './AlertDialogPortal'
 
 const AlertDialogContent = React.forwardRef<
   HTMLDivElement,
diff --git a/packages/client/ui/AlertDialog/AlertDialogPortal.tsx b/packages/client/ui/AlertDialog/AlertDialogPortal.tsx
index c4e8d56916f..f572b2d9baa 100644
--- a/packages/client/ui/AlertDialog/AlertDialogPortal.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogPortal.tsx
@@ -1,3 +1,3 @@
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 
-const AlertDialogPortal = AlertDialogPrimitive.Portal
+export const AlertDialogPortal = AlertDialogPrimitive.Portal
diff --git a/packages/client/ui/AlertDialog/AlertDialogTrigger.tsx b/packages/client/ui/AlertDialog/AlertDialogTrigger.tsx
index 0a20feddfc1..6b2d6149df4 100644
--- a/packages/client/ui/AlertDialog/AlertDialogTrigger.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogTrigger.tsx
@@ -1,3 +1,3 @@
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 
-const AlertDialogTrigger = AlertDialogPrimitive.Trigger
+export const AlertDialogTrigger = AlertDialogPrimitive.Trigger
diff --git a/packages/client/utils/__tests__/parseEmailAddressList.test.ts b/packages/client/utils/__tests__/parseEmailAddressList.test.ts
index a9778e7bebe..87c83ee894e 100644
--- a/packages/client/utils/__tests__/parseEmailAddressList.test.ts
+++ b/packages/client/utils/__tests__/parseEmailAddressList.test.ts
@@ -1,7 +1,12 @@
 /* eslint-env jest */
 import parseEmailAddressList from '../parseEmailAddressList'
 
-const getAddressStr = (res) => res && res.parsedInvitees.map((val) => val.address).join(', ')
+type Res = {
+  parsedInvitees: {
+    [other: string]: any
+  }[]
+}
+const getAddressStr = (res: Res) => res && res.parsedInvitees.map((val) => val.address).join(', ')
 
 describe('parseEmailAddressList', () => {
   it('validates a simple single email', () => {
diff --git a/packages/client/utils/getBezierTimePercentGivenDistancePercent.ts b/packages/client/utils/getBezierTimePercentGivenDistancePercent.ts
index af2b6ab346b..3b988aec450 100644
--- a/packages/client/utils/getBezierTimePercentGivenDistancePercent.ts
+++ b/packages/client/utils/getBezierTimePercentGivenDistancePercent.ts
@@ -10,7 +10,12 @@ const bezierLookup = [] as {x: number; y: number}[]
 const getBezierTimePercentGivenDistancePercent = (threshold: number, bezierCurve: string) => {
   if (bezierLookup.length === 0) {
     const re = /\(([^)]+)\)/
-    const [x1, y1, x2, y2] = re.exec(bezierCurve)![1].split(',').map(Number)
+    const [x1, y1, x2, y2] = re.exec(bezierCurve)![1]!.split(',').map(Number) as [
+      number,
+      number,
+      number,
+      number
+    ]
     // css bezier-curves imply a start of 0,0 and end of 1,1
     const x0 = 0
     const y0 = 0
@@ -32,9 +37,9 @@ const getBezierTimePercentGivenDistancePercent = (threshold: number, bezierCurve
   }
   let x
   for (let i = 1; i < bezierLookup.length; i++) {
-    const point = bezierLookup[i]
+    const point = bezierLookup[i]!
     if (point.y > threshold) {
-      x = bezierLookup[i - 1].x
+      x = bezierLookup[i - 1]!.x
       break
     }
   }
diff --git a/packages/client/utils/screenBugs/Bug.ts b/packages/client/utils/screenBugs/Bug.ts
index 536d0142887..0ab7411d40d 100644
--- a/packages/client/utils/screenBugs/Bug.ts
+++ b/packages/client/utils/screenBugs/Bug.ts
@@ -183,7 +183,7 @@ export default class Bug {
     this.bug.classList.remove('bug-dead')
   }
 
-  animate = (t) => {
+  animate = (t: any) => {
     if (!this.animating || !this.alive || !this.active) return
     this.going = requestAnimationFrame((t) => {
       this.animate(t)
@@ -217,9 +217,9 @@ export default class Bug {
       this.angle_deg %= 360
       if (this.angle_deg < 0) this.angle_deg += 360
 
-      if (Math.abs(this.directions[this.near_edge] - this.angle_deg) > 15) {
-        const angle1 = this.directions[this.near_edge] - this.angle_deg
-        const angle2 = 360 - this.angle_deg + this.directions[this.near_edge]
+      if (Math.abs(this.directions[this.near_edge]! - this.angle_deg) > 15) {
+        const angle1 = this.directions[this.near_edge]! - this.angle_deg
+        const angle2 = 360 - this.angle_deg + this.directions[this.near_edge]!
         this.large_turn_angle_deg = Math.abs(angle1) < Math.abs(angle2) ? angle1 : angle2
 
         this.edge_test_counter = 10
@@ -399,7 +399,7 @@ export default class Bug {
     let side = Math.round(Math.random() * 4 - 0.5)
     const d = document
     const e = d.documentElement
-    const g = d.getElementsByTagName('body')[0]
+    const g = d.getElementsByTagName('body')[0]!
     const windowX = window.innerWidth || e.clientWidth || g.clientWidth
     const windowY = window.innerHeight || e.clientHeight || g.clientHeight
     if (side > 3) side = 3
@@ -455,7 +455,7 @@ export default class Bug {
     let side = Math.round(Math.random() * 4 - 0.5)
     const d = document
     const e = d.documentElement
-    const g = d.getElementsByTagName('body')[0]
+    const g = d.getElementsByTagName('body')[0]!
     const windowX = window.innerWidth || e.clientWidth || g.clientWidth
     const windowY = window.innerHeight || e.clientHeight || g.clientHeight
     if (side > 3) side = 3
@@ -496,7 +496,7 @@ export default class Bug {
     const style = {} as Pos
     const d = document
     const e = d.documentElement
-    const g = d.getElementsByTagName('body')[0]
+    const g = d.getElementsByTagName('body')[0]!
     const windowX = window.innerWidth || e.clientWidth || g.clientWidth
     const windowY = window.innerHeight || e.clientHeight || g.clientHeight
 
@@ -529,11 +529,11 @@ export default class Bug {
     this.drop(deathType)
   }
 
-  drop = (deathType) => {
+  drop = (deathType: any) => {
     const startPos = this.bug.top
     const d = document
     const e = d.documentElement
-    const g = d.getElementsByTagName('body')[0]
+    const g = d.getElementsByTagName('body')[0]!
     const pos = window.innerHeight || e.clientHeight || g.clientHeight
     const finalPos = pos - this.options.bugHeight
     const rotationRate = this.random(0, 20, true)
@@ -545,7 +545,7 @@ export default class Bug {
     })
   }
 
-  dropping = (t, startPos, finalPos, rotationRate, deathType) => {
+  dropping = (t: number, startPos: any, finalPos: any, rotationRate: any, deathType: any) => {
     const elapsedTime = t - this._lastTimestamp!
     const deltaPos = 0.002 * (elapsedTime * elapsedTime)
     let newPos = startPos + deltaPos
diff --git a/packages/client/utils/screenBugs/BugController.ts b/packages/client/utils/screenBugs/BugController.ts
index 132c1796103..330f729ad61 100644
--- a/packages/client/utils/screenBugs/BugController.ts
+++ b/packages/client/utils/screenBugs/BugController.ts
@@ -131,7 +131,7 @@ class BugDispatch {
     this.spawnDelay = []
     for (let i = 0; i < numBugs; i++) {
       const delay = this.random(this.options.minDelay, this.options.maxDelay, true)
-      const thebug = this.bugs[i]
+      const thebug = this.bugs[i]!
       // fly the bug onto the page:
       this.spawnDelay[i] = window.setTimeout(() => {
         this.options.canFly ? thebug.flyIn() : thebug.walkIn()
@@ -152,30 +152,30 @@ class BugDispatch {
   stop = () => {
     for (let i = 0; i < this.bugs.length; i++) {
       if (this.spawnDelay[i]) clearTimeout(this.spawnDelay[i])
-      this.bugs[i].stop()
+      this.bugs[i]!.stop()
     }
   }
 
   end = () => {
     for (let i = 0; i < this.bugs.length; i++) {
       if (this.spawnDelay[i]) clearTimeout(this.spawnDelay[i])
-      this.bugs[i].stop()
-      this.bugs[i].remove()
+      this.bugs[i]!.stop()
+      this.bugs[i]!.remove()
     }
   }
 
   reset = () => {
     this.stop()
     for (let i = 0; i < this.bugs.length; i++) {
-      this.bugs[i].reset()
-      this.bugs[i].walkIn()
+      this.bugs[i]!.reset()
+      this.bugs[i]!.walkIn()
     }
   }
 
   killAll = () => {
     for (let i = 0; i < this.bugs.length; i++) {
       if (this.spawnDelay[i]) clearTimeout(this.spawnDelay[i])
-      this.bugs[i].die()
+      this.bugs[i]!.die()
     }
   }
 
@@ -209,13 +209,13 @@ class BugDispatch {
     }
     const numBugs = this.bugs.length
     for (let i = 0; i < numBugs; i++) {
-      const pos = this.bugs[i].getPos()
+      const pos = this.bugs[i]!.getPos()
       if (pos) {
         if (
           Math.abs(pos.top - posy) + Math.abs(pos.left - posx) < this.options.eventDistanceToBug &&
-          !this.bugs[i].flyperiodical
+          !this.bugs[i]!.flyperiodical
         ) {
-          this.near_bug(this.bugs[i])
+          this.near_bug(this.bugs[i]!)
         }
       }
     }
@@ -233,7 +233,7 @@ class BugDispatch {
     let mode = this.options.mouseOver
 
     if (mode === 'random') {
-      mode = this.modes[this.random(0, this.modes.length - 1, true)]
+      mode = this.modes[this.random(0, this.modes.length - 1, true)]!
     }
 
     if (mode === 'fly') {
diff --git a/packages/embedder/ai_models/OpenAIGeneration.ts b/packages/embedder/ai_models/OpenAIGeneration.ts
index b5614b608c5..9818012edb4 100644
--- a/packages/embedder/ai_models/OpenAIGeneration.ts
+++ b/packages/embedder/ai_models/OpenAIGeneration.ts
@@ -6,8 +6,6 @@ import {
   GenerationOptions
 } from './AbstractModel'
 
-const MAX_REQUEST_TIME_S = 3 * 60
-
 export type ModelId = 'gpt-3.5-turbo-0125' | 'gpt-4-turbo-preview'
 
 type OpenAIGenerationOptions = Omit<GenerationOptions, 'topK'>
@@ -27,7 +25,7 @@ function isValidModelId(object: any): object is ModelId {
 
 export class OpenAIGeneration extends AbstractGenerationModel {
   private openAIApi: OpenAI | null
-  private modelId: ModelId
+  private modelId!: ModelId
 
   constructor(config: GenerationModelConfig) {
     super(config)
diff --git a/packages/embedder/embedder.ts b/packages/embedder/embedder.ts
index f6762013d08..dccd9492a02 100644
--- a/packages/embedder/embedder.ts
+++ b/packages/embedder/embedder.ts
@@ -1,25 +1,25 @@
-import {Insertable} from 'kysely'
 import tracer from 'dd-trace'
+import {Insertable} from 'kysely'
 import Redlock, {RedlockAbortSignal} from 'redlock'
 
 import 'parabol-server/initSentry'
 import getKysely from 'parabol-server/postgres/getKysely'
 import {DB} from 'parabol-server/postgres/pg'
-import {refreshRetroDiscussionTopicsMeta as refreshRetroDiscussionTopicsMeta} from './indexing/retrospectiveDiscussionTopic'
-import {orgIdsWithFeatureFlag} from './indexing/orgIdsWithFeatureFlag'
 import getModelManager, {ModelManager} from './ai_models/ModelManager'
 import {countWords} from './indexing/countWords'
 import {createEmbeddingTextFrom} from './indexing/createEmbeddingTextFrom'
 import {
+  completeJobTxn,
+  insertNewJobs,
   selectJobQueueItemById,
+  selectMetaToQueue,
   selectMetadataByJobQueueId,
   updateJobState
 } from './indexing/embeddingsTablesOps'
-import {selectMetaToQueue} from './indexing/embeddingsTablesOps'
-import {insertNewJobs} from './indexing/embeddingsTablesOps'
-import {completeJobTxn} from './indexing/embeddingsTablesOps'
-import {getRootDataLoader} from './indexing/getRootDataLoader'
 import {getRedisClient} from './indexing/getRedisClient'
+import {getRootDataLoader} from './indexing/getRootDataLoader'
+import {orgIdsWithFeatureFlag} from './indexing/orgIdsWithFeatureFlag'
+import {refreshRetroDiscussionTopicsMeta} from './indexing/retrospectiveDiscussionTopic'
 
 /*
  * TODO List
@@ -91,11 +91,11 @@ const maybeQueueMetadataItems = async (modelManager: ModelManager) => {
       model: item.model,
       state: 'queued' as const
     }
-  })
+  }) as any[]
 
   const ejqRows = await insertNewJobs(ejqValues)
 
-  ejqRows.forEach((item) => {
+  ejqRows.forEach((item: any) => {
     const {refUpdatedAt} = ejqHash[makeKey(item)]!
     const score = new Date(refUpdatedAt).getTime()
     redisClient.zadd('embedder:queue', score, item.id)
@@ -117,7 +117,7 @@ const dequeueAndEmbedUntilEmpty = async (modelManager: ModelManager) => {
       continue
     }
     const jobQueueId = parseInt(id, 10)
-    const jobQueueItem = await selectJobQueueItemById(jobQueueId)
+    const jobQueueItem = (await selectJobQueueItemById(jobQueueId)) as any
     if (!jobQueueItem) {
       console.log(`embedder: unable to fetch EmbeddingsJobQueue.id = ${id}`)
       continue
@@ -131,7 +131,7 @@ const dequeueAndEmbedUntilEmpty = async (modelManager: ModelManager) => {
       continue
     }
 
-    let fullText = metadata?.fullText
+    let fullText = metadata?.fullText as string
     try {
       if (!fullText) {
         fullText = await createEmbeddingTextFrom(jobQueueItem, dataLoader)
diff --git a/packages/embedder/indexing/createEmbeddingTextFrom.ts b/packages/embedder/indexing/createEmbeddingTextFrom.ts
index 9d6e66b60e7..ce76c7fc380 100644
--- a/packages/embedder/indexing/createEmbeddingTextFrom.ts
+++ b/packages/embedder/indexing/createEmbeddingTextFrom.ts
@@ -1,14 +1,14 @@
 import {Selectable} from 'kysely'
-import {DB} from 'parabol-server/postgres/pg'
 import {DataLoaderWorker} from 'parabol-server/graphql/graphql'
+import {DB} from 'parabol-server/postgres/pg'
 
 import {createText as createTextFromRetrospectiveDiscussionTopic} from './retrospectiveDiscussionTopic'
 
 export const createEmbeddingTextFrom = async (
   item: Selectable<DB['EmbeddingsJobQueue']>,
   dataLoader: DataLoaderWorker
-): Promise<string> => {
-  switch (item.objectType) {
+): Promise<any> => {
+  switch ((item as any).objectType) {
     case 'retrospectiveDiscussionTopic':
       return createTextFromRetrospectiveDiscussionTopic(item, dataLoader)
   }
diff --git a/packages/embedder/indexing/embeddingsTablesOps.ts b/packages/embedder/indexing/embeddingsTablesOps.ts
index c74eb709708..4ce843248a9 100644
--- a/packages/embedder/indexing/embeddingsTablesOps.ts
+++ b/packages/embedder/indexing/embeddingsTablesOps.ts
@@ -1,8 +1,7 @@
-import {Insertable, Selectable, Updateable, sql} from 'kysely'
+import {Insertable, RawBuilder, Selectable, Updateable, sql} from 'kysely'
 import getKysely from 'parabol-server/postgres/getKysely'
 import {DB} from 'parabol-server/postgres/pg'
 import {DBInsert} from '../embedder'
-import {RawBuilder} from 'kysely'
 import numberVectorToString from './numberVectorToString'
 
 function unnestedArray<T>(maybeArray: T[] | T): RawBuilder<T> {
@@ -24,7 +23,9 @@ export const selectMetadataByJobQueueId = async (
     .selectFrom('EmbeddingsMetadata as em')
     .selectAll()
     .leftJoin('EmbeddingsJobQueue as ejq', (join) =>
-      join.onRef('em.objectType', '=', 'ejq.objectType').onRef('em.refId', '=', 'ejq.refId')
+      join
+        .onRef('em.objectType', '=', 'ejq.objectType' as any)
+        .onRef('em.refId', '=', 'ejq.refId' as any)
     )
     .where('ejq.id', '=', id)
     .executeTakeFirstOrThrow()
@@ -52,16 +53,18 @@ export async function selectMetaToQueue(
     .where(({eb, not, or, and, exists, selectFrom}) =>
       and([
         or([
-          not(eb('em.models', '@>', sql`ARRAY[${sql.ref('model')}]::varchar[]` as any) as any),
+          not(
+            eb('em.models' as any, '@>', sql`ARRAY[${sql.ref('model')}]::varchar[]` as any) as any
+          ),
           eb('em.models' as any, 'is', null)
         ]),
         not(
           exists(
             selectFrom('EmbeddingsJobQueue as ejq')
               .select('ejq.id')
-              .whereRef('em.objectType', '=', 'ejq.objectType')
-              .whereRef('em.refId', '=', 'ejq.refId')
-              .whereRef('ejq.model', '=', 'model' as any)
+              .whereRef('em.objectType', '=', 'ejq.objectType' as any)
+              .whereRef('em.refId', '=', 'ejq.refId' as any)
+              .whereRef('ejq.model' as any, '=', 'model' as any)
           )
         ),
         eb('t.orgId', 'in', orgIds)
@@ -104,7 +107,7 @@ export function insertNewJobs(ejqValues: Insertable<DB['EmbeddingsJobQueue']>[])
   return pg
     .insertInto('EmbeddingsJobQueue')
     .values(ejqValues)
-    .returning(['id', 'objectType', 'refId'])
+    .returning(['id', 'objectType', 'refId'] as any)
     .execute()
 }
 
@@ -123,11 +126,11 @@ export function completeJobTxn(
   const pg = getKysely()
   return pg.transaction().execute(async (trx) => {
     // get fields to update correct metadata row
-    const jobQueueItem = await trx
+    const jobQueueItem = (await trx
       .selectFrom('EmbeddingsJobQueue')
-      .select(['objectType', 'refId', 'model'])
+      .select(['objectType', 'refId', 'model'] as any)
       .where('id', '=', jobQueueId)
-      .executeTakeFirstOrThrow()
+      .executeTakeFirstOrThrow()) as any
 
     // (1) update metadata row
     const metadataColumnsToUpdate: {
diff --git a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
index f31aab74cc2..eb28b1bc3b0 100644
--- a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
+++ b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
@@ -1,4 +1,3 @@
-import {Selectable} from 'kysely'
 import prettier from 'prettier'
 
 import getRethink, {RethinkSchema} from 'parabol-server/database/rethinkDriver'
@@ -12,8 +11,8 @@ import MeetingRetrospective, {
   isMeetingRetrospective
 } from 'parabol-server/database/types/MeetingRetrospective'
 
-import {upsertEmbeddingsMetaRows} from './embeddingsTablesOps'
 import {AnyMeeting} from 'parabol-server/postgres/types/Meeting'
+import {upsertEmbeddingsMetaRows} from './embeddingsTablesOps'
 
 const BATCH_SIZE = 1000
 
@@ -291,10 +290,7 @@ export const createTextFromNewMeetingDiscussionStage = async (
   return markdown
 }
 
-export const createText = async (
-  item: Selectable<EmbeddingsJobQueueRetrospectiveDiscussionTopic>,
-  dataLoader: DataLoaderWorker
-): Promise<string> => {
+export const createText = async (item: any, dataLoader: DataLoaderWorker): Promise<string> => {
   if (!item.refId) throw 'refId is undefined'
   const [newMeetingId, discussionId] = item.refId.split(':')
   if (!newMeetingId) throw new Error('newMeetingId cannot be undefined')
diff --git a/packages/embedder/modules.d.ts b/packages/embedder/modules.d.ts
new file mode 100644
index 00000000000..8a2be20ba0c
--- /dev/null
+++ b/packages/embedder/modules.d.ts
@@ -0,0 +1,2 @@
+import '../server/types/modules'
+import '../server/types/webpackEnv'
diff --git a/packages/embedder/tsconfig.json b/packages/embedder/tsconfig.json
index 1d179d08096..b75106d1a8a 100644
--- a/packages/embedder/tsconfig.json
+++ b/packages/embedder/tsconfig.json
@@ -3,13 +3,10 @@
   "compilerOptions": {
     "baseUrl": "../",
     "paths": {
-      // when we import from lib, make goto-definition point to the src
       "parabol-server/*": ["server/*"],
-      "parabol-client/*": ["client/*"]
+      "parabol-client/*": ["client/*"],
+      "~/*": ["client/*"]
     },
-    "outDir": "lib",
-    "lib": ["esnext"],
-    "types": ["node"]
-  },
-  "files": ["../server/types/modules.d.ts"]
+    "lib": ["esnext"]
+  }
 }
diff --git a/packages/gql-executor/RedisStream.ts b/packages/gql-executor/RedisStream.ts
index 739480bd51d..173a493321a 100644
--- a/packages/gql-executor/RedisStream.ts
+++ b/packages/gql-executor/RedisStream.ts
@@ -2,8 +2,8 @@ import RedisInstance from 'parabol-server/utils/RedisInstance'
 
 type MessageValue = [prop: string, stringifiedData: string]
 type Message = [messageId: string, value: MessageValue]
-type XReadGroupRes = [streamName: string, messages: Message[]]
-export default class RedisStream<T> implements AsyncIterableIterator<T> {
+type XReadGroupRes = [streamName: string, messages: [Message, ...Message[]]]
+export default class RedisStream implements AsyncIterableIterator<string> {
   private stream: string
   private consumerGroup: string
   // xreadgroup blocks until a response is received, so this needs its own connection
@@ -19,7 +19,7 @@ export default class RedisStream<T> implements AsyncIterableIterator<T> {
   [Symbol.asyncIterator]() {
     return this
   }
-  async next() {
+  async next(): Promise<IteratorResult<string>> {
     const response = await this.redis.xreadgroup(
       'GROUP',
       this.consumerGroup,
diff --git a/packages/gql-executor/gqlExecutor.ts b/packages/gql-executor/gqlExecutor.ts
index 2d4239b22a6..a3ce88d0853 100644
--- a/packages/gql-executor/gqlExecutor.ts
+++ b/packages/gql-executor/gqlExecutor.ts
@@ -2,9 +2,10 @@ import tracer from 'dd-trace'
 import {ServerChannel} from 'parabol-client/types/constEnums'
 import GQLExecutorChannelId from '../client/shared/gqlIds/GQLExecutorChannelId'
 import SocketServerChannelId from '../client/shared/gqlIds/SocketServerChannelId'
-import executeGraphQL, {GQLRequest} from '../server/graphql/executeGraphQL'
+import executeGraphQL from '../server/graphql/executeGraphQL'
 import '../server/initSentry'
 import '../server/monkeyPatchFetch'
+import {GQLRequest} from '../server/types/custom'
 import RedisInstance from '../server/utils/RedisInstance'
 import RedisStream from './RedisStream'
 
@@ -16,7 +17,7 @@ tracer.init({
 })
 tracer.use('ioredis').use('http').use('pg')
 
-const {REDIS_URL, SERVER_ID} = process.env
+const {SERVER_ID} = process.env
 interface PubSubPromiseMessage {
   jobId: string
   socketServerId: string
@@ -26,7 +27,7 @@ interface PubSubPromiseMessage {
 const run = async () => {
   const publisher = new RedisInstance('gql_pub')
   const subscriber = new RedisInstance('gql_sub')
-  const executorChannel = GQLExecutorChannelId.join(SERVER_ID)
+  const executorChannel = GQLExecutorChannelId.join(SERVER_ID!)
 
   // on shutdown, remove consumer from the group
   process.on('SIGTERM', async () => {
diff --git a/packages/gql-executor/modules.d.ts b/packages/gql-executor/modules.d.ts
new file mode 100644
index 00000000000..8a2be20ba0c
--- /dev/null
+++ b/packages/gql-executor/modules.d.ts
@@ -0,0 +1,2 @@
+import '../server/types/modules'
+import '../server/types/webpackEnv'
diff --git a/packages/gql-executor/tsconfig.json b/packages/gql-executor/tsconfig.json
index 1d179d08096..5f1fdbf2d75 100644
--- a/packages/gql-executor/tsconfig.json
+++ b/packages/gql-executor/tsconfig.json
@@ -1,15 +1,14 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
+    "esModuleInterop": true,
     "baseUrl": "../",
     "paths": {
       // when we import from lib, make goto-definition point to the src
       "parabol-server/*": ["server/*"],
-      "parabol-client/*": ["client/*"]
+      "parabol-client/*": ["client/*"],
+      "~/*": ["client/*"]
     },
-    "outDir": "lib",
-    "lib": ["esnext"],
-    "types": ["node"]
-  },
-  "files": ["../server/types/modules.d.ts"]
+    "lib": ["esnext"]
+  }
 }
diff --git a/packages/server/__tests__/autoJoin.test.ts b/packages/server/__tests__/autoJoin.test.ts
index 85bc9e3e222..3fe4564e6eb 100644
--- a/packages/server/__tests__/autoJoin.test.ts
+++ b/packages/server/__tests__/autoJoin.test.ts
@@ -1,11 +1,11 @@
 import faker from 'faker'
-import {getUserTeams, sendPublic, sendIntranet, signUp, signUpWithEmail} from './common'
 import getRethink from '../database/rethinkDriver'
 import createEmailVerification from '../email/createEmailVerification'
+import {getUserTeams, sendIntranet, sendPublic} from './common'
 
 const signUpVerified = async (email: string) => {
   const password = faker.internet.password()
-  const signUp = await sendPublic({
+  await sendPublic({
     query: `
       mutation SignUpWithPassword($email: ID!, $password: String!) {
         signUpWithPassword(email: $email, password: $password, params: "") {
diff --git a/packages/server/__tests__/common.ts b/packages/server/__tests__/common.ts
index f9ca34ab293..93c134b229b 100644
--- a/packages/server/__tests__/common.ts
+++ b/packages/server/__tests__/common.ts
@@ -199,5 +199,5 @@ export const getUserTeams = async (userId: string) => {
       }
     }
   })
-  return user.data.user.teams
+  return user.data.user.teams as [{id: string}, ...{id: string}[]]
 }
diff --git a/packages/server/__tests__/disableAnonymity.test.ts b/packages/server/__tests__/disableAnonymity.test.ts
index 7143981aa36..1887c3357a0 100644
--- a/packages/server/__tests__/disableAnonymity.test.ts
+++ b/packages/server/__tests__/disableAnonymity.test.ts
@@ -89,8 +89,12 @@ const startRetro = async (teamId: string, authToken: string) => {
     },
     authToken
   })
-
-  const meeting = startRetroQuery.data.startRetrospective.meeting
+  const meeting = startRetroQuery.data.startRetrospective.meeting as {
+    id: string
+    phases: {
+      reflectPrompts: [{id: string}]
+    }[]
+  }
   return meeting
 }
 
@@ -134,7 +138,7 @@ test('By default all reflections are anonymous', async () => {
   expect(meetingSettings.disableAnonymity).toEqual(false)
 
   const meeting = await startRetro(teamId, authToken)
-  const reflectPrompts = meeting.phases.find(({reflectPrompts}) => !!reflectPrompts).reflectPrompts
+  const reflectPrompts = meeting.phases.find(({reflectPrompts}) => !!reflectPrompts)!.reflectPrompts
   const reflection = await addReflection(meeting.id, reflectPrompts[0].id, authToken)
 
   expect(reflection).toEqual({
@@ -153,7 +157,7 @@ test('Creator is visible when disableAnonymity is set', async () => {
   expect(updatedMeetingSettings.disableAnonymity).toEqual(true)
 
   const meeting = await startRetro(teamId, authToken)
-  const reflectPrompts = meeting.phases.find(({reflectPrompts}) => !!reflectPrompts).reflectPrompts
+  const reflectPrompts = meeting.phases.find(({reflectPrompts}) => !!reflectPrompts)!.reflectPrompts
   const reflection = await addReflection(meeting.id, reflectPrompts[0].id, authToken)
 
   expect(reflection).toEqual({
@@ -172,7 +176,7 @@ test('Super user can always read creatorId of a reflection', async () => {
   expect(meetingSettings.disableAnonymity).toEqual(false)
 
   const meeting = await startRetro(teamId, authToken)
-  const reflectPrompts = meeting.phases.find(({reflectPrompts}) => !!reflectPrompts).reflectPrompts
+  const reflectPrompts = meeting.phases.find(({reflectPrompts}) => !!reflectPrompts)!.reflectPrompts
 
   await addReflection(meeting.id, reflectPrompts[0].id, authToken)
 
diff --git a/packages/server/__tests__/loginSAML.test.ts b/packages/server/__tests__/loginSAML.test.ts
index 426f9606140..312bb3154e5 100644
--- a/packages/server/__tests__/loginSAML.test.ts
+++ b/packages/server/__tests__/loginSAML.test.ts
@@ -10,30 +10,6 @@ test.skip('SAML', async () => {
   const orgId = `${samlName}-orgId`
   const domain = 'example.com'
 
-  const _metadata = `
-    <?xml version="1.0"?>
-    <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" validUntil="2021-09-12T09:22:28Z" cacheDuration="PT1631870548S" entityID="https://idp.example.com/metadata">
-      <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <md:KeyDescriptor use="signing">
-          <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:X509Data>
-              <ds:X509Certificate>MIICUDCCAbmgAwIBAgIBADANBgkqhkiG9w0BAQ0FADBFMQswCQYDVQQGEwJ1czELMAkGA1UECAwCQ0ExEzARBgNVBAoMCkV4YW1wbGUgQ28xFDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTIxMDkxMDA3NTkzMFoXDTI2MDkwOTA3NTkzMFowRTELMAkGA1UEBhMCdXMxCzAJBgNVBAgMAkNBMRMwEQYDVQQKDApFeGFtcGxlIENvMRQwEgYDVQQDDAtleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArg9DZwR9v7Vok1IW+hIpYin9llPBh1MV5CxjfK596EwuadyQuko3jGv8qDlx4tG6JiGTjQfCuzJVAhYi2OKuKBqyJewKoen1uF0dRyws9n6zZl0GsVJkObdrNo5P6eib3VOsXPJ10RjxWsWx5WRur2dYdkOJFxC6zN1IbXSXYYMCAwEAAaNQME4wHQYDVR0OBBYEFKr/1y4R+kamPz623HnHM7tz6C4XMB8GA1UdIwQYMBaAFKr/1y4R+kamPz623HnHM7tz6C4XMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQENBQADgYEALKBl6QPk9HMB5V+GYu50XNFmzyuuXt3zAKMSYcyhxVSBCe6SKw1iqvvPza4rGp7DpeJI/8R3qBTuZqfl0rX624wvHGc4N9WubMLPejAn7dMu3oGfm9KUX+Um1RG0U6zsi9t3X90rroea/5SQvw/uAWUxS59U2r8massI/WFJKh8=</ds:X509Certificate>
-            </ds:X509Data>
-          </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:KeyDescriptor use="encryption">
-          <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:X509Data>
-              <ds:X509Certificate>MIICUDCCAbmgAwIBAgIBADANBgkqhkiG9w0BAQ0FADBFMQswCQYDVQQGEwJ1czELMAkGA1UECAwCQ0ExEzARBgNVBAoMCkV4YW1wbGUgQ28xFDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTIxMDkxMDA3NTkzMFoXDTI2MDkwOTA3NTkzMFowRTELMAkGA1UEBhMCdXMxCzAJBgNVBAgMAkNBMRMwEQYDVQQKDApFeGFtcGxlIENvMRQwEgYDVQQDDAtleGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArg9DZwR9v7Vok1IW+hIpYin9llPBh1MV5CxjfK596EwuadyQuko3jGv8qDlx4tG6JiGTjQfCuzJVAhYi2OKuKBqyJewKoen1uF0dRyws9n6zZl0GsVJkObdrNo5P6eib3VOsXPJ10RjxWsWx5WRur2dYdkOJFxC6zN1IbXSXYYMCAwEAAaNQME4wHQYDVR0OBBYEFKr/1y4R+kamPz623HnHM7tz6C4XMB8GA1UdIwQYMBaAFKr/1y4R+kamPz623HnHM7tz6C4XMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQENBQADgYEALKBl6QPk9HMB5V+GYu50XNFmzyuuXt3zAKMSYcyhxVSBCe6SKw1iqvvPza4rGp7DpeJI/8R3qBTuZqfl0rX624wvHGc4N9WubMLPejAn7dMu3oGfm9KUX+Um1RG0U6zsi9t3X90rroea/5SQvw/uAWUxS59U2r8massI/WFJKh8=</ds:X509Certificate>
-            </ds:X509Data>
-          </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-        <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.example.org/sso/SingleSignOnService"/>
-      </md:IDPSSODescriptor>
-    </md:EntityDescriptor>
-  `
-
   const verifyDomain = await sendIntranet({
     query: `
       mutation VerifyDomain($slug: ID!, $addDomains: [ID!], $orgId: ID!) {
diff --git a/packages/server/__tests__/processRecurrence.test.ts b/packages/server/__tests__/processRecurrence.test.ts
index f6e6c685715..fab6970bc9a 100644
--- a/packages/server/__tests__/processRecurrence.test.ts
+++ b/packages/server/__tests__/processRecurrence.test.ts
@@ -1,14 +1,13 @@
 import ms from 'ms'
 import {RRule} from 'rrule'
 import getRethink from '../database/rethinkDriver'
-import MeetingTeamPrompt from '../database/types/MeetingTeamPrompt'
-import TeamPromptResponsesPhase from '../database/types/TeamPromptResponsesPhase'
 import MeetingRetrospective from '../database/types/MeetingRetrospective'
+import MeetingTeamPrompt from '../database/types/MeetingTeamPrompt'
 import ReflectPhase from '../database/types/ReflectPhase'
+import TeamPromptResponsesPhase from '../database/types/TeamPromptResponsesPhase'
 import generateUID from '../generateUID'
 import {insertMeetingSeries as insertMeetingSeriesQuery} from '../postgres/queries/insertMeetingSeries'
 import {getUserTeams, sendIntranet, signUp} from './common'
-import createNewMeetingPhases from '../graphql/mutations/helpers/createNewMeetingPhases'
 
 const PROCESS_RECURRENCE = `
   mutation {
@@ -292,7 +291,11 @@ test('Should end the current retro meeting and start a new meeting', async () =>
     facilitatorUserId: userId,
     scheduledEndTime: new Date(Date.now() - ms('5m')),
     meetingSeriesId,
-    templateId: 'startStopContinueTemplate'
+    templateId: 'startStopContinueTemplate',
+    disableAnonymity: false,
+    totalVotes: 5,
+    name: '',
+    maxVotesPerGroup: 5
   })
 
   // The last meeting in the series was created just over 24h ago, so the next one should start
diff --git a/packages/server/__tests__/startRetrospective.test.ts b/packages/server/__tests__/startRetrospective.test.ts
index 22ff21a7f12..17deae321e5 100644
--- a/packages/server/__tests__/startRetrospective.test.ts
+++ b/packages/server/__tests__/startRetrospective.test.ts
@@ -1,14 +1,8 @@
-import ms from 'ms'
-import {RRule} from 'rrule'
 import getRethink from '../database/rethinkDriver'
-import MeetingTeamPrompt from '../database/types/MeetingTeamPrompt'
-import TeamPromptResponsesPhase from '../database/types/TeamPromptResponsesPhase'
-import generateUID from '../generateUID'
-import {insertMeetingSeries as insertMeetingSeriesQuery} from '../postgres/queries/insertMeetingSeries'
-import {getUserTeams, sendIntranet, sendPublic, signUp} from './common'
+import {getUserTeams, sendPublic, signUp} from './common'
 
 test('Retro is named Retro #1 by default', async () => {
-  const r = await getRethink()
+  await getRethink()
   const {userId, authToken} = await signUp()
   const {id: teamId} = (await getUserTeams(userId))[0]
 
@@ -48,7 +42,7 @@ test('Retro is named Retro #1 by default', async () => {
 })
 
 test('Recurring retro is named like RetroSeries Jan 1', async () => {
-  const r = await getRethink()
+  await getRethink()
   const {userId, authToken} = await signUp()
   const {id: teamId} = (await getUserTeams(userId))[0]
 
@@ -81,7 +75,11 @@ test('Recurring retro is named like RetroSeries Jan 1', async () => {
     authToken
   })
 
-  const formattedDate = now.toLocaleDateString('en-US', {month: 'short', day: 'numeric'}, 'UTC')
+  const formattedDate = now.toLocaleDateString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    timeZone: 'UTC'
+  })
   expect(newRetro).toMatchObject({
     data: {
       startRetrospective: {
diff --git a/packages/server/dataloader/__tests__/isCompanyDomain.test.ts b/packages/server/dataloader/__tests__/isCompanyDomain.test.ts
index 172958a60d6..d364d2a7d61 100644
--- a/packages/server/dataloader/__tests__/isCompanyDomain.test.ts
+++ b/packages/server/dataloader/__tests__/isCompanyDomain.test.ts
@@ -1,7 +1,5 @@
-import faker from 'faker'
 import '../../../../scripts/webpack/utils/dotenv'
 import getDataLoader from '../../graphql/getDataLoader'
-import getPg from '../../postgres/getPg'
 
 const dataloader = getDataLoader()
 
diff --git a/packages/server/dataloader/__tests__/isOrgVerified.test.ts b/packages/server/dataloader/__tests__/isOrgVerified.test.ts
index b12897d4b3a..58247c515ab 100644
--- a/packages/server/dataloader/__tests__/isOrgVerified.test.ts
+++ b/packages/server/dataloader/__tests__/isOrgVerified.test.ts
@@ -1,18 +1,22 @@
 /* eslint-env jest */
-import {MasterPool, r} from 'rethinkdb-ts'
-import getRedis from '../../utils/getRedis'
+import {r} from 'rethinkdb-ts'
 import getRethinkConfig from '../../database/getRethinkConfig'
 import getRethink from '../../database/rethinkDriver'
-import isUserVerified from '../../utils/isUserVerified'
+import OrganizationUser from '../../database/types/OrganizationUser'
 import generateUID from '../../generateUID'
+import {DataLoaderWorker} from '../../graphql/graphql'
+import getRedis from '../../utils/getRedis'
+import isUserVerified from '../../utils/isUserVerified'
+import RootDataLoader from '../RootDataLoader'
 import {isOrgVerified} from '../customLoaderMakers'
 jest.mock('../../database/rethinkDriver')
 jest.mock('../../utils/isUserVerified')
 
-getRethink.mockImplementation(() => {
-  return r
+jest.mocked(getRethink).mockImplementation(() => {
+  return r as any
 })
-isUserVerified.mockImplementation(() => {
+
+jest.mocked(isUserVerified).mockImplementation(() => {
   return true
 })
 
@@ -24,7 +28,7 @@ const testConfig = {
   db: TEST_DB
 }
 
-const createTables = async (...tables: string) => {
+const createTables = async (...tables: string[]) => {
   for (const tableName of tables) {
     const structure = await r
       .db('rethinkdb')
@@ -40,9 +44,10 @@ const createTables = async (...tables: string) => {
   }
 }
 
-type TestOrganizationUser = Pick<
-  OrganizationUser,
-  'inactive' | 'joinedAt' | 'removedAt' | 'role' | 'userId'
+type TestOrganizationUser = Partial<
+  Pick<OrganizationUser, 'inactive' | 'joinedAt' | 'removedAt' | 'role' | 'userId'> & {
+    domain: string
+  }
 >
 
 const userLoader = {
@@ -61,9 +66,9 @@ const dataLoader = {
       users: userLoader,
       isCompanyDomain: isCompanyDomainLoader
     }
-    return loaders[loader]
+    return loaders[loader as keyof typeof loaders]
   })
-}
+} as any as DataLoaderWorker
 
 const addOrg = async (
   activeDomain: string | null,
@@ -101,10 +106,10 @@ const addOrg = async (
   return orgId
 }
 
-const isOrgVerifiedLoader = isOrgVerified(dataLoader)
+const isOrgVerifiedLoader = isOrgVerified(dataLoader as any as RootDataLoader)
 
 beforeAll(async () => {
-  const conn = await r.connectPool(testConfig)
+  await r.connectPool(testConfig)
   try {
     await r.dbDrop(TEST_DB).run()
   } catch (e) {
@@ -121,7 +126,7 @@ afterEach(async () => {
 })
 
 afterAll(async () => {
-  await r.getPoolMaster().drain()
+  await r.getPoolMaster()?.drain()
   getRedis().quit()
 })
 
@@ -203,12 +208,12 @@ test('Empty org does not throw', async () => {
 })
 
 test('Orgs with verified emails from different domains do not qualify', async () => {
-  const org1 = await addOrg('parabol.co', [
+  await addOrg('parabol.co', [
     {
       joinedAt: new Date('2023-09-06'),
       userId: 'founder1',
       domain: 'not-parabol.co'
-    }
+    } as any
   ])
 
   const isVerified = await isOrgVerifiedLoader.load('parabol.co')
diff --git a/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts b/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts
index 0aa1d0a3162..50fcc7fa77f 100644
--- a/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts
+++ b/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts
@@ -1,6 +1,7 @@
 import faker from 'faker'
 import '../../../../scripts/webpack/utils/dotenv'
 import getDataLoader from '../../graphql/getDataLoader'
+import isValid from '../../graphql/isValid'
 import getPg from '../../postgres/getPg'
 
 afterAll(async () => {
@@ -17,16 +18,19 @@ test('Result is mapped to correct id', async () => {
   const dataloader = getDataLoader()
 
   const expectedUsers = faker.helpers.shuffle(
-    (await pg.query('SELECT "id", "email" FROM "User" LIMIT 100')).rows
+    (await pg.query('SELECT "id", "email" FROM "User" LIMIT 100')).rows as {
+      id: string
+      email: string
+    }[]
   )
   const userIds = expectedUsers.map(({id}) => id)
 
-  const actualUsers = (await (dataloader.get('users') as any).loadMany(userIds)).map(
-    ({id, email}) => ({
+  const actualUsers = (await dataloader.get('users').loadMany(userIds))
+    .filter(isValid)
+    .map(({id, email}) => ({
       id,
       email
-    })
-  )
+    }))
 
   console.log('Ran with #users:', actualUsers.length)
 
diff --git a/packages/server/email/inlineImages.ts b/packages/server/email/inlineImages.ts
index d02c7bf6448..176a10d5798 100644
--- a/packages/server/email/inlineImages.ts
+++ b/packages/server/email/inlineImages.ts
@@ -20,7 +20,7 @@ const getFile = async (pathname: string) => {
     try {
       const res = await fetch(pathname)
       if (res.status !== 200) return null
-      data = await res.buffer()
+      data = await (res as any).buffer()
     } catch (e) {
       return null
     }
@@ -42,7 +42,7 @@ const inlineImages = async (html: string) => {
   $('body')
     .find('img')
     .each((_i, img) => {
-      const pathname = $(img).attr('src')
+      const pathname = $(img).attr('src') as keyof typeof cidDict
       if (!pathname) return
       cidDict[pathname] = cidDict[pathname] || generateUID() + path.extname(pathname)
       $(img).attr('src', `cid:${cidDict[pathname]}`)
@@ -51,7 +51,7 @@ const inlineImages = async (html: string) => {
   const files = await Promise.all(uniquePathnames.map(getFile))
   const options = files.map((data, idx) => {
     if (!data) return null
-    const pathname = uniquePathnames[idx]
+    const pathname = uniquePathnames[idx] as keyof typeof cidDict
     const filename = cidDict[pathname]
     return {data, filename}
   })
diff --git a/packages/server/generateUID.ts b/packages/server/generateUID.ts
index 15d3a616e70..822843fa52d 100644
--- a/packages/server/generateUID.ts
+++ b/packages/server/generateUID.ts
@@ -8,7 +8,7 @@ const SEQ_BIT_LEN = 12
 const TS_OFFSET = BigInt(MACHINE_ID_BIT_LEN + SEQ_BIT_LEN)
 const MID_OFFSET = BigInt(SEQ_BIT_LEN)
 const BIG_ZERO = BigInt(0)
-const MAX_SEQ = 2 ** SEQ_BIT_LEN - 1
+export const MAX_SEQ = 2 ** SEQ_BIT_LEN - 1
 
 // if MID overflows, we will generate duplicate ids, throw instead
 if (MID < 0 || MID > 2 ** MACHINE_ID_BIT_LEN - 1) {
diff --git a/packages/server/graphql/executeGraphQL.ts b/packages/server/graphql/executeGraphQL.ts
index 6b6ad34ea72..8fea40bc2a5 100644
--- a/packages/server/graphql/executeGraphQL.ts
+++ b/packages/server/graphql/executeGraphQL.ts
@@ -7,30 +7,13 @@
 import tracer from 'dd-trace'
 import {graphql} from 'graphql'
 import {FormattedExecutionResult} from 'graphql/execution/execute'
-import AuthToken from '../database/types/AuthToken'
+import type {GQLRequest} from '../types/custom'
 import CompiledQueryCache from './CompiledQueryCache'
 import getDataLoader from './getDataLoader'
 import getRateLimiter from './getRateLimiter'
 import privateSchema from './private/rootSchema'
 import publicSchema from './public/rootSchema'
 
-export interface GQLRequest {
-  authToken: AuthToken
-  ip?: string
-  socketId?: string
-  variables?: {[key: string]: any}
-  docId?: string
-  query?: string
-  rootValue?: {[key: string]: any}
-  dataLoaderId?: string
-  // true if the query is on the private schema
-  isPrivate?: boolean
-  // true if the query is ad-hoc (e.g. GraphiQL, CLI)
-  isAdHoc?: boolean
-  // Datadog opentracing span of the calling server
-  carrier?: any
-}
-
 const queryCache = new CompiledQueryCache()
 
 const executeGraphQL = async (req: GQLRequest) => {
diff --git a/packages/server/package.json b/packages/server/package.json
index 68cfcfbb846..62295579ced 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -32,6 +32,7 @@
     "@types/bcryptjs": "^2.4.2",
     "@types/cheerio": "^0.22.30",
     "@types/dotenv": "^6.1.1",
+    "@types/faker": "^5.5.9",
     "@types/graphql": "^14.5.0",
     "@types/html-minifier-terser": "5.1.2",
     "@types/jest": "^29.5.1",
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index a1a9c3130df..bc89d53cbbe 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -8,24 +8,16 @@
       "parabol-client/*": ["client/*"],
       "~/*": ["client/*"]
     },
-    "lib": ["esnext", "dom"],
-    "types": ["node", "jest", "jest-extended"]
+    "lib": ["esnext", "dom"]
   },
 
   "exclude": [
     "**/node_modules",
     "types/githubTypes.ts",
     "postgres/migrationTemplate.ts",
-    "graphql/intranetSchema/sdl/resolverTypes.ts"
-  ],
-  "files": [
-    "types/webpackEnv.ts",
-    "types/modules.d.ts",
-    "server.ts",
-    "../client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx"
-  ],
-  "include": ["graphql/**/*.ts"]
-
-  // if "include" or "files" is added, even if they are empty arrays, then strictNullChecks breaks
-  // repro: https://www.typescriptlang.org/play?strictFunctionTypes=false&strictPropertyInitialization=false&strictBindCallApply=false&noImplicitThis=false&noImplicitReturns=false&alwaysStrict=false&declaration=false&experimentalDecorators=false&emitDecoratorMetadata=false&target=6&ts=3.5.1#code/C4TwDgpgBA8gRgKygXigbwFBSgWwIYhwQDKwATgIJlkD8AXFAM7kCWAdgOYDaAuhgL4ZQkKFTIpYiLgHJ8hEuTHS+AYwD2bZlDwS2AVwA2B7Y21sQJ0dQx4AdADM1ZAKJ4VACwAUngF4BKFAA+KH8MIA
+    "database/migrations/**/*",
+    "postgres/migrations/**/*",
+    "graphql/intranetSchema/sdl/resolverTypes.ts",
+    "billing/debug.ts"
+  ]
 }
diff --git a/packages/server/types/custom.d.ts b/packages/server/types/custom.d.ts
index 34587f968c4..2fc4dba2ce8 100644
--- a/packages/server/types/custom.d.ts
+++ b/packages/server/types/custom.d.ts
@@ -1,3 +1,5 @@
+import '../../client/types/reactHTML4'
+import type AuthToken from '../database/types/AuthToken'
 export interface OAuth2Success {
   access_token: string
   token_type: string
@@ -17,3 +19,19 @@ export interface OAuth2Error {
   error_description?: string
   error_uri?: string
 }
+export interface GQLRequest {
+  authToken: AuthToken
+  ip?: string
+  socketId?: string
+  variables?: {[key: string]: any}
+  docId?: string
+  query?: string
+  rootValue?: {[key: string]: any}
+  dataLoaderId?: string
+  // true if the query is on the private schema
+  isPrivate?: boolean
+  // true if the query is ad-hoc (e.g. GraphiQL, CLI)
+  isAdHoc?: boolean
+  // Datadog opentracing span of the calling server
+  carrier?: any
+}
diff --git a/packages/server/types/modules.d.ts b/packages/server/types/modules.d.ts
index c79e5a0b011..9b16b604830 100644
--- a/packages/server/types/modules.d.ts
+++ b/packages/server/types/modules.d.ts
@@ -21,6 +21,7 @@ declare module 'node-env-flag'
 declare module '*getProjectRoot'
 declare module 'tayden-clusterfck'
 declare module 'unicode-substring'
+declare module 'jest-extended'
 declare module 'json2csv/lib/JSON2CSVParser'
 declare module 'object-hash'
 declare module 'string-score'
diff --git a/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts b/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
index 3c65dff93cb..6858d2854cf 100644
--- a/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
+++ b/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
@@ -1,16 +1,16 @@
 /* eslint-env jest */
-import {MasterPool, r} from 'rethinkdb-ts'
-import getRedis from '../getRedis'
-import RedisLockQueue from '../RedisLockQueue'
-import sleep from 'parabol-client/utils/sleep'
+import {r} from 'rethinkdb-ts'
 import getRethinkConfig from '../../database/getRethinkConfig'
 import getRethink from '../../database/rethinkDriver'
-import {getEligibleOrgIdsByDomain} from '../isRequestToJoinDomainAllowed'
+import OrganizationUser from '../../database/types/OrganizationUser'
 import generateUID from '../../generateUID'
+import {DataLoaderWorker} from '../../graphql/graphql'
+import getRedis from '../getRedis'
+import {getEligibleOrgIdsByDomain} from '../isRequestToJoinDomainAllowed'
 jest.mock('../../database/rethinkDriver')
 
-getRethink.mockImplementation(() => {
-  return r
+jest.mocked(getRethink).mockImplementation(() => {
+  return r as any
 })
 
 const TEST_DB = 'isRequestToJoinDomainAllowedTest'
@@ -21,7 +21,7 @@ const testConfig = {
   db: TEST_DB
 }
 
-const createTables = async (...tables: string) => {
+const createTables = async (...tables: string[]) => {
   for (const tableName of tables) {
     const structure = await r
       .db('rethinkdb')
@@ -37,9 +37,8 @@ const createTables = async (...tables: string) => {
   }
 }
 
-type TestOrganizationUser = Pick<
-  OrganizationUser,
-  'inactive' | 'joinedAt' | 'removedAt' | 'role' | 'userId'
+type TestOrganizationUser = Partial<
+  Pick<OrganizationUser, 'inactive' | 'joinedAt' | 'removedAt' | 'role' | 'userId'>
 >
 
 const addOrg = async (
@@ -88,12 +87,12 @@ const dataLoader = {
       users: userLoader,
       isCompanyDomain: isCompanyDomainLoader
     }
-    return loaders[loader]
+    return loaders[loader as keyof typeof loaders]
   })
-}
+} as any as DataLoaderWorker
 
 beforeAll(async () => {
-  const conn = await r.connectPool(testConfig)
+  await r.connectPool(testConfig)
   try {
     await r.dbDrop(TEST_DB).run()
   } catch (e) {
@@ -109,7 +108,7 @@ afterEach(async () => {
 })
 
 afterAll(async () => {
-  await r.getPoolMaster().drain()
+  await r.getPoolMaster()?.drain()
   getRedis().quit()
 })
 
@@ -126,7 +125,7 @@ test('Founder is billing lead', async () => {
     }
   ])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(1)
   expect(userLoader.loadMany).toHaveBeenCalledWith(['user1'])
 })
@@ -148,7 +147,7 @@ test('Org with noPromptToJoinOrg feature flag is ignored', async () => {
     {featureFlags: ['noPromptToJoinOrg']}
   )
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(0)
 })
 
@@ -170,7 +169,7 @@ test('Inactive founder is ignored', async () => {
     }
   ])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   // implementation detail, important is only that no user was loaded
   expect(userLoader.loadMany).toHaveBeenCalledTimes(1)
   expect(userLoader.loadMany).toHaveBeenCalledWith([])
@@ -195,7 +194,7 @@ test('Non-founder billing lead is checked', async () => {
     }
   ])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(1)
   expect(userLoader.loadMany).toHaveBeenCalledWith(['billing1'])
 })
@@ -212,7 +211,7 @@ test('Founder is checked even when not billing lead', async () => {
     }
   ])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(1)
   expect(userLoader.loadMany).toHaveBeenCalledWith(['user1'])
 })
@@ -239,7 +238,7 @@ test('All matching orgs are checked', async () => {
     }
   ])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   // implementation detail, important is only that both users were loaded
   expect(userLoader.loadMany).toHaveBeenCalledTimes(2)
   expect(userLoader.loadMany).toHaveBeenCalledWith(['founder1'])
@@ -249,12 +248,12 @@ test('All matching orgs are checked', async () => {
 test('Empty org does not throw', async () => {
   await addOrg('parabol.co', [])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(0)
 })
 
 test('No org does not throw', async () => {
-  const orgIds = await getEligibleOrgIdsByDomain('example.com', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('example.com', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(0)
 })
 
@@ -267,7 +266,7 @@ test('1 person orgs are ignored', async () => {
     }
   ])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(0)
 })
 
@@ -283,12 +282,12 @@ test('Org matching the user are ignored', async () => {
     }
   ])
 
-  const orgIds = await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
+  await getEligibleOrgIdsByDomain('parabol.co', 'newUser', dataLoader)
   expect(userLoader.loadMany).toHaveBeenCalledTimes(0)
 })
 
 test('Only the biggest org with verified emails qualify', async () => {
-  const org = await addOrg('parabol.co', [
+  await addOrg('parabol.co', [
     {
       joinedAt: new Date('2023-09-06'),
       userId: 'founder1'
@@ -350,7 +349,7 @@ test('Only the biggest org with verified emails qualify', async () => {
         ]
       }
     }
-    return userIds.map((id) => ({
+    return userIds.map((id: keyof typeof users) => ({
       id,
       ...users[id]
     }))
@@ -423,7 +422,7 @@ test('All the biggest orgs with verified emails qualify', async () => {
         ]
       }
     }
-    return userIds.map((id) => ({
+    return userIds.map((id: keyof typeof users) => ({
       id,
       ...users[id]
     }))
@@ -452,7 +451,7 @@ test('Team trumps starter tier with more users org', async () => {
     ],
     {tier: 'team'}
   )
-  const biggerStarterOrg = await addOrg('parabol.co', [
+  await addOrg('parabol.co', [
     {
       joinedAt: new Date('2023-09-06'),
       userId: 'founder2'
@@ -504,7 +503,7 @@ test('Team trumps starter tier with more users org', async () => {
         ]
       }
     }
-    return userIds.map((id) => ({
+    return userIds.map((id: keyof typeof users) => ({
       id,
       ...users[id]
     }))
@@ -533,7 +532,7 @@ test('Enterprise trumps team tier with more users org', async () => {
     ],
     {tier: 'enterprise'}
   )
-  const starterOrg = await addOrg(
+  await addOrg(
     'parabol.co',
     [
       {
@@ -589,7 +588,7 @@ test('Enterprise trumps team tier with more users org', async () => {
         ]
       }
     }
-    return userIds.map((id) => ({
+    return userIds.map((id: keyof typeof users) => ({
       id,
       ...users[id]
     }))
@@ -604,7 +603,7 @@ test('Enterprise trumps team tier with more users org', async () => {
 })
 
 test('Orgs with verified emails from different domains do not qualify', async () => {
-  const org1 = await addOrg('parabol.co', [
+  await addOrg('parabol.co', [
     {
       joinedAt: new Date('2023-09-06'),
       userId: 'founder1'
diff --git a/packages/server/utils/__tests__/rateLimiters/InMemoryRateLimiter.test.ts b/packages/server/utils/__tests__/rateLimiters/InMemoryRateLimiter.test.ts
index 01f4fa4394a..3b2478aa9d6 100644
--- a/packages/server/utils/__tests__/rateLimiters/InMemoryRateLimiter.test.ts
+++ b/packages/server/utils/__tests__/rateLimiters/InMemoryRateLimiter.test.ts
@@ -14,7 +14,7 @@ describe('InMemoryRateLimiter', () => {
   }
 
   beforeEach(() => {
-    jest.useFakeTimers('modern')
+    jest.useFakeTimers()
   })
 
   afterEach(() => {
diff --git a/packages/server/utils/getGraphQLExecutor.ts b/packages/server/utils/getGraphQLExecutor.ts
index bc70b875316..759f21bade2 100644
--- a/packages/server/utils/getGraphQLExecutor.ts
+++ b/packages/server/utils/getGraphQLExecutor.ts
@@ -1,7 +1,7 @@
 import {ExecutionResult} from 'graphql'
 import {ServerChannel} from 'parabol-client/types/constEnums'
+import type {GQLRequest} from '../types/custom'
 import SocketServerChannelId from '../../client/shared/gqlIds/SocketServerChannelId'
-import {GQLRequest} from '../graphql/executeGraphQL'
 import PubSubPromise from './PubSubPromise'
 
 let pubsub: PubSubPromise<GQLRequest & {executorServerId?: string}, ExecutionResult>
diff --git a/packages/server/utils/uwsGetHeaders.ts b/packages/server/utils/uwsGetHeaders.ts
index 9fd7bdcdc02..f51fd27e78f 100644
--- a/packages/server/utils/uwsGetHeaders.ts
+++ b/packages/server/utils/uwsGetHeaders.ts
@@ -1,7 +1,7 @@
 import {HttpRequest} from 'uWebSockets.js'
 
 const uwsGetHeaders = (req: HttpRequest) => {
-  const reqHeaders = {}
+  const reqHeaders: Record<string, string> = {}
   req.forEach((key, value) => {
     reqHeaders[key] = value
   })
diff --git a/scripts/webpack/utils/getProjectRoot.d.ts b/scripts/webpack/utils/getProjectRoot.d.ts
new file mode 100644
index 00000000000..436f1feb4c9
--- /dev/null
+++ b/scripts/webpack/utils/getProjectRoot.d.ts
@@ -0,0 +1,2 @@
+declare function getProjectRoot(): string
+export default getProjectRoot
diff --git a/yarn.lock b/yarn.lock
index dc34fd16fae..817e730db40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7565,6 +7565,11 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/faker@^5.5.9":
+  version "5.5.9"
+  resolved "https://registry.yarnpkg.com/@types/faker/-/faker-5.5.9.tgz#588ede92186dc557bff8341d294335d50d255f0c"
+  integrity sha512-uCx6mP3UY5SIO14XlspxsGjgaemrxpssJI0Ol+GfhxtcKpv9pgRZYsS4eeKeHVLje6Qtc8lGszuBI461+gVZBA==
+
 "@types/fbjs@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/fbjs/-/fbjs-3.0.4.tgz#272faf44b6a24d24d6fdf36ed895b47436e6c125"
@@ -7674,6 +7679,14 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
+"@types/jest@^29.5.12":
+  version "29.5.12"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
+  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
+  dependencies:
+    expect "^29.0.0"
+    pretty-format "^29.0.0"
+
 "@types/js-yaml@^4.0.0":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
@@ -9704,9 +9717,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
-  version "1.0.30001594"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz#bea552414cd52c2d0c985ed9206314a696e685f5"
-  integrity sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==
+  version "1.0.30001600"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz#93a3ee17a35aa6a9f0c6ef1b2ab49507d1ab9079"
+  integrity sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -11305,7 +11318,6 @@ draft-js-utils@^1.4.0:
 
 "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6":
   version "0.10.5"
-  uid "025fddba56f21aaf3383aee778e0b17025c9a7bc"
   resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc"
   dependencies:
     fbjs "^0.8.15"
@@ -20384,7 +20396,19 @@ tar@^4.4.13:
     safe-buffer "^5.2.1"
     yallist "^3.1.1"
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
+  integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
   integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==

From 538c95ce4dc7d4839b3e813006cb20e1b7d1d1c8 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 28 Mar 2024 17:19:41 -0700
Subject: [PATCH 105/183] feat: prepare embedder for Production (#9517)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .env.example                                  |   2 +-
 .github/workflows/build.yml                   |   4 +-
 .github/workflows/test.yml                    |  14 +-
 docker/images/parabol-ubi/README.md           |  24 +-
 .../images/parabol-ubi/environments/pipeline  |   4 +
 docker/stacks/development/docker-compose.yml  |   2 +-
 ...docker-compose.yaml => docker-compose.yml} |   2 +-
 package.json                                  |   2 +-
 .../client/shared/gqlIds/EmbedderChannelId.ts |   9 +
 packages/client/types/generics.ts             |   3 +
 packages/embedder/EMBEDDER_JOB_PRIORITY.ts    |   6 +
 packages/embedder/EmbeddingsJobQueueStream.ts |  72 ++
 packages/embedder/README.md                   |  41 +-
 packages/embedder/addEmbeddingsMetadata.ts    |  15 +
 ...MetadataForRetrospectiveDiscussionTopic.ts | 143 +++
 .../ai_models/AbstractEmbeddingsModel.ts      | 126 +++
 .../ai_models/AbstractGenerationModel.ts      |  26 +
 packages/embedder/ai_models/AbstractModel.ts  |  57 +-
 packages/embedder/ai_models/ModelManager.ts   |  51 +-
 .../embedder/ai_models/OpenAIGeneration.ts    |   2 +-
 .../ai_models/TextEmbeddingsInference.ts      |  85 +-
 .../ai_models/TextGenerationInference.ts      |   3 +-
 packages/embedder/custom.d.ts                 |  11 +
 packages/embedder/embedder.ts                 | 310 ++-----
 packages/embedder/establishPrimaryEmbedder.ts |  17 +
 packages/embedder/importHistoricalMetadata.ts |  16 +
 ...tHistoricalRetrospectiveDiscussionTopic.ts |  37 +
 packages/embedder/indexing/countWords.ts      |  17 -
 .../indexing/createEmbeddingTextFrom.ts       |  16 +-
 .../embedder/indexing/embeddingsTablesOps.ts  | 201 ----
 packages/embedder/indexing/failJob.ts         |  17 +
 packages/embedder/indexing/getRedisClient.ts  |  11 -
 .../embedder/indexing/getRootDataLoader.ts    |  10 -
 .../indexing/retrospectiveDiscussionTopic.ts  | 216 +----
 packages/embedder/iso6393To1.ts               | 195 ++++
 packages/embedder/logMemoryUse.ts             |  10 +
 packages/embedder/mergeAsyncIterators.ts      |  96 ++
 packages/embedder/modules.d.ts                |   2 -
 packages/embedder/package.json                |   5 +-
 packages/embedder/processJob.ts               |  13 +
 packages/embedder/processJobEmbed.ts          | 102 +++
 packages/embedder/resetStalledJobs.ts         |  18 +
 packages/embedder/textEmbeddingsnterface.d.ts | 857 ++++++++++++++++++
 packages/embedder/types/modules.d.ts          |   4 +
 packages/embedder/types/shared.d.ts           |   2 +
 packages/gql-executor/RedisStream.ts          |   3 +-
 .../rethinkForeignKeyLoaderMakers.ts          |  13 +
 .../mutations/helpers/publishToEmbedder.ts    |  14 +
 .../mutations/helpers/safeEndRetrospective.ts |  16 +-
 .../1703031300000_addEmbeddingTables.ts       |   6 +-
 .../1709934935000_embeddingsMetadataId.ts     |  62 ++
 release-please-config.json                    |   5 +
 yarn.lock                                     |  64 +-
 53 files changed, 2210 insertions(+), 849 deletions(-)
 rename docker/stacks/single-tenant-host/{docker-compose.yaml => docker-compose.yml} (98%)
 create mode 100644 packages/client/shared/gqlIds/EmbedderChannelId.ts
 create mode 100644 packages/embedder/EMBEDDER_JOB_PRIORITY.ts
 create mode 100644 packages/embedder/EmbeddingsJobQueueStream.ts
 create mode 100644 packages/embedder/addEmbeddingsMetadata.ts
 create mode 100644 packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
 create mode 100644 packages/embedder/ai_models/AbstractEmbeddingsModel.ts
 create mode 100644 packages/embedder/ai_models/AbstractGenerationModel.ts
 create mode 100644 packages/embedder/custom.d.ts
 create mode 100644 packages/embedder/establishPrimaryEmbedder.ts
 create mode 100644 packages/embedder/importHistoricalMetadata.ts
 create mode 100644 packages/embedder/importHistoricalRetrospectiveDiscussionTopic.ts
 delete mode 100644 packages/embedder/indexing/countWords.ts
 delete mode 100644 packages/embedder/indexing/embeddingsTablesOps.ts
 create mode 100644 packages/embedder/indexing/failJob.ts
 delete mode 100644 packages/embedder/indexing/getRedisClient.ts
 delete mode 100644 packages/embedder/indexing/getRootDataLoader.ts
 create mode 100644 packages/embedder/iso6393To1.ts
 create mode 100644 packages/embedder/logMemoryUse.ts
 create mode 100644 packages/embedder/mergeAsyncIterators.ts
 delete mode 100644 packages/embedder/modules.d.ts
 create mode 100644 packages/embedder/processJob.ts
 create mode 100644 packages/embedder/processJobEmbed.ts
 create mode 100644 packages/embedder/resetStalledJobs.ts
 create mode 100644 packages/embedder/textEmbeddingsnterface.d.ts
 create mode 100644 packages/embedder/types/modules.d.ts
 create mode 100644 packages/embedder/types/shared.d.ts
 create mode 100644 packages/server/graphql/mutations/helpers/publishToEmbedder.ts
 create mode 100644 packages/server/postgres/migrations/1709934935000_embeddingsMetadataId.ts

diff --git a/.env.example b/.env.example
index 2aa11780748..5f0285650a9 100644
--- a/.env.example
+++ b/.env.example
@@ -14,7 +14,7 @@ SOCKET_PORT='3001'
 # AI MODELS
 AI_EMBEDDING_MODELS='[{"model": "text-embeddings-inference:llmrails/ember-v1", "url": "http://localhost:3040/"}]'
 AI_GENERATION_MODELS='[{"model": "text-generation-inference:TheBloke/zephyr-7b-beta", "url": "http://localhost:3050/"}]'
-AI_EMBEDDER_ENABLED='true'
+AI_EMBEDDER_WORKERS='1'
 
 # APPLICATION
 # AMPLITUDE_WRITE_KEY='key_AMPLITUDE_WRITE_KEY'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 709f0a2d818..4da61b03eac 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
       id-token: "write"
     services:
       postgres:
-        image: pgvector/pgvector:pg15
+        image: pgvector/pgvector:0.6.2-pg15
         # This env variables must be the same in the file PARABOL_BUILD_ENV_PATH
         env:
           POSTGRES_PASSWORD: "temppassword"
@@ -143,6 +143,6 @@ jobs:
         uses: ravsamhq/notify-slack-action@v2
         with:
           status: ${{ job.status }}
-          notify_when: 'failure'
+          notify_when: "failure"
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8378696b622..171e080964f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
       id-token: "write"
     services:
       postgres:
-        image: postgres:15.4
+        image: pgvector/pgvector:0.6.2-pg15
         # This env variables must be the same in the file PARABOL_BUILD_ENV_PATH
         env:
           POSTGRES_PASSWORD: "temppassword"
@@ -78,7 +78,6 @@ jobs:
           yarn db:migrate
           yarn pg:migrate up
           yarn pg:build
-          yarn pg:generate
 
       - name: Build for testing
         run: yarn build
@@ -86,9 +85,6 @@ jobs:
       - name: Verify source is clean
         run: git diff --quiet HEAD || (echo "Changes in generated files detected"; git diff; exit 1)
 
-      - name: Check Code Quality
-        run: yarn codecheck
-
       - name: Run Predeploy for Testing
         run: yarn predeploy
 
@@ -100,6 +96,12 @@ jobs:
           wait-on: |
             http://localhost:3000/graphql
 
+      - name: Kysely Codegen
+        run: yarn pg:generate
+
+      - name: Check Code Quality
+        run: yarn codecheck
+
       - name: Run server tests
         run: yarn test:server -- --reporters=default --reporters=jest-junit
         env:
@@ -139,6 +141,6 @@ jobs:
         uses: ravsamhq/notify-slack-action@v2
         with:
           status: ${{ job.status }}
-          notify_when: 'failure'
+          notify_when: "failure"
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}
diff --git a/docker/images/parabol-ubi/README.md b/docker/images/parabol-ubi/README.md
index 920c6d48fd8..518269140bc 100644
--- a/docker/images/parabol-ubi/README.md
+++ b/docker/images/parabol-ubi/README.md
@@ -16,21 +16,21 @@ Recommended:
 
 ## Variables
 
-| Name                 | Description                                                                                                             | Possible values                                       | Recommended value                                                   |
-| -------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------- | ------------------------------------------------------------------- |
-| `postgresql_tag`     | PostgreSQL version from the [Docker image](https://hub.docker.com/_/postgres)                                           | `Any tag`                                             | `15.4`                                                              |
-| `rethinkdb_tag`      | RethinkDB version from the [Docker image](https://hub.docker.com/_/rethinkdb)                                           | `Any tag`                                             | `2.4.2`                                                             |
-| `redis_tag`          | Redis version from the [Docker image](https://hub.docker.com/_/redis)                                                   | `Any tag`                                             | `7.0-alpine`                                                        |
-| `_BUILD_ENV_PATH`    | File `.env` used by the application during the build process                                                            | `Relative path from the root level of the repository` | `docker/parabol-ubi/environments/basic-env`             |
-| `_NODE_VERSION`      | Node version, used by Docker to use the Docker image node:\_NODE_VERSION as base image to build                         | `Same as in root package.json`                        |                                                                     |
-| `_DOCKERFILE`        | Dockerfile used to build the image                                                                                      | `Relative path from the root level of the repository` | `./docker/parabol-ubi/dockerfiles/basic.dockerfile` |
-| `_DOCKER_REPOSITORY` | The destination repository                                                                                              | `String`                                              | `parabol`                                                           |
-| `_DOCKER_TAG`        | Tag for the produced image                                                                                              | `String`                                              |                                                                     |
+| Name                 | Description                                                                                     | Possible values                                       | Recommended value                                   |
+| -------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------- | --------------------------------------------------- |
+| `postgresql_tag`     | PostgreSQL version from the [Docker image](https://hub.docker.com/r/pgvector/pgvector)          | `Any tag`                                             | `0.6.2-pg15`                                        |
+| `rethinkdb_tag`      | RethinkDB version from the [Docker image](https://hub.docker.com/_/rethinkdb)                   | `Any tag`                                             | `2.4.2`                                             |
+| `redis_tag`          | Redis version from the [Docker image](https://hub.docker.com/_/redis)                           | `Any tag`                                             | `7.0-alpine`                                        |
+| `_BUILD_ENV_PATH`    | File `.env` used by the application during the build process                                    | `Relative path from the root level of the repository` | `docker/parabol-ubi/environments/basic-env`         |
+| `_NODE_VERSION`      | Node version, used by Docker to use the Docker image node:\_NODE_VERSION as base image to build | `Same as in root package.json`                        |                                                     |
+| `_DOCKERFILE`        | Dockerfile used to build the image                                                              | `Relative path from the root level of the repository` | `./docker/parabol-ubi/dockerfiles/basic.dockerfile` |
+| `_DOCKER_REPOSITORY` | The destination repository                                                                      | `String`                                              | `parabol`                                           |
+| `_DOCKER_TAG`        | Tag for the produced image                                                                      | `String`                                              |                                                     |
 
 Example of variables:
 
 ```commandLine
-export postgresql_tag=15.4; \
+export postgresql_tag=0.6.2-pg15; \
 export rethinkdb_tag=2.4.2; \
 export redis_tag=7.0-alpine; \
 export _BUILD_ENV_PATH=docker/parabol-ubi/environments/basic-env; \
@@ -61,7 +61,7 @@ cp $_BUILD_ENV_PATH ./.env
 > :warning: Stop all database containers you might have running before executing the following command. If other database containers are running, some ports might be already taken.
 
 ```commandLine
-docker run --name temp-postgres -e POSTGRES_PASSWORD=temppassword -e POSTGRES_USER=tempuser -e POSTGRES_DB=tempdb -d -p 5432:5432 postgres:$postgresql_tag && \
+docker run --name temp-postgres -e POSTGRES_PASSWORD=temppassword -e POSTGRES_USER=tempuser -e POSTGRES_DB=tempdb -d -p 5432:5432 pgvector/pgvector:$postgresql_tag && \
 docker run --name temp-rethinkdb -d -p 28015:28015 -p 29015:29015 -p 8080:8080 rethinkdb:$rethinkdb_tag && \
 docker run --name temp-redis -d -p 6379:6379 redis:$redis_tag
 ```
diff --git a/docker/images/parabol-ubi/environments/pipeline b/docker/images/parabol-ubi/environments/pipeline
index cfc707c746b..cd111fab88b 100644
--- a/docker/images/parabol-ubi/environments/pipeline
+++ b/docker/images/parabol-ubi/environments/pipeline
@@ -54,3 +54,7 @@ STRIPE_PUBLISHABLE_KEY='pk_test_MNoKbCzQX0lhktuxxI7M14wd'
 STRIPE_SECRET_KEY=''
 STRIPE_WEBHOOK_SECRET=''
 HUBSPOT_API_KEY=''
+AI_EMBEDDING_MODELS='[{"model": "text-embeddings-inference:llmrails/ember-v1", "url": "http://localhost:3040/"}]'
+AI_GENERATION_MODELS='[{"model": "text-generation-inference:TheBloke/zephyr-7b-beta", "url": "http://localhost:3050/"}]'
+AI_EMBEDDER_WORKERS='1'
+POSTGRES_USE_PGVECTOR='true'
diff --git a/docker/stacks/development/docker-compose.yml b/docker/stacks/development/docker-compose.yml
index 91adbbb6578..a4509d051b9 100644
--- a/docker/stacks/development/docker-compose.yml
+++ b/docker/stacks/development/docker-compose.yml
@@ -70,7 +70,7 @@ services:
     networks:
       parabol-network:
   text-embeddings-inference:
-    image: ghcr.io/huggingface/text-embeddings-inference:cpu-0.6
+    image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.2
     command:
       - "--model-id=llmrails/ember-v1"
     platform: linux/x86_64
diff --git a/docker/stacks/single-tenant-host/docker-compose.yaml b/docker/stacks/single-tenant-host/docker-compose.yml
similarity index 98%
rename from docker/stacks/single-tenant-host/docker-compose.yaml
rename to docker/stacks/single-tenant-host/docker-compose.yml
index e5f662ed74a..a336201bfe3 100644
--- a/docker/stacks/single-tenant-host/docker-compose.yaml
+++ b/docker/stacks/single-tenant-host/docker-compose.yml
@@ -17,7 +17,7 @@ services:
   postgres:
     container_name: postgres
     profiles: ["databases"]
-    image: postgres:15.4
+    image: pgvector/pgvector:0.6.2-pg15
     restart: always
     env_file: .env
     environment:
diff --git a/package.json b/package.json
index 82179da713f..7312d1f47d3 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
     "jscodeshift": "^0.14.0",
-    "kysely": "^0.27.2",
+    "kysely": "^0.27.3",
     "kysely-codegen": "^0.11.0",
     "lerna": "^6.4.1",
     "mini-css-extract-plugin": "^2.7.2",
diff --git a/packages/client/shared/gqlIds/EmbedderChannelId.ts b/packages/client/shared/gqlIds/EmbedderChannelId.ts
new file mode 100644
index 00000000000..f1fb49341ef
--- /dev/null
+++ b/packages/client/shared/gqlIds/EmbedderChannelId.ts
@@ -0,0 +1,9 @@
+export const EmbedderChannelId = {
+  join: (serverId: string) => `embedder:${serverId}`,
+  split: (id: string) => {
+    const [, serverId] = id.split(':')
+    return serverId
+  }
+}
+
+export default EmbedderChannelId
diff --git a/packages/client/types/generics.ts b/packages/client/types/generics.ts
index 663bbd7ac52..7a1d76dafb0 100644
--- a/packages/client/types/generics.ts
+++ b/packages/client/types/generics.ts
@@ -100,6 +100,9 @@ export type WithFieldsAsType<TObj, NType, F> = {
     : TObj[K]
 }
 
+export type Tuple<T, N, R extends T[] = []> = R['length'] extends N ? R : Tuple<T, N, [...R, T]>
+export type ParseInt<T extends string> = T extends `${infer Digit extends number}` ? Digit : never
+
 declare global {
   interface Array<T> {
     findLastIndex(predicate: (value: T, index: number, obj: T[]) => unknown, thisArg?: any): number
diff --git a/packages/embedder/EMBEDDER_JOB_PRIORITY.ts b/packages/embedder/EMBEDDER_JOB_PRIORITY.ts
new file mode 100644
index 00000000000..a54e4b5c67d
--- /dev/null
+++ b/packages/embedder/EMBEDDER_JOB_PRIORITY.ts
@@ -0,0 +1,6 @@
+export const EMBEDDER_JOB_PRIORITY = {
+  MEETING: 40,
+  DEFAULT: 50,
+  TOPIC_HISTORY: 80,
+  NEW_MODEL: 90
+} as const
diff --git a/packages/embedder/EmbeddingsJobQueueStream.ts b/packages/embedder/EmbeddingsJobQueueStream.ts
new file mode 100644
index 00000000000..7f5b1bde03d
--- /dev/null
+++ b/packages/embedder/EmbeddingsJobQueueStream.ts
@@ -0,0 +1,72 @@
+import {Selectable, sql} from 'kysely'
+import ms from 'ms'
+import sleep from 'parabol-client/utils/sleep'
+import 'parabol-server/initSentry'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {DB} from 'parabol-server/postgres/pg'
+import RootDataLoader from '../server/dataloader/RootDataLoader'
+import {processJob} from './processJob'
+import {Logger} from '../server/utils/Logger'
+
+export type DBJob = Selectable<DB['EmbeddingsJobQueue']>
+export type EmbedJob = DBJob & {
+  jobType: 'embed'
+  jobData: {
+    embeddingsMetadataId: number
+    model: string
+  }
+}
+export type RerankJob = DBJob & {jobType: 'rerank'; jobData: {discussionIds: string[]}}
+export type Job = EmbedJob | RerankJob
+
+export class EmbeddingsJobQueueStream implements AsyncIterableIterator<Job> {
+  [Symbol.asyncIterator]() {
+    return this
+  }
+  dataLoader = new RootDataLoader({maxBatchSize: 1000})
+  async next(): Promise<IteratorResult<Job>> {
+    const pg = getKysely()
+    const getJob = (isFailed: boolean) => {
+      return pg
+        .with(
+          (cte) => cte('ids').materialized(),
+          (db) =>
+            db
+              .selectFrom('EmbeddingsJobQueue')
+              .select('id')
+              .orderBy(['priority'])
+              .$if(!isFailed, (db) => db.where('state', '=', 'queued'))
+              .$if(isFailed, (db) =>
+                db.where('state', '=', 'failed').where('retryAfter', '<', new Date())
+              )
+              .limit(1)
+              .forUpdate()
+              .skipLocked()
+        )
+        .updateTable('EmbeddingsJobQueue')
+        .set({state: 'running', startAt: new Date()})
+        .where('id', '=', sql<number>`ANY(SELECT id FROM ids)`)
+        .returningAll()
+        .executeTakeFirst()
+    }
+    const job = (await getJob(false)) || (await getJob(true))
+    if (!job) {
+      Logger.log('JobQueueStream: no jobs found')
+      // queue is empty, so sleep for a while
+      await sleep(ms('1m'))
+      return this.next()
+    }
+
+    const isSuccessful = await processJob(job as Job, this.dataLoader)
+    if (isSuccessful) {
+      await pg.deleteFrom('EmbeddingsJobQueue').where('id', '=', job.id).executeTakeFirstOrThrow()
+    }
+    return {done: false, value: job as Job}
+  }
+  return() {
+    return Promise.resolve({done: true as const, value: undefined})
+  }
+  throw(error: any) {
+    return Promise.resolve({done: true, value: error})
+  }
+}
diff --git a/packages/embedder/README.md b/packages/embedder/README.md
index fc3fc68f335..36bb8e2ea50 100644
--- a/packages/embedder/README.md
+++ b/packages/embedder/README.md
@@ -3,27 +3,14 @@
 This service builds embedding vectors for semantic search and for other AI/ML
 use cases. It does so by:
 
-1.  Updating a list of all possible items to create embedding vectors for and
-    storing that list in the `EmbeddingsMetadata` table
-2.  Adding these items in batches to the `EmbeddingsJobQueue` table and a redis
-    priority queue called `embedder:queue`
-3.  Allowing one or more parallel embedding services to calculate embedding
-    vectors (EmbeddingJobQueue states transistion from `queued` -> `embedding`,
-    then `embedding` -> [deleting the `EmbeddingJobQueue` row]
-
-    In addition to deleteing the `EmbeddingJobQueue` row, when a job completes
-    successfully:
-
-    - A row is added to the model table with the embedding vector; the
-      `EmbeddingMetadataId` field on this row points the appropriate
-      metadata row on `EmbeddingsMetadata`
-    - The `EmbeddingsMetadata.models` array is updated with the name of the
-      table that the embedding has been generated for
-
-4.  This process repeats forever using a silly polling loop
-
-In the future, it would be wonderful to enhance this service such that it were
-event driven.
+1. Homogenizes different types of data into a single `EmbeddingsMetadata` table
+2. Each new row in `EmbeddingsMetadata` creates a new row in `EmbeddingsJobQueue` for each model
+3. Uses PG to pick a job from the queue and sets the job from `queued` -> `embedding`,
+   then `embedding` -> [deleting the `EmbeddingJobQueue` row]
+4. Embedding involves creating a `fullText` from the work item and then a vector from that `fullText`
+5. New jobs to add metadata are sent via redis streams from the GQL Executor
+6. If embedding fails, the application increments the `retryCount` and increases the `retryAfter` if a retry is desired
+7. If a job gets stalled, a process that runs every 5 minutes will look for jobs older than 5 minutes and reset them to `queued`
 
 ## Prerequisites
 
@@ -37,10 +24,9 @@ The predeploy script checks for an environment variable
 The Embedder service takes no arguments and is controlled by the following
 environment variables, here given with example configuration:
 
-- `AI_EMBEDDER_ENABLE`: enable/disable the embedder service from
-  performing work, or sleeping indefinitely
+- `AI_EMBEDDER_WORKERS`: How many workers should simultaneously pick jobs from the queue. If less than 1, disabled.
 
-`AI_EMBEDDER_ENABLED='true'`
+`AI_EMBEDDER_WORKERS='1'`
 
 - `AI_EMBEDDING_MODELS`: JSON configuration for which embedding models
   are enabled. Each model in the array will be instantiated by
@@ -69,3 +55,10 @@ environment variables, here given with example configuration:
 The Embedder service is stateless and takes no arguments. Multiple instances
 of the service may be started in order to match embedding load, or to
 catch up on history more quickly.
+
+## Resources
+
+### PG as a Job Queue
+
+- https://leontrolski.github.io/postgres-as-queue.html
+- https://www.2ndquadrant.com/en/blog/what-is-select-skip-locked-for-in-postgresql-9-5/
diff --git a/packages/embedder/addEmbeddingsMetadata.ts b/packages/embedder/addEmbeddingsMetadata.ts
new file mode 100644
index 00000000000..214fecc0409
--- /dev/null
+++ b/packages/embedder/addEmbeddingsMetadata.ts
@@ -0,0 +1,15 @@
+import {addEmbeddingsMetadataForRetrospectiveDiscussionTopic} from './addEmbeddingsMetadataForRetrospectiveDiscussionTopic'
+import {MessageToEmbedder} from './custom'
+
+export const addEmbeddingsMetadata = async ({objectTypes, ...options}: MessageToEmbedder) => {
+  return Promise.all(
+    objectTypes.map((type) => {
+      switch (type) {
+        case 'retrospectiveDiscussionTopic':
+          return addEmbeddingsMetadataForRetrospectiveDiscussionTopic(options)
+        default:
+          throw new Error(`Invalid object type: ${type}`)
+      }
+    })
+  )
+}
diff --git a/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts b/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
new file mode 100644
index 00000000000..724aec6fb13
--- /dev/null
+++ b/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
@@ -0,0 +1,143 @@
+import {ExpressionOrFactory, SqlBool, sql} from 'kysely'
+import getRethink from 'parabol-server/database/rethinkDriver'
+import {RDatum} from 'parabol-server/database/stricterR'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {DB} from 'parabol-server/postgres/pg'
+import {Logger} from 'parabol-server/utils/Logger'
+import {EMBEDDER_JOB_PRIORITY} from './EMBEDDER_JOB_PRIORITY'
+import getModelManager from './ai_models/ModelManager'
+import {EmbedderOptions} from './custom'
+
+interface DiscussionMeta {
+  id: string
+  teamId: string
+  createdAt: Date
+}
+
+const validateDiscussions = async (discussions: (DiscussionMeta & {meetingId: string})[]) => {
+  const r = await getRethink()
+  if (discussions.length === 0) return discussions
+  // Exclude discussions that belong to an unfinished meeting
+  const meetingIds = [...new Set(discussions.map(({meetingId}) => meetingId))]
+  const endedMeetingIds = await r
+    .table('NewMeeting')
+    .getAll(r.args(meetingIds), {index: 'id'})
+    .filter((row: RDatum) => row('endedAt').default(null).ne(null))('id')
+    .distinct()
+    .run()
+  const endedMeetingIdsSet = new Set(endedMeetingIds)
+  return discussions.filter(({meetingId}) => endedMeetingIdsSet.has(meetingId))
+}
+
+const insertDiscussionsIntoMetadata = async (discussions: DiscussionMeta[], priority: number) => {
+  const pg = getKysely()
+  const metadataRows = discussions.map(({id, teamId, createdAt}) => ({
+    refId: id,
+    objectType: 'retrospectiveDiscussionTopic' as const,
+    teamId,
+    // Not techincally updatedAt since discussions are be updated after they get created
+    refUpdatedAt: createdAt
+  }))
+  if (!metadataRows[0]) return
+
+  const modelManager = getModelManager()
+  const models = modelManager.embeddingModels.map((m) => m.tableName)
+  return (
+    pg
+      .with('Insert', (qc) =>
+        qc
+          .insertInto('EmbeddingsMetadata')
+          .values(metadataRows)
+          .onConflict((oc) => oc.doNothing())
+          .returning('id')
+      )
+      // create n*m rows for n models & m discussions
+      .with('Metadata', (qc) =>
+        qc
+          .selectFrom('Insert')
+          .fullJoin(sql<{model: string}>`UNNEST(ARRAY[${sql.join(models)}])`.as('model'), (join) =>
+            join.onTrue()
+          )
+          .select(['id', 'model'])
+      )
+      .insertInto('EmbeddingsJobQueue')
+      .columns(['jobType', 'priority', 'jobData'])
+      .expression(({selectFrom}) =>
+        selectFrom('Metadata').select(({lit, fn, ref}) => [
+          sql.lit('embed').as('jobType'),
+          lit(priority).as('priority'),
+          fn('json_build_object', [
+            sql.lit('embeddingsMetadataId'),
+            ref('Metadata.id'),
+            sql.lit('model'),
+            ref('Metadata.model')
+          ]).as('jobData')
+        ])
+      )
+      .execute()
+  )
+}
+
+export const addEmbeddingsMetadataForRetrospectiveDiscussionTopic = async ({
+  startAt,
+  endAt,
+  meetingId
+}: EmbedderOptions) => {
+  // load up the metadata table will all discussion topics that are a part of meetings ended within the given date range
+  const pg = getKysely()
+  if (meetingId) {
+    const discussions = await pg
+      .selectFrom('Discussion')
+      .select(['id', 'teamId', 'createdAt'])
+      .where('meetingId', '=', meetingId)
+      .execute()
+    await insertDiscussionsIntoMetadata(discussions, EMBEDDER_JOB_PRIORITY.MEETING)
+    return
+  }
+  // PG only accepts 65K parameters (inserted columns * number of rows + query params). Make the batches as big as possible
+  const PG_MAX_PARAMS = 65535
+  const QUERY_PARAMS = 10
+  const METADATA_COLS_PER_ROW = 4
+  const BATCH_SIZE = Math.floor((PG_MAX_PARAMS - QUERY_PARAMS) / METADATA_COLS_PER_ROW)
+  const pgStartAt = startAt || new Date(0)
+  const pgEndAt = (endAt || new Date('4000-01-01')).getTime() / 1000
+
+  let curEndAt = pgEndAt
+  let curEndId = ''
+  for (let i = 0; i < 1e6; i++) {
+    // preserve microsecond resolution to keep timestamps equal
+    // so we can use the ID as a tiebreaker when count(createdAt) > BATCH_SIZE
+    const pgTime = sql<Date>`to_timestamp(${curEndAt})`
+    const lessThanTimeOrId: ExpressionOrFactory<DB, 'Discussion', SqlBool> = curEndId
+      ? ({eb}) =>
+          eb('createdAt', '<', pgTime).or(eb('createdAt', '=', pgTime).and('id', '>', curEndId))
+      : ({eb}) => eb('createdAt', '<=', pgTime)
+    const discussions = await pg
+      .selectFrom('Discussion')
+      .select([
+        'id',
+        'teamId',
+        'createdAt',
+        'meetingId',
+        sql<number>`extract(epoch from "createdAt")`.as('createdAtEpoch')
+      ])
+      .where('createdAt', '>', pgStartAt)
+      .where(lessThanTimeOrId)
+      .where('discussionTopicType', '=', 'reflectionGroup')
+      .orderBy('createdAt', 'desc')
+      .orderBy('id')
+      .limit(BATCH_SIZE)
+      .execute()
+    const earliestDiscussionInBatch = discussions.at(-1)
+    if (!earliestDiscussionInBatch) break
+    const {createdAtEpoch, id} = earliestDiscussionInBatch
+    curEndId = curEndAt === createdAtEpoch ? id : ''
+    curEndAt = createdAtEpoch
+    const validDiscussions = await validateDiscussions(discussions)
+    await insertDiscussionsIntoMetadata(validDiscussions, EMBEDDER_JOB_PRIORITY.TOPIC_HISTORY)
+    const jsTime = new Date(createdAtEpoch * 1000)
+    Logger.log(
+      `Inserted ${validDiscussions.length}/${discussions.length} discussions in metadata ending at ${jsTime}`
+    )
+  }
+}
diff --git a/packages/embedder/ai_models/AbstractEmbeddingsModel.ts b/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
new file mode 100644
index 00000000000..9fd5831ea1f
--- /dev/null
+++ b/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
@@ -0,0 +1,126 @@
+import {sql} from 'kysely'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {DB} from 'parabol-server/postgres/pg'
+import {Logger} from '../../server/utils/Logger'
+import {EMBEDDER_JOB_PRIORITY} from '../EMBEDDER_JOB_PRIORITY'
+import {ISO6391} from '../iso6393To1'
+import {AbstractModel, ModelConfig} from './AbstractModel'
+
+export interface EmbeddingModelParams {
+  embeddingDimensions: number
+  maxInputTokens: number
+  tableSuffix: string
+  languages: ISO6391[]
+}
+export type EmbeddingsTable = Extract<keyof DB, `Embeddings_${string}`>
+export interface EmbeddingModelConfig extends ModelConfig {
+  tableSuffix: string
+}
+
+export abstract class AbstractEmbeddingsModel extends AbstractModel {
+  readonly embeddingDimensions: number
+  readonly maxInputTokens: number
+  readonly tableName: string
+  readonly languages: ISO6391[]
+  constructor(config: EmbeddingModelConfig) {
+    super(config)
+    const modelParams = this.constructModelParams(config)
+    this.embeddingDimensions = modelParams.embeddingDimensions
+    this.languages = modelParams.languages
+    this.maxInputTokens = modelParams.maxInputTokens
+    this.tableName = `Embeddings_${modelParams.tableSuffix}`
+  }
+  protected abstract constructModelParams(config: EmbeddingModelConfig): EmbeddingModelParams
+  abstract getEmbedding(content: string, retries?: number): Promise<number[] | Error>
+
+  abstract getTokens(content: string): Promise<number[] | Error>
+  splitText(content: string) {
+    // it's actually 4 / 3, but don't want to chance a failed split
+    const TOKENS_PER_WORD = 5 / 3
+    const WORD_LIMIT = Math.floor(this.maxInputTokens / TOKENS_PER_WORD)
+    const chunks: string[] = []
+    const delimiters = ['\n\n', '\n', '.', ' ']
+    const countWords = (text: string) => text.trim().split(/\s+/).length
+    const splitOnDelimiter = (text: string, delimiter: string) => {
+      const sections = text.split(delimiter)
+      for (let i = 0; i < sections.length; i++) {
+        const section = sections[i]!
+        const sectionWordCount = countWords(section)
+        if (sectionWordCount < WORD_LIMIT) {
+          // try to merge this section with the last one
+          const previousSection = chunks.at(-1)
+          if (previousSection) {
+            const combinedChunks = `${previousSection}${delimiter}${section}`
+            const mergedWordCount = countWords(combinedChunks)
+            if (mergedWordCount < WORD_LIMIT) {
+              chunks[chunks.length - 1] = combinedChunks
+              continue
+            }
+          }
+          chunks.push(section)
+        } else {
+          const nextDelimiter = delimiters[delimiters.indexOf(delimiter) + 1]!
+          splitOnDelimiter(section, nextDelimiter)
+        }
+      }
+    }
+    splitOnDelimiter(content.trim(), delimiters[0]!)
+    return chunks
+  }
+
+  async createEmbeddingsForModel() {
+    Logger.log(`Queueing EmbeddingsMetadata into EmbeddingsJobQueue for ${this.tableName}`)
+    const pg = getKysely()
+    await pg
+      .insertInto('EmbeddingsJobQueue')
+      .columns(['jobData', 'priority'])
+      .expression(({selectFrom}) =>
+        selectFrom('EmbeddingsMetadata')
+          .select(({fn, lit}) => [
+            fn('json_build_object', [
+              sql.lit('model'),
+              sql.lit(this.tableName),
+              sql.lit('embeddingsMetadataId'),
+              'id'
+            ]).as('jobData'),
+            lit(EMBEDDER_JOB_PRIORITY.NEW_MODEL).as('priority')
+          ])
+          .where('language', 'in', this.languages)
+      )
+      .onConflict((oc) => oc.doNothing())
+      .execute()
+  }
+  async createTable() {
+    const pg = getKysely()
+    const hasTable =
+      (
+        await sql<number[]>`SELECT 1 FROM ${sql.id('pg_catalog', 'pg_tables')} WHERE ${sql.id(
+          'tablename'
+        )} = ${this.tableName}`.execute(pg)
+      ).rows.length > 0
+    if (hasTable) return undefined
+    const vectorDimensions = this.embeddingDimensions
+    Logger.log(`ModelManager: creating ${this.tableName} with ${vectorDimensions} dimensions`)
+    await sql`
+      DO $$
+        BEGIN
+        CREATE TABLE IF NOT EXISTS ${sql.id(this.tableName)} (
+          "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+          "embedText" TEXT,
+          "embedding" vector(${sql.raw(vectorDimensions.toString())}),
+          "embeddingsMetadataId" INTEGER UNIQUE NOT NULL,
+          "chunkNumber" SMALLINT,
+          UNIQUE("embeddingsMetadataId", "chunkNumber"),
+          FOREIGN KEY ("embeddingsMetadataId")
+            REFERENCES "EmbeddingsMetadata"("id")
+            ON DELETE CASCADE
+        );
+        CREATE INDEX IF NOT EXISTS "idx_${sql.raw(this.tableName)}_embedding_vector_cosign_ops"
+          ON ${sql.id(this.tableName)}
+          USING hnsw ("embedding" vector_cosine_ops);
+        END
+      $$;
+      `.execute(pg)
+    await this.createEmbeddingsForModel()
+  }
+}
diff --git a/packages/embedder/ai_models/AbstractGenerationModel.ts b/packages/embedder/ai_models/AbstractGenerationModel.ts
new file mode 100644
index 00000000000..c57d86c243a
--- /dev/null
+++ b/packages/embedder/ai_models/AbstractGenerationModel.ts
@@ -0,0 +1,26 @@
+import {AbstractModel, ModelConfig} from './AbstractModel'
+
+export interface GenerationOptions {
+  maxNewTokens?: number
+  seed?: number
+  stop?: string
+  temperature?: number
+  topK?: number
+  topP?: number
+}
+export interface GenerationModelParams {
+  maxInputTokens: number
+}
+export interface GenerationModelConfig extends ModelConfig {}
+
+export abstract class AbstractGenerationModel extends AbstractModel {
+  readonly maxInputTokens: number
+  constructor(config: GenerationModelConfig) {
+    super(config)
+    const modelParams = this.constructModelParams(config)
+    this.maxInputTokens = modelParams.maxInputTokens
+  }
+
+  protected abstract constructModelParams(config: GenerationModelConfig): GenerationModelParams
+  abstract summarize(content: string, options: GenerationOptions): Promise<string>
+}
diff --git a/packages/embedder/ai_models/AbstractModel.ts b/packages/embedder/ai_models/AbstractModel.ts
index b57d220cd35..3b114558539 100644
--- a/packages/embedder/ai_models/AbstractModel.ts
+++ b/packages/embedder/ai_models/AbstractModel.ts
@@ -3,71 +3,18 @@ export interface ModelConfig {
   url: string
 }
 
-export interface EmbeddingModelConfig extends ModelConfig {
-  tableSuffix: string
-}
-
-export interface GenerationModelConfig extends ModelConfig {}
-
 export abstract class AbstractModel {
-  public readonly url?: string
+  public readonly url: string
 
   constructor(config: ModelConfig) {
     this.url = this.normalizeUrl(config.url)
   }
 
   // removes a trailing slash from the inputUrl
-  private normalizeUrl(inputUrl: string | undefined) {
-    if (!inputUrl) return undefined
+  private normalizeUrl(inputUrl: string) {
     const regex = /[/]+$/
     return inputUrl.replace(regex, '')
   }
 }
 
-export interface EmbeddingModelParams {
-  embeddingDimensions: number
-  maxInputTokens: number
-  tableSuffix: string
-}
-
-export abstract class AbstractEmbeddingsModel extends AbstractModel {
-  readonly embeddingDimensions: number
-  readonly maxInputTokens: number
-  readonly tableName: string
-  constructor(config: EmbeddingModelConfig) {
-    super(config)
-    const modelParams = this.constructModelParams(config)
-    this.embeddingDimensions = modelParams.embeddingDimensions
-    this.maxInputTokens = modelParams.maxInputTokens
-    this.tableName = `Embeddings_${modelParams.tableSuffix}`
-  }
-  protected abstract constructModelParams(config: EmbeddingModelConfig): EmbeddingModelParams
-  abstract getEmbedding(content: string): Promise<number[]>
-}
-
-export interface GenerationModelParams {
-  maxInputTokens: number
-}
-
-export interface GenerationOptions {
-  maxNewTokens?: number
-  seed?: number
-  stop?: string
-  temperature?: number
-  topK?: number
-  topP?: number
-}
-
-export abstract class AbstractGenerationModel extends AbstractModel {
-  readonly maxInputTokens: number
-  constructor(config: GenerationModelConfig) {
-    super(config)
-    const modelParams = this.constructModelParams(config)
-    this.maxInputTokens = modelParams.maxInputTokens
-  }
-
-  protected abstract constructModelParams(config: GenerationModelConfig): GenerationModelParams
-  abstract summarize(content: string, options: GenerationOptions): Promise<string>
-}
-
 export default AbstractModel
diff --git a/packages/embedder/ai_models/ModelManager.ts b/packages/embedder/ai_models/ModelManager.ts
index bf6888378c8..55bf3feeadc 100644
--- a/packages/embedder/ai_models/ModelManager.ts
+++ b/packages/embedder/ai_models/ModelManager.ts
@@ -1,12 +1,6 @@
-import {Kysely, sql} from 'kysely'
-
-import {
-  AbstractEmbeddingsModel,
-  AbstractGenerationModel,
-  EmbeddingModelConfig,
-  GenerationModelConfig,
-  ModelConfig
-} from './AbstractModel'
+import {AbstractEmbeddingsModel, EmbeddingModelConfig} from './AbstractEmbeddingsModel'
+import {AbstractGenerationModel, GenerationModelConfig} from './AbstractGenerationModel'
+import {ModelConfig} from './AbstractModel'
 import OpenAIGeneration from './OpenAIGeneration'
 import TextEmbeddingsInference from './TextEmbeddingsInference'
 import TextGenerationInference from './TextGenerationInference'
@@ -16,8 +10,8 @@ interface ModelManagerConfig {
   generationModels: GenerationModelConfig[]
 }
 
-export type EmbeddingsModelType = 'text-embeddings-inference'
-export type GenerationModelType = 'openai' | 'text-generation-inference'
+type EmbeddingsModelType = 'text-embeddings-inference'
+type GenerationModelType = 'openai' | 'text-generation-inference'
 
 export class ModelManager {
   embeddingModels: AbstractEmbeddingsModel[]
@@ -93,39 +87,8 @@ export class ModelManager {
     })
   }
 
-  async maybeCreateTables(pg: Kysely<any>) {
-    const maybePromises = this.embeddingModels.map(async (embeddingsModel) => {
-      const tableName = embeddingsModel.tableName
-      const hasTable =
-        (
-          await sql<number[]>`SELECT 1 FROM ${sql.id('pg_catalog', 'pg_tables')} WHERE ${sql.id(
-            'tablename'
-          )} = ${tableName}`.execute(pg)
-        ).rows.length > 0
-      if (hasTable) return undefined
-      const vectorDimensions = embeddingsModel.embeddingDimensions
-      console.log(`ModelManager: creating ${tableName} with ${vectorDimensions} dimensions`)
-      const query = sql`
-      DO $$
-  BEGIN
-  CREATE TABLE IF NOT EXISTS ${sql.id(tableName)} (
-    "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-    "embedText" TEXT,
-    "embedding" vector(${sql.raw(vectorDimensions.toString())}),
-    "embeddingsMetadataId" INTEGER NOT NULL,
-    FOREIGN KEY ("embeddingsMetadataId")
-      REFERENCES "EmbeddingsMetadata"("id")
-      ON DELETE CASCADE
-  );
-  CREATE INDEX IF NOT EXISTS "idx_${sql.raw(tableName)}_embedding_vector_cosign_ops"
-    ON ${sql.id(tableName)}
-    USING hnsw ("embedding" vector_cosine_ops);
-  END $$;
-
-      `
-      return query.execute(pg)
-    })
-    Promise.all(maybePromises)
+  async maybeCreateTables() {
+    return Promise.all(this.embeddingModels.map((model) => model.createTable()))
   }
 }
 
diff --git a/packages/embedder/ai_models/OpenAIGeneration.ts b/packages/embedder/ai_models/OpenAIGeneration.ts
index 9818012edb4..697160513ae 100644
--- a/packages/embedder/ai_models/OpenAIGeneration.ts
+++ b/packages/embedder/ai_models/OpenAIGeneration.ts
@@ -4,7 +4,7 @@ import {
   GenerationModelConfig,
   GenerationModelParams,
   GenerationOptions
-} from './AbstractModel'
+} from './AbstractGenerationModel'
 
 export type ModelId = 'gpt-3.5-turbo-0125' | 'gpt-4-turbo-preview'
 
diff --git a/packages/embedder/ai_models/TextEmbeddingsInference.ts b/packages/embedder/ai_models/TextEmbeddingsInference.ts
index 549fadcd6fd..c30c59e8e8d 100644
--- a/packages/embedder/ai_models/TextEmbeddingsInference.ts
+++ b/packages/embedder/ai_models/TextEmbeddingsInference.ts
@@ -1,20 +1,25 @@
-import {AbstractEmbeddingsModel, EmbeddingModelConfig, EmbeddingModelParams} from './AbstractModel'
-import fetchWithRetry from './helpers/fetchWithRetry'
-
-const MAX_REQUEST_TIME_S = 3 * 60
-
+import createClient from 'openapi-fetch'
+import sleep from 'parabol-client/utils/sleep'
+import type {paths} from '../textEmbeddingsnterface'
+import {
+  AbstractEmbeddingsModel,
+  EmbeddingModelConfig,
+  EmbeddingModelParams
+} from './AbstractEmbeddingsModel'
 export type ModelId = 'BAAI/bge-large-en-v1.5' | 'llmrails/ember-v1'
 
 const modelIdDefinitions: Record<ModelId, EmbeddingModelParams> = {
   'BAAI/bge-large-en-v1.5': {
     embeddingDimensions: 1024,
     maxInputTokens: 512,
-    tableSuffix: 'bge_l_en_1p5'
+    tableSuffix: 'bge_l_en_1p5',
+    languages: ['en']
   },
   'llmrails/ember-v1': {
     embeddingDimensions: 1024,
     maxInputTokens: 512,
-    tableSuffix: 'ember_1'
+    tableSuffix: 'ember_1',
+    languages: ['en']
   }
 }
 
@@ -23,34 +28,60 @@ function isValidModelId(object: any): object is ModelId {
 }
 
 export class TextEmbeddingsInference extends AbstractEmbeddingsModel {
+  client: ReturnType<typeof createClient<paths>>
   constructor(config: EmbeddingModelConfig) {
     super(config)
+    this.client = createClient<paths>({baseUrl: this.url})
   }
 
-  public async getEmbedding(content: string) {
-    const fetchOptions = {
-      body: JSON.stringify({inputs: content}),
-      deadline: new Date(new Date().getTime() + MAX_REQUEST_TIME_S * 1000),
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json; charset=utf-8'
-      },
-      method: 'POST'
+  async getTokens(content: string) {
+    try {
+      const {data, error} = await this.client.POST('/tokenize', {
+        body: {inputs: content, add_special_tokens: true},
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json; charset=utf-8'
+        }
+      })
+      if (error) return new Error(error.error)
+      return data[0]!.map(({id}) => id)
+    } catch (e) {
+      return e instanceof Error ? e : new Error(e as string)
     }
+  }
 
+  async decodeTokens(inputIds: number[]) {
+    try {
+      const {data, error} = await this.client.POST('/decode', {
+        body: {ids: inputIds},
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json; charset=utf-8'
+        }
+      })
+      if (error) return new Error(error.error)
+      return data
+    } catch (e) {
+      return e instanceof Error ? e : new Error(e as string)
+    }
+  }
+  public async getEmbedding(content: string, retries = 5): Promise<number[] | Error> {
     try {
-      const res = await fetchWithRetry(`${this.url}/embed`, fetchOptions)
-      const listOfVectors = (await res.json()) as Array<number[]>
-      if (!listOfVectors)
-        throw new Error('TextEmbeddingsInference.getEmbeddings(): listOfVectors is undefined')
-      if (listOfVectors.length !== 1 || !listOfVectors[0])
-        throw new Error(
-          `TextEmbeddingsInference.getEmbeddings(): listOfVectors list length !== 1 (length: ${listOfVectors.length})`
-        )
-      return listOfVectors[0]
+      const {data, error, response} = await this.client.POST('/embed', {
+        body: {inputs: content},
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json; charset=utf-8'
+        }
+      })
+      if (error) {
+        if (response.status !== 429 || retries < 1) return new Error(error.error)
+        await sleep(2000)
+        return this.getEmbedding(content, retries - 1)
+      }
+      return data[0]!
     } catch (e) {
-      console.log(`TextEmbeddingsInference.getEmbeddings() timeout: `, e)
-      throw e
+      return e instanceof Error ? e : new Error(e as string)
     }
   }
 
diff --git a/packages/embedder/ai_models/TextGenerationInference.ts b/packages/embedder/ai_models/TextGenerationInference.ts
index bcf1daa6303..8fa4ab7cd7b 100644
--- a/packages/embedder/ai_models/TextGenerationInference.ts
+++ b/packages/embedder/ai_models/TextGenerationInference.ts
@@ -3,7 +3,7 @@ import {
   GenerationModelConfig,
   GenerationModelParams,
   GenerationOptions
-} from './AbstractModel'
+} from './AbstractGenerationModel'
 import fetchWithRetry from './helpers/fetchWithRetry'
 
 const MAX_REQUEST_TIME_S = 3 * 60
@@ -51,7 +51,6 @@ export class TextGenerationInference extends AbstractGenerationModel {
     }
 
     try {
-      // console.log(`TextGenerationInference.summarize(): summarizing from ${this.url}/generate`)
       const res = await fetchWithRetry(`${this.url}/generate`, fetchOptions)
       const json = await res.json()
       if (!json || !json.generated_text)
diff --git a/packages/embedder/custom.d.ts b/packages/embedder/custom.d.ts
new file mode 100644
index 00000000000..6640974c6a9
--- /dev/null
+++ b/packages/embedder/custom.d.ts
@@ -0,0 +1,11 @@
+import type {DB} from '../server/postgres/pg'
+
+export type EmbeddingObjectType = DB['EmbeddingsMetadata']['objectType']
+
+export interface MessageToEmbedder {
+  objectTypes: EmbeddingObjectType[]
+  startAt?: Date
+  endAt?: Date
+  meetingId?: string
+}
+export type EmbedderOptions = Omit<MessageToEmbedder, 'objectTypes'>
diff --git a/packages/embedder/embedder.ts b/packages/embedder/embedder.ts
index dccd9492a02..628d0d8decd 100644
--- a/packages/embedder/embedder.ts
+++ b/packages/embedder/embedder.ts
@@ -1,42 +1,18 @@
 import tracer from 'dd-trace'
-import {Insertable} from 'kysely'
-import Redlock, {RedlockAbortSignal} from 'redlock'
-
+import EmbedderChannelId from 'parabol-client/shared/gqlIds/EmbedderChannelId'
 import 'parabol-server/initSentry'
-import getKysely from 'parabol-server/postgres/getKysely'
-import {DB} from 'parabol-server/postgres/pg'
-import getModelManager, {ModelManager} from './ai_models/ModelManager'
-import {countWords} from './indexing/countWords'
-import {createEmbeddingTextFrom} from './indexing/createEmbeddingTextFrom'
-import {
-  completeJobTxn,
-  insertNewJobs,
-  selectJobQueueItemById,
-  selectMetaToQueue,
-  selectMetadataByJobQueueId,
-  updateJobState
-} from './indexing/embeddingsTablesOps'
-import {getRedisClient} from './indexing/getRedisClient'
-import {getRootDataLoader} from './indexing/getRootDataLoader'
-import {orgIdsWithFeatureFlag} from './indexing/orgIdsWithFeatureFlag'
-import {refreshRetroDiscussionTopicsMeta} from './indexing/retrospectiveDiscussionTopic'
-
-/*
- * TODO List
- * - [ ] implement a clean-up function that re-queues items that haven't transitioned
- *       to a completed state, or that failed
- */
-
-export type DBInsert = {
-  [K in keyof DB]: Insertable<DB[K]>
-}
-
-const POLLING_PERIOD_SEC = 60 // How often do we try to grab the lock and re-index?
-const Q_MAX_LENGTH = 100 // How many EmbeddingIndex items do we batch in redis?
-const WORD_COUNT_TO_TOKEN_RATIO = 3.0 / 2 // We multiple the word count by this to estimate token count
-
-const {AI_EMBEDDER_ENABLED} = process.env
-const {SERVER_ID} = process.env
+import {Logger} from 'parabol-server/utils/Logger'
+import RedisInstance from 'parabol-server/utils/RedisInstance'
+import {Tuple} from '../client/types/generics'
+import RedisStream from '../gql-executor/RedisStream'
+import {EmbeddingsJobQueueStream} from './EmbeddingsJobQueueStream'
+import {addEmbeddingsMetadata} from './addEmbeddingsMetadata'
+import getModelManager from './ai_models/ModelManager'
+import {MessageToEmbedder} from './custom'
+import {establishPrimaryEmbedder} from './establishPrimaryEmbedder'
+import {importHistoricalMetadata} from './importHistoricalMetadata'
+import {mergeAsyncIterators} from './mergeAsyncIterators'
+import {resetStalledJobs} from './resetStalledJobs'
 
 tracer.init({
   service: `embedder`,
@@ -46,207 +22,89 @@ tracer.init({
 })
 tracer.use('pg')
 
-const refreshMetadata = async () => {
-  const dataLoader = getRootDataLoader()
-  await refreshRetroDiscussionTopicsMeta(dataLoader)
-  // In the future, other sorts of objects to index could be added here...
+const parseEmbedderMessage = (message: string): MessageToEmbedder => {
+  const {startAt, endAt, ...input} = JSON.parse(message)
+  return {
+    ...input,
+    startAt: startAt ? new Date(startAt) : undefined,
+    endAt: endAt ? new Date(endAt) : undefined
+  }
 }
-const maybeQueueMetadataItems = async (modelManager: ModelManager) => {
-  const redisClient = getRedisClient()
-  const queueLength = await redisClient.zcard('embedder:queue')
-  if (queueLength >= Q_MAX_LENGTH) return
-  const itemCountToQueue = Q_MAX_LENGTH - queueLength
-  const modelTables = modelManager.embeddingModels.map((m) => m.tableName)
-  const orgIds = await orgIdsWithFeatureFlag()
-
-  // For each configured embedding model, select rows from EmbeddingsMetadata
-  // that haven't been calculated nor exist in the EmbeddingsJobQueue yet
-  //
-  // Notes:
-  //   * `em.models @> ARRAY[v.model]` is an indexed query
-  //   * I don't love all overrides, I wish there was a better way
-  //     see: https://github.com/kysely-org/kysely/issues/872
-
-  const batchToQueue = await selectMetaToQueue(modelTables, orgIds, itemCountToQueue)
 
-  if (!batchToQueue.length) {
-    console.log(`embedder: no new items to queue`)
+const run = async () => {
+  const SERVER_ID = process.env.SERVER_ID
+  if (!SERVER_ID) throw new Error('env.SERVER_ID is required')
+  const embedderChannel = EmbedderChannelId.join(SERVER_ID)
+  const NUM_WORKERS = parseInt(process.env.AI_EMBEDDER_WORKERS!)
+  if (!(NUM_WORKERS > 0)) {
+    Logger.log('env.AI_EMBEDDER_WORKERS is < 0. Embedder will not run.')
     return
   }
 
-  const ejqHash: {
-    [key: string]: {
-      refUpdatedAt: Date
-    }
-  } = {}
-  const makeKey = (item: {objectType: string; refId: string}) => `${item.objectType}:${item.refId}`
-
-  const ejqValues = batchToQueue.map((item) => {
-    ejqHash[makeKey(item)] = {
-      refUpdatedAt: item.refUpdatedAt
-    }
-    return {
-      objectType: item.objectType,
-      refId: item.refId as string,
-      model: item.model,
-      state: 'queued' as const
-    }
-  }) as any[]
-
-  const ejqRows = await insertNewJobs(ejqValues)
-
-  ejqRows.forEach((item: any) => {
-    const {refUpdatedAt} = ejqHash[makeKey(item)]!
-    const score = new Date(refUpdatedAt).getTime()
-    redisClient.zadd('embedder:queue', score, item.id)
-  })
-
-  console.log(`embedder: queued ${batchToQueue.length} items`)
-}
-
-const dequeueAndEmbedUntilEmpty = async (modelManager: ModelManager) => {
-  const dataLoader = getRootDataLoader()
-  const redisClient = getRedisClient()
-  while (true) {
-    const maybeRedisQItem = await redisClient.zpopmax('embedder:queue', 1)
-    if (maybeRedisQItem.length < 2) return // Q is empty, all done!
-
-    const [id, _] = maybeRedisQItem
-    if (!id) {
-      console.log(`embedder: de-queued undefined item from embedder:queue`)
-      continue
-    }
-    const jobQueueId = parseInt(id, 10)
-    const jobQueueItem = (await selectJobQueueItemById(jobQueueId)) as any
-    if (!jobQueueItem) {
-      console.log(`embedder: unable to fetch EmbeddingsJobQueue.id = ${id}`)
-      continue
-    }
-
-    const metadata = await selectMetadataByJobQueueId(jobQueueId)
-    if (!metadata) {
-      await updateJobState(jobQueueId, 'failed', {
-        stateMessage: `unable to fetch metadata by EmbeddingsJobQueue.id = ${id}`
-      })
-      continue
-    }
-
-    let fullText = metadata?.fullText as string
-    try {
-      if (!fullText) {
-        fullText = await createEmbeddingTextFrom(jobQueueItem, dataLoader)
-      }
-    } catch (e) {
-      await updateJobState(jobQueueId, 'failed', {
-        stateMessage: `unable to create embedding text: ${e}`
-      })
-      continue
-    }
+  const redis = new RedisInstance(`embedder_${SERVER_ID}`)
+  const primaryLock = await establishPrimaryEmbedder(redis)
+  const modelManager = getModelManager()
+  let streams: AsyncIterableIterator<any> | undefined
+  const kill = () => {
+    primaryLock?.release()
+    streams?.return?.()
+    process.exit()
+  }
+  process.on('SIGTERM', kill)
+  process.on('SIGINT', kill)
+  if (primaryLock) {
+    // only 1 worker needs to perform these on startup
+    await modelManager.maybeCreateTables()
+    await importHistoricalMetadata()
+    resetStalledJobs()
+  }
 
-    const wordCount = countWords(fullText)
+  const onMessage = async (_channel: string, message: string) => {
+    const parsedMessage = parseEmbedderMessage(message)
+    await addEmbeddingsMetadata(parsedMessage)
+  }
 
-    const embeddingModel = modelManager.embeddingModelsMapByTable[jobQueueItem.model]
-    if (!embeddingModel) {
-      await updateJobState(jobQueueId, 'failed', {
-        stateMessage: `embedding model ${jobQueueItem.model} not available`
-      })
-      continue
-    }
-    const itemKey = `${jobQueueItem.objectType}:${jobQueueItem.refId}`
-    const modelTable = embeddingModel.tableName
+  // subscribe to consumer group
+  try {
+    await redis.xgroup(
+      'CREATE',
+      'embedMetadataStream',
+      'embedMetadataConsumerGroup',
+      '$',
+      'MKSTREAM'
+    )
+  } catch (e) {
+    // stream already exists
+  }
 
-    let embedText = fullText
-    const maxInputTokens = embeddingModel.maxInputTokens
-    // we're using word count as an appoximation of tokens
-    if (wordCount * WORD_COUNT_TO_TOKEN_RATIO > maxInputTokens) {
-      try {
-        const generator = modelManager.generationModels[0] // use 1st generator
-        if (!generator) throw new Error(`Generator unavailable`)
-        console.log(`embedder:     ...summarizing ${itemKey} for ${modelTable}`)
-        embedText = await generator.summarize(fullText, {maxNewTokens: maxInputTokens})
-      } catch (e) {
-        await updateJobState(jobQueueId, 'failed', {
-          stateMessage: `unable to summarize long embed text: ${e}`
-        })
+  const messageStream = new RedisStream(
+    'embedMetadataStream',
+    'embedMetadataConsumerGroup',
+    embedderChannel
+  )
+
+  // Assume 3 workers for type safety, but it doesn't really matter at runtime
+  const jobQueueStreams = Array.from(
+    {length: NUM_WORKERS},
+    () => new EmbeddingsJobQueueStream()
+  ) as Tuple<EmbeddingsJobQueueStream, 3>
+
+  Logger.log(`\n⚡⚡⚡️️ Server ID: ${SERVER_ID}. Embedder is ready ⚡⚡⚡️️️`)
+
+  streams = mergeAsyncIterators([messageStream, ...jobQueueStreams])
+  for await (const [idx, message] of streams) {
+    switch (idx) {
+      case 0:
+        onMessage('', message)
+        continue
+      default:
+        Logger.log(`Worker ${idx} finished job ${message.id}`)
         continue
-      }
-    }
-    // console.log(`embedText: ${embedText}`)
-
-    let embeddingVector: number[]
-    try {
-      embeddingVector = await embeddingModel.getEmbedding(embedText)
-    } catch (e) {
-      await updateJobState(jobQueueId, 'failed', {
-        stateMessage: `unable to get embeddings: ${e}`
-      })
-      continue
     }
-
-    // complete job, do the following atomically
-    // (1) update EmbeddingsMetadata to reflect model completion
-    // (2) upsert model table row with embedding
-    // (3) delete EmbeddingsJobQueue row
-    await completeJobTxn(modelTable, jobQueueId, metadata, fullText, embedText, embeddingVector)
-    console.log(`embedder: completed ${itemKey} -> ${modelTable}`)
   }
-}
-
-const tick = async (modelManager: ModelManager) => {
-  console.log(`embedder: tick`)
-  const redisClient = getRedisClient()
-  const redlock = new Redlock([redisClient], {
-    driftFactor: 0.01,
-    retryCount: 10,
-    retryDelay: 250,
-    retryJitter: 50,
-    automaticExtensionThreshold: 500
-  })
-
-  await redlock
-    .using(['embedder:lock'], 10000, async (signal: RedlockAbortSignal) => {
-      console.log(`embedder: acquired index queue lock`)
-      // N.B. one of the many benefits of using redlock is the using() interface
-      // will automatically extend the lock if these operations exceed the
-      // original redis timeout time
-      await refreshMetadata()
-      await maybeQueueMetadataItems(modelManager)
-
-      if (signal.aborted) {
-        // Not certain which conditions this would happen, it would
-        // happen after operations took place, so nothing much to do here.
-        console.log('embedder: lock was lost!')
-      }
-    })
-    .catch((err: string) => {
-      // Handle errors (including lock acquisition errors)
-      console.error('embedder: an error occurred ', err)
-    })
-  console.log('embedder: index queue lock released')
-
-  // get the highest priority item and embed it
-  await dequeueAndEmbedUntilEmpty(modelManager)
-
-  setTimeout(() => tick(modelManager), POLLING_PERIOD_SEC * 1000)
-}
-
-function parseEnvBoolean(envVarValue: string | undefined): boolean {
-  return envVarValue === 'true'
-}
 
-const run = async () => {
-  console.log(`embedder: run()`)
-  const embedderEnabled = parseEnvBoolean(AI_EMBEDDER_ENABLED)
-  const modelManager = getModelManager()
-  if (embedderEnabled && modelManager) {
-    const pg = getKysely()
-    await modelManager.maybeCreateTables(pg)
-    console.log(`\n⚡⚡⚡️️ Server ID: ${SERVER_ID}. Embedder is ready ⚡⚡⚡️️️`)
-    tick(modelManager)
-  } else {
-    console.log(`embedder: no valid configuration (check AI_EMBEDDER_ENABLED in .env)`)
-    // exit
-  }
+  // On graceful shutdown
+  Logger.log('Streaming Complete. Goodbye!')
 }
 
 run()
diff --git a/packages/embedder/establishPrimaryEmbedder.ts b/packages/embedder/establishPrimaryEmbedder.ts
new file mode 100644
index 00000000000..72f349d655f
--- /dev/null
+++ b/packages/embedder/establishPrimaryEmbedder.ts
@@ -0,0 +1,17 @@
+import ms from 'ms'
+import RedisInstance from 'parabol-server/utils/RedisInstance'
+import Redlock from 'redlock'
+
+export const establishPrimaryEmbedder = async (redis: RedisInstance) => {
+  const redlock = new Redlock([redis], {retryCount: 0})
+  const MAX_TIME_BETWEEN_WORKER_STARTUPS = ms('5s')
+  try {
+    const primaryWorkerLock = await redlock.acquire(
+      [`embedder_isPrimary_${process.env.npm_package_version}`],
+      MAX_TIME_BETWEEN_WORKER_STARTUPS
+    )
+    return primaryWorkerLock
+  } catch {
+    return undefined
+  }
+}
diff --git a/packages/embedder/importHistoricalMetadata.ts b/packages/embedder/importHistoricalMetadata.ts
new file mode 100644
index 00000000000..0b805f18888
--- /dev/null
+++ b/packages/embedder/importHistoricalMetadata.ts
@@ -0,0 +1,16 @@
+import {EmbeddingObjectType} from './custom'
+import {importHistoricalRetrospectiveDiscussionTopic} from './importHistoricalRetrospectiveDiscussionTopic'
+
+export const importHistoricalMetadata = async () => {
+  const OBJECT_TYPES: EmbeddingObjectType[] = ['retrospectiveDiscussionTopic']
+  return Promise.all(
+    OBJECT_TYPES.map(async (objectType) => {
+      switch (objectType) {
+        case 'retrospectiveDiscussionTopic':
+          return importHistoricalRetrospectiveDiscussionTopic()
+        default:
+          throw new Error(`Invalid object type: ${objectType}`)
+      }
+    })
+  )
+}
diff --git a/packages/embedder/importHistoricalRetrospectiveDiscussionTopic.ts b/packages/embedder/importHistoricalRetrospectiveDiscussionTopic.ts
new file mode 100644
index 00000000000..2469327a18a
--- /dev/null
+++ b/packages/embedder/importHistoricalRetrospectiveDiscussionTopic.ts
@@ -0,0 +1,37 @@
+import getKysely from 'parabol-server/postgres/getKysely'
+import {Logger} from 'parabol-server/utils/Logger'
+import {addEmbeddingsMetadataForRetrospectiveDiscussionTopic} from './addEmbeddingsMetadataForRetrospectiveDiscussionTopic'
+
+// Check to see if the oldest discussion topic exists in the metadata table
+// If not, get the date of the oldest discussion topic in the metadata table and import all items before that date
+export const importHistoricalRetrospectiveDiscussionTopic = async () => {
+  const pg = getKysely()
+  const isEarliestMetadataImported = await pg
+    .selectFrom('EmbeddingsMetadata')
+    .select('id')
+    .where(({eb, selectFrom}) =>
+      eb(
+        'EmbeddingsMetadata.refId',
+        '=',
+        selectFrom('Discussion')
+          .select('Discussion.id')
+          .where('discussionTopicType', '=', 'reflectionGroup')
+          .orderBy(['createdAt', 'id'])
+          .limit(1)
+      )
+    )
+    .limit(1)
+    .executeTakeFirst()
+
+  if (isEarliestMetadataImported) return
+  const earliestImportedDiscussion = await pg
+    .selectFrom('EmbeddingsMetadata')
+    .select(['id', 'refUpdatedAt', 'refId'])
+    .where('objectType', '=', 'retrospectiveDiscussionTopic')
+    .orderBy('refUpdatedAt')
+    .limit(1)
+    .executeTakeFirst()
+  const endAt = earliestImportedDiscussion?.refUpdatedAt ?? undefined
+  Logger.log(`Importing discussion history up to ${endAt || 'now'}`)
+  return addEmbeddingsMetadataForRetrospectiveDiscussionTopic({endAt})
+}
diff --git a/packages/embedder/indexing/countWords.ts b/packages/embedder/indexing/countWords.ts
deleted file mode 100644
index 75dae3effa2..00000000000
--- a/packages/embedder/indexing/countWords.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export function countWords(text: string) {
-  let count = 0
-  let inWord = false
-
-  for (const char of text) {
-    if (/\w/.test(char)) {
-      if (!inWord) {
-        count++
-        inWord = true
-      }
-    } else {
-      inWord = false
-    }
-  }
-
-  return count
-}
diff --git a/packages/embedder/indexing/createEmbeddingTextFrom.ts b/packages/embedder/indexing/createEmbeddingTextFrom.ts
index ce76c7fc380..9fb3cceda80 100644
--- a/packages/embedder/indexing/createEmbeddingTextFrom.ts
+++ b/packages/embedder/indexing/createEmbeddingTextFrom.ts
@@ -1,15 +1,17 @@
 import {Selectable} from 'kysely'
-import {DataLoaderWorker} from 'parabol-server/graphql/graphql'
 import {DB} from 'parabol-server/postgres/pg'
 
-import {createText as createTextFromRetrospectiveDiscussionTopic} from './retrospectiveDiscussionTopic'
+import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
+import {createTextFromRetrospectiveDiscussionTopic} from './retrospectiveDiscussionTopic'
 
 export const createEmbeddingTextFrom = async (
-  item: Selectable<DB['EmbeddingsJobQueue']>,
-  dataLoader: DataLoaderWorker
-): Promise<any> => {
-  switch ((item as any).objectType) {
+  embeddingsMetadata: Selectable<DB['EmbeddingsMetadata']>,
+  dataLoader: RootDataLoader
+) => {
+  switch (embeddingsMetadata.objectType) {
     case 'retrospectiveDiscussionTopic':
-      return createTextFromRetrospectiveDiscussionTopic(item, dataLoader)
+      return createTextFromRetrospectiveDiscussionTopic(embeddingsMetadata.refId, dataLoader)
+    default:
+      throw new Error(`Unexcepted objectType: ${embeddingsMetadata.objectType}`)
   }
 }
diff --git a/packages/embedder/indexing/embeddingsTablesOps.ts b/packages/embedder/indexing/embeddingsTablesOps.ts
deleted file mode 100644
index 4ce843248a9..00000000000
--- a/packages/embedder/indexing/embeddingsTablesOps.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import {Insertable, RawBuilder, Selectable, Updateable, sql} from 'kysely'
-import getKysely from 'parabol-server/postgres/getKysely'
-import {DB} from 'parabol-server/postgres/pg'
-import {DBInsert} from '../embedder'
-import numberVectorToString from './numberVectorToString'
-
-function unnestedArray<T>(maybeArray: T[] | T): RawBuilder<T> {
-  let a: T[] = Array.isArray(maybeArray) ? maybeArray : [maybeArray]
-  return sql`unnest(ARRAY[${sql.join(a)}]::varchar[])`
-}
-
-export const selectJobQueueItemById = async (
-  id: number
-): Promise<Selectable<DB['EmbeddingsJobQueue']> | undefined> => {
-  const pg = getKysely()
-  return pg.selectFrom('EmbeddingsJobQueue').selectAll().where('id', '=', id).executeTakeFirst()
-}
-export const selectMetadataByJobQueueId = async (
-  id: number
-): Promise<Selectable<DB['EmbeddingsMetadata']> | undefined> => {
-  const pg = getKysely()
-  return pg
-    .selectFrom('EmbeddingsMetadata as em')
-    .selectAll()
-    .leftJoin('EmbeddingsJobQueue as ejq', (join) =>
-      join
-        .onRef('em.objectType', '=', 'ejq.objectType' as any)
-        .onRef('em.refId', '=', 'ejq.refId' as any)
-    )
-    .where('ejq.id', '=', id)
-    .executeTakeFirstOrThrow()
-}
-
-// For each configured embedding model, select rows from EmbeddingsMetadata
-// that haven't been calculated nor exist in the EmbeddingsJobQueue yet
-//
-// Notes:
-//   * `em.models @> ARRAY[v.model]` is an indexed query
-//   * I don't love all overrides, I wish there was a better way
-//     see: https://github.com/kysely-org/kysely/issues/872
-export async function selectMetaToQueue(
-  configuredModels: string[],
-  orgIds: any[],
-  itemCountToQueue: number
-) {
-  const pg = getKysely()
-  const maybeMetaToQueue = (await pg
-    .selectFrom('EmbeddingsMetadata as em')
-    .selectAll('em')
-    .leftJoinLateral(unnestedArray(configuredModels).as('model'), (join) => join.onTrue())
-    .leftJoin('Team as t', 'em.teamId', 't.id')
-    .select('model' as any)
-    .where(({eb, not, or, and, exists, selectFrom}) =>
-      and([
-        or([
-          not(
-            eb('em.models' as any, '@>', sql`ARRAY[${sql.ref('model')}]::varchar[]` as any) as any
-          ),
-          eb('em.models' as any, 'is', null)
-        ]),
-        not(
-          exists(
-            selectFrom('EmbeddingsJobQueue as ejq')
-              .select('ejq.id')
-              .whereRef('em.objectType', '=', 'ejq.objectType' as any)
-              .whereRef('em.refId', '=', 'ejq.refId' as any)
-              .whereRef('ejq.model' as any, '=', 'model' as any)
-          )
-        ),
-        eb('t.orgId', 'in', orgIds)
-      ])
-    )
-    .limit(itemCountToQueue)
-    .execute()) as unknown as Selectable<DB['EmbeddingsMetadata'] & {model: string}>[]
-
-  type MetadataToQueue = Selectable<
-    Omit<DB['EmbeddingsMetadata'], 'refId'> & {
-      refId: NonNullable<DB['EmbeddingsMetadata']['refId']>
-    } & {model: string}
-  >
-
-  return maybeMetaToQueue.filter(
-    (item) => item.refId !== null && item.refId !== undefined
-  ) as MetadataToQueue[]
-}
-
-export const updateJobState = async (
-  id: number,
-  state: Updateable<DB['EmbeddingsJobQueue']>['state'],
-  jobQueueFields: Updateable<DB['EmbeddingsJobQueue']> = {}
-) => {
-  const pg = getKysely()
-  const jobQueueColumns: Updateable<DB['EmbeddingsJobQueue']> = {
-    ...jobQueueFields,
-    state
-  }
-  if (state === 'failed') console.log(`embedder: failed job ${id}, ${jobQueueFields.stateMessage}`)
-  return pg
-    .updateTable('EmbeddingsJobQueue')
-    .set(jobQueueColumns)
-    .where('id', '=', id)
-    .executeTakeFirstOrThrow()
-}
-
-export function insertNewJobs(ejqValues: Insertable<DB['EmbeddingsJobQueue']>[]) {
-  const pg = getKysely()
-  return pg
-    .insertInto('EmbeddingsJobQueue')
-    .values(ejqValues)
-    .returning(['id', 'objectType', 'refId'] as any)
-    .execute()
-}
-
-// complete job, do the following atomically
-// (1) update EmbeddingsMetadata to reflect model completion
-// (2) upsert model table row with embedding
-// (3) delete EmbeddingsJobQueue row
-export function completeJobTxn(
-  modelTable: string,
-  jobQueueId: number,
-  metadata: Updateable<DB['EmbeddingsMetadata']>,
-  fullText: string,
-  embedText: string,
-  embeddingVector: number[]
-) {
-  const pg = getKysely()
-  return pg.transaction().execute(async (trx) => {
-    // get fields to update correct metadata row
-    const jobQueueItem = (await trx
-      .selectFrom('EmbeddingsJobQueue')
-      .select(['objectType', 'refId', 'model'] as any)
-      .where('id', '=', jobQueueId)
-      .executeTakeFirstOrThrow()) as any
-
-    // (1) update metadata row
-    const metadataColumnsToUpdate: {
-      models: RawBuilder<string[]>
-      fullText?: string | null | undefined
-    } = {
-      // update models as a set
-      models: sql<string[]>`(
-SELECT array_agg(DISTINCT value)
-FROM (
-  SELECT unnest(COALESCE("models", '{}')) AS value
-  UNION
-  SELECT unnest(ARRAY[${modelTable}]::VARCHAR[]) AS value
-) AS combined_values
-)`
-    }
-
-    if (metadata?.fullText !== fullText) {
-      metadataColumnsToUpdate.fullText = fullText
-    }
-
-    const updatedMetadata = await trx
-      .updateTable('EmbeddingsMetadata')
-      .set(metadataColumnsToUpdate)
-      .where('objectType', '=', jobQueueItem.objectType)
-      .where('refId', '=', jobQueueItem.refId)
-      .returning(['id'])
-      .executeTakeFirstOrThrow()
-
-    // (2) upsert into model table
-    await trx
-      .insertInto(modelTable as any)
-      .values({
-        embedText: fullText !== embedText ? embedText : null,
-        embedding: numberVectorToString(embeddingVector),
-        embeddingsMetadataId: updatedMetadata.id
-      })
-      .onConflict((oc) =>
-        oc.column('id').doUpdateSet((eb) => ({
-          embedText: eb.ref('excluded.embedText'),
-          embeddingsMetadataId: eb.ref('excluded.embeddingsMetadataId')
-        }))
-      )
-      .executeTakeFirstOrThrow()
-
-    // (3) delete completed job queue item
-    return await trx
-      .deleteFrom('EmbeddingsJobQueue')
-      .where('id', '=', jobQueueId)
-      .executeTakeFirstOrThrow()
-  })
-}
-export async function upsertEmbeddingsMetaRows(
-  embeddingsMetaRows: DBInsert['EmbeddingsMetadata'][]
-) {
-  const pg = getKysely()
-  return pg
-    .insertInto('EmbeddingsMetadata')
-    .values(embeddingsMetaRows)
-    .onConflict((oc) =>
-      oc.columns(['objectType', 'refId']).doUpdateSet((eb) => ({
-        objectType: eb.ref('excluded.objectType'),
-        refId: eb.ref('excluded.refId'),
-        refUpdatedAt: eb.ref('excluded.refUpdatedAt')
-      }))
-    )
-    .execute()
-}
diff --git a/packages/embedder/indexing/failJob.ts b/packages/embedder/indexing/failJob.ts
new file mode 100644
index 00000000000..17d293b49a9
--- /dev/null
+++ b/packages/embedder/indexing/failJob.ts
@@ -0,0 +1,17 @@
+import getKysely from 'parabol-server/postgres/getKysely'
+import {Logger} from 'parabol-server/utils/Logger'
+
+export const failJob = async (jobId: number, stateMessage: string, retryAfter?: Date | null) => {
+  const pg = getKysely()
+  Logger.log(`embedder: failed job ${jobId}, ${stateMessage}`)
+  await pg
+    .updateTable('EmbeddingsJobQueue')
+    .set((eb) => ({
+      state: 'failed',
+      stateMessage,
+      retryCount: eb('retryCount', '+', 1),
+      retryAfter: retryAfter || null
+    }))
+    .where('id', '=', jobId)
+    .executeTakeFirstOrThrow()
+}
diff --git a/packages/embedder/indexing/getRedisClient.ts b/packages/embedder/indexing/getRedisClient.ts
deleted file mode 100644
index 7aaf65be33c..00000000000
--- a/packages/embedder/indexing/getRedisClient.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import RedisInstance from 'parabol-server/utils/RedisInstance'
-
-const {SERVER_ID} = process.env
-
-let redisClient: RedisInstance
-export const getRedisClient = () => {
-  if (!redisClient) {
-    redisClient = new RedisInstance(`embedder-${SERVER_ID}`)
-  }
-  return redisClient
-}
diff --git a/packages/embedder/indexing/getRootDataLoader.ts b/packages/embedder/indexing/getRootDataLoader.ts
deleted file mode 100644
index 304c0c01058..00000000000
--- a/packages/embedder/indexing/getRootDataLoader.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import getDataLoader from 'parabol-server/graphql/getDataLoader'
-import {DataLoaderWorker} from 'parabol-server/graphql/graphql'
-
-let rootDataLoader: DataLoaderWorker
-export const getRootDataLoader = () => {
-  if (!rootDataLoader) {
-    rootDataLoader = getDataLoader() as DataLoaderWorker
-  }
-  return rootDataLoader
-}
diff --git a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
index eb28b1bc3b0..4dc0bfaddd5 100644
--- a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
+++ b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
@@ -1,25 +1,8 @@
-import prettier from 'prettier'
-
-import getRethink, {RethinkSchema} from 'parabol-server/database/rethinkDriver'
-import {DataLoaderWorker} from 'parabol-server/graphql/graphql'
-import getKysely from 'parabol-server/postgres/getKysely'
-import {DB} from 'parabol-server/postgres/pg'
-
+import {RethinkSchema} from 'parabol-server/database/rethinkDriver'
 import Comment from 'parabol-server/database/types/Comment'
-import DiscussStage from 'parabol-server/database/types/DiscussStage'
-import MeetingRetrospective, {
-  isMeetingRetrospective
-} from 'parabol-server/database/types/MeetingRetrospective'
-
-import {AnyMeeting} from 'parabol-server/postgres/types/Meeting'
-import {upsertEmbeddingsMetaRows} from './embeddingsTablesOps'
-
-const BATCH_SIZE = 1000
-
-export interface EmbeddingsJobQueueRetrospectiveDiscussionTopic
-  extends Omit<DB['EmbeddingsJobQueue'], 'objectType'> {
-  objectType: 'retrospectiveDiscussionTopic'
-}
+import {isMeetingRetrospective} from 'parabol-server/database/types/MeetingRetrospective'
+import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
+import prettier from 'prettier'
 
 // Here's a generic reprentation of the text generated here:
 
@@ -38,109 +21,14 @@ export interface EmbeddingsJobQueueRetrospectiveDiscussionTopic
 
 const IGNORE_COMMENT_USER_IDS = ['parabolAIUser']
 
-const pg = getKysely()
-
-export async function refreshRetroDiscussionTopicsMeta(dataLoader: DataLoaderWorker) {
-  const r = await getRethink()
-  const {createdAt: newestMeetingDate} = (await r
-    .table('NewMeeting')
-    .max({index: 'createdAt'})
-    .run()) as unknown as RethinkSchema['NewMeeting']['type']
-  const {createdAt: oldestMeetingDate} = (await r
-    .table('NewMeeting')
-    .min({index: 'createdAt'})
-    .run()) as unknown as RethinkSchema['NewMeeting']['type']
-
-  const {newestMetaDate} = (await pg
-    .selectFrom('EmbeddingsMetadata')
-    .select(pg.fn.max('refUpdatedAt').as('newestMetaDate'))
-    .where('objectType', '=', 'retrospectiveDiscussionTopic')
-    .executeTakeFirst()) ?? {newestMetaDate: null}
-  let startDateTime = newestMetaDate || oldestMeetingDate
-
-  if (startDateTime.getTime() === newestMeetingDate.getTime()) return
-
-  console.log(
-    `refreshRetroDiscussionTopicsMeta(): ` +
-      `will consider adding items from ${startDateTime.toISOString()} to ` +
-      `${newestMeetingDate.toISOString()}`
-  )
-
-  let totalAdded = 0
-  do {
-    // Process history in batches.
-    //
-    // N.B. We add historical meetings to the EmbeddingsMetadata table here.
-    // This query will intentionally miss meetings that haven't been completed
-    // (`summarySentAt` is null). These meetings will need to be added to the
-    // EmbeddingsMetadata table by a hook that runs when the meetings complete.
-    const {maxCreatedAt, completedNewMeetings} = await r
-      .table('NewMeeting')
-      .between(startDateTime, newestMeetingDate, {rightBound: 'closed', index: 'createdAt'})
-      .orderBy({index: 'createdAt'})
-      .limit(BATCH_SIZE)
-      .coerceTo('array')
-      .do((rows: any) => ({
-        maxCreatedAt: r.expr(rows).max('createdAt')('createdAt'), // Then find the max createdAt value
-        completedNewMeetings: r.expr(rows).filter((r: any) =>
-          r('meetingType')
-            .eq('retrospective')
-            .and(
-              r('endedAt').gt(0),
-              r
-                .hasFields('phases')
-                .and(r('phases').count().gt(0))
-                .and(
-                  r('phases')
-                    .filter((phase: any) => phase('phaseType').eq('discuss'))
-                    .filter((phase: any) =>
-                      phase.hasFields('stages').and(phase('stages').count().gt(0))
-                    )
-                    .count()
-                    .gt(0)
-                )
-            )
-        )
-      }))
-      .run()
-    const embeddingsMetaRows = (
-      await Promise.all(
-        completedNewMeetings.map((m: AnyMeeting) =>
-          newRetroDiscussionTopicsFromNewMeeting(m, dataLoader)
-        )
-      )
-    ).flat()
-    if (embeddingsMetaRows.length > 0) {
-      await upsertEmbeddingsMetaRows(embeddingsMetaRows)
-      totalAdded += embeddingsMetaRows.length
-      console.log(
-        `refreshRetroDiscussionTopicsMeta(): synced to ${maxCreatedAt.toISOString()}, added` +
-          ` ${embeddingsMetaRows.length} retrospectiveDiscussionTopics`
-      )
-    }
-
-    // N.B. In the unlikely event that we have >=BATCH_SIZE meetings that end at _exactly_
-    // the same timetsamp, this will loop forever.
-    if (
-      startDateTime.getTime() === newestMeetingDate.getTime() &&
-      completedNewMeetings.length < BATCH_SIZE
-    )
-      break
-    startDateTime = maxCreatedAt
-  } while (true)
-
-  console.log(
-    `refreshRetroDiscussionTopicsMeta(): added ${totalAdded} total retrospectiveDiscussionTopics`
-  )
-}
-
-async function getPreferredNameByUserId(userId: string, dataLoader: DataLoaderWorker) {
+async function getPreferredNameByUserId(userId: string, dataLoader: RootDataLoader) {
+  if (!userId) return 'Unknown'
   const user = await dataLoader.get('users').load(userId)
   return !user ? 'Unknown' : user.preferredName
 }
 
 async function formatThread(
-  dataLoader: DataLoaderWorker,
+  dataLoader: RootDataLoader,
   comments: Comment[],
   parentId: string | null = null,
   depth = 0
@@ -155,9 +43,7 @@ async function formatThread(
     const indent = '   '.repeat(depth + 1)
     const author = comment.isAnonymous
       ? 'Anonymous'
-      : comment.createdBy
-      ? await getPreferredNameByUserId(comment.createdBy, dataLoader)
-      : 'Unknown'
+      : await getPreferredNameByUserId(comment.createdBy, dataLoader)
     const how = depth === 0 ? 'wrote' : 'replied'
     const content = comment.plaintextContent
     const formattedPost = `${indent}- ${author} ${how}, "${content}"\n`
@@ -172,60 +58,47 @@ async function formatThread(
   return formattedComments.join('')
 }
 
-export const createTextFromNewMeetingDiscussionStage = async (
-  newMeeting: MeetingRetrospective,
-  stageId: string,
-  dataLoader: DataLoaderWorker,
+export const createTextFromRetrospectiveDiscussionTopic = async (
+  discussionId: string,
+  dataLoader: RootDataLoader,
   textForReranking: boolean = false
 ) => {
-  if (!newMeeting) throw 'newMeeting is undefined'
-  if (!isMeetingRetrospective(newMeeting)) throw 'newMeeting is not retrospective'
-  if (!newMeeting.templateId) throw 'template is undefined'
-  const template = await dataLoader.get('meetingTemplates').load(newMeeting.templateId)
-  if (!template) throw 'template is undefined'
-  const discussPhase = newMeeting.phases.find((phase) => phase.phaseType === 'discuss')
-  if (!discussPhase) throw 'newMeeting discuss phase is undefined'
-  if (!discussPhase.stages) throw 'newMeeting discuss phase has no stages'
-  const discussStage = discussPhase.stages.find((stage) => stage.id === stageId) as DiscussStage
-  if (!discussStage) throw 'newMeeting discuss stage not found'
-  const {summary: discussionSummary} = discussStage.discussionId
-    ? (await dataLoader.get('discussions').load(discussStage.discussionId)) ?? {summary: null}
-    : {summary: null}
-  const r = await getRethink()
-  if (!discussStage.reflectionGroupId) throw 'newMeeting discuss stage has no reflectionGroupId'
-  const reflectionGroup = await r
-    .table('RetroReflectionGroup')
-    .get(discussStage.reflectionGroupId)
-    .run()
-  if (!reflectionGroup.id) throw 'newMeeting reflectionGroup has no id'
-  const reflections = await r
-    .table('RetroReflection')
-    .getAll(reflectionGroup.id, {index: 'reflectionGroupId'})
-    .run()
+  const discussion = await dataLoader.get('discussions').load(discussionId)
+  if (!discussion) throw new Error(`Discussion not found: ${discussionId}`)
+  const {discussionTopicId: reflectionGroupId, meetingId, summary: discussionSummary} = discussion
+  const [newMeeting, reflectionGroup, reflections] = await Promise.all([
+    dataLoader.get('newMeetings').load(meetingId),
+    dataLoader.get('retroReflectionGroups').load(reflectionGroupId),
+    dataLoader.get('retroReflectionsByGroupId').load(reflectionGroupId)
+  ])
+  if (!isMeetingRetrospective(newMeeting)) throw new Error('Meeting is not a retro')
+  const {templateId} = newMeeting
+
   const promptIds = [...new Set(reflections.map((r) => r.promptId))]
+  const [template, ...prompts] = await Promise.all([
+    dataLoader.get('meetingTemplates').loadNonNull(templateId),
+    ...promptIds.map((promptId) => dataLoader.get('reflectPrompts').load(promptId))
+  ])
+
   let markdown = ''
-  if (!textForReranking)
+  if (!textForReranking) {
     markdown =
-      `A topic "${reflectionGroup.title}" was discussed during ` +
+      `A topic "${reflectionGroup?.title ?? ''}" was discussed during ` +
       `the meeting "${newMeeting.name}" that followed the "${template.name}" template.\n` +
       `\n`
-  const prompts = await dataLoader.get('reflectPrompts').loadMany(promptIds)
+  }
+
   for (const prompt of prompts) {
-    if (!prompt || prompt instanceof Error) continue
     if (!textForReranking) {
       markdown += `Participants were prompted with, "${prompt.question}`
       if (prompt.description) markdown += `: ${prompt.description}`
       markdown += `".\n`
     }
-    if (newMeeting.disableAnonymity) {
-      for (const reflection of reflections.filter((r) => r.promptId === prompt.id)) {
-        const author = await getPreferredNameByUserId(reflection.creatorId, dataLoader)
-        markdown += `   - ${author} wrote, "${reflection.plaintextContent}"\n`
-      }
-    } else {
-      for (const reflection of reflections.filter((r) => r.promptId === prompt.id)) {
-        markdown += `   - Anonymous wrote, "${reflection.plaintextContent}"\n`
-      }
+    for (const reflection of reflections.filter((r) => r.promptId === prompt.id)) {
+      const author = newMeeting.disableAnonymity
+        ? await getPreferredNameByUserId(reflection.creatorId, dataLoader)
+        : 'Anonymous'
+      markdown += `   - ${author} wrote, "${reflection.plaintextContent}"\n`
     }
     markdown += `\n`
   }
@@ -250,7 +123,7 @@ export const createTextFromNewMeetingDiscussionStage = async (
   if (discussionSummary) {
     markdown += `Further discussion was made. ` + ` ${discussionSummary}`
   } else {
-    const comments = await dataLoader.get('commentsByDiscussionId').load(stageId)
+    const comments = await dataLoader.get('commentsByDiscussionId').load(discussionId)
 
     const sortedComments = comments
       .map((comment) => {
@@ -290,22 +163,9 @@ export const createTextFromNewMeetingDiscussionStage = async (
   return markdown
 }
 
-export const createText = async (item: any, dataLoader: DataLoaderWorker): Promise<string> => {
-  if (!item.refId) throw 'refId is undefined'
-  const [newMeetingId, discussionId] = item.refId.split(':')
-  if (!newMeetingId) throw new Error('newMeetingId cannot be undefined')
-  if (!discussionId) throw new Error('discussionId cannot be undefined')
-  const newMeeting = await dataLoader.get('newMeetings').load(newMeetingId)
-  return createTextFromNewMeetingDiscussionStage(
-    newMeeting as MeetingRetrospective,
-    discussionId,
-    dataLoader
-  )
-}
-
 export const newRetroDiscussionTopicsFromNewMeeting = async (
   newMeeting: RethinkSchema['NewMeeting']['type'],
-  dataLoader: DataLoaderWorker
+  dataLoader: RootDataLoader
 ) => {
   const discussPhase = newMeeting.phases.find((phase) => phase.phaseType === 'discuss')
   const orgId = (await dataLoader.get('teams').load(newMeeting.teamId))?.orgId
diff --git a/packages/embedder/iso6393To1.ts b/packages/embedder/iso6393To1.ts
new file mode 100644
index 00000000000..f1e470e1232
--- /dev/null
+++ b/packages/embedder/iso6393To1.ts
@@ -0,0 +1,195 @@
+import {ValueOf} from '../client/types/generics'
+
+/**
+ * Map of ISO 639-3 codes to ISO 639-1 codes.
+ *
+ * @type {Record<string, string>}
+ */
+export const iso6393To1 = {
+  aar: 'aa',
+  abk: 'ab',
+  afr: 'af',
+  aka: 'ak',
+  amh: 'am',
+  ara: 'ar',
+  arg: 'an',
+  asm: 'as',
+  ava: 'av',
+  ave: 'ae',
+  aym: 'ay',
+  aze: 'az',
+  bak: 'ba',
+  bam: 'bm',
+  bel: 'be',
+  ben: 'bn',
+  bis: 'bi',
+  bod: 'bo',
+  bos: 'bs',
+  bre: 'br',
+  bul: 'bg',
+  cat: 'ca',
+  ces: 'cs',
+  cha: 'ch',
+  che: 'ce',
+  chu: 'cu',
+  chv: 'cv',
+  cor: 'kw',
+  cos: 'co',
+  cre: 'cr',
+  cym: 'cy',
+  dan: 'da',
+  deu: 'de',
+  div: 'dv',
+  dzo: 'dz',
+  ell: 'el',
+  eng: 'en',
+  epo: 'eo',
+  est: 'et',
+  eus: 'eu',
+  ewe: 'ee',
+  fao: 'fo',
+  fas: 'fa',
+  fij: 'fj',
+  fin: 'fi',
+  fra: 'fr',
+  fry: 'fy',
+  ful: 'ff',
+  gla: 'gd',
+  gle: 'ga',
+  glg: 'gl',
+  glv: 'gv',
+  grn: 'gn',
+  guj: 'gu',
+  hat: 'ht',
+  hau: 'ha',
+  hbs: 'sh',
+  heb: 'he',
+  her: 'hz',
+  hin: 'hi',
+  hmo: 'ho',
+  hrv: 'hr',
+  hun: 'hu',
+  hye: 'hy',
+  ibo: 'ig',
+  ido: 'io',
+  iii: 'ii',
+  iku: 'iu',
+  ile: 'ie',
+  ina: 'ia',
+  ind: 'id',
+  ipk: 'ik',
+  isl: 'is',
+  ita: 'it',
+  jav: 'jv',
+  jpn: 'ja',
+  kal: 'kl',
+  kan: 'kn',
+  kas: 'ks',
+  kat: 'ka',
+  kau: 'kr',
+  kaz: 'kk',
+  khm: 'km',
+  kik: 'ki',
+  kin: 'rw',
+  kir: 'ky',
+  kom: 'kv',
+  kon: 'kg',
+  kor: 'ko',
+  kua: 'kj',
+  kur: 'ku',
+  lao: 'lo',
+  lat: 'la',
+  lav: 'lv',
+  lim: 'li',
+  lin: 'ln',
+  lit: 'lt',
+  ltz: 'lb',
+  lub: 'lu',
+  lug: 'lg',
+  mah: 'mh',
+  mal: 'ml',
+  mar: 'mr',
+  mkd: 'mk',
+  mlg: 'mg',
+  mlt: 'mt',
+  mon: 'mn',
+  mri: 'mi',
+  msa: 'ms',
+  mya: 'my',
+  nau: 'na',
+  nav: 'nv',
+  nbl: 'nr',
+  nde: 'nd',
+  ndo: 'ng',
+  nep: 'ne',
+  nld: 'nl',
+  nno: 'nn',
+  nob: 'nb',
+  nor: 'no',
+  nya: 'ny',
+  oci: 'oc',
+  oji: 'oj',
+  ori: 'or',
+  orm: 'om',
+  oss: 'os',
+  pan: 'pa',
+  pli: 'pi',
+  pol: 'pl',
+  por: 'pt',
+  pus: 'ps',
+  que: 'qu',
+  roh: 'rm',
+  ron: 'ro',
+  run: 'rn',
+  rus: 'ru',
+  sag: 'sg',
+  san: 'sa',
+  sin: 'si',
+  slk: 'sk',
+  slv: 'sl',
+  sme: 'se',
+  smo: 'sm',
+  sna: 'sn',
+  snd: 'sd',
+  som: 'so',
+  sot: 'st',
+  spa: 'es',
+  sqi: 'sq',
+  srd: 'sc',
+  srp: 'sr',
+  ssw: 'ss',
+  sun: 'su',
+  swa: 'sw',
+  swe: 'sv',
+  tah: 'ty',
+  tam: 'ta',
+  tat: 'tt',
+  tel: 'te',
+  tgk: 'tg',
+  tgl: 'tl',
+  tha: 'th',
+  tir: 'ti',
+  ton: 'to',
+  tsn: 'tn',
+  tso: 'ts',
+  tuk: 'tk',
+  tur: 'tr',
+  twi: 'tw',
+  uig: 'ug',
+  ukr: 'uk',
+  urd: 'ur',
+  uzb: 'uz',
+  ven: 've',
+  vie: 'vi',
+  vol: 'vo',
+  wln: 'wa',
+  wol: 'wo',
+  xho: 'xh',
+  yid: 'yi',
+  yor: 'yo',
+  zha: 'za',
+  zho: 'zh',
+  zul: 'zu'
+} as const
+
+export type ISO6391 = ValueOf<typeof iso6393To1>
diff --git a/packages/embedder/logMemoryUse.ts b/packages/embedder/logMemoryUse.ts
new file mode 100644
index 00000000000..afe3259aee5
--- /dev/null
+++ b/packages/embedder/logMemoryUse.ts
@@ -0,0 +1,10 @@
+// Not for use in prod, but useful for dev
+export const logMemoryUse = () => {
+  const MB = 2 ** 20
+  setInterval(() => {
+    const memoryUsage = process.memoryUsage()
+    const {rss} = memoryUsage
+    const usedMB = Math.floor(rss / MB)
+    console.log('Memory use:', usedMB, 'MB')
+  }, 10000)
+}
diff --git a/packages/embedder/mergeAsyncIterators.ts b/packages/embedder/mergeAsyncIterators.ts
new file mode 100644
index 00000000000..e274e0cca6f
--- /dev/null
+++ b/packages/embedder/mergeAsyncIterators.ts
@@ -0,0 +1,96 @@
+import {ParseInt} from '../client/types/generics'
+
+// can remove PromiseCapability after TS v5.4.2
+type PromiseCapability<T> = {
+  resolve: (value: T) => void
+  reject: (reason?: any) => void
+  promise: Promise<T>
+}
+
+type UnYield<T> = T extends IteratorYieldResult<infer U> ? U : never
+type Result<T extends AsyncIterator<any>> = UnYield<Awaited<ReturnType<T['next']>>>
+
+// Promise.race has a memory leak
+// To avoid: https://github.com/tc39/proposal-async-iterator-helpers/issues/15#issuecomment-1937011820
+export function mergeAsyncIterators<T extends AsyncIterator<any>[] | []>(
+  iterators: T
+): AsyncIterableIterator<{[P in keyof T]: [ParseInt<`${P}`>, Result<T[P]>]}[number]> {
+  return (async function* () {
+    type ResultThunk = () => [number, Result<T[number]>]
+    let count = iterators.length as number
+    let capability: PromiseCapability<ResultThunk | null> | undefined
+    const queuedResults: ResultThunk[] = []
+    const getNext = async (idx: number, iterator: T[number]) => {
+      try {
+        const next = await iterator.next()
+        if (next.done) {
+          if (--count === 0 && capability !== undefined) {
+            capability.resolve(null)
+          }
+        } else {
+          resolveResult(() => {
+            void getNext(idx, iterator)
+            return [idx, next.value]
+          })
+        }
+      } catch (error) {
+        resolveResult(() => {
+          throw error
+        })
+      }
+    }
+    const resolveResult = (resultThunk: ResultThunk) => {
+      if (capability === undefined) {
+        queuedResults.push(resultThunk)
+      } else {
+        capability.resolve(resultThunk)
+      }
+    }
+
+    try {
+      // Begin all iterators
+      for (const [idx, iterable] of iterators.entries()) {
+        void getNext(idx, iterable)
+      }
+
+      // Delegate to iterables as results complete
+      while (true) {
+        while (true) {
+          const nextQueuedResult = queuedResults.shift()
+          if (nextQueuedResult === undefined) {
+            break
+          } else {
+            yield nextQueuedResult()
+          }
+        }
+        if (count === 0) {
+          break
+        } else {
+          // Promise.withResolvers() is not yet implemented in node
+          capability = {
+            resolve: undefined as any,
+            reject: undefined as any,
+            promise: undefined as any
+          }
+          capability.promise = new Promise((res, rej) => {
+            capability!.resolve = res
+            capability!.reject = rej
+          })
+          const nextResult = await capability.promise
+          if (nextResult === null) {
+            break
+          } else {
+            capability = undefined
+            yield nextResult()
+          }
+        }
+      }
+    } catch (err) {
+      // Unwind remaining iterators on failure
+      try {
+        await Promise.all(iterators.map((iterator) => iterator.return?.()))
+      } catch {}
+      throw err
+    }
+  })()
+}
diff --git a/packages/embedder/modules.d.ts b/packages/embedder/modules.d.ts
deleted file mode 100644
index 8a2be20ba0c..00000000000
--- a/packages/embedder/modules.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import '../server/types/modules'
-import '../server/types/webpackEnv'
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 47af8737dac..fdf98991ced 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -18,14 +18,17 @@
   "devDependencies": {
     "@babel/cli": "7.18.6",
     "@babel/core": "7.18.6",
+    "@types/franc": "^5.0.3",
     "@types/node": "^16.11.62",
     "babel-plugin-inline-import": "^3.0.0",
+    "openapi-fetch": "^0.9.3",
     "sucrase": "^3.32.0",
     "ts-node-dev": "^1.0.0-pre.44",
-    "typescript": "4.9.5"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
+    "franc-min": "^5.0.0",
     "redlock": "^5.0.0-beta.2"
   }
 }
diff --git a/packages/embedder/processJob.ts b/packages/embedder/processJob.ts
new file mode 100644
index 00000000000..8723b75de6a
--- /dev/null
+++ b/packages/embedder/processJob.ts
@@ -0,0 +1,13 @@
+import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
+import {Job} from './EmbeddingsJobQueueStream'
+import {processJobEmbed} from './processJobEmbed'
+
+export const processJob = async (job: Job, dataLoader: RootDataLoader) => {
+  const {jobType} = job
+  switch (jobType) {
+    case 'embed':
+      return processJobEmbed(job, dataLoader)
+    default:
+      throw new Error(`Invalid job type: ${jobType}`)
+  }
+}
diff --git a/packages/embedder/processJobEmbed.ts b/packages/embedder/processJobEmbed.ts
new file mode 100644
index 00000000000..d1b895cc640
--- /dev/null
+++ b/packages/embedder/processJobEmbed.ts
@@ -0,0 +1,102 @@
+import franc from 'franc-min'
+import ms from 'ms'
+import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {EmbedJob} from './EmbeddingsJobQueueStream'
+import {EmbeddingsTable} from './ai_models/AbstractEmbeddingsModel'
+import getModelManager from './ai_models/ModelManager'
+import {createEmbeddingTextFrom} from './indexing/createEmbeddingTextFrom'
+import {failJob} from './indexing/failJob'
+import numberVectorToString from './indexing/numberVectorToString'
+import {iso6393To1} from './iso6393To1'
+
+export const processJobEmbed = async (job: EmbedJob, dataLoader: RootDataLoader) => {
+  const pg = getKysely()
+  const {id: jobId, retryCount, jobData} = job
+  const {embeddingsMetadataId, model} = jobData
+  const modelManager = getModelManager()
+
+  const metadata = await pg
+    .selectFrom('EmbeddingsMetadata')
+    .selectAll()
+    .where('id', '=', embeddingsMetadataId)
+    .executeTakeFirst()
+
+  if (!metadata) {
+    await failJob(jobId, `unable to fetch metadata by EmbeddingsJobQueue.id = ${jobId}`)
+    return
+  }
+
+  let {fullText, language} = metadata
+  try {
+    if (!fullText) {
+      fullText = await createEmbeddingTextFrom(metadata, dataLoader)
+      language = iso6393To1[franc(fullText) as keyof typeof iso6393To1]
+      await pg
+        .updateTable('EmbeddingsMetadata')
+        .set({fullText, language})
+        .where('id', '=', embeddingsMetadataId)
+        .execute()
+    }
+  } catch (e) {
+    // get the trace since the error message may be unobvious
+    console.trace(e)
+    await failJob(jobId, `unable to create embedding text: ${e}`)
+    return
+  }
+
+  const embeddingModel = modelManager.embeddingModelsMapByTable[model]
+  if (!embeddingModel) {
+    await failJob(jobId, `embedding model ${model} not available`)
+    return
+  }
+
+  // Exit successfully, we don't want to fail the job because the language is not supported
+  if (!embeddingModel.languages.includes(language!)) return true
+
+  const tokens = await embeddingModel.getTokens(fullText)
+  if (tokens instanceof Error) {
+    await failJob(
+      jobId,
+      `unable to get tokens: ${tokens.message}`,
+      retryCount < 10 ? new Date(Date.now() + ms('1m')) : null
+    )
+    return
+  }
+  const isFullTextTooBig = tokens.length > embeddingModel.maxInputTokens
+  // Cannot use summarization strategy if generation model has same context length as embedding model
+  // We must split the text & not tokens because BERT tokenizer is not trained for linebreaks e.g. \n\n
+  const chunks = isFullTextTooBig ? embeddingModel.splitText(fullText) : [fullText]
+  await Promise.all(
+    chunks.map(async (chunk, chunkNumber) => {
+      const embeddingVector = await embeddingModel.getEmbedding(chunk)
+      if (embeddingVector instanceof Error) {
+        await failJob(
+          jobId,
+          `unable to get embeddings: ${embeddingVector.message}`,
+          retryCount < 10 ? new Date(Date.now() + ms('1m')) : null
+        )
+        return
+      }
+      await pg
+        // cast to any because these types won't be available in CI
+        .insertInto(embeddingModel.tableName as EmbeddingsTable)
+        .values({
+          // TODO is the extra space of a null embedText really worth it?!
+          embedText: isFullTextTooBig ? chunk : null,
+          embedding: numberVectorToString(embeddingVector),
+          embeddingsMetadataId,
+          chunkNumber: isFullTextTooBig ? chunkNumber : null
+        })
+        .onConflict((oc) =>
+          oc.column('embeddingsMetadataId').doUpdateSet((eb) => ({
+            embedText: eb.ref('excluded.embedText'),
+            embedding: eb.ref('excluded.embedding')
+          }))
+        )
+        .execute()
+    })
+  )
+  // Logger.log(`Embedded ${embeddingsMetadataId} -> ${model}`)
+  return true
+}
diff --git a/packages/embedder/resetStalledJobs.ts b/packages/embedder/resetStalledJobs.ts
new file mode 100644
index 00000000000..592b468faee
--- /dev/null
+++ b/packages/embedder/resetStalledJobs.ts
@@ -0,0 +1,18 @@
+import ms from 'ms'
+import getKysely from 'parabol-server/postgres/getKysely'
+
+export const resetStalledJobs = () => {
+  setInterval(async () => {
+    const pg = getKysely()
+    await pg
+      .updateTable('EmbeddingsJobQueue')
+      .set((eb) => ({
+        state: 'queued',
+        startAt: null,
+        retryCount: eb('retryCount', '+', 1),
+        stateMessage: 'stalled'
+      }))
+      .where('startAt', '<', new Date(Date.now() - ms('5m')))
+      .execute()
+  }, ms('5m'))
+}
diff --git a/packages/embedder/textEmbeddingsnterface.d.ts b/packages/embedder/textEmbeddingsnterface.d.ts
new file mode 100644
index 00000000000..3fdbcac0185
--- /dev/null
+++ b/packages/embedder/textEmbeddingsnterface.d.ts
@@ -0,0 +1,857 @@
+/**
+ * This file was auto-generated by openapi-typescript.
+ * Do not make direct changes to the file.
+ */
+
+
+/** OneOf type helpers */
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
+type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
+type OneOf<T extends any[]> = T extends [infer Only] ? Only : T extends [infer A, infer B, ...infer Rest] ? OneOf<[XOR<A, B>, ...Rest]> : never;
+
+export interface paths {
+  "/decode": {
+    /**
+     * Decode input ids
+     * @description Decode input ids
+     */
+    post: operations["decode"];
+  };
+  "/embed": {
+    /**
+     * Get Embeddings. Returns a 424 status code if the model is not an embedding model.
+     * @description Get Embeddings. Returns a 424 status code if the model is not an embedding model.
+     */
+    post: operations["embed"];
+  };
+  "/embed_all": {
+    /**
+     * Get all Embeddings without Pooling.
+     * @description Get all Embeddings without Pooling.
+     * Returns a 424 status code if the model is not an embedding model.
+     */
+    post: operations["embed_all"];
+  };
+  "/embed_sparse": {
+    /**
+     * Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
+     * @description Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
+     */
+    post: operations["embed_sparse"];
+  };
+  "/embeddings": {
+    /**
+     * OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
+     * @description OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
+     */
+    post: operations["openai_embed"];
+  };
+  "/health": {
+    /**
+     * Health check method
+     * @description Health check method
+     */
+    get: operations["health"];
+  };
+  "/info": {
+    /**
+     * Text Embeddings Inference endpoint info
+     * @description Text Embeddings Inference endpoint info
+     */
+    get: operations["get_model_info"];
+  };
+  "/metrics": {
+    /**
+     * Prometheus metrics scrape endpoint
+     * @description Prometheus metrics scrape endpoint
+     */
+    get: operations["metrics"];
+  };
+  "/predict": {
+    /**
+     * Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
+     * @description Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
+     */
+    post: operations["predict"];
+  };
+  "/rerank": {
+    /**
+     * Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
+     * @description Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
+     * a single class.
+     */
+    post: operations["rerank"];
+  };
+  "/tokenize": {
+    /**
+     * Tokenize inputs
+     * @description Tokenize inputs
+     */
+    post: operations["tokenize"];
+  };
+  "/vertex": {
+    /**
+     * Generate embeddings from a Vertex request
+     * @description Generate embeddings from a Vertex request
+     */
+    post: operations["vertex_compatibility"];
+  };
+}
+
+export type webhooks = Record<string, never>;
+
+export interface components {
+  schemas: {
+    ClassifierModel: {
+      /**
+       * @example {
+       *   "0": "LABEL"
+       * }
+       */
+      id2label: {
+        [key: string]: string;
+      };
+      /**
+       * @example {
+       *   "LABEL": 0
+       * }
+       */
+      label2id: {
+        [key: string]: number;
+      };
+    };
+    DecodeRequest: {
+      ids: components["schemas"]["InputIds"];
+      /**
+       * @default true
+       * @example true
+       */
+      skip_special_tokens?: boolean;
+    };
+    /**
+     * @example [
+     *   "test"
+     * ]
+     */
+    DecodeResponse: string[];
+    EmbedAllRequest: {
+      inputs: components["schemas"]["Input"];
+      /**
+       * @default false
+       * @example false
+       */
+      truncate?: boolean;
+    };
+    /**
+     * @example [
+     *   [
+     *     [
+     *       0,
+     *       1,
+     *       2
+     *     ]
+     *   ]
+     * ]
+     */
+    EmbedAllResponse: number[][][];
+    EmbedRequest: {
+      inputs: components["schemas"]["Input"];
+      /**
+       * @default true
+       * @example true
+       */
+      normalize?: boolean;
+      /**
+       * @default false
+       * @example false
+       */
+      truncate?: boolean;
+    };
+    /**
+     * @example [
+     *   [
+     *     0,
+     *     1,
+     *     2
+     *   ]
+     * ]
+     */
+    EmbedResponse: number[][];
+    EmbedSparseRequest: {
+      inputs: components["schemas"]["Input"];
+      /**
+       * @default false
+       * @example false
+       */
+      truncate?: boolean;
+    };
+    EmbedSparseResponse: components["schemas"]["SparseValue"][][];
+    EmbeddingModel: {
+      /** @example cls */
+      pooling: string;
+    };
+    ErrorResponse: {
+      error: string;
+      error_type: components["schemas"]["ErrorType"];
+    };
+    /** @enum {string} */
+    ErrorType: "Unhealthy" | "Backend" | "Overloaded" | "Validation" | "Tokenizer";
+    Info: {
+      /** @example null */
+      docker_label?: string | null;
+      /**
+       * @default null
+       * @example null
+       */
+      max_batch_requests?: number | null;
+      /** @example 2048 */
+      max_batch_tokens: number;
+      /** @example 32 */
+      max_client_batch_size: number;
+      /**
+       * @description Router Parameters
+       * @example 128
+       */
+      max_concurrent_requests: number;
+      /** @example 512 */
+      max_input_length: number;
+      /** @example float16 */
+      model_dtype: string;
+      /**
+       * @description Model info
+       * @example thenlper/gte-base
+       */
+      model_id: string;
+      /** @example fca14538aa9956a46526bd1d0d11d69e19b5a101 */
+      model_sha?: string | null;
+      model_type: components["schemas"]["ModelType"];
+      /** @example null */
+      sha?: string | null;
+      /** @example 4 */
+      tokenization_workers: number;
+      /**
+       * @description Router Info
+       * @example 0.5.0
+       */
+      version: string;
+    };
+    Input: string | string[];
+    InputIds: number[] | number[][];
+    ModelType: OneOf<[{
+      classifier: components["schemas"]["ClassifierModel"];
+    }, {
+      embedding: components["schemas"]["EmbeddingModel"];
+    }, {
+      reranker: components["schemas"]["ClassifierModel"];
+    }]>;
+    OpenAICompatEmbedding: {
+      /**
+       * @example [
+       *   0,
+       *   1,
+       *   2
+       * ]
+       */
+      embedding: number[];
+      /** @example 0 */
+      index: number;
+      /** @example embedding */
+      object: string;
+    };
+    OpenAICompatErrorResponse: {
+      /** Format: int32 */
+      code: number;
+      error_type: components["schemas"]["ErrorType"];
+      message: string;
+    };
+    OpenAICompatRequest: {
+      input: components["schemas"]["Input"];
+      /** @example null */
+      model?: string | null;
+      /** @example null */
+      user?: string | null;
+    };
+    OpenAICompatResponse: {
+      data: components["schemas"]["OpenAICompatEmbedding"][];
+      /** @example thenlper/gte-base */
+      model: string;
+      /** @example list */
+      object: string;
+      usage: components["schemas"]["OpenAICompatUsage"];
+    };
+    OpenAICompatUsage: {
+      /** @example 512 */
+      prompt_tokens: number;
+      /** @example 512 */
+      total_tokens: number;
+    };
+    /**
+     * @description Model input. Can be either a single string, a pair of strings or a batch of mixed single and pairs of strings.
+     * @example What is Deep Learning?
+     */
+    PredictInput: string | string[] | string[][];
+    PredictRequest: {
+      inputs: components["schemas"]["PredictInput"];
+      /**
+       * @default false
+       * @example false
+       */
+      raw_scores?: boolean;
+      /**
+       * @default false
+       * @example false
+       */
+      truncate?: boolean;
+    };
+    PredictResponse: components["schemas"]["Prediction"][] | components["schemas"]["Prediction"][][];
+    Prediction: {
+      /** @example admiration */
+      label: string;
+      /**
+       * Format: float
+       * @example 0.5
+       */
+      score: number;
+    };
+    Rank: {
+      /** @example 0 */
+      index: number;
+      /**
+       * Format: float
+       * @example 1.0
+       */
+      score: number;
+      /**
+       * @default null
+       * @example Deep Learning is ...
+       */
+      text?: string | null;
+    };
+    RerankRequest: {
+      /** @example What is Deep Learning? */
+      query: string;
+      /**
+       * @default false
+       * @example false
+       */
+      raw_scores?: boolean;
+      /**
+       * @default false
+       * @example false
+       */
+      return_text?: boolean;
+      /**
+       * @example [
+       *   "Deep Learning is ..."
+       * ]
+       */
+      texts: string[];
+      /**
+       * @default false
+       * @example false
+       */
+      truncate?: boolean;
+    };
+    RerankResponse: components["schemas"]["Rank"][];
+    SimpleToken: {
+      /**
+       * Format: int32
+       * @example 0
+       */
+      id: number;
+      /** @example false */
+      special: boolean;
+      /** @example 0 */
+      start?: number | null;
+      /** @example 2 */
+      stop?: number | null;
+      /** @example test */
+      text: string;
+    };
+    SparseValue: {
+      index: number;
+      /** Format: float */
+      value: number;
+    };
+    TokenizeRequest: {
+      /**
+       * @default true
+       * @example true
+       */
+      add_special_tokens?: boolean;
+      inputs: components["schemas"]["Input"];
+    };
+    /**
+     * @example [
+     *   [
+     *     {
+     *       "id": 0,
+     *       "special": false,
+     *       "start": 0,
+     *       "stop": 2,
+     *       "text": "test"
+     *     }
+     *   ]
+     * ]
+     */
+    TokenizeResponse: components["schemas"]["SimpleToken"][][];
+    VertexInstance: (components["schemas"]["EmbedRequest"] & {
+      /** @enum {string} */
+      type: "embed";
+    }) | (components["schemas"]["EmbedAllRequest"] & {
+      /** @enum {string} */
+      type: "embed_all";
+    }) | (components["schemas"]["EmbedSparseRequest"] & {
+      /** @enum {string} */
+      type: "embed_sparse";
+    }) | (components["schemas"]["PredictRequest"] & {
+      /** @enum {string} */
+      type: "predict";
+    }) | (components["schemas"]["RerankRequest"] & {
+      /** @enum {string} */
+      type: "rerank";
+    }) | (components["schemas"]["TokenizeRequest"] & {
+      /** @enum {string} */
+      type: "tokenize";
+    });
+    VertexRequest: {
+      instances: components["schemas"]["VertexInstance"][];
+    };
+    VertexResponse: components["schemas"]["VertexResponseInstance"][];
+    VertexResponseInstance: {
+      result: components["schemas"]["EmbedResponse"];
+      /** @enum {string} */
+      type: "embed";
+    } | {
+      result: components["schemas"]["EmbedAllResponse"];
+      /** @enum {string} */
+      type: "embed_all";
+    } | {
+      result: components["schemas"]["EmbedSparseResponse"];
+      /** @enum {string} */
+      type: "embed_sparse";
+    } | {
+      result: components["schemas"]["PredictResponse"];
+      /** @enum {string} */
+      type: "predict";
+    } | {
+      result: components["schemas"]["RerankResponse"];
+      /** @enum {string} */
+      type: "rerank";
+    } | {
+      result: components["schemas"]["TokenizeResponse"];
+      /** @enum {string} */
+      type: "tokenize";
+    };
+  };
+  responses: never;
+  parameters: never;
+  requestBodies: never;
+  headers: never;
+  pathItems: never;
+}
+
+export type $defs = Record<string, never>;
+
+export type external = Record<string, never>;
+
+export interface operations {
+
+  /**
+   * Decode input ids
+   * @description Decode input ids
+   */
+  decode: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["DecodeRequest"];
+      };
+    };
+    responses: {
+      /** @description Decoded ids */
+      200: {
+        content: {
+          "application/json": components["schemas"]["DecodeResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Get Embeddings. Returns a 424 status code if the model is not an embedding model.
+   * @description Get Embeddings. Returns a 424 status code if the model is not an embedding model.
+   */
+  embed: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["EmbedRequest"];
+      };
+    };
+    responses: {
+      /** @description Embeddings */
+      200: {
+        content: {
+          "application/json": components["schemas"]["EmbedResponse"];
+        };
+      };
+      /** @description Batch size error */
+      413: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Embedding Error */
+      424: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Model is overloaded */
+      429: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Get all Embeddings without Pooling.
+   * @description Get all Embeddings without Pooling.
+   * Returns a 424 status code if the model is not an embedding model.
+   */
+  embed_all: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["EmbedAllRequest"];
+      };
+    };
+    responses: {
+      /** @description Embeddings */
+      200: {
+        content: {
+          "application/json": components["schemas"]["EmbedAllResponse"];
+        };
+      };
+      /** @description Batch size error */
+      413: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Embedding Error */
+      424: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Model is overloaded */
+      429: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
+   * @description Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
+   */
+  embed_sparse: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["EmbedSparseRequest"];
+      };
+    };
+    responses: {
+      /** @description Embeddings */
+      200: {
+        content: {
+          "application/json": components["schemas"]["EmbedSparseResponse"];
+        };
+      };
+      /** @description Batch size error */
+      413: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Embedding Error */
+      424: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Model is overloaded */
+      429: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
+   * @description OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
+   */
+  openai_embed: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["OpenAICompatRequest"];
+      };
+    };
+    responses: {
+      /** @description Embeddings */
+      200: {
+        content: {
+          "application/json": components["schemas"]["OpenAICompatResponse"];
+        };
+      };
+      /** @description Batch size error */
+      413: {
+        content: {
+          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
+        };
+      };
+      /** @description Embedding Error */
+      424: {
+        content: {
+          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
+        };
+      };
+      /** @description Model is overloaded */
+      429: {
+        content: {
+          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Health check method
+   * @description Health check method
+   */
+  health: {
+    responses: {
+      /** @description Everything is working fine */
+      200: {
+        content: never;
+      };
+      /** @description Text embeddings Inference is down */
+      503: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Text Embeddings Inference endpoint info
+   * @description Text Embeddings Inference endpoint info
+   */
+  get_model_info: {
+    responses: {
+      /** @description Served model info */
+      200: {
+        content: {
+          "application/json": components["schemas"]["Info"];
+        };
+      };
+    };
+  };
+  /**
+   * Prometheus metrics scrape endpoint
+   * @description Prometheus metrics scrape endpoint
+   */
+  metrics: {
+    responses: {
+      /** @description Prometheus Metrics */
+      200: {
+        content: {
+          "text/plain": string;
+        };
+      };
+    };
+  };
+  /**
+   * Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
+   * @description Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
+   */
+  predict: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["PredictRequest"];
+      };
+    };
+    responses: {
+      /** @description Predictions */
+      200: {
+        content: {
+          "application/json": components["schemas"]["PredictResponse"];
+        };
+      };
+      /** @description Batch size error */
+      413: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Prediction Error */
+      424: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Model is overloaded */
+      429: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
+   * @description Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
+   * a single class.
+   */
+  rerank: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["RerankRequest"];
+      };
+    };
+    responses: {
+      /** @description Ranks */
+      200: {
+        content: {
+          "application/json": components["schemas"]["RerankResponse"];
+        };
+      };
+      /** @description Batch size error */
+      413: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Rerank Error */
+      424: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Model is overloaded */
+      429: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Tokenize inputs
+   * @description Tokenize inputs
+   */
+  tokenize: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["TokenizeRequest"];
+      };
+    };
+    responses: {
+      /** @description Tokenized ids */
+      200: {
+        content: {
+          "application/json": components["schemas"]["TokenizeResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+  /**
+   * Generate embeddings from a Vertex request
+   * @description Generate embeddings from a Vertex request
+   */
+  vertex_compatibility: {
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["VertexRequest"];
+      };
+    };
+    responses: {
+      /** @description Results */
+      200: {
+        content: never;
+      };
+      /** @description Batch size error */
+      413: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Tokenization error */
+      422: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Error */
+      424: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+      /** @description Model is overloaded */
+      429: {
+        content: {
+          "application/json": components["schemas"]["ErrorResponse"];
+        };
+      };
+    };
+  };
+}
diff --git a/packages/embedder/types/modules.d.ts b/packages/embedder/types/modules.d.ts
new file mode 100644
index 00000000000..276eb185fa4
--- /dev/null
+++ b/packages/embedder/types/modules.d.ts
@@ -0,0 +1,4 @@
+declare module 'franc-min' {
+  import f from 'franc'
+  export = f
+}
diff --git a/packages/embedder/types/shared.d.ts b/packages/embedder/types/shared.d.ts
new file mode 100644
index 00000000000..1d6610890e7
--- /dev/null
+++ b/packages/embedder/types/shared.d.ts
@@ -0,0 +1,2 @@
+import '../../server/types/modules'
+import '../../server/types/webpackEnv'
diff --git a/packages/gql-executor/RedisStream.ts b/packages/gql-executor/RedisStream.ts
index 173a493321a..22798509396 100644
--- a/packages/gql-executor/RedisStream.ts
+++ b/packages/gql-executor/RedisStream.ts
@@ -7,13 +7,14 @@ export default class RedisStream implements AsyncIterableIterator<string> {
   private stream: string
   private consumerGroup: string
   // xreadgroup blocks until a response is received, so this needs its own connection
-  private redis = new RedisInstance('gql_stream')
+  private redis: RedisInstance
   private consumer: string
 
   constructor(stream: string, consumerGroup: string, consumer: string) {
     this.stream = stream
     this.consumerGroup = consumerGroup
     this.consumer = consumer
+    this.redis = new RedisInstance(stream)
   }
 
   [Symbol.asyncIterator]() {
diff --git a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
index 7c19ba2d254..70a038b712c 100644
--- a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
@@ -192,6 +192,19 @@ export const retroReflectionsByMeetingId = new RethinkForeignKeyLoaderMaker(
   }
 )
 
+export const retroReflectionsByGroupId = new RethinkForeignKeyLoaderMaker(
+  'retroReflections',
+  'reflectionGroupId',
+  async (reflectionGroupIds) => {
+    const r = await getRethink()
+    return r
+      .table('RetroReflection')
+      .getAll(r.args(reflectionGroupIds), {index: 'reflectionGroupId'})
+      .filter({isActive: true})
+      .run()
+  }
+)
+
 export const templateDimensionsByTemplateId = new RethinkForeignKeyLoaderMaker(
   'templateDimensions',
   'templateId',
diff --git a/packages/server/graphql/mutations/helpers/publishToEmbedder.ts b/packages/server/graphql/mutations/helpers/publishToEmbedder.ts
new file mode 100644
index 00000000000..c8a735f4ac9
--- /dev/null
+++ b/packages/server/graphql/mutations/helpers/publishToEmbedder.ts
@@ -0,0 +1,14 @@
+import type {MessageToEmbedder} from 'embedder/custom'
+import getRedis from '../../../utils/getRedis'
+
+export const publishToEmbedder = (message: MessageToEmbedder) => {
+  return getRedis().xadd(
+    'embedMetadataStream',
+    'MAXLEN',
+    '~',
+    1000,
+    '*',
+    'msg',
+    JSON.stringify(message)
+  )
+}
diff --git a/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts b/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
index cd116c65ea8..f5a69be4f22 100644
--- a/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
+++ b/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
@@ -1,35 +1,36 @@
+import {RawDraftContentState} from 'draft-js'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import {DISCUSS, PARABOL_AI_USER_ID} from 'parabol-client/utils/constants'
 import getMeetingPhase from 'parabol-client/utils/getMeetingPhase'
 import findStageById from 'parabol-client/utils/meetings/findStageById'
-import {RawDraftContentState} from 'draft-js'
 import {checkTeamsLimit} from '../../../billing/helpers/teamLimitsCheck'
 import getRethink from '../../../database/rethinkDriver'
 import {RDatum} from '../../../database/stricterR'
 import MeetingRetrospective from '../../../database/types/MeetingRetrospective'
+import NotificationMentioned from '../../../database/types/NotificationMentioned'
 import TimelineEventRetroComplete from '../../../database/types/TimelineEventRetroComplete'
 import getKysely from '../../../postgres/getKysely'
 import removeSuggestedAction from '../../../safeMutations/removeSuggestedAction'
+import {Logger} from '../../../utils/Logger'
+import RecallAIServerManager from '../../../utils/RecallAIServerManager'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId} from '../../../utils/authorization'
 import getPhase from '../../../utils/getPhase'
 import publish from '../../../utils/publish'
-import publishNotification from '../../public/mutations/helpers/publishNotification'
-import RecallAIServerManager from '../../../utils/RecallAIServerManager'
 import sendToSentry from '../../../utils/sendToSentry'
 import standardError from '../../../utils/standardError'
 import {InternalContext} from '../../graphql'
-import updateTeamInsights from './updateTeamInsights'
+import publishNotification from '../../public/mutations/helpers/publishNotification'
 import sendNewMeetingSummary from './endMeeting/sendNewMeetingSummary'
+import gatherInsights from './gatherInsights'
 import generateWholeMeetingSentimentScore from './generateWholeMeetingSentimentScore'
 import generateWholeMeetingSummary from './generateWholeMeetingSummary'
 import handleCompletedStage from './handleCompletedStage'
 import {IntegrationNotifier} from './notifications/IntegrationNotifier'
+import {publishToEmbedder} from './publishToEmbedder'
 import removeEmptyTasks from './removeEmptyTasks'
 import updateQualAIMeetingsCount from './updateQualAIMeetingsCount'
-import gatherInsights from './gatherInsights'
-import NotificationMentioned from '../../../database/types/NotificationMentioned'
-import {Logger} from '../../../utils/Logger'
+import updateTeamInsights from './updateTeamInsights'
 
 const getTranscription = async (recallBotId?: string | null) => {
   if (!recallBotId) return
@@ -370,6 +371,7 @@ const safeEndRetrospective = async ({
     removedTaskIds,
     timelineEventId
   }
+  publishToEmbedder({objectTypes: ['retrospectiveDiscussionTopic'], meetingId})
   publish(SubscriptionChannel.TEAM, teamId, 'EndRetrospectiveSuccess', data, subOptions)
 
   return data
diff --git a/packages/server/postgres/migrations/1703031300000_addEmbeddingTables.ts b/packages/server/postgres/migrations/1703031300000_addEmbeddingTables.ts
index e5f6f813877..33718ee75a1 100644
--- a/packages/server/postgres/migrations/1703031300000_addEmbeddingTables.ts
+++ b/packages/server/postgres/migrations/1703031300000_addEmbeddingTables.ts
@@ -1,7 +1,7 @@
 import {Client} from 'pg'
-import getPgConfig from '../getPgConfig'
 import {r} from 'rethinkdb-ts'
 import connectRethinkDB from '../../database/connectRethinkDB'
+import getPgConfig from '../getPgConfig'
 
 export async function up() {
   const client = new Client(getPgConfig())
@@ -78,8 +78,8 @@ export async function down() {
       EXECUTE 'DROP TABLE IF EXISTS "EmbeddingsJobQueue"';
       EXECUTE 'DROP TABLE IF EXISTS "EmbeddingsMetadata"';
 
-      EXECUTE 'DROP TYPE IF EXISTS "EmbeddingsStateEnum"';
-      EXECUTE 'DROP TYPE IF EXISTS "EmbeddingsObjectTypeEnum"';
+      EXECUTE 'DROP TYPE IF EXISTS "EmbeddingsStateEnum" CASCADE';
+      EXECUTE 'DROP TYPE IF EXISTS "EmbeddingsObjectTypeEnum" CASCADE';
   END $$;
   `)
   await client.end()
diff --git a/packages/server/postgres/migrations/1709934935000_embeddingsMetadataId.ts b/packages/server/postgres/migrations/1709934935000_embeddingsMetadataId.ts
new file mode 100644
index 00000000000..185b1e0881b
--- /dev/null
+++ b/packages/server/postgres/migrations/1709934935000_embeddingsMetadataId.ts
@@ -0,0 +1,62 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  // wipe data to ensure the non-null constraints succeed
+  await client.query(`
+    CREATE TYPE "ISO6391Enum" AS ENUM ('aa', 'ab', 'af', 'ak', 'am', 'ar', 'an', 'as', 'av', 'ae', 'ay', 'az', 'ba', 'bm', 'be', 'bn', 'bi', 'bo', 'bs', 'br', 'bg', 'ca', 'cs', 'ch', 'ce', 'cu', 'cv', 'kw', 'co', 'cr', 'cy', 'da', 'de', 'dv', 'dz', 'el', 'en', 'eo', 'et', 'eu', 'ee', 'fo', 'fa', 'fj', 'fi', 'fr', 'fy', 'ff', 'gd', 'ga', 'gl', 'gv', 'gn', 'gu', 'ht', 'ha', 'sh', 'he', 'hz', 'hi', 'ho', 'hr', 'hu', 'hy', 'ig', 'io', 'ii', 'iu', 'ie', 'ia', 'id', 'ik', 'is', 'it', 'jv', 'ja', 'kl', 'kn', 'ks', 'ka', 'kr', 'kk', 'km', 'ki', 'rw', 'ky', 'kv', 'kg', 'ko', 'kj', 'ku', 'lo', 'la', 'lv', 'li', 'ln', 'lt', 'lb', 'lu', 'lg', 'mh', 'ml', 'mr', 'mk', 'mg', 'mt', 'mn', 'mi', 'ms', 'my', 'na', 'nv', 'nr', 'nd', 'ng', 'ne', 'nl', 'nn', 'nb', 'no', 'ny', 'oc', 'oj', 'or', 'om', 'os', 'pa', 'pi', 'pl', 'pt', 'ps', 'qu', 'rm', 'ro', 'rn', 'ru', 'sg', 'sa', 'si', 'sk', 'sl', 'se', 'sm', 'sn', 'sd', 'so', 'st', 'es', 'sq', 'sc', 'sr', 'ss', 'su', 'sw', 'sv', 'ty', 'ta', 'tt', 'te', 'tg', 'tl', 'th', 'ti', 'to', 'tn', 'ts', 'tk', 'tr', 'tw', 'ug', 'uk', 'ur', 'uz', 've', 'vi', 'vo', 'wa', 'wo', 'xh', 'yi', 'yo', 'za', 'zh', 'zu');
+    DELETE FROM "EmbeddingsMetadata";
+    DELETE FROM "EmbeddingsJobQueue";
+    CREATE INDEX IF NOT EXISTS "idx_Discussion_createdAt" ON "Discussion"("createdAt");
+    ALTER TYPE "EmbeddingsStateEnum" RENAME VALUE 'embedding' TO 'running';
+    ALTER TYPE "EmbeddingsStateEnum" RENAME TO "EmbeddingsJobStateEnum";
+    ALTER TABLE "EmbeddingsMetadata"
+      DROP COLUMN "models",
+      ADD COLUMN "language" "ISO6391Enum",
+      ALTER COLUMN "refId" SET NOT NULL;
+    ALTER TABLE "EmbeddingsJobQueue"
+      ADD COLUMN "retryAfter" TIMESTAMP WITH TIME ZONE,
+      ADD COLUMN "retryCount" SMALLINT NOT NULL DEFAULT 0,
+      ADD COLUMN "startAt" TIMESTAMP WITH TIME ZONE,
+      ADD COLUMN "priority" SMALLINT NOT NULL DEFAULT 50,
+      ADD COLUMN "jobData" JSONB NOT NULL DEFAULT '{}',
+      ADD COLUMN "jobType" VARCHAR(255) NOT NULL,
+      DROP CONSTRAINT IF EXISTS "EmbeddingsJobQueue_objectType_refId_model_key",
+      DROP COLUMN "refId",
+      DROP COLUMN "objectType",
+      DROP COLUMN "model";
+    CREATE INDEX IF NOT EXISTS "idx_EmbeddingsJobQueue_priority" ON "EmbeddingsJobQueue"("priority");
+    `)
+  await client.end()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DROP TYPE IF EXISTS "ISO6391Enum" CASCADE;
+    DROP INDEX IF EXISTS "idx_Discussion_createdAt";
+    ALTER TYPE "EmbeddingsJobStateEnum" RENAME VALUE 'running' TO 'embedding';
+    ALTER TYPE "EmbeddingsJobStateEnum" RENAME TO "EmbeddingsStateEnum";
+    ALTER TABLE "EmbeddingsMetadata"
+      ADD COLUMN "models" VARCHAR(255)[],
+      DROP COLUMN IF EXISTS "language",
+      ALTER COLUMN "refId" DROP NOT NULL;
+    ALTER TABLE "EmbeddingsJobQueue"
+      ALTER COLUMN "state" TYPE "EmbeddingsStateEnum" USING "state"::text::"EmbeddingsStateEnum",
+      ADD CONSTRAINT "EmbeddingsJobQueue_objectType_refId_model_key" UNIQUE("objectType", "refId", "model"),
+      ADD COLUMN "refId" VARCHAR(100),
+      ADD COLUMN "model" VARCHAR(255),
+      ADD COLUMN "objectType" "EmbeddingsObjectTypeEnum",
+      DROP COLUMN "retryAfter",
+      DROP COLUMN "retryCount",
+      DROP COLUMN "startAt",
+      DROP COLUMN "jobData",
+      DROP COLUMN "priority",
+      DROP COLUMN "jobType";
+    DROP INDEX IF EXISTS "idx_EmbeddingsJobQueue_priority";
+  `)
+  await client.end()
+}
diff --git a/release-please-config.json b/release-please-config.json
index 29f302183a1..b8959848b5a 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -60,6 +60,11 @@
       "path": "packages/integration-tests/package.json",
       "jsonpath": "$.version"
     },
+    {
+      "type": "json",
+      "path": "packages/embedder/package.json",
+      "jsonpath": "$.version"
+    },
     {
       "type": "json",
       "path": "packages/server/package.json",
diff --git a/yarn.lock b/yarn.lock
index 817e730db40..e6fb56f52bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7577,6 +7577,11 @@
   dependencies:
     "@types/jsdom" "*"
 
+"@types/franc@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@types/franc/-/franc-5.0.3.tgz#7263cef3ab3512ac95a78c328fcc51c51396b49f"
+  integrity sha512-YX6o2vVkeiUvOF12bUmnSGf8sezOoBnCWjHHZGeh2lt3tqAutbJ9OL3cDRiZoiAYaZR638nuOc0Ji9bzdad2XA==
+
 "@types/glob@*":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
@@ -10109,6 +10114,11 @@ codemirror@^5.65.3:
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.3.tgz#2d029930d5a293bc5fb96ceea64654803c0d4ac7"
   integrity sha512-kCC0iwGZOVZXHEKW3NDTObvM7pTIyowjty4BUqeREROc/3I6bWbgZDA3fGDwlA+rbgRjvnRnfqs9SfXynel1AQ==
 
+collapse-white-space@^1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -12401,6 +12411,13 @@ framesync@6.0.1:
   dependencies:
     tslib "^2.1.0"
 
+franc-min@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/franc-min/-/franc-min-5.0.0.tgz#5625d0570a18564dcbbfa8330254d23549294d9a"
+  integrity sha512-xy7Iq7uNflbvNU+bkyYWtP+BOHWZle7kT9GM84gEV14b7/7sgq7M7Flf6v1XRflHAuHoshBMveWA6Q+kEXYeHQ==
+  dependencies:
+    trigram-utils "^1.0.0"
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -15026,10 +15043,10 @@ kysely-codegen@^0.11.0:
     micromatch "^4.0.5"
     minimist "^1.2.8"
 
-kysely@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.27.2.tgz#b289ce5e561064ec613a17149b7155783d2b36de"
-  integrity sha512-DmRvEfiR/NLpgsTbSxma2ldekhsdcd65+MNiKXyd/qj7w7X5e3cLkXxcj+MypsRDjPhHQ/CD5u3Eq1sBYzX0bw==
+kysely@^0.27.3:
+  version "0.27.3"
+  resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.27.3.tgz#6cc6c757040500b43c4ac596cdbb12be400ee276"
+  integrity sha512-lG03Ru+XyOJFsjH3OMY6R/9U38IjDPfnOfDgO3ynhbDr+Dz8fak+X6L62vqu3iybQnj+lG84OttBuU9KY3L9kA==
 
 launch-editor@^2.6.0:
   version "2.6.0"
@@ -16139,6 +16156,11 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+n-gram@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/n-gram/-/n-gram-1.1.2.tgz#69c609a5c83bb32f82774c9e297f8494c7326798"
+  integrity sha512-mBTpWKp0NHdujHmxrskPg2jc108mjyMmVxHN1rZGK/ogTLi9O0debDIXlQPqotNELdNmVGtL4jr7SCig+4OWvQ==
+
 nan@^2.17.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
@@ -16876,11 +16898,23 @@ openai@^4.24.1:
     node-fetch "^2.6.7"
     web-streams-polyfill "^3.2.1"
 
+openapi-fetch@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/openapi-fetch/-/openapi-fetch-0.9.3.tgz#37c1dbde7faec885eaa40f351cab1c231b794761"
+  integrity sha512-tC1NDn71vJHeCzu+lYdrnIpgRt4GxR0B4eSwXNb15ypWpZcpaEOwHFkoz8FcfG5Fvqkz2P0Fl9zQF1JJwBjuvA==
+  dependencies:
+    openapi-typescript-helpers "^0.0.7"
+
 openapi-types@^12.1.0:
   version "12.1.1"
   resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-12.1.1.tgz#0aface4e05ba60efbf51153ed6af23988796617d"
   integrity sha512-m/DJaEqOUDSU8KoI74E6A3TokccuDOJ81ewZ6kLFwUT1KEIE0GDWvErtnJJDU4sySx8JKF5kk2GzHUuK6f+VHA==
 
+openapi-typescript-helpers@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/openapi-typescript-helpers/-/openapi-typescript-helpers-0.0.7.tgz#1d0ead67c35864d189c2cb2d0556854ccbb16c38"
+  integrity sha512-7nwlAtdA1fULipibFRBWE/rnF114q6ejRYzNvhdA/x+qTWAZhXGLc/368dlwMlyJDvCQMCnADjpzb5BS5ZmNSA==
+
 opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
@@ -20704,6 +20738,15 @@ treeverse@^2.0.0:
   resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
   integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
 
+trigram-utils@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/trigram-utils/-/trigram-utils-1.0.3.tgz#535da37a414dae249c4b023512cf2b3dc65c8ea4"
+  integrity sha512-UAhS1Ll21FtClVIzIN0I/SmGnJ+D08BOxX7Dl1penV8raC0ksf2dJkhNI6kU1Mj3uT86Bul12iMvxXquXSYSng==
+  dependencies:
+    collapse-white-space "^1.0.0"
+    n-gram "^1.0.0"
+    trim "0.0.1"
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -20714,6 +20757,11 @@ trim-newlines@^4.0.2:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz#d6aaaf6a0df1b4b536d183879a6b939489808c7c"
   integrity sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==
 
+trim@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
+  integrity sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==
+
 ts-algebra@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ts-algebra/-/ts-algebra-1.2.0.tgz#f91c481207a770f0d14d055c376cbee040afdfc9"
@@ -20997,10 +21045,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.9.5, "typescript@^3 || ^4", typescript@^4.2.4, typescript@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
-  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
+"typescript@^3 || ^4", typescript@^4.2.4, typescript@^5.3.3:
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
+  integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
 
 uWebSockets.js@uNetworking/uWebSockets.js#v20.34.0:
   version "20.34.0"

From 9865bc966edd90bdadd963d07eef12d8899e8fc0 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Mon, 1 Apr 2024 09:41:02 -0700
Subject: [PATCH 106/183] chore(release): release v7.24.0 (#9581)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 12 ++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index bae38c98366..bc72873ade5 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.23.1"
+  ".": "7.24.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 294dbfc8830..a9adc2cad97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.24.0](https://github.com/ParabolInc/parabol/compare/v7.23.1...v7.24.0) (2024-03-29)
+
+
+### Added
+
+* prepare embedder for Production ([#9517](https://github.com/ParabolInc/parabol/issues/9517)) ([538c95c](https://github.com/ParabolInc/parabol/commit/538c95ce4dc7d4839b3e813006cb20e1b7d1d1c8))
+
+
+### Changed
+
+* fix tsconfig problems ([#9579](https://github.com/ParabolInc/parabol/issues/9579)) ([d1af0f1](https://github.com/ParabolInc/parabol/commit/d1af0f164c629e8fc075278cd63475e8913f4295))
+
 ## [7.23.1](https://github.com/ParabolInc/parabol/compare/v7.23.0...v7.23.1) (2024-03-28)
 
 
diff --git a/package.json b/package.json
index 7312d1f47d3..a7562ce29bd 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.1",
+  "version": "7.24.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index b2e5061c6bc..63593c4e0fb 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.23.1",
+  "version": "7.24.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.23.1"
+    "parabol-server": "7.24.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 5775dc743ab..155fa89f5fd 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.1",
+  "version": "7.24.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index fdf98991ced..b7c510ef5b5 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.10.0",
+  "version": "7.24.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index bed8c3473eb..bd7f9c61b51 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.23.1",
+  "version": "7.24.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.23.1",
-    "parabol-server": "7.23.1",
+    "parabol-client": "7.24.0",
+    "parabol-server": "7.24.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 2cbc84391c1..893db5ee8df 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.1",
+  "version": "7.24.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 62295579ced..8cc20a60e6c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.23.1",
+  "version": "7.24.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -125,7 +125,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.23.1",
+    "parabol-client": "7.24.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 8cdd9014c3277905605c6544de92d9ac2833a6e9 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 1 Apr 2024 11:45:02 -0700
Subject: [PATCH 107/183] fix: embedder doesn't dive deep into schema (#9582)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/embedder/types/shared.d.ts                   |  1 -
 packages/server/database/rethinkDriver.ts             |  2 +-
 packages/server/dataloader/customLoaderMakers.ts      |  2 +-
 .../graphql/private/mutations/runScheduledJobs.ts     |  2 --
 packages/server/graphql/public/rootSchema.ts          |  1 -
 .../server/integrations/gitlab/GitLabServerManager.ts |  2 +-
 .../postgres/types/{Meeting.ts => Meeting.d.ts}       |  0
 packages/server/types/custom.d.ts                     | 11 +++++++++++
 packages/server/utils/analytics/analytics.ts          | 11 +++++------
 packages/server/utils/getGitHubRequest.ts             |  2 +-
 tsconfig.base.json                                    |  1 +
 11 files changed, 21 insertions(+), 14 deletions(-)
 rename packages/server/postgres/types/{Meeting.ts => Meeting.d.ts} (100%)

diff --git a/packages/embedder/types/shared.d.ts b/packages/embedder/types/shared.d.ts
index 1d6610890e7..e94d0d14dea 100644
--- a/packages/embedder/types/shared.d.ts
+++ b/packages/embedder/types/shared.d.ts
@@ -1,2 +1 @@
 import '../../server/types/modules'
-import '../../server/types/webpackEnv'
diff --git a/packages/server/database/rethinkDriver.ts b/packages/server/database/rethinkDriver.ts
index 5f7311c0580..370482933b2 100644
--- a/packages/server/database/rethinkDriver.ts
+++ b/packages/server/database/rethinkDriver.ts
@@ -4,7 +4,7 @@ import SlackAuth from '../database/types/SlackAuth'
 import SlackNotification from '../database/types/SlackNotification'
 import TeamInvitation from '../database/types/TeamInvitation'
 import TeamMember from '../database/types/TeamMember'
-import {ScheduledJobUnion} from '../graphql/private/mutations/runScheduledJobs'
+import {ScheduledJobUnion} from '../types/custom'
 import {AnyMeeting, AnyMeetingSettings, AnyMeetingTeamMember} from '../postgres/types/Meeting'
 import getRethinkConfig from './getRethinkConfig'
 import {R} from './stricterR'
diff --git a/packages/server/dataloader/customLoaderMakers.ts b/packages/server/dataloader/customLoaderMakers.ts
index ac7e1ea6ec7..f10dfd1f257 100644
--- a/packages/server/dataloader/customLoaderMakers.ts
+++ b/packages/server/dataloader/customLoaderMakers.ts
@@ -5,11 +5,11 @@ import getRethink, {RethinkSchema} from '../database/rethinkDriver'
 import {RDatum} from '../database/stricterR'
 import MeetingSettingsTeamPrompt from '../database/types/MeetingSettingsTeamPrompt'
 import MeetingTemplate from '../database/types/MeetingTemplate'
+import Organization from '../database/types/Organization'
 import OrganizationUser from '../database/types/OrganizationUser'
 import {Reactable, ReactableEnum} from '../database/types/Reactable'
 import Task, {TaskStatusEnum} from '../database/types/Task'
 import isValid from '../graphql/isValid'
-import {Organization} from '../graphql/public/resolverTypes'
 import {SAMLSource} from '../graphql/public/types/SAML'
 import getKysely from '../postgres/getKysely'
 import {TeamMeetingTemplate} from '../postgres/pg.d'
diff --git a/packages/server/graphql/private/mutations/runScheduledJobs.ts b/packages/server/graphql/private/mutations/runScheduledJobs.ts
index aebb1e5eafe..5317aff0147 100644
--- a/packages/server/graphql/private/mutations/runScheduledJobs.ts
+++ b/packages/server/graphql/private/mutations/runScheduledJobs.ts
@@ -40,8 +40,6 @@ const processMeetingStageTimeLimits = async (
   })
 }
 
-export type ScheduledJobUnion = ScheduledJobMeetingStageTimeLimit | ScheduledTeamLimitsJob
-
 const processJob = async (job: Selectable<DB['ScheduledJob']>, dataLoader: DataLoaderWorker) => {
   const pg = getKysely()
   const res = await pg.deleteFrom('ScheduledJob').where('id', '=', job.id).executeTakeFirst()
diff --git a/packages/server/graphql/public/rootSchema.ts b/packages/server/graphql/public/rootSchema.ts
index b6f1d26fad2..e65b1459189 100644
--- a/packages/server/graphql/public/rootSchema.ts
+++ b/packages/server/graphql/public/rootSchema.ts
@@ -99,5 +99,4 @@ const addRequestors = (schema: GraphQLSchema) => {
 
 const rootSchema = addRequestors(resolveTypesForMutationPayloads(parabolWithNestedResolversSchema))
 
-export type RootSchema = typeof rootSchema
 export default rootSchema
diff --git a/packages/server/integrations/gitlab/GitLabServerManager.ts b/packages/server/integrations/gitlab/GitLabServerManager.ts
index 2ffcfa826bf..dd44a3a5525 100644
--- a/packages/server/integrations/gitlab/GitLabServerManager.ts
+++ b/packages/server/integrations/gitlab/GitLabServerManager.ts
@@ -9,8 +9,8 @@ import getIssue from '../../graphql/nestedSchema/GitLab/queries/getIssue.graphql
 import getProfile from '../../graphql/nestedSchema/GitLab/queries/getProfile.graphql'
 import getProjectIssues from '../../graphql/nestedSchema/GitLab/queries/getProjectIssues.graphql'
 import getProjects from '../../graphql/nestedSchema/GitLab/queries/getProjects.graphql'
-import {RootSchema} from '../../graphql/public/rootSchema'
 import {IGetTeamMemberIntegrationAuthQueryResult} from '../../postgres/queries/generated/getTeamMemberIntegrationAuthQuery'
+import {RootSchema} from '../../types/custom'
 import {
   CreateIssueMutation,
   CreateNoteMutation,
diff --git a/packages/server/postgres/types/Meeting.ts b/packages/server/postgres/types/Meeting.d.ts
similarity index 100%
rename from packages/server/postgres/types/Meeting.ts
rename to packages/server/postgres/types/Meeting.d.ts
diff --git a/packages/server/types/custom.d.ts b/packages/server/types/custom.d.ts
index 2fc4dba2ce8..aae67c270cd 100644
--- a/packages/server/types/custom.d.ts
+++ b/packages/server/types/custom.d.ts
@@ -1,5 +1,9 @@
+import {GraphQLSchema} from 'graphql'
+import type nestGitHubEndpoint from 'nest-graphql-endpoint/lib/nestGitHubEndpoint'
 import '../../client/types/reactHTML4'
 import type AuthToken from '../database/types/AuthToken'
+import type ScheduledJobMeetingStageTimeLimit from '../database/types/ScheduledJobMetingStageTimeLimit'
+import type ScheduledTeamLimitsJob from '../database/types/ScheduledTeamLimitsJob'
 export interface OAuth2Success {
   access_token: string
   token_type: string
@@ -35,3 +39,10 @@ export interface GQLRequest {
   // Datadog opentracing span of the calling server
   carrier?: any
 }
+
+export type ScheduledJobUnion = ScheduledJobMeetingStageTimeLimit | ScheduledTeamLimitsJob
+
+export type RootSchema = GraphQLSchema & {
+  githubRequest: ReturnType<typeof nestGitHubEndpoint>['githubRequest']
+  gitlabRequest: ReturnType<typeof nestGitHubEndpoint>['githubRequest']
+}
diff --git a/packages/server/utils/analytics/analytics.ts b/packages/server/utils/analytics/analytics.ts
index a4cbc61f189..305839e2651 100644
--- a/packages/server/utils/analytics/analytics.ts
+++ b/packages/server/utils/analytics/analytics.ts
@@ -5,9 +5,12 @@ import Meeting from '../../database/types/Meeting'
 import MeetingMember from '../../database/types/MeetingMember'
 import MeetingRetrospective from '../../database/types/MeetingRetrospective'
 import MeetingTemplate from '../../database/types/MeetingTemplate'
-import {Reactable} from '../../database/types/Reactable'
+import {Reactable, ReactableEnum} from '../../database/types/Reactable'
+import {SlackNotificationEventEnum} from '../../database/types/SlackNotification'
 import {TaskServiceEnum} from '../../database/types/Task'
-import {ReactableEnum} from '../../graphql/private/resolverTypes'
+import TemplateScale from '../../database/types/TemplateScale'
+import {DataLoaderWorker} from '../../graphql/graphql'
+import {ModifyType} from '../../graphql/public/resolverTypes'
 import {IntegrationProviderServiceEnumType} from '../../graphql/types/IntegrationProviderServiceEnum'
 import {UpgradeCTALocationEnumType} from '../../graphql/types/UpgradeCTALocationEnum'
 import {TeamPromptResponse} from '../../postgres/queries/getTeamPromptResponsesByIds'
@@ -16,10 +19,6 @@ import {MeetingTypeEnum} from '../../postgres/types/Meeting'
 import {MeetingSeries} from '../../postgres/types/MeetingSeries'
 import {AmplitudeAnalytics} from './amplitude/AmplitudeAnalytics'
 import {createMeetingProperties} from './helpers'
-import {SlackNotificationEventEnum} from '../../database/types/SlackNotification'
-import TemplateScale from '../../database/types/TemplateScale'
-import {DataLoaderWorker} from '../../graphql/graphql'
-import {ModifyType} from '../../graphql/public/resolverTypes'
 
 export type AnalyticsUser = {
   id: string
diff --git a/packages/server/utils/getGitHubRequest.ts b/packages/server/utils/getGitHubRequest.ts
index 76efb0db5ae..59ff1eea559 100644
--- a/packages/server/utils/getGitHubRequest.ts
+++ b/packages/server/utils/getGitHubRequest.ts
@@ -1,6 +1,6 @@
 import {GraphQLResolveInfo} from 'graphql'
 import {EndpointContext} from 'nest-graphql-endpoint/lib/types'
-import {RootSchema} from '../graphql/public/rootSchema'
+import {RootSchema} from '../types/custom'
 
 // This helper just cleans up the input/output boilerplate.
 // It breaks githubRequest into 2 parts so the info, endpointContext, and batchRef are kept in context
diff --git a/tsconfig.base.json b/tsconfig.base.json
index adc1623c1b5..c207d6f1c07 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -16,6 +16,7 @@
     "strictPropertyInitialization": true,
     "noImplicitThis": true,
     "alwaysStrict": true,
+    "noEmit": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,

From 341b4b797ec6444066244f25916803e64c03258c Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 1 Apr 2024 14:46:12 -0700
Subject: [PATCH 108/183] fix: embedder errors in embed length (#9584)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 package.json                                  |   7 +-
 packages/client/package.json                  |   2 -
 packages/embedder/EmbeddingsJobQueueStream.ts |   3 +-
 ...MetadataForRetrospectiveDiscussionTopic.ts |   7 +-
 .../ai_models/AbstractEmbeddingsModel.ts      |  56 +-
 .../ai_models/AbstractGenerationModel.ts      |  11 +-
 packages/embedder/ai_models/AbstractModel.ts  |   9 +-
 packages/embedder/ai_models/ModelManager.ts   | 155 ++--
 .../embedder/ai_models/OpenAIGeneration.ts    |  26 +-
 .../ai_models/TextEmbeddingsInference.ts      |  29 +-
 .../ai_models/TextGenerationInference.ts      |  24 +-
 packages/embedder/embedder.ts                 |   2 +-
 .../indexing/retrospectiveDiscussionTopic.ts  |   4 +-
 packages/embedder/package.json                |   4 +
 packages/embedder/processJobEmbed.ts          |  21 +-
 packages/embedder/textEmbeddingsnterface.d.ts | 778 +++++++++---------
 packages/integration-tests/package.json       |   2 -
 packages/server/package.json                  |   2 -
 yarn.lock                                     | 306 +++----
 19 files changed, 716 insertions(+), 732 deletions(-)

diff --git a/package.json b/package.json
index a7562ce29bd..427d88d96e8 100644
--- a/package.json
+++ b/package.json
@@ -92,13 +92,14 @@
     "@types/dotenv": "^6.1.1",
     "@types/jscodeshift": "^0.11.3",
     "@types/lodash.toarray": "^4.4.7",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
     "autoprefixer": "^10.4.13",
     "babel-loader": "^9.1.2",
     "concurrently": "^8.0.1",
     "copy-webpack-plugin": "^11.0.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
     "graphql": "15.7.2",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
diff --git a/packages/client/package.json b/packages/client/package.json
index 155fa89f5fd..9261fb18d5a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -50,8 +50,6 @@
     "@types/stripe-v2": "^2.0.1",
     "babel-plugin-relay": "^12.0.0",
     "debug": "^4.1.1",
-    "eslint": "^8.2.0",
-    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-emotion": "^10.0.14",
     "eslint-plugin-react": "^7.16.0",
     "eslint-plugin-react-hooks": "^1.6.1",
diff --git a/packages/embedder/EmbeddingsJobQueueStream.ts b/packages/embedder/EmbeddingsJobQueueStream.ts
index 7f5b1bde03d..64f7de936dd 100644
--- a/packages/embedder/EmbeddingsJobQueueStream.ts
+++ b/packages/embedder/EmbeddingsJobQueueStream.ts
@@ -7,13 +7,14 @@ import {DB} from 'parabol-server/postgres/pg'
 import RootDataLoader from '../server/dataloader/RootDataLoader'
 import {processJob} from './processJob'
 import {Logger} from '../server/utils/Logger'
+import {EmbeddingsTableName} from './ai_models/AbstractEmbeddingsModel'
 
 export type DBJob = Selectable<DB['EmbeddingsJobQueue']>
 export type EmbedJob = DBJob & {
   jobType: 'embed'
   jobData: {
     embeddingsMetadataId: number
-    model: string
+    model: EmbeddingsTableName
   }
 }
 export type RerankJob = DBJob & {jobType: 'rerank'; jobData: {discussionIds: string[]}}
diff --git a/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts b/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
index 724aec6fb13..cd4489e3942 100644
--- a/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
+++ b/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
@@ -41,7 +41,7 @@ const insertDiscussionsIntoMetadata = async (discussions: DiscussionMeta[], prio
   if (!metadataRows[0]) return
 
   const modelManager = getModelManager()
-  const models = modelManager.embeddingModels.map((m) => m.tableName)
+  const tableNames = [...modelManager.embeddingModels.keys()]
   return (
     pg
       .with('Insert', (qc) =>
@@ -55,8 +55,9 @@ const insertDiscussionsIntoMetadata = async (discussions: DiscussionMeta[], prio
       .with('Metadata', (qc) =>
         qc
           .selectFrom('Insert')
-          .fullJoin(sql<{model: string}>`UNNEST(ARRAY[${sql.join(models)}])`.as('model'), (join) =>
-            join.onTrue()
+          .fullJoin(
+            sql<{model: string}>`UNNEST(ARRAY[${sql.join(tableNames)}])`.as('model'),
+            (join) => join.onTrue()
           )
           .select(['id', 'model'])
       )
diff --git a/packages/embedder/ai_models/AbstractEmbeddingsModel.ts b/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
index 9fd5831ea1f..f9fb669737d 100644
--- a/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
+++ b/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
@@ -1,10 +1,11 @@
 import {sql} from 'kysely'
 import getKysely from 'parabol-server/postgres/getKysely'
 import {DB} from 'parabol-server/postgres/pg'
+import isValid from '../../server/graphql/isValid'
 import {Logger} from '../../server/utils/Logger'
 import {EMBEDDER_JOB_PRIORITY} from '../EMBEDDER_JOB_PRIORITY'
 import {ISO6391} from '../iso6393To1'
-import {AbstractModel, ModelConfig} from './AbstractModel'
+import {AbstractModel} from './AbstractModel'
 
 export interface EmbeddingModelParams {
   embeddingDimensions: number
@@ -12,32 +13,59 @@ export interface EmbeddingModelParams {
   tableSuffix: string
   languages: ISO6391[]
 }
-export type EmbeddingsTable = Extract<keyof DB, `Embeddings_${string}`>
-export interface EmbeddingModelConfig extends ModelConfig {
-  tableSuffix: string
-}
+export type EmbeddingsTableName = `Embeddings_${string}`
+export type EmbeddingsTable = Extract<keyof DB, EmbeddingsTableName>
 
 export abstract class AbstractEmbeddingsModel extends AbstractModel {
   readonly embeddingDimensions: number
   readonly maxInputTokens: number
-  readonly tableName: string
+  readonly tableName: EmbeddingsTableName
   readonly languages: ISO6391[]
-  constructor(config: EmbeddingModelConfig) {
-    super(config)
-    const modelParams = this.constructModelParams(config)
+  constructor(modelId: string, url: string) {
+    super(url)
+    const modelParams = this.constructModelParams(modelId)
     this.embeddingDimensions = modelParams.embeddingDimensions
     this.languages = modelParams.languages
     this.maxInputTokens = modelParams.maxInputTokens
     this.tableName = `Embeddings_${modelParams.tableSuffix}`
   }
-  protected abstract constructModelParams(config: EmbeddingModelConfig): EmbeddingModelParams
+  protected abstract constructModelParams(modelId: string): EmbeddingModelParams
   abstract getEmbedding(content: string, retries?: number): Promise<number[] | Error>
 
   abstract getTokens(content: string): Promise<number[] | Error>
-  splitText(content: string) {
+
+  async chunkText(content: string) {
+    const tokens = await this.getTokens(content)
+    if (tokens instanceof Error) return tokens
+    const isFullTextTooBig = tokens.length > this.maxInputTokens
+    if (!isFullTextTooBig) return [content]
+
+    for (let i = 0; i < 3; i++) {
+      const tokensPerWord = (4 + i) / 3
+      const chunks = this.splitText(content, tokensPerWord)
+      const chunkLengths = await Promise.all(
+        chunks.map(async (chunk) => {
+          const chunkTokens = await this.getTokens(chunk)
+          if (chunkTokens instanceof Error) return chunkTokens
+          return chunkTokens.length
+        })
+      )
+      const firstError = chunkLengths.find(
+        (chunkLength): chunkLength is Error => chunkLength instanceof Error
+      )
+      if (firstError) return firstError
+
+      const validChunks = chunkLengths.filter(isValid)
+      if (validChunks.every((chunkLength) => chunkLength <= this.maxInputTokens)) {
+        return chunks
+      }
+    }
+    return new Error(`Text is too long and could not be split into chunks. Is it english?`)
+  }
+  // private because result must still be too long to go into model. Must verify with getTokens
+  private splitText(content: string, tokensPerWord = 4 / 3) {
     // it's actually 4 / 3, but don't want to chance a failed split
-    const TOKENS_PER_WORD = 5 / 3
-    const WORD_LIMIT = Math.floor(this.maxInputTokens / TOKENS_PER_WORD)
+    const WORD_LIMIT = Math.floor(this.maxInputTokens / tokensPerWord)
     const chunks: string[] = []
     const delimiters = ['\n\n', '\n', '.', ' ']
     const countWords = (text: string) => text.trim().split(/\s+/).length
@@ -98,7 +126,7 @@ export abstract class AbstractEmbeddingsModel extends AbstractModel {
           'tablename'
         )} = ${this.tableName}`.execute(pg)
       ).rows.length > 0
-    if (hasTable) return undefined
+    if (hasTable) return
     const vectorDimensions = this.embeddingDimensions
     Logger.log(`ModelManager: creating ${this.tableName} with ${vectorDimensions} dimensions`)
     await sql`
diff --git a/packages/embedder/ai_models/AbstractGenerationModel.ts b/packages/embedder/ai_models/AbstractGenerationModel.ts
index c57d86c243a..ac0223e6eb6 100644
--- a/packages/embedder/ai_models/AbstractGenerationModel.ts
+++ b/packages/embedder/ai_models/AbstractGenerationModel.ts
@@ -1,4 +1,4 @@
-import {AbstractModel, ModelConfig} from './AbstractModel'
+import {AbstractModel} from './AbstractModel'
 
 export interface GenerationOptions {
   maxNewTokens?: number
@@ -11,16 +11,15 @@ export interface GenerationOptions {
 export interface GenerationModelParams {
   maxInputTokens: number
 }
-export interface GenerationModelConfig extends ModelConfig {}
 
 export abstract class AbstractGenerationModel extends AbstractModel {
   readonly maxInputTokens: number
-  constructor(config: GenerationModelConfig) {
-    super(config)
-    const modelParams = this.constructModelParams(config)
+  constructor(modelId: string, url: string) {
+    super(url)
+    const modelParams = this.constructModelParams(modelId)
     this.maxInputTokens = modelParams.maxInputTokens
   }
 
-  protected abstract constructModelParams(config: GenerationModelConfig): GenerationModelParams
+  protected abstract constructModelParams(modelId: string): GenerationModelParams
   abstract summarize(content: string, options: GenerationOptions): Promise<string>
 }
diff --git a/packages/embedder/ai_models/AbstractModel.ts b/packages/embedder/ai_models/AbstractModel.ts
index 3b114558539..322476c552f 100644
--- a/packages/embedder/ai_models/AbstractModel.ts
+++ b/packages/embedder/ai_models/AbstractModel.ts
@@ -1,13 +1,8 @@
-export interface ModelConfig {
-  model: string
-  url: string
-}
-
 export abstract class AbstractModel {
   public readonly url: string
 
-  constructor(config: ModelConfig) {
-    this.url = this.normalizeUrl(config.url)
+  constructor(url: string) {
+    this.url = this.normalizeUrl(url)
   }
 
   // removes a trailing slash from the inputUrl
diff --git a/packages/embedder/ai_models/ModelManager.ts b/packages/embedder/ai_models/ModelManager.ts
index 55bf3feeadc..bbbfa4f6273 100644
--- a/packages/embedder/ai_models/ModelManager.ts
+++ b/packages/embedder/ai_models/ModelManager.ts
@@ -1,118 +1,93 @@
-import {AbstractEmbeddingsModel, EmbeddingModelConfig} from './AbstractEmbeddingsModel'
-import {AbstractGenerationModel, GenerationModelConfig} from './AbstractGenerationModel'
-import {ModelConfig} from './AbstractModel'
+import {AbstractEmbeddingsModel, EmbeddingsTableName} from './AbstractEmbeddingsModel'
+import {AbstractGenerationModel} from './AbstractGenerationModel'
 import OpenAIGeneration from './OpenAIGeneration'
 import TextEmbeddingsInference from './TextEmbeddingsInference'
 import TextGenerationInference from './TextGenerationInference'
 
-interface ModelManagerConfig {
-  embeddingModels: EmbeddingModelConfig[]
-  generationModels: GenerationModelConfig[]
-}
-
 type EmbeddingsModelType = 'text-embeddings-inference'
 type GenerationModelType = 'openai' | 'text-generation-inference'
 
-export class ModelManager {
-  embeddingModels: AbstractEmbeddingsModel[]
-  embeddingModelsMapByTable: {[key: string]: AbstractEmbeddingsModel}
-  generationModels: AbstractGenerationModel[]
+export interface ModelConfig {
+  model: `${EmbeddingsModelType | GenerationModelType}:${string}`
+  url: string
+}
 
-  private isValidConfig(
-    maybeConfig: Partial<ModelManagerConfig>
-  ): maybeConfig is ModelManagerConfig {
-    if (!maybeConfig.embeddingModels || !Array.isArray(maybeConfig.embeddingModels)) {
-      throw new Error('Invalid configuration: embedding_models is missing or not an array')
-    }
-    if (!maybeConfig.generationModels || !Array.isArray(maybeConfig.generationModels)) {
-      throw new Error('Invalid configuration: summarization_models is missing or not an array')
+export class ModelManager {
+  embeddingModels: Map<EmbeddingsTableName, AbstractEmbeddingsModel>
+  generationModels: Map<string, AbstractGenerationModel>
+
+  private parseModelEnvVars(envVar: 'AI_EMBEDDING_MODELS' | 'AI_GENERATION_MODELS'): ModelConfig[] {
+    const envValue = process.env[envVar]
+    if (!envValue) return []
+    let models
+    try {
+      models = JSON.parse(envValue)
+    } catch (e) {
+      throw new Error(`Invalid Env Var: ${envVar}. Must be a valid JSON`)
     }
 
-    maybeConfig.embeddingModels.forEach((model: ModelConfig) => {
-      this.isValidModelConfig(model)
-    })
-
-    maybeConfig.generationModels.forEach((model: ModelConfig) => {
-      this.isValidModelConfig(model)
-    })
-
-    return true
-  }
-
-  private isValidModelConfig(model: ModelConfig): model is ModelConfig {
-    if (typeof model.model !== 'string') {
-      throw new Error('Invalid ModelConfig: model field should be a string')
-    }
-    if (model.url !== undefined && typeof model.url !== 'string') {
-      throw new Error('Invalid ModelConfig: url field should be a string')
+    if (!Array.isArray(models)) {
+      throw new Error(`Invalid Env Var: ${envVar}. Must be an array`)
     }
-
-    return true
-  }
-
-  constructor(config: ModelManagerConfig) {
-    // Validate configuration
-    this.isValidConfig(config)
-
-    // Initialize embeddings models
-    this.embeddingModelsMapByTable = {}
-    this.embeddingModels = config.embeddingModels.map((modelConfig) => {
-      const [modelType] = modelConfig.model.split(':') as [EmbeddingsModelType, string]
-
-      switch (modelType) {
-        case 'text-embeddings-inference': {
-          const embeddingsModel = new TextEmbeddingsInference(modelConfig)
-          this.embeddingModelsMapByTable[embeddingsModel.tableName] = embeddingsModel
-          return embeddingsModel
+    const properties = ['model', 'url']
+    models.forEach((model, idx) => {
+      properties.forEach((prop) => {
+        if (typeof model[prop] !== 'string') {
+          throw new Error(`Invalid Env Var: ${envVar}. Invalid "${prop}" at index ${idx}`)
         }
-        default:
-          throw new Error(`unsupported embeddings model '${modelType}'`)
-      }
+      })
     })
+    return models
+  }
 
-    // Initialize summarization models
-    this.generationModels = config.generationModels.map((modelConfig) => {
-      const [modelType, _] = modelConfig.model.split(':') as [GenerationModelType, string]
-
-      switch (modelType) {
-        case 'openai': {
-          return new OpenAIGeneration(modelConfig)
+  constructor() {
+    // Initialize embeddings models
+    const embeddingConfig = this.parseModelEnvVars('AI_EMBEDDING_MODELS')
+    this.embeddingModels = new Map(
+      embeddingConfig.map((modelConfig) => {
+        const {model, url} = modelConfig
+        const [modelType, modelId] = model.split(':') as [EmbeddingsModelType, string]
+        switch (modelType) {
+          case 'text-embeddings-inference': {
+            const embeddingsModel = new TextEmbeddingsInference(modelId, url)
+            return [embeddingsModel.tableName, embeddingsModel]
+          }
+          default:
+            throw new Error(`unsupported embeddings model '${modelType}'`)
         }
-        case 'text-generation-inference': {
-          return new TextGenerationInference(modelConfig)
+      })
+    )
+
+    // Initialize generation models
+    const generationConfig = this.parseModelEnvVars('AI_GENERATION_MODELS')
+    this.generationModels = new Map<string, AbstractGenerationModel>(
+      generationConfig.map((modelConfig) => {
+        const {model, url} = modelConfig
+        const [modelType, modelId] = model.split(':') as [GenerationModelType, string]
+        switch (modelType) {
+          case 'openai': {
+            return [modelId, new OpenAIGeneration(modelId, url)]
+          }
+          case 'text-generation-inference': {
+            return [modelId, new TextGenerationInference(modelId, url)]
+          }
+          default:
+            throw new Error(`unsupported generation model '${modelType}'`)
         }
-        default:
-          throw new Error(`unsupported summarization model '${modelType}'`)
-      }
-    })
+      })
+    )
   }
 
   async maybeCreateTables() {
-    return Promise.all(this.embeddingModels.map((model) => model.createTable()))
+    return Promise.all([...this.embeddingModels].map(([, model]) => model.createTable()))
   }
 }
 
 let modelManager: ModelManager | undefined
 export function getModelManager() {
-  if (modelManager) return modelManager
-  const {AI_EMBEDDING_MODELS, AI_GENERATION_MODELS} = process.env
-  const config: ModelManagerConfig = {
-    embeddingModels: [],
-    generationModels: []
-  }
-  try {
-    config.embeddingModels = AI_EMBEDDING_MODELS && JSON.parse(AI_EMBEDDING_MODELS)
-  } catch (e) {
-    throw new Error(`Invalid AI_EMBEDDING_MODELS .env JSON: ${e}`)
+  if (!modelManager) {
+    modelManager = new ModelManager()
   }
-  try {
-    config.generationModels = AI_GENERATION_MODELS && JSON.parse(AI_GENERATION_MODELS)
-  } catch (e) {
-    throw new Error(`Invalid AI_GENERATION_MODELS .env JSON: ${e}`)
-  }
-
-  modelManager = new ModelManager(config)
-
   return modelManager
 }
 
diff --git a/packages/embedder/ai_models/OpenAIGeneration.ts b/packages/embedder/ai_models/OpenAIGeneration.ts
index 697160513ae..2bd97a32822 100644
--- a/packages/embedder/ai_models/OpenAIGeneration.ts
+++ b/packages/embedder/ai_models/OpenAIGeneration.ts
@@ -1,7 +1,6 @@
 import OpenAI from 'openai'
 import {
   AbstractGenerationModel,
-  GenerationModelConfig,
   GenerationModelParams,
   GenerationOptions
 } from './AbstractGenerationModel'
@@ -19,16 +18,12 @@ const modelIdDefinitions: Record<ModelId, GenerationModelParams> = {
   }
 }
 
-function isValidModelId(object: any): object is ModelId {
-  return Object.keys(modelIdDefinitions).includes(object)
-}
-
 export class OpenAIGeneration extends AbstractGenerationModel {
   private openAIApi: OpenAI | null
   private modelId!: ModelId
 
-  constructor(config: GenerationModelConfig) {
-    super(config)
+  constructor(modelId: string, url: string) {
+    super(modelId, url)
     if (!process.env.OPEN_AI_API_KEY) {
       this.openAIApi = null
       return
@@ -73,19 +68,10 @@ export class OpenAIGeneration extends AbstractGenerationModel {
       throw e
     }
   }
-  protected constructModelParams(config: GenerationModelConfig): GenerationModelParams {
-    const modelConfigStringSplit = config.model.split(':')
-    if (modelConfigStringSplit.length != 2) {
-      throw new Error('OpenAIGeneration model string must be colon-delimited and len 2')
-    }
-
-    const maybeModelId = modelConfigStringSplit[1]
-    if (!isValidModelId(maybeModelId))
-      throw new Error(`OpenAIGeneration model id unknown: ${maybeModelId}`)
-
-    this.modelId = maybeModelId
-
-    return modelIdDefinitions[maybeModelId]
+  protected constructModelParams(modelId: string): GenerationModelParams {
+    const modelParams = modelIdDefinitions[modelId as keyof typeof modelIdDefinitions]
+    if (!modelParams) throw new Error(`Unknown modelId ${modelId} for OpenAIGeneration`)
+    return modelParams
   }
 }
 
diff --git a/packages/embedder/ai_models/TextEmbeddingsInference.ts b/packages/embedder/ai_models/TextEmbeddingsInference.ts
index c30c59e8e8d..1a2a02596b3 100644
--- a/packages/embedder/ai_models/TextEmbeddingsInference.ts
+++ b/packages/embedder/ai_models/TextEmbeddingsInference.ts
@@ -1,11 +1,7 @@
 import createClient from 'openapi-fetch'
 import sleep from 'parabol-client/utils/sleep'
 import type {paths} from '../textEmbeddingsnterface'
-import {
-  AbstractEmbeddingsModel,
-  EmbeddingModelConfig,
-  EmbeddingModelParams
-} from './AbstractEmbeddingsModel'
+import {AbstractEmbeddingsModel, EmbeddingModelParams} from './AbstractEmbeddingsModel'
 export type ModelId = 'BAAI/bge-large-en-v1.5' | 'llmrails/ember-v1'
 
 const modelIdDefinitions: Record<ModelId, EmbeddingModelParams> = {
@@ -23,14 +19,10 @@ const modelIdDefinitions: Record<ModelId, EmbeddingModelParams> = {
   }
 }
 
-function isValidModelId(object: any): object is ModelId {
-  return Object.keys(modelIdDefinitions).includes(object)
-}
-
 export class TextEmbeddingsInference extends AbstractEmbeddingsModel {
   client: ReturnType<typeof createClient<paths>>
-  constructor(config: EmbeddingModelConfig) {
-    super(config)
+  constructor(modelId: string, url: string) {
+    super(modelId, url)
     this.client = createClient<paths>({baseUrl: this.url})
   }
 
@@ -85,17 +77,10 @@ export class TextEmbeddingsInference extends AbstractEmbeddingsModel {
     }
   }
 
-  protected constructModelParams(config: EmbeddingModelConfig): EmbeddingModelParams {
-    const modelConfigStringSplit = config.model.split(':')
-    if (modelConfigStringSplit.length != 2) {
-      throw new Error('TextGenerationInference model string must be colon-delimited and len 2')
-    }
-
-    if (!this.url) throw new Error('TextGenerationInferenceSummarizer model requires url')
-    const maybeModelId = modelConfigStringSplit[1]
-    if (!isValidModelId(maybeModelId))
-      throw new Error(`TextGenerationInference model id unknown: ${maybeModelId}`)
-    return modelIdDefinitions[maybeModelId]
+  protected constructModelParams(modelId: string): EmbeddingModelParams {
+    const modelParams = modelIdDefinitions[modelId as keyof typeof modelIdDefinitions]
+    if (!modelParams) throw new Error(`Unknown modelId ${modelId} for TextEmbeddingsInference`)
+    return modelParams
   }
 }
 
diff --git a/packages/embedder/ai_models/TextGenerationInference.ts b/packages/embedder/ai_models/TextGenerationInference.ts
index 8fa4ab7cd7b..96d7fdde89f 100644
--- a/packages/embedder/ai_models/TextGenerationInference.ts
+++ b/packages/embedder/ai_models/TextGenerationInference.ts
@@ -1,6 +1,5 @@
 import {
   AbstractGenerationModel,
-  GenerationModelConfig,
   GenerationModelParams,
   GenerationOptions
 } from './AbstractGenerationModel'
@@ -16,13 +15,9 @@ const modelIdDefinitions: Record<ModelId, GenerationModelParams> = {
   }
 }
 
-function isValidModelId(object: any): object is ModelId {
-  return Object.keys(modelIdDefinitions).includes(object)
-}
-
 export class TextGenerationInference extends AbstractGenerationModel {
-  constructor(config: GenerationModelConfig) {
-    super(config)
+  constructor(modelId: string, url: string) {
+    super(modelId, url)
   }
 
   async summarize(content: string, options: GenerationOptions) {
@@ -61,17 +56,10 @@ export class TextGenerationInference extends AbstractGenerationModel {
       throw e
     }
   }
-  protected constructModelParams(config: GenerationModelConfig): GenerationModelParams {
-    const modelConfigStringSplit = config.model.split(':')
-    if (modelConfigStringSplit.length != 2) {
-      throw new Error('TextGenerationInference model string must be colon-delimited and len 2')
-    }
-
-    if (!this.url) throw new Error('TextGenerationInferenceSummarizer model requires url')
-    const maybeModelId = modelConfigStringSplit[1]
-    if (!isValidModelId(maybeModelId))
-      throw new Error(`TextGenerationInference model id unknown: ${maybeModelId}`)
-    return modelIdDefinitions[maybeModelId]
+  protected constructModelParams(modelId: string): GenerationModelParams {
+    const modelParams = modelIdDefinitions[modelId as keyof typeof modelIdDefinitions]
+    if (!modelParams) throw new Error(`Unknown modelId ${modelId} for TextGenerationInference`)
+    return modelParams
   }
 }
 
diff --git a/packages/embedder/embedder.ts b/packages/embedder/embedder.ts
index 628d0d8decd..7971ba4f717 100644
--- a/packages/embedder/embedder.ts
+++ b/packages/embedder/embedder.ts
@@ -44,7 +44,7 @@ const run = async () => {
   const redis = new RedisInstance(`embedder_${SERVER_ID}`)
   const primaryLock = await establishPrimaryEmbedder(redis)
   const modelManager = getModelManager()
-  let streams: AsyncIterableIterator<any> | undefined
+  let streams: AsyncIterableIterator<any> | undefined = undefined
   const kill = () => {
     primaryLock?.release()
     streams?.return?.()
diff --git a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
index 4dc0bfaddd5..03af3b510ba 100644
--- a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
+++ b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
@@ -139,8 +139,8 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
         if (a.threadParentId === b.threadParentId) {
           return a.threadSortOrder - b.threadSortOrder
         }
-        if (a.threadParentId == null) return 1
-        if (b.threadParentId == null) return -1
+        if (!a.threadParentId) return 1
+        if (!b.threadParentId) return -1
         return a.threadParentId > b.threadParentId ? 1 : -1
       }) as Comment[]
 
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index b7c510ef5b5..aea9068a6ca 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -10,6 +10,10 @@
     "url": "git+https://github.com/ParabolInc/parabol.git"
   },
   "scripts": {
+    "lint": "eslint --fix . --ext .ts,.tsx",
+    "lint:check": "eslint . --ext .ts,.tsx",
+    "prettier": "prettier --config ../../.prettierrc --write \"**/*.{ts,tsx}\"",
+    "prettier:check": "prettier --config ../../.prettierrc --check \"**/*.{ts,tsx}\"",
     "typecheck": "yarn tsc --noEmit -p tsconfig.json"
   },
   "bugs": {
diff --git a/packages/embedder/processJobEmbed.ts b/packages/embedder/processJobEmbed.ts
index d1b895cc640..d7fecf2aab0 100644
--- a/packages/embedder/processJobEmbed.ts
+++ b/packages/embedder/processJobEmbed.ts
@@ -45,7 +45,7 @@ export const processJobEmbed = async (job: EmbedJob, dataLoader: RootDataLoader)
     return
   }
 
-  const embeddingModel = modelManager.embeddingModelsMapByTable[model]
+  const embeddingModel = modelManager.embeddingModels.get(model)
   if (!embeddingModel) {
     await failJob(jobId, `embedding model ${model} not available`)
     return
@@ -54,20 +54,18 @@ export const processJobEmbed = async (job: EmbedJob, dataLoader: RootDataLoader)
   // Exit successfully, we don't want to fail the job because the language is not supported
   if (!embeddingModel.languages.includes(language!)) return true
 
-  const tokens = await embeddingModel.getTokens(fullText)
-  if (tokens instanceof Error) {
+  const chunks = await embeddingModel.chunkText(fullText)
+  if (chunks instanceof Error) {
     await failJob(
       jobId,
-      `unable to get tokens: ${tokens.message}`,
+      `unable to get tokens: ${chunks.message}`,
       retryCount < 10 ? new Date(Date.now() + ms('1m')) : null
     )
     return
   }
-  const isFullTextTooBig = tokens.length > embeddingModel.maxInputTokens
   // Cannot use summarization strategy if generation model has same context length as embedding model
   // We must split the text & not tokens because BERT tokenizer is not trained for linebreaks e.g. \n\n
-  const chunks = isFullTextTooBig ? embeddingModel.splitText(fullText) : [fullText]
-  await Promise.all(
+  const isSuccessful = await Promise.all(
     chunks.map(async (chunk, chunkNumber) => {
       const embeddingVector = await embeddingModel.getEmbedding(chunk)
       if (embeddingVector instanceof Error) {
@@ -76,17 +74,17 @@ export const processJobEmbed = async (job: EmbedJob, dataLoader: RootDataLoader)
           `unable to get embeddings: ${embeddingVector.message}`,
           retryCount < 10 ? new Date(Date.now() + ms('1m')) : null
         )
-        return
+        return false
       }
       await pg
         // cast to any because these types won't be available in CI
         .insertInto(embeddingModel.tableName as EmbeddingsTable)
         .values({
           // TODO is the extra space of a null embedText really worth it?!
-          embedText: isFullTextTooBig ? chunk : null,
+          embedText: chunks.length > 1 ? chunk : null,
           embedding: numberVectorToString(embeddingVector),
           embeddingsMetadataId,
-          chunkNumber: isFullTextTooBig ? chunkNumber : null
+          chunkNumber: chunks.length > 1 ? chunkNumber : null
         })
         .onConflict((oc) =>
           oc.column('embeddingsMetadataId').doUpdateSet((eb) => ({
@@ -95,8 +93,9 @@ export const processJobEmbed = async (job: EmbedJob, dataLoader: RootDataLoader)
           }))
         )
         .execute()
+      return true
     })
   )
   // Logger.log(`Embedded ${embeddingsMetadataId} -> ${model}`)
-  return true
+  return isSuccessful
 }
diff --git a/packages/embedder/textEmbeddingsnterface.d.ts b/packages/embedder/textEmbeddingsnterface.d.ts
index 3fdbcac0185..618eea7db91 100644
--- a/packages/embedder/textEmbeddingsnterface.d.ts
+++ b/packages/embedder/textEmbeddingsnterface.d.ts
@@ -3,102 +3,105 @@
  * Do not make direct changes to the file.
  */
 
-
 /** OneOf type helpers */
-type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
-type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
-type OneOf<T extends any[]> = T extends [infer Only] ? Only : T extends [infer A, infer B, ...infer Rest] ? OneOf<[XOR<A, B>, ...Rest]> : never;
+type Without<T, U> = {[P in Exclude<keyof T, keyof U>]?: never}
+type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U
+type OneOf<T extends any[]> = T extends [infer Only]
+  ? Only
+  : T extends [infer A, infer B, ...infer Rest]
+  ? OneOf<[XOR<A, B>, ...Rest]>
+  : never
 
 export interface paths {
-  "/decode": {
+  '/decode': {
     /**
      * Decode input ids
      * @description Decode input ids
      */
-    post: operations["decode"];
-  };
-  "/embed": {
+    post: operations['decode']
+  }
+  '/embed': {
     /**
      * Get Embeddings. Returns a 424 status code if the model is not an embedding model.
      * @description Get Embeddings. Returns a 424 status code if the model is not an embedding model.
      */
-    post: operations["embed"];
-  };
-  "/embed_all": {
+    post: operations['embed']
+  }
+  '/embed_all': {
     /**
      * Get all Embeddings without Pooling.
      * @description Get all Embeddings without Pooling.
      * Returns a 424 status code if the model is not an embedding model.
      */
-    post: operations["embed_all"];
-  };
-  "/embed_sparse": {
+    post: operations['embed_all']
+  }
+  '/embed_sparse': {
     /**
      * Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
      * @description Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
      */
-    post: operations["embed_sparse"];
-  };
-  "/embeddings": {
+    post: operations['embed_sparse']
+  }
+  '/embeddings': {
     /**
      * OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
      * @description OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
      */
-    post: operations["openai_embed"];
-  };
-  "/health": {
+    post: operations['openai_embed']
+  }
+  '/health': {
     /**
      * Health check method
      * @description Health check method
      */
-    get: operations["health"];
-  };
-  "/info": {
+    get: operations['health']
+  }
+  '/info': {
     /**
      * Text Embeddings Inference endpoint info
      * @description Text Embeddings Inference endpoint info
      */
-    get: operations["get_model_info"];
-  };
-  "/metrics": {
+    get: operations['get_model_info']
+  }
+  '/metrics': {
     /**
      * Prometheus metrics scrape endpoint
      * @description Prometheus metrics scrape endpoint
      */
-    get: operations["metrics"];
-  };
-  "/predict": {
+    get: operations['metrics']
+  }
+  '/predict': {
     /**
      * Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
      * @description Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
      */
-    post: operations["predict"];
-  };
-  "/rerank": {
+    post: operations['predict']
+  }
+  '/rerank': {
     /**
      * Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
      * @description Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
      * a single class.
      */
-    post: operations["rerank"];
-  };
-  "/tokenize": {
+    post: operations['rerank']
+  }
+  '/tokenize': {
     /**
      * Tokenize inputs
      * @description Tokenize inputs
      */
-    post: operations["tokenize"];
-  };
-  "/vertex": {
+    post: operations['tokenize']
+  }
+  '/vertex': {
     /**
      * Generate embeddings from a Vertex request
      * @description Generate embeddings from a Vertex request
      */
-    post: operations["vertex_compatibility"];
-  };
+    post: operations['vertex_compatibility']
+  }
 }
 
-export type webhooks = Record<string, never>;
+export type webhooks = Record<string, never>
 
 export interface components {
   schemas: {
@@ -109,39 +112,39 @@ export interface components {
        * }
        */
       id2label: {
-        [key: string]: string;
-      };
+        [key: string]: string
+      }
       /**
        * @example {
        *   "LABEL": 0
        * }
        */
       label2id: {
-        [key: string]: number;
-      };
-    };
+        [key: string]: number
+      }
+    }
     DecodeRequest: {
-      ids: components["schemas"]["InputIds"];
+      ids: components['schemas']['InputIds']
       /**
        * @default true
        * @example true
        */
-      skip_special_tokens?: boolean;
-    };
+      skip_special_tokens?: boolean
+    }
     /**
      * @example [
      *   "test"
      * ]
      */
-    DecodeResponse: string[];
+    DecodeResponse: string[]
     EmbedAllRequest: {
-      inputs: components["schemas"]["Input"];
+      inputs: components['schemas']['Input']
       /**
        * @default false
        * @example false
        */
-      truncate?: boolean;
-    };
+      truncate?: boolean
+    }
     /**
      * @example [
      *   [
@@ -153,20 +156,20 @@ export interface components {
      *   ]
      * ]
      */
-    EmbedAllResponse: number[][][];
+    EmbedAllResponse: number[][][]
     EmbedRequest: {
-      inputs: components["schemas"]["Input"];
+      inputs: components['schemas']['Input']
       /**
        * @default true
        * @example true
        */
-      normalize?: boolean;
+      normalize?: boolean
       /**
        * @default false
        * @example false
        */
-      truncate?: boolean;
-    };
+      truncate?: boolean
+    }
     /**
      * @example [
      *   [
@@ -176,74 +179,80 @@ export interface components {
      *   ]
      * ]
      */
-    EmbedResponse: number[][];
+    EmbedResponse: number[][]
     EmbedSparseRequest: {
-      inputs: components["schemas"]["Input"];
+      inputs: components['schemas']['Input']
       /**
        * @default false
        * @example false
        */
-      truncate?: boolean;
-    };
-    EmbedSparseResponse: components["schemas"]["SparseValue"][][];
+      truncate?: boolean
+    }
+    EmbedSparseResponse: components['schemas']['SparseValue'][][]
     EmbeddingModel: {
       /** @example cls */
-      pooling: string;
-    };
+      pooling: string
+    }
     ErrorResponse: {
-      error: string;
-      error_type: components["schemas"]["ErrorType"];
-    };
+      error: string
+      error_type: components['schemas']['ErrorType']
+    }
     /** @enum {string} */
-    ErrorType: "Unhealthy" | "Backend" | "Overloaded" | "Validation" | "Tokenizer";
+    ErrorType: 'Unhealthy' | 'Backend' | 'Overloaded' | 'Validation' | 'Tokenizer'
     Info: {
       /** @example null */
-      docker_label?: string | null;
+      docker_label?: string | null
       /**
        * @default null
        * @example null
        */
-      max_batch_requests?: number | null;
+      max_batch_requests?: number | null
       /** @example 2048 */
-      max_batch_tokens: number;
+      max_batch_tokens: number
       /** @example 32 */
-      max_client_batch_size: number;
+      max_client_batch_size: number
       /**
        * @description Router Parameters
        * @example 128
        */
-      max_concurrent_requests: number;
+      max_concurrent_requests: number
       /** @example 512 */
-      max_input_length: number;
+      max_input_length: number
       /** @example float16 */
-      model_dtype: string;
+      model_dtype: string
       /**
        * @description Model info
        * @example thenlper/gte-base
        */
-      model_id: string;
+      model_id: string
       /** @example fca14538aa9956a46526bd1d0d11d69e19b5a101 */
-      model_sha?: string | null;
-      model_type: components["schemas"]["ModelType"];
+      model_sha?: string | null
+      model_type: components['schemas']['ModelType']
       /** @example null */
-      sha?: string | null;
+      sha?: string | null
       /** @example 4 */
-      tokenization_workers: number;
+      tokenization_workers: number
       /**
        * @description Router Info
        * @example 0.5.0
        */
-      version: string;
-    };
-    Input: string | string[];
-    InputIds: number[] | number[][];
-    ModelType: OneOf<[{
-      classifier: components["schemas"]["ClassifierModel"];
-    }, {
-      embedding: components["schemas"]["EmbeddingModel"];
-    }, {
-      reranker: components["schemas"]["ClassifierModel"];
-    }]>;
+      version: string
+    }
+    Input: string | string[]
+    InputIds: number[] | number[][]
+    ModelType: OneOf<
+      [
+        {
+          classifier: components['schemas']['ClassifierModel']
+        },
+        {
+          embedding: components['schemas']['EmbeddingModel']
+        },
+        {
+          reranker: components['schemas']['ClassifierModel']
+        }
+      ]
+    >
     OpenAICompatEmbedding: {
       /**
        * @example [
@@ -252,135 +261,135 @@ export interface components {
        *   2
        * ]
        */
-      embedding: number[];
+      embedding: number[]
       /** @example 0 */
-      index: number;
+      index: number
       /** @example embedding */
-      object: string;
-    };
+      object: string
+    }
     OpenAICompatErrorResponse: {
       /** Format: int32 */
-      code: number;
-      error_type: components["schemas"]["ErrorType"];
-      message: string;
-    };
+      code: number
+      error_type: components['schemas']['ErrorType']
+      message: string
+    }
     OpenAICompatRequest: {
-      input: components["schemas"]["Input"];
+      input: components['schemas']['Input']
       /** @example null */
-      model?: string | null;
+      model?: string | null
       /** @example null */
-      user?: string | null;
-    };
+      user?: string | null
+    }
     OpenAICompatResponse: {
-      data: components["schemas"]["OpenAICompatEmbedding"][];
+      data: components['schemas']['OpenAICompatEmbedding'][]
       /** @example thenlper/gte-base */
-      model: string;
+      model: string
       /** @example list */
-      object: string;
-      usage: components["schemas"]["OpenAICompatUsage"];
-    };
+      object: string
+      usage: components['schemas']['OpenAICompatUsage']
+    }
     OpenAICompatUsage: {
       /** @example 512 */
-      prompt_tokens: number;
+      prompt_tokens: number
       /** @example 512 */
-      total_tokens: number;
-    };
+      total_tokens: number
+    }
     /**
      * @description Model input. Can be either a single string, a pair of strings or a batch of mixed single and pairs of strings.
      * @example What is Deep Learning?
      */
-    PredictInput: string | string[] | string[][];
+    PredictInput: string | string[] | string[][]
     PredictRequest: {
-      inputs: components["schemas"]["PredictInput"];
+      inputs: components['schemas']['PredictInput']
       /**
        * @default false
        * @example false
        */
-      raw_scores?: boolean;
+      raw_scores?: boolean
       /**
        * @default false
        * @example false
        */
-      truncate?: boolean;
-    };
-    PredictResponse: components["schemas"]["Prediction"][] | components["schemas"]["Prediction"][][];
+      truncate?: boolean
+    }
+    PredictResponse: components['schemas']['Prediction'][] | components['schemas']['Prediction'][][]
     Prediction: {
       /** @example admiration */
-      label: string;
+      label: string
       /**
        * Format: float
        * @example 0.5
        */
-      score: number;
-    };
+      score: number
+    }
     Rank: {
       /** @example 0 */
-      index: number;
+      index: number
       /**
        * Format: float
        * @example 1.0
        */
-      score: number;
+      score: number
       /**
        * @default null
        * @example Deep Learning is ...
        */
-      text?: string | null;
-    };
+      text?: string | null
+    }
     RerankRequest: {
       /** @example What is Deep Learning? */
-      query: string;
+      query: string
       /**
        * @default false
        * @example false
        */
-      raw_scores?: boolean;
+      raw_scores?: boolean
       /**
        * @default false
        * @example false
        */
-      return_text?: boolean;
+      return_text?: boolean
       /**
        * @example [
        *   "Deep Learning is ..."
        * ]
        */
-      texts: string[];
+      texts: string[]
       /**
        * @default false
        * @example false
        */
-      truncate?: boolean;
-    };
-    RerankResponse: components["schemas"]["Rank"][];
+      truncate?: boolean
+    }
+    RerankResponse: components['schemas']['Rank'][]
     SimpleToken: {
       /**
        * Format: int32
        * @example 0
        */
-      id: number;
+      id: number
       /** @example false */
-      special: boolean;
+      special: boolean
       /** @example 0 */
-      start?: number | null;
+      start?: number | null
       /** @example 2 */
-      stop?: number | null;
+      stop?: number | null
       /** @example test */
-      text: string;
-    };
+      text: string
+    }
     SparseValue: {
-      index: number;
+      index: number
       /** Format: float */
-      value: number;
-    };
+      value: number
+    }
     TokenizeRequest: {
       /**
        * @default true
        * @example true
        */
-      add_special_tokens?: boolean;
-      inputs: components["schemas"]["Input"];
-    };
+      add_special_tokens?: boolean
+      inputs: components['schemas']['Input']
+    }
     /**
      * @example [
      *   [
@@ -394,69 +403,80 @@ export interface components {
      *   ]
      * ]
      */
-    TokenizeResponse: components["schemas"]["SimpleToken"][][];
-    VertexInstance: (components["schemas"]["EmbedRequest"] & {
-      /** @enum {string} */
-      type: "embed";
-    }) | (components["schemas"]["EmbedAllRequest"] & {
-      /** @enum {string} */
-      type: "embed_all";
-    }) | (components["schemas"]["EmbedSparseRequest"] & {
-      /** @enum {string} */
-      type: "embed_sparse";
-    }) | (components["schemas"]["PredictRequest"] & {
-      /** @enum {string} */
-      type: "predict";
-    }) | (components["schemas"]["RerankRequest"] & {
-      /** @enum {string} */
-      type: "rerank";
-    }) | (components["schemas"]["TokenizeRequest"] & {
-      /** @enum {string} */
-      type: "tokenize";
-    });
+    TokenizeResponse: components['schemas']['SimpleToken'][][]
+    VertexInstance:
+      | (components['schemas']['EmbedRequest'] & {
+          /** @enum {string} */
+          type: 'embed'
+        })
+      | (components['schemas']['EmbedAllRequest'] & {
+          /** @enum {string} */
+          type: 'embed_all'
+        })
+      | (components['schemas']['EmbedSparseRequest'] & {
+          /** @enum {string} */
+          type: 'embed_sparse'
+        })
+      | (components['schemas']['PredictRequest'] & {
+          /** @enum {string} */
+          type: 'predict'
+        })
+      | (components['schemas']['RerankRequest'] & {
+          /** @enum {string} */
+          type: 'rerank'
+        })
+      | (components['schemas']['TokenizeRequest'] & {
+          /** @enum {string} */
+          type: 'tokenize'
+        })
     VertexRequest: {
-      instances: components["schemas"]["VertexInstance"][];
-    };
-    VertexResponse: components["schemas"]["VertexResponseInstance"][];
-    VertexResponseInstance: {
-      result: components["schemas"]["EmbedResponse"];
-      /** @enum {string} */
-      type: "embed";
-    } | {
-      result: components["schemas"]["EmbedAllResponse"];
-      /** @enum {string} */
-      type: "embed_all";
-    } | {
-      result: components["schemas"]["EmbedSparseResponse"];
-      /** @enum {string} */
-      type: "embed_sparse";
-    } | {
-      result: components["schemas"]["PredictResponse"];
-      /** @enum {string} */
-      type: "predict";
-    } | {
-      result: components["schemas"]["RerankResponse"];
-      /** @enum {string} */
-      type: "rerank";
-    } | {
-      result: components["schemas"]["TokenizeResponse"];
-      /** @enum {string} */
-      type: "tokenize";
-    };
-  };
-  responses: never;
-  parameters: never;
-  requestBodies: never;
-  headers: never;
-  pathItems: never;
+      instances: components['schemas']['VertexInstance'][]
+    }
+    VertexResponse: components['schemas']['VertexResponseInstance'][]
+    VertexResponseInstance:
+      | {
+          result: components['schemas']['EmbedResponse']
+          /** @enum {string} */
+          type: 'embed'
+        }
+      | {
+          result: components['schemas']['EmbedAllResponse']
+          /** @enum {string} */
+          type: 'embed_all'
+        }
+      | {
+          result: components['schemas']['EmbedSparseResponse']
+          /** @enum {string} */
+          type: 'embed_sparse'
+        }
+      | {
+          result: components['schemas']['PredictResponse']
+          /** @enum {string} */
+          type: 'predict'
+        }
+      | {
+          result: components['schemas']['RerankResponse']
+          /** @enum {string} */
+          type: 'rerank'
+        }
+      | {
+          result: components['schemas']['TokenizeResponse']
+          /** @enum {string} */
+          type: 'tokenize'
+        }
+  }
+  responses: never
+  parameters: never
+  requestBodies: never
+  headers: never
+  pathItems: never
 }
 
-export type $defs = Record<string, never>;
+export type $defs = Record<string, never>
 
-export type external = Record<string, never>;
+export type external = Record<string, never>
 
 export interface operations {
-
   /**
    * Decode input ids
    * @description Decode input ids
@@ -464,24 +484,24 @@ export interface operations {
   decode: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["DecodeRequest"];
-      };
-    };
+        'application/json': components['schemas']['DecodeRequest']
+      }
+    }
     responses: {
       /** @description Decoded ids */
       200: {
         content: {
-          "application/json": components["schemas"]["DecodeResponse"];
-        };
-      };
+          'application/json': components['schemas']['DecodeResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Get Embeddings. Returns a 424 status code if the model is not an embedding model.
    * @description Get Embeddings. Returns a 424 status code if the model is not an embedding model.
@@ -489,42 +509,42 @@ export interface operations {
   embed: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["EmbedRequest"];
-      };
-    };
+        'application/json': components['schemas']['EmbedRequest']
+      }
+    }
     responses: {
       /** @description Embeddings */
       200: {
         content: {
-          "application/json": components["schemas"]["EmbedResponse"];
-        };
-      };
+          'application/json': components['schemas']['EmbedResponse']
+        }
+      }
       /** @description Batch size error */
       413: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Embedding Error */
       424: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Model is overloaded */
       429: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Get all Embeddings without Pooling.
    * @description Get all Embeddings without Pooling.
@@ -533,42 +553,42 @@ export interface operations {
   embed_all: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["EmbedAllRequest"];
-      };
-    };
+        'application/json': components['schemas']['EmbedAllRequest']
+      }
+    }
     responses: {
       /** @description Embeddings */
       200: {
         content: {
-          "application/json": components["schemas"]["EmbedAllResponse"];
-        };
-      };
+          'application/json': components['schemas']['EmbedAllResponse']
+        }
+      }
       /** @description Batch size error */
       413: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Embedding Error */
       424: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Model is overloaded */
       429: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
    * @description Get Sparse Embeddings. Returns a 424 status code if the model is not an embedding model with SPLADE pooling.
@@ -576,42 +596,42 @@ export interface operations {
   embed_sparse: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["EmbedSparseRequest"];
-      };
-    };
+        'application/json': components['schemas']['EmbedSparseRequest']
+      }
+    }
     responses: {
       /** @description Embeddings */
       200: {
         content: {
-          "application/json": components["schemas"]["EmbedSparseResponse"];
-        };
-      };
+          'application/json': components['schemas']['EmbedSparseResponse']
+        }
+      }
       /** @description Batch size error */
       413: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Embedding Error */
       424: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Model is overloaded */
       429: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
    * @description OpenAI compatible route. Returns a 424 status code if the model is not an embedding model.
@@ -619,42 +639,42 @@ export interface operations {
   openai_embed: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["OpenAICompatRequest"];
-      };
-    };
+        'application/json': components['schemas']['OpenAICompatRequest']
+      }
+    }
     responses: {
       /** @description Embeddings */
       200: {
         content: {
-          "application/json": components["schemas"]["OpenAICompatResponse"];
-        };
-      };
+          'application/json': components['schemas']['OpenAICompatResponse']
+        }
+      }
       /** @description Batch size error */
       413: {
         content: {
-          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['OpenAICompatErrorResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['OpenAICompatErrorResponse']
+        }
+      }
       /** @description Embedding Error */
       424: {
         content: {
-          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['OpenAICompatErrorResponse']
+        }
+      }
       /** @description Model is overloaded */
       429: {
         content: {
-          "application/json": components["schemas"]["OpenAICompatErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['OpenAICompatErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Health check method
    * @description Health check method
@@ -663,16 +683,16 @@ export interface operations {
     responses: {
       /** @description Everything is working fine */
       200: {
-        content: never;
-      };
+        content: never
+      }
       /** @description Text embeddings Inference is down */
       503: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Text Embeddings Inference endpoint info
    * @description Text Embeddings Inference endpoint info
@@ -682,11 +702,11 @@ export interface operations {
       /** @description Served model info */
       200: {
         content: {
-          "application/json": components["schemas"]["Info"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['Info']
+        }
+      }
+    }
+  }
   /**
    * Prometheus metrics scrape endpoint
    * @description Prometheus metrics scrape endpoint
@@ -696,11 +716,11 @@ export interface operations {
       /** @description Prometheus Metrics */
       200: {
         content: {
-          "text/plain": string;
-        };
-      };
-    };
-  };
+          'text/plain': string
+        }
+      }
+    }
+  }
   /**
    * Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
    * @description Get Predictions. Returns a 424 status code if the model is not a Sequence Classification model
@@ -708,42 +728,42 @@ export interface operations {
   predict: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["PredictRequest"];
-      };
-    };
+        'application/json': components['schemas']['PredictRequest']
+      }
+    }
     responses: {
       /** @description Predictions */
       200: {
         content: {
-          "application/json": components["schemas"]["PredictResponse"];
-        };
-      };
+          'application/json': components['schemas']['PredictResponse']
+        }
+      }
       /** @description Batch size error */
       413: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Prediction Error */
       424: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Model is overloaded */
       429: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
    * @description Get Ranks. Returns a 424 status code if the model is not a Sequence Classification model with
@@ -752,42 +772,42 @@ export interface operations {
   rerank: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["RerankRequest"];
-      };
-    };
+        'application/json': components['schemas']['RerankRequest']
+      }
+    }
     responses: {
       /** @description Ranks */
       200: {
         content: {
-          "application/json": components["schemas"]["RerankResponse"];
-        };
-      };
+          'application/json': components['schemas']['RerankResponse']
+        }
+      }
       /** @description Batch size error */
       413: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Rerank Error */
       424: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Model is overloaded */
       429: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Tokenize inputs
    * @description Tokenize inputs
@@ -795,24 +815,24 @@ export interface operations {
   tokenize: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["TokenizeRequest"];
-      };
-    };
+        'application/json': components['schemas']['TokenizeRequest']
+      }
+    }
     responses: {
       /** @description Tokenized ids */
       200: {
         content: {
-          "application/json": components["schemas"]["TokenizeResponse"];
-        };
-      };
+          'application/json': components['schemas']['TokenizeResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
   /**
    * Generate embeddings from a Vertex request
    * @description Generate embeddings from a Vertex request
@@ -820,38 +840,38 @@ export interface operations {
   vertex_compatibility: {
     requestBody: {
       content: {
-        "application/json": components["schemas"]["VertexRequest"];
-      };
-    };
+        'application/json': components['schemas']['VertexRequest']
+      }
+    }
     responses: {
       /** @description Results */
       200: {
-        content: never;
-      };
+        content: never
+      }
       /** @description Batch size error */
       413: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Tokenization error */
       422: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Error */
       424: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
       /** @description Model is overloaded */
       429: {
         content: {
-          "application/json": components["schemas"]["ErrorResponse"];
-        };
-      };
-    };
-  };
+          'application/json': components['schemas']['ErrorResponse']
+        }
+      }
+    }
+  }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 893db5ee8df..8a344b6462e 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -11,8 +11,6 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.34.3",
-    "eslint": "^8.8.0",
-    "eslint-config-prettier": "^8.5.0",
     "lint-staged": "^12.3.3",
     "ts-app-env": "^1.4.2",
     "typescript": "^5.3.3"
diff --git a/packages/server/package.json b/packages/server/package.json
index 8cc20a60e6c..8afddae459c 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -50,8 +50,6 @@
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "7.0.0",
     "css-loader": "5.0.1",
-    "eslint": "^8.2.0",
-    "eslint-config-prettier": "^8.5.0",
     "faker": "^5.5.3",
     "file-loader": "6.2.0",
     "graphql-typed": "^0.4.1",
diff --git a/yarn.lock b/yarn.lock
index e6fb56f52bf..6701230bae9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
 "@amplitude/analytics-browser@^2.2.3":
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/@amplitude/analytics-browser/-/analytics-browser-2.2.3.tgz#7dbe4ad2ada7facfcf21aac4b47314f8e4c2903c"
@@ -3166,33 +3171,38 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
   integrity sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==
 
-"@eslint-community/eslint-utils@^4.4.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.5.1":
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
-  integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.2.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+
 "@exodus/schemasafe@^1.0.0-rc.2":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@exodus/schemasafe/-/schemasafe-1.0.1.tgz#e4e2d86ae176b7c96fbff033f3b1a8b1cfd390fb"
@@ -3833,24 +3843,29 @@
   dependencies:
     client-only "^0.0.1"
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
-  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/momoa@^2.0.3":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/momoa/-/momoa-2.0.4.tgz#8b9e7a629651d15009c3587d07a222deeb829385"
   integrity sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
+  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
@@ -5065,7 +5080,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -8208,16 +8223,16 @@
   resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.29.11.tgz#d654a112973f5e004bf8438122bd7e56a8e5cd7e"
   integrity sha512-9cwk3c87qQKZrT251EDoibiYRILjCmxBvvcb4meofCmx1vdnNcR9gyildy5vOHASpOKMsn42CugxUvcwK5eu1g==
 
-"@typescript-eslint/eslint-plugin@^6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
-  integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==
+"@typescript-eslint/eslint-plugin@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.4.0.tgz#de61c3083842fc6ac889d2fc83c9a96b55ab8328"
+  integrity sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/type-utils" "6.21.0"
-    "@typescript-eslint/utils" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/scope-manager" "7.4.0"
+    "@typescript-eslint/type-utils" "7.4.0"
+    "@typescript-eslint/utils" "7.4.0"
+    "@typescript-eslint/visitor-keys" "7.4.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -8225,47 +8240,47 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/parser@^6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
-  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
+"@typescript-eslint/parser@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.4.0.tgz#540f4321de1e52b886c0fa68628af1459954c1f1"
+  integrity sha512-ZvKHxHLusweEUVwrGRXXUVzFgnWhigo4JurEj0dGF1tbcGh6buL+ejDdjxOQxv6ytcY1uhun1p2sm8iWStlgLQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/scope-manager" "7.4.0"
+    "@typescript-eslint/types" "7.4.0"
+    "@typescript-eslint/typescript-estree" "7.4.0"
+    "@typescript-eslint/visitor-keys" "7.4.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
-  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
+"@typescript-eslint/scope-manager@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.4.0.tgz#acfc69261f10ece7bf7ece1734f1713392c3655f"
+  integrity sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.4.0"
+    "@typescript-eslint/visitor-keys" "7.4.0"
 
-"@typescript-eslint/type-utils@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
-  integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==
+"@typescript-eslint/type-utils@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.4.0.tgz#cfcaab21bcca441c57da5d3a1153555e39028cbd"
+  integrity sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.21.0"
-    "@typescript-eslint/utils" "6.21.0"
+    "@typescript-eslint/typescript-estree" "7.4.0"
+    "@typescript-eslint/utils" "7.4.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
-  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
+"@typescript-eslint/types@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.4.0.tgz#ee9dafa75c99eaee49de6dcc9348b45d354419b6"
+  integrity sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==
 
-"@typescript-eslint/typescript-estree@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
-  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
+"@typescript-eslint/typescript-estree@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.4.0.tgz#12dbcb4624d952f72c10a9f4431284fca24624f4"
+  integrity sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/visitor-keys" "6.21.0"
+    "@typescript-eslint/types" "7.4.0"
+    "@typescript-eslint/visitor-keys" "7.4.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -8273,27 +8288,32 @@
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
-  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
+"@typescript-eslint/utils@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.4.0.tgz#d889a0630cab88bddedaf7c845c64a00576257bd"
+  integrity sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.21.0"
-    "@typescript-eslint/types" "6.21.0"
-    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/scope-manager" "7.4.0"
+    "@typescript-eslint/types" "7.4.0"
+    "@typescript-eslint/typescript-estree" "7.4.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.21.0":
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
-  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
+"@typescript-eslint/visitor-keys@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.4.0.tgz#0c8ff2c1f8a6fe8d7d1a57ebbd4a638e86a60a94"
+  integrity sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==
   dependencies:
-    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/types" "7.4.0"
     eslint-visitor-keys "^3.4.1"
 
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 "@webassemblyjs/ast@1.11.5", "@webassemblyjs/ast@^1.11.5":
   version "1.11.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.5.tgz#6e818036b94548c1fb53b754b5cae3c9b208281c"
@@ -8690,7 +8710,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -9722,9 +9742,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
-  version "1.0.30001600"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz#93a3ee17a35aa6a9f0c6ef1b2ab49507d1ab9079"
-  integrity sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==
+  version "1.0.30001603"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001603.tgz#605046a5bdc95ba4a92496d67e062522dce43381"
+  integrity sha512-iL2iSS0eDILMb9n5yKQoTBim9jMZ0Yrk8g0N9K7UzYyWnfIKzXBZD5ngpM37ZcL/cv0Mli8XtVMRYMQAfFpi5Q==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -11661,10 +11681,10 @@ escodegen@^2.0.0, escodegen@^2.1.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
-  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+eslint-config-prettier@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f"
+  integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==
 
 eslint-plugin-emotion@^10.0.14:
   version "10.0.27"
@@ -11704,71 +11724,62 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"
-  integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
-eslint-visitor-keys@^3.2.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8.2.0, eslint@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.8.0.tgz#9762b49abad0cb4952539ffdb0a046392e571a2d"
-  integrity sha512-H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ==
-  dependencies:
-    "@eslint/eslintrc" "^1.0.5"
-    "@humanwhocodes/config-array" "^0.9.2"
-    ajv "^6.10.0"
+eslint@^8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.0"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.2.0"
-    espree "^9.3.0"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.6.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
 esniff@^2.0.1:
   version "2.0.1"
@@ -11780,7 +11791,7 @@ esniff@^2.0.1:
     event-emitter "^0.3.5"
     type "^2.7.2"
 
-espree@^9.0.0, espree@^9.2.0, espree@^9.3.0:
+espree@^9.0.0, espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -11794,13 +11805,20 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1, esquery@^1.4.0:
+esquery@^1.0.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
   integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
     estraverse "^5.1.0"
 
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -12517,11 +12535,6 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 fuzzy@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
@@ -12852,10 +12865,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+globals@^13.19.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -13520,11 +13533,6 @@ ignore-walk@^5.0.1:
   dependencies:
     minimatch "^5.0.1"
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
 ignore@^5.0.4, ignore@^5.1.4, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
@@ -13560,7 +13568,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -13954,6 +13962,11 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -15912,7 +15925,7 @@ minimatch@9.0.3:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5:
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -16937,17 +16950,17 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 ora@5.4.1, ora@^5.4.1:
   version "5.4.1"
@@ -18850,11 +18863,6 @@ regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 regexpu-core@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
@@ -21369,7 +21377,7 @@ v8-compile-cache-lib@^3.0.1:
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
-v8-compile-cache@2.3.0, v8-compile-cache@^2.0.3:
+v8-compile-cache@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -21827,7 +21835,7 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@~1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
   integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==

From b6ddfa5755394633e83dadd0178234ef740454ea Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 2 Apr 2024 15:08:42 +0200
Subject: [PATCH 109/183] fix: Fetch CORS resources from network (#9586)

---
 packages/client/serviceWorker/sw.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/client/serviceWorker/sw.ts b/packages/client/serviceWorker/sw.ts
index e35d7f86db7..eb19da02807 100644
--- a/packages/client/serviceWorker/sw.ts
+++ b/packages/client/serviceWorker/sw.ts
@@ -79,8 +79,10 @@ const onFetch = async (event: FetchEvent) => {
       // request.mode could be 'no-cors'
       // By fetching the URL without specifying the mode the response will not be opaque
       const isParabolHosted = url.startsWith(PUBLIC_PATH) || url.startsWith(self.origin)
-      const req = isParabolHosted ? request.url : request
-      const networkRes = await fetch(req)
+      // if one of our assets is not in the service worker cache, then it's either fetched via network or served from the broswer cache.
+      // The browser cache most likely has incorrect CORS headers set, so we better always fetch from the network.
+      const req = isParabolHosted ? fetch(request.url, {cache: 'no-store'}) : fetch(request)
+      const networkRes = await req
       const cache = await caches.open(DYNAMIC_CACHE)
       // cloning here because I'm not sure if we must clone before reading the body
       cache.put(request.url, networkRes.clone()).catch(console.error)

From 9b21ad405612a485b1603053d7802739a0866f1c Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:20:33 +0200
Subject: [PATCH 110/183] chore(release): release v7.24.1 (#9585)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 9 +++++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/embedder/package.json          | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 9 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index bc72873ade5..2fb3566ccf3 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.24.0"
+  ".": "7.24.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9adc2cad97..b5ed33f4256 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.24.1](https://github.com/ParabolInc/parabol/compare/v7.24.0...v7.24.1) (2024-04-02)
+
+
+### Fixed
+
+* embedder doesn't dive deep into schema ([#9582](https://github.com/ParabolInc/parabol/issues/9582)) ([8cdd901](https://github.com/ParabolInc/parabol/commit/8cdd9014c3277905605c6544de92d9ac2833a6e9))
+* embedder errors in embed length ([#9584](https://github.com/ParabolInc/parabol/issues/9584)) ([341b4b7](https://github.com/ParabolInc/parabol/commit/341b4b797ec6444066244f25916803e64c03258c))
+* Fetch CORS resources from network ([#9586](https://github.com/ParabolInc/parabol/issues/9586)) ([b6ddfa5](https://github.com/ParabolInc/parabol/commit/b6ddfa5755394633e83dadd0178234ef740454ea))
+
 ## [7.24.0](https://github.com/ParabolInc/parabol/compare/v7.23.1...v7.24.0) (2024-03-29)
 
 
diff --git a/package.json b/package.json
index 427d88d96e8..a6b2e22b178 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.0",
+  "version": "7.24.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 63593c4e0fb..b8e0b4886a7 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.24.0",
+  "version": "7.24.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.24.0"
+    "parabol-server": "7.24.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 9261fb18d5a..51b9eb2aead 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.0",
+  "version": "7.24.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index aea9068a6ca..975309bdb62 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.24.0",
+  "version": "7.24.1",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index bd7f9c61b51..3797dee3e75 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.24.0",
+  "version": "7.24.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.24.0",
-    "parabol-server": "7.24.0",
+    "parabol-client": "7.24.1",
+    "parabol-server": "7.24.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 8a344b6462e..84ae4bb4e29 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.0",
+  "version": "7.24.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 8afddae459c..d619f4b0860 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.0",
+  "version": "7.24.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -123,7 +123,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.24.0",
+    "parabol-client": "7.24.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From dbc9f091a4c93efc0eca24c5cd42b80bae95cff3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 19:43:34 +0200
Subject: [PATCH 111/183] chore(deps-dev): bump webpack-dev-middleware from
 4.0.2 to 5.3.4 (#9561)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Georg Bremer <github@dschoordsch.de>
---
 packages/server/package.json |  1 -
 yarn.lock                    | 38 +-----------------------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index d619f4b0860..f131227f4c1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -72,7 +72,6 @@
     "vscode-apollo-relay": "^1.5.0",
     "webpack-bundle-analyzer": "4.3.0",
     "webpack-cli": "4.9.1",
-    "webpack-dev-middleware": "4.0.2",
     "webpack-hot-middleware": "^2.22.2",
     "webpack-node-externals": "2.5.2"
   },
diff --git a/yarn.lock b/yarn.lock
index 6701230bae9..0ad5e645838 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15669,13 +15669,6 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
-map-age-cleaner@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -15742,15 +15735,7 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-mem@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122"
-  integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==
-  dependencies:
-    map-age-cleaner "^0.1.3"
-    mimic-fn "^3.1.0"
-
-memfs@^3.2.0, memfs@^3.4.3:
+memfs@^3.4.3:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
   integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
@@ -15871,11 +15856,6 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-fn@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
-  integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
-
 mimic-response@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
@@ -17009,11 +16989,6 @@ oy-vey@^0.12.1:
     object-assign "^4.1.1"
     sanitizer "^0.1.3"
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -21620,17 +21595,6 @@ webpack-cli@4.9.1:
     rechoir "^0.7.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.0.2.tgz#1436ae6cacee78475bd6bc1fbf063dfbfd6e577d"
-  integrity sha512-xyAICqIugWtT1RRH5aMMmZlPhDhEqPTDL0TWhmMZsuZ+cFlAvRxv4thCbuxdk9MW+OYK4c9BkfmgdQ1/7imkJA==
-  dependencies:
-    mem "^8.0.0"
-    memfs "^3.2.0"
-    mime-types "^2.1.27"
-    range-parser "^1.2.1"
-    schema-utils "^3.0.0"
-
 webpack-dev-middleware@^5.3.1:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"

From 9486587c9f7d4b1c40a0eff549e819ed4565aa23 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Tue, 2 Apr 2024 20:36:37 +0100
Subject: [PATCH 112/183] fix(single-tenant): application upgrades do not need
 --profile databases (#9593)

---
 docker/stacks/single-tenant-host/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/stacks/single-tenant-host/README.md b/docker/stacks/single-tenant-host/README.md
index 59a6a4a8a3e..5f2ca04254f 100644
--- a/docker/stacks/single-tenant-host/README.md
+++ b/docker/stacks/single-tenant-host/README.md
@@ -18,7 +18,7 @@ To run Parabol in single tenant mode (e.g. simple docker-compose on a docker hos
 
 1. Edit the `docker-compose.yaml` and change the `#image:tag` changing the tag. Ex: from `v7.15.0` to `v7.15.2`.
 2. (optional) In a different terminal, run `docker compose logs -f` to follow the upgrade.
-3. Run `docker compose --profile databases --profile parabol up -d`. It will start the `pre-deploy` and, once it is done successfully, then it will stop and recreate the `web-server` and `gql-executor` with the new version of the image. **This step implies a downtime**.
+3. Run `docker compose --profile parabol up -d`. It will start the `pre-deploy` and, once it is done successfully, then it will stop and recreate the `web-server` and `gql-executor` with the new version of the image. **This step implies a downtime**.
 4. Verify the application is still up and running.
 
 ## Running Chronos

From a5ca7f10c5646dfe6cbbcf1988d494b49cdba4f0 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 2 Apr 2024 23:53:14 -0700
Subject: [PATCH 113/183] [Snyk] Upgrade json2csv from 5.0.5 to 5.0.7 (#9574)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: GitHub Action <action@github.com>
---
 packages/client/package.json |  2 +-
 yarn.lock                    | 39 +++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 51b9eb2aead..c241bd9ef83 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -115,7 +115,7 @@
     "hoist-non-react-statics": "^3.3.0",
     "humanize-duration": "3.29.0",
     "immutable": "3.8.2",
-    "json2csv": "5.0.5",
+    "json2csv": "5.0.7",
     "jwt-decode": "^2.1.0",
     "linkify-it": "^2.0.3",
     "mousetrap": "^1.6.3",
diff --git a/yarn.lock b/yarn.lock
index 0ad5e645838..a1a316381af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14881,10 +14881,10 @@ json-to-pretty-yaml@^1.2.2:
     remedial "^1.0.7"
     remove-trailing-spaces "^1.0.6"
 
-json2csv@5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/json2csv/-/json2csv-5.0.5.tgz#b65bf4f1e1eeb81cb7097d383edec249f8bce3af"
-  integrity sha512-/UyvnfuUghRM+C/AiQ02X0LS+/AKfugcwaWo/gAz1pi203v29sUMrMSNEC088i+h0EG39eSsmeL9Z0iK+9MM0A==
+json2csv@5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/json2csv/-/json2csv-5.0.7.tgz#f3a583c25abd9804be873e495d1e65ad8d1b54ae"
+  integrity sha512-YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA==
   dependencies:
     commander "^6.1.0"
     jsonparse "^1.3.1"
@@ -20021,7 +20021,7 @@ string-similarity@^3.0.0:
   resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-3.0.0.tgz#07b0bc69fae200ad88ceef4983878d03793847c7"
   integrity sha512-7kS7LyTp56OqOI2BDWQNVnLX/rCxIQn+/5M0op1WV6P8Xx6TZNdajpuqQdiJ7Xx+p1C5CsWMvdiBp9ApMhxzEQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -20039,6 +20039,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.0.tgz#5ab00980cfb29f43e736b113a120a73a0fb569d3"
@@ -20115,7 +20124,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -20129,6 +20138,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
@@ -21978,7 +21994,7 @@ workbox-window@6.5.4:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.5.4"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -21996,6 +22012,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From e372f5f7bccd0a2fd1b4fea414610ad12fe0ec89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 09:05:35 +0200
Subject: [PATCH 114/183] chore(deps): bump follow-redirects from 1.15.2 to
 1.15.6 (#9536)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a1a316381af..b82bf6ee615 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12339,15 +12339,10 @@ flow-parser@0.*:
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.168.0.tgz#e9c385499145828b42fd754d3528f4cb7d5c6edf"
   integrity sha512-YMlc+6vvyDPqWKOpzmyifJXBbwlNdqznuy8YBHxX1/90F8d+NnhsxMe1u/ok5LNvNJVJ2TVMkWudu0BUKOSawA==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
-
-follow-redirects@^1.14.9:
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
-  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 foreground-child@^3.1.0:
   version "3.1.1"

From 8ab86b4cd8698ba6f0a4cdec8eca2bf31a290599 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 09:08:01 +0200
Subject: [PATCH 115/183] chore(deps): bump express from 4.18.2 to 4.19.2
 (#9566)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b82bf6ee615..18effd91074 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9440,13 +9440,13 @@ bodec@^0.1.0:
   resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc"
   integrity sha1-vIUVVUMPI8n3ZQp172TGqUw0GMw=
 
-body-parser@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
-  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+body-parser@1.20.2:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.4"
+    content-type "~1.0.5"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -9454,7 +9454,7 @@ body-parser@1.20.1:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.1"
+    raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -10390,6 +10390,11 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
+content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
 continuation-local-storage@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
@@ -10497,7 +10502,12 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.5.0, cookie@^0.5.0:
+cookie@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+
+cookie@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
@@ -11958,16 +11968,16 @@ expect@^29.0.0, expect@^29.5.0:
     jest-util "^29.5.0"
 
 express@^4.17.3:
-  version "4.18.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
-  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  version "4.19.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.1"
+    body-parser "1.20.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.5.0"
+    cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -18291,7 +18301,17 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.1, raw-body@^2.2.0:
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@^2.2.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
   integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==

From c8c2321bd4fb65bf67f65a9712fc31f031e4fca4 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 3 Apr 2024 00:13:00 -0700
Subject: [PATCH 116/183] [Snyk] Upgrade react-beautiful-dnd from 13.0.0 to
 13.1.1 (#9575)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: GitHub Action <action@github.com>
---
 packages/client/package.json |  2 +-
 yarn.lock                    | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index c241bd9ef83..44480517b01 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -121,7 +121,7 @@
     "mousetrap": "^1.6.3",
     "ms": "^2.0.0",
     "react": "^17.0.2",
-    "react-beautiful-dnd": "13.0.0",
+    "react-beautiful-dnd": "13.1.1",
     "react-chartjs-2": "^4.2.0",
     "react-copy-to-clipboard": "^5.0.0",
     "react-day-picker": "^8.3.7",
diff --git a/yarn.lock b/yarn.lock
index 18effd91074..9423f37dd1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18339,16 +18339,16 @@ rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-beautiful-dnd@13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.0.0.tgz#f70cc8ff82b84bc718f8af157c9f95757a6c3b40"
-  integrity sha512-87It8sN0ineoC3nBW0SbQuTFXM6bUqM62uJGY4BtTf0yzPl8/3+bHMWkgIe0Z6m8e+gJgjWxefGRVfpE3VcdEg==
+react-beautiful-dnd@13.1.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2"
+  integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
   dependencies:
-    "@babel/runtime" "^7.8.4"
+    "@babel/runtime" "^7.9.2"
     css-box-model "^1.2.0"
     memoize-one "^5.1.1"
     raf-schd "^4.0.2"
-    react-redux "^7.1.1"
+    react-redux "^7.2.0"
     redux "^4.0.4"
     use-memo-one "^1.1.1"
 
@@ -18420,10 +18420,10 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
-react-redux@^7.1.1:
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa"
-  integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==
+react-redux@^7.2.0:
+  version "7.2.9"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
+  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@types/react-redux" "^7.1.20"

From c312f4821698ae7966dee8889a0c8c3353733dcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 09:13:50 +0200
Subject: [PATCH 117/183] chore(deps): bump jose from 4.14.4 to 4.15.5 (#9515)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Georg Bremer <github@dschoordsch.de>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9423f37dd1a..3722ca8df49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14637,9 +14637,9 @@ join-component@^1.1.0:
   integrity sha1-uEF7dQZho5K+4sJTfGiyqdSXfNU=
 
 jose@^4.11.4:
-  version "4.14.4"
-  resolved "https://registry.yarnpkg.com/jose/-/jose-4.14.4.tgz#59e09204e2670c3164ee24cbfe7115c6f8bff9ca"
-  integrity sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==
+  version "4.15.5"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.5.tgz#6475d0f467ecd3c630a1b5dadd2735a7288df706"
+  integrity sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==
 
 js-git@^0.7.8:
   version "0.7.8"

From df59066523f3abc0fdb5f3728e1732cb0d722f71 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 3 Apr 2024 00:16:04 -0700
Subject: [PATCH 118/183] [Snyk] Upgrade humanize-duration from 3.29.0 to
 3.31.0 (#9573)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: GitHub Action <action@github.com>
---
 packages/client/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 44480517b01..905829c12f1 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -113,7 +113,7 @@
     "graphiql": "^3.0.0",
     "graphql-typed": "^0.7.2",
     "hoist-non-react-statics": "^3.3.0",
-    "humanize-duration": "3.29.0",
+    "humanize-duration": "3.31.0",
     "immutable": "3.8.2",
     "json2csv": "5.0.7",
     "jwt-decode": "^2.1.0",
diff --git a/yarn.lock b/yarn.lock
index 3722ca8df49..7e3593cb3d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13468,10 +13468,10 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-humanize-duration@3.29.0:
-  version "3.29.0"
-  resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.29.0.tgz#beffaf7938388cd0f38c494f8970d6faebecf3c0"
-  integrity sha512-G5wZGwYTLaQAmYqhfK91aw3xt6wNbJW1RnWDh4qP1PvF4T/jnkjx2RVhG5kzB2PGsYGTn+oSDBQp+dMdILLxcg==
+humanize-duration@3.31.0:
+  version "3.31.0"
+  resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.31.0.tgz#a0384d22555024cd17e6e9f8561540d37756bf4c"
+  integrity sha512-fRrehgBG26NNZysRlTq1S+HPtDpp3u+Jzdc/d5A4cEzOD86YLAkDaJyJg8krSdCi7CJ+s7ht3fwRj8Dl+Btd0w==
 
 humanize-ms@^1.2.1:
   version "1.2.1"

From 1bca19ad89281bcbee6a1006b014bc8c351ba5f2 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 3 Apr 2024 00:19:03 -0700
Subject: [PATCH 119/183] [Snyk] Upgrade graphql from 15.7.2 to 15.8.0 (#9569)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: GitHub Action <action@github.com>
---
 packages/server/package.json | 2 +-
 yarn.lock                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index f131227f4c1..4f82eb5a892 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -100,7 +100,7 @@
     "fast-json-stable-stringify": "^2.1.0",
     "fast-xml-parser": "^4.2.7",
     "googleapis": "^118.0.0",
-    "graphql": "15.7.2",
+    "graphql": "15.8.0",
     "graphql-jit": "^0.8.4",
     "graphql-middleware": "^6.1.18",
     "graphql-relay": "^0.10.0",
diff --git a/yarn.lock b/yarn.lock
index 7e3593cb3d0..558fd3223ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13115,7 +13115,7 @@ graphql@15.7.2:
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.7.2.tgz#85ab0eeb83722977151b3feb4d631b5f2ab287ef"
   integrity sha512-AnnKk7hFQFmU/2I9YSQf3xw44ctnSFCfp3zE0N6W174gqe9fWG/2rKaKxROK7CcI3XtERpjEKFqts8o319Kf7A==
 
-graphql@^15.0.0:
+graphql@15.8.0, graphql@^15.0.0:
   version "15.8.0"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38"
   integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==

From b92d96e2972560ee16f83d90a82ebbb946e39dc0 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 3 Apr 2024 10:24:07 +0200
Subject: [PATCH 120/183] fix: Add graphql-relay to predeploy (#9595)

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index a6b2e22b178..c6c630d2461 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "graphql": "15.7.2",
+    "graphql-relay": "^0.10.0",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
     "jscodeshift": "^0.14.0",

From 01f69de9eb809ef16ac954e5d75ac884b11f8342 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Wed, 3 Apr 2024 16:10:16 +0100
Subject: [PATCH 121/183] feat: update pricing page with template changes
 (#9596)

---
 .../userDashboard/components/OrgBilling/OrgPlans.tsx | 11 +++--------
 packages/client/utils/constants.ts                   | 12 ++++++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
index e355a1e8381..0e31205312a 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
@@ -5,12 +5,12 @@ import {useFragment} from 'react-relay'
 import Panel from '../../../../components/Panel/Panel'
 import Row from '../../../../components/Row/Row'
 import {OrgPlans_organization$key} from '../../../../__generated__/OrgPlans_organization.graphql'
-import {ElementWidth, Threshold} from '../../../../types/constEnums'
+import {ElementWidth} from '../../../../types/constEnums'
 import {TierEnum} from '../../../../__generated__/NewMeetingQuery.graphql'
 import OrgStats from './OrgStats'
 import useModal from '../../../../hooks/useModal'
 import DowngradeModal from './DowngradeModal'
-import {EnterpriseBenefits, TeamBenefits} from '../../../../utils/constants'
+import {EnterpriseBenefits, StarterBenefits, TeamBenefits} from '../../../../utils/constants'
 import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import LimitExceededWarning from '../../../../components/LimitExceededWarning'
@@ -91,12 +91,7 @@ const OrgPlans = (props: Props) => {
     {
       tier: 'starter',
       subtitle: 'Free',
-      details: [
-        `${Threshold.MAX_STARTER_TIER_TEAMS} teams`,
-        'Essential templates',
-        'Retrospectives, Sprint Poker, Standups, Check-Ins',
-        'Unlimited team members'
-      ],
+      details: [...StarterBenefits],
       buttonStyle: getButtonStyle(billingTier, 'starter'),
       buttonLabel: getButtonLabel(billingTier, 'starter'),
       isActive: !hasSelectedTeamPlan && billingTier === 'starter'
diff --git a/packages/client/utils/constants.ts b/packages/client/utils/constants.ts
index 08180a93209..b2f4a0f77d5 100644
--- a/packages/client/utils/constants.ts
+++ b/packages/client/utils/constants.ts
@@ -9,6 +9,7 @@ import {TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import {ReadableReasonToDowngradeEnum} from '../../server/graphql/types/ReasonToDowngrade'
 import {ReasonToDowngradeEnum} from '../__generated__/DowngradeToStarterMutation.graphql'
 import {TimelineEventEnum} from '../__generated__/MyDashboardTimelineQuery.graphql'
+import {Threshold} from '../types/constEnums'
 
 /* Meeting Misc. */
 export const MEETING_NAME = 'Check-in Meeting'
@@ -160,10 +161,16 @@ export const SPOTLIGHT_TOP_SECTION_HEIGHT = 236
 
 export const PARABOL_AI_USER_ID = 'parabolAIUser'
 
+export const StarterBenefits = [
+  `${Threshold.MAX_STARTER_TIER_TEAMS} teams`,
+  'Retrospectives, Sprint Poker, Standups, Check-Ins',
+  'Unlimited meeting templates',
+  'Unlimited team members'
+]
+
 export const TeamBenefits = [
   'Unlimited teams',
-  'Premium templates',
-  'Custom templates',
+  'Unlimited custom templates',
   'Unlimited meeting history',
   'Priority customer support',
   'AI Summaries',
@@ -172,6 +179,7 @@ export const TeamBenefits = [
 
 export const EnterpriseBenefits = [
   'Single Sign-On (SSO)',
+  'Org Admin Role',
   'Annual Billing',
   'Domain Whitelisting',
   'Uptime Service Level Agreement (SLA)',

From c6da00c06929d377b8b698c82352559d1da85467 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 4 Apr 2024 12:29:11 +0200
Subject: [PATCH 122/183] fix: trim inet address (#9598)

---
 packages/server/utils/uwsGetIP.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/utils/uwsGetIP.ts b/packages/server/utils/uwsGetIP.ts
index b41765b100d..d5ccf554bbf 100644
--- a/packages/server/utils/uwsGetIP.ts
+++ b/packages/server/utils/uwsGetIP.ts
@@ -5,7 +5,7 @@ const TRUSTED_PROXY_COUNT = Number(process.env.TRUSTED_PROXY_COUNT)
 const CLIENT_IP_POS = isNaN(TRUSTED_PROXY_COUNT) ? 0 : -1 - TRUSTED_PROXY_COUNT
 
 const uwsGetIP = (res: HttpResponse, req: HttpRequest) => {
-  const clientIp = req.getHeader('x-forwarded-for')?.split(',').at(CLIENT_IP_POS)
+  const clientIp = req.getHeader('x-forwarded-for')?.split(',').at(CLIENT_IP_POS)?.trim()
   if (clientIp) return clientIp
   // returns ipv6 e.g. '0000:0000:0000:0000:0000:ffff:ac11:0001'
   return Buffer.from(res.getRemoteAddressAsText()).toString()

From 415d03b2ce5216608a2dd144166666013d1752a0 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 4 Apr 2024 17:15:56 +0200
Subject: [PATCH 123/183] chore: Remove one on one meeting type (#9590)

---
 .../ActivityDetails/TemplateDetails.tsx       |  19 +--
 .../ActivityDetailsSidebar.tsx                | 143 +++---------------
 .../ActivityLibrary/ActivityLibrary.tsx       |   5 -
 .../ActivityLibrary/OneOnOneTeamStatus.tsx    |  28 ----
 .../OneOnOneTeamStatusComponent.tsx           |  40 -----
 .../client/mutations/StartCheckInMutation.ts  |   8 +-
 packages/server/database/types/Team.ts        |   4 -
 .../server/graphql/mutations/endCheckIn.ts    |   2 +-
 .../mutations/helpers/createTeamAndLeader.ts  |   3 +-
 .../helpers/getExistingOneOnOneTeam.ts        |  43 ------
 .../helpers/maybeCreateOneOnOneTeam.ts        |  98 ------------
 .../server/graphql/mutations/joinMeeting.ts   |   3 +-
 .../typeDefs/updateOrgFeatureFlag.graphql     |   1 -
 .../graphql/public/mutations/startCheckIn.ts  |  33 +---
 .../typeDefs/CreateOneOnOneTeamInput.graphql  |   4 -
 .../public/typeDefs/Organization.graphql      |   6 -
 .../public/typeDefs/startCheckIn.graphql      |   6 +-
 .../public/types/CreateOneOnOneTeamInput.ts   |  21 ---
 .../graphql/public/types/Organization.ts      |  33 +---
 .../public/types/OrganizationFeatureFlags.ts  |   1 -
 .../1712073121060_removeOneOnOne.ts           |  16 ++
 .../postgres/queries/src/insertTeamQuery.sql  |   2 -
 packages/server/utils/analytics/analytics.ts  |  33 ++--
 packages/server/utils/analytics/helpers.ts    |   7 +-
 .../meeting_types-one_on_one.svg              |  28 ----
 static/images/illustrations/oneOnOne.svg      |  33 ----
 26 files changed, 61 insertions(+), 559 deletions(-)
 delete mode 100644 packages/client/components/ActivityLibrary/OneOnOneTeamStatus.tsx
 delete mode 100644 packages/client/components/ActivityLibrary/OneOnOneTeamStatusComponent.tsx
 delete mode 100644 packages/server/graphql/mutations/helpers/getExistingOneOnOneTeam.ts
 delete mode 100644 packages/server/graphql/mutations/helpers/maybeCreateOneOnOneTeam.ts
 delete mode 100644 packages/server/graphql/public/typeDefs/CreateOneOnOneTeamInput.graphql
 delete mode 100644 packages/server/graphql/public/types/CreateOneOnOneTeamInput.ts
 create mode 100644 packages/server/postgres/migrations/1712073121060_removeOneOnOne.ts
 delete mode 100644 static/images/illustrations/meeting_types-one_on_one.svg
 delete mode 100644 static/images/illustrations/oneOnOne.svg

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
index b86554fb3ef..f45191fad8c 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
@@ -73,22 +73,6 @@ const ACTIVITY_TYPE_DATA_LOOKUP: Record<
   }
 }
 
-const ACTIVITY_ID_DATA_LOOKUP: Record<
-  string,
-  {description: React.ReactNode; integrationsTip: React.ReactNode}
-> = {
-  oneOnOneAction: {
-    description: (
-      <>
-        This is a space to check in one-on-one. Share a personal update using the <b>Icebreaker</b>{' '}
-        phase. Give a brief update on what’s changed with your work during the <b>Solo Updates</b>{' '}
-        phase. Raise issues for discussion in the <b>Agenda</b> phase.
-      </>
-    ),
-    integrationsTip: <>push takeaway tasks to your backlog</>
-  }
-}
-
 interface Props {
   activityRef: TemplateDetails_activity$key
   isEditing: boolean
@@ -143,8 +127,7 @@ export const TemplateDetails = (props: Props) => {
   } = activity
   const {id: teamId, editingScaleId} = team
 
-  const {description: activityDescription, integrationsTip} =
-    ACTIVITY_ID_DATA_LOOKUP[activityId] ?? ACTIVITY_TYPE_DATA_LOOKUP[type]
+  const {description: activityDescription, integrationsTip} = ACTIVITY_TYPE_DATA_LOOKUP[type]
 
   const viewer = useFragment(
     graphql`
diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index 20574555b3b..d0721f72af5 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -16,7 +16,6 @@ import useAtmosphere from '../../hooks/useAtmosphere'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMutationProps from '../../hooks/useMutationProps'
 import SelectTemplateMutation from '../../mutations/SelectTemplateMutation'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import StartCheckInMutation from '../../mutations/StartCheckInMutation'
 import StartTeamPromptMutation from '../../mutations/StartTeamPromptMutation'
 import {PALETTE} from '../../styles/paletteV3'
@@ -33,14 +32,6 @@ import StyledError from '../StyledError'
 import FlatPrimaryButton from '../FlatPrimaryButton'
 import NewMeetingActionsCurrentMeetings from '../NewMeetingActionsCurrentMeetings'
 import NewMeetingTeamPicker from '../NewMeetingTeamPicker'
-import {AdhocTeamMultiSelect, Option} from '../AdhocTeamMultiSelect/AdhocTeamMultiSelect'
-import {Select} from '../../ui/Select/Select'
-import {SelectTrigger} from '../../ui/Select/SelectTrigger'
-import {SelectValue} from '../../ui/Select/SelectValue'
-import {SelectContent} from '../../ui/Select/SelectContent'
-import {SelectGroup} from '../../ui/Select/SelectGroup'
-import {SelectItem} from '../../ui/Select/SelectItem'
-import OneOnOneTeamStatus from './OneOnOneTeamStatus'
 import ScheduleMeetingButton from './ScheduleMeetingButton'
 import useBreakpoint from '../../hooks/useBreakpoint'
 import {Breakpoint} from '../../types/constEnums'
@@ -156,37 +147,6 @@ const ActivityDetailsSidebar = (props: Props) => {
   const mutationProps = useMutationProps()
   const {onError, onCompleted, submitting, submitMutation, error} = mutationProps
   const history = useHistory()
-  const {organizations: viewerOrganizations} = viewer
-  const [selectedUser, setSelectedUser] = React.useState<Option>()
-  const [mutualOrgsIds, setMutualOrgsIds] = React.useState<string[]>([])
-
-  const showOrgPicker = selectedUser && (mutualOrgsIds.length > 1 || !mutualOrgsIds.length)
-
-  const defaultOrgId = mutualOrgsIds[0] ?? selectedTeam.orgId
-  const [selectedOrgId, setSelectedOrgId] = useState(defaultOrgId)
-
-  const onUserSelected = (newUsers: Option[]) => {
-    const user = newUsers[0]
-    setSelectedUser(user)
-    if (user) {
-      SendClientSideEvent(atmosphere, 'Teammate Selected', {
-        selectionLocation: 'oneOnOneUserPicker'
-      })
-    }
-    const selectedUserOrganizationIds = new Set(user?.organizationIds ?? [])
-    const mutualOrgs = viewerOrganizations.filter((org) => selectedUserOrganizationIds.has(org.id))
-    const mutualOrgsIds = mutualOrgs.map((org) => org.id)
-    setMutualOrgsIds(mutualOrgsIds)
-    setSelectedOrgId(mutualOrgsIds[0] ?? selectedTeam.orgId)
-    onError(new Error(''))
-  }
-
-  const oneOnOneTeamInput = selectedUser
-    ? {
-        email: selectedUser.email,
-        orgId: selectedOrgId
-      }
-    : null
 
   const handleStartActivity = (
     gcalInput?: CreateGcalEventInput,
@@ -210,20 +170,9 @@ const ActivityDetailsSidebar = (props: Props) => {
         {history, onError, onCompleted}
       )
     } else if (type === 'action') {
-      const variables =
-        selectedTemplate.id !== 'oneOnOneAction'
-          ? {
-              teamId: selectedTeam.id,
-              gcalInput
-            }
-          : {
-              oneOnOneTeamInput,
-              gcalInput
-            }
-
-      if (selectedTemplate.id === 'oneOnOneAction' && !oneOnOneTeamInput) {
-        onError(new Error('Please select a teammate'))
-        return
+      const variables = {
+        teamId: selectedTeam.id,
+        gcalInput
       }
 
       StartCheckInMutation(atmosphere, variables, {history, onError, onCompleted})
@@ -337,55 +286,14 @@ const ActivityDetailsSidebar = (props: Props) => {
             )}
           >
             <div className='mt-6 flex grow flex-col gap-2'>
-              {/* TODO: move one-on-one logic to its own component */}
-              {selectedTemplate.id === 'oneOnOneAction' ? (
-                <div className='rounded-lg bg-slate-200 p-3'>
-                  <div className='text-gray-700 pb-3 text-lg font-semibold'>Teammate</div>
-                  <AdhocTeamMultiSelect
-                    viewerRef={viewer}
-                    onChange={onUserSelected}
-                    value={selectedUser ? [selectedUser] : []}
-                    multiple={false}
-                  />
-
-                  {showOrgPicker && (
-                    <>
-                      <div className='text-gray-700 my-4 text-sm font-semibold'>Organization</div>
-                      <Select
-                        onValueChange={(orgId) => setSelectedOrgId(orgId)}
-                        value={selectedOrgId}
-                      >
-                        <SelectTrigger className='bg-white'>
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          <SelectGroup>
-                            {viewerOrganizations
-                              .filter((org) =>
-                                mutualOrgsIds.length ? mutualOrgsIds.includes(org.id) : true
-                              )
-                              .map((org) => (
-                                <SelectItem value={org.id} key={org.id}>
-                                  {org.name}
-                                </SelectItem>
-                              ))}
-                          </SelectGroup>
-                        </SelectContent>
-                      </Select>
-                    </>
-                  )}
-                </div>
-              ) : (
-                <NewMeetingTeamPicker
-                  positionOverride={isMobile ? MenuPosition.UPPER_RIGHT : MenuPosition.UPPER_LEFT} // refactor this: https://github.com/ParabolInc/parabol/issues/9274
-                  onSelectTeam={onSelectTeam}
-                  selectedTeamRef={selectedTeam}
-                  teamsRef={availableTeams}
-                  customPortal={teamScopePopover}
-                  allowAddTeam={viewer.featureFlags.adHocTeams}
-                />
-              )}
-
+              <NewMeetingTeamPicker
+                positionOverride={isMobile ? MenuPosition.UPPER_RIGHT : MenuPosition.UPPER_LEFT} // refactor this: https://github.com/ParabolInc/parabol/issues/9274
+                onSelectTeam={onSelectTeam}
+                selectedTeamRef={selectedTeam}
+                teamsRef={availableTeams}
+                customPortal={teamScopePopover}
+                allowAddTeam={viewer.featureFlags.adHocTeams}
+              />
               {type === 'retrospective' && (
                 <>
                   <NewMeetingSettingsToggleCheckIn settingsRef={selectedTeam.retroSettings} />
@@ -407,27 +315,16 @@ const ActivityDetailsSidebar = (props: Props) => {
         </div>
 
         <div className='z-10 flex h-fit w-full flex-col gap-2 pb-4'>
-          {oneOnOneTeamInput && (
-            <OneOnOneTeamStatus
-              email={oneOnOneTeamInput.email}
-              orgId={oneOnOneTeamInput.orgId}
-              name={(selectedUser?.id ? selectedUser?.label : selectedUser?.email) ?? ''}
-            />
-          )}
           {error && <StyledError>{error.message}</StyledError>}
-          {selectedTemplate.id !== 'oneOnOneAction' && (
-            <>
-              <NewMeetingActionsCurrentMeetings team={selectedTeam} />
-              {/* TODO: scheduling meeting does not work with one-on-one https://github.com/ParabolInc/parabol/issues/8820  */}
-              <ScheduleMeetingButton
-                handleStartActivity={handleStartActivity}
-                mutationProps={mutationProps}
-                teamRef={selectedTeam}
-                placeholder={meetingNamePlaceholder}
-                withRecurrence={withRecurrence}
-              />
-            </>
-          )}
+          <NewMeetingActionsCurrentMeetings team={selectedTeam} />
+          {/* TODO: scheduling meeting does not work with one-on-one https://github.com/ParabolInc/parabol/issues/8820  */}
+          <ScheduleMeetingButton
+            handleStartActivity={handleStartActivity}
+            mutationProps={mutationProps}
+            teamRef={selectedTeam}
+            placeholder={meetingNamePlaceholder}
+            withRecurrence={withRecurrence}
+          />
           <FlatPrimaryButton
             onClick={() => handleStartActivity()}
             waiting={submitting}
diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 921b2bb7b48..2bf9f7cb5ab 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -90,7 +90,6 @@ const query = graphql`
       }
       organizations {
         featureFlags {
-          oneOnOne
           aiTemplate
         }
       }
@@ -198,7 +197,6 @@ export const ActivityLibrary = (props: Props) => {
   const data = usePreloadedQuery<ActivityLibraryQuery>(query, queryRef)
   const {viewer} = data
   const {featureFlags, availableTemplates, organizations} = viewer
-  const hasOneOnOneFeatureFlag = !!organizations.find((org) => org.featureFlags.oneOnOne)
   const hasAITemplateFeatureFlag = !!organizations.find((org) => org.featureFlags.aiTemplate)
 
   const setSearch = (value: string) => {
@@ -211,9 +209,6 @@ export const ActivityLibrary = (props: Props) => {
 
   const templates = useMemo(() => {
     const templatesMap = availableTemplates.edges.map((edge) => edge.node)
-    if (!hasOneOnOneFeatureFlag) {
-      return templatesMap.filter((template) => template.id !== 'oneOnOneAction')
-    }
     return templatesMap
   }, [availableTemplates])
 
diff --git a/packages/client/components/ActivityLibrary/OneOnOneTeamStatus.tsx b/packages/client/components/ActivityLibrary/OneOnOneTeamStatus.tsx
deleted file mode 100644
index 53b188b9653..00000000000
--- a/packages/client/components/ActivityLibrary/OneOnOneTeamStatus.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React, {Suspense} from 'react'
-import {OneOnOneTeamStatusComponentQuery} from '../../__generated__/OneOnOneTeamStatusComponentQuery.graphql'
-import useQueryLoaderNow from '../../hooks/useQueryLoaderNow'
-import {Loader} from '../../utils/relay/renderLoader'
-import {LoaderSize} from '../../types/constEnums'
-import OneOnOneTeamStatusComponent, {
-  oneOnOneTeamStatusComponentQuery
-} from './OneOnOneTeamStatusComponent'
-
-interface Props {
-  email: string
-  orgId: string
-  name: string
-}
-
-const OneOnOneTeamStatus = ({email, orgId, name}: Props) => {
-  const queryRef = useQueryLoaderNow<OneOnOneTeamStatusComponentQuery>(
-    oneOnOneTeamStatusComponentQuery,
-    {email, orgId}
-  )
-  return (
-    <Suspense fallback={<Loader size={LoaderSize.MENU} />}>
-      {queryRef && <OneOnOneTeamStatusComponent queryRef={queryRef} name={name} />}
-    </Suspense>
-  )
-}
-
-export default OneOnOneTeamStatus
diff --git a/packages/client/components/ActivityLibrary/OneOnOneTeamStatusComponent.tsx b/packages/client/components/ActivityLibrary/OneOnOneTeamStatusComponent.tsx
deleted file mode 100644
index 4cbb05d129a..00000000000
--- a/packages/client/components/ActivityLibrary/OneOnOneTeamStatusComponent.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react'
-import graphql from 'babel-plugin-relay/macro'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {OneOnOneTeamStatusComponentQuery} from '../../__generated__/OneOnOneTeamStatusComponentQuery.graphql'
-
-export const oneOnOneTeamStatusComponentQuery = graphql`
-  query OneOnOneTeamStatusComponentQuery($email: Email!, $orgId: ID!) {
-    viewer {
-      organization(orgId: $orgId) {
-        oneOnOneTeam(email: $email) {
-          id
-          name
-        }
-      }
-    }
-  }
-`
-
-interface Props {
-  queryRef: PreloadedQuery<OneOnOneTeamStatusComponentQuery>
-  name: string
-}
-
-const OneOnOneTeamStatusComponent = (props: Props) => {
-  const {queryRef, name} = props
-  const data = usePreloadedQuery<OneOnOneTeamStatusComponentQuery>(
-    oneOnOneTeamStatusComponentQuery,
-    queryRef
-  )
-
-  const team = data.viewer.organization?.oneOnOneTeam
-
-  return (
-    <div className='mb-4 text-center text-sm'>
-      {team ? `"${team.name}" team will be used` : `A new team will be created for you and ${name}`}
-    </div>
-  )
-}
-
-export default OneOnOneTeamStatusComponent
diff --git a/packages/client/mutations/StartCheckInMutation.ts b/packages/client/mutations/StartCheckInMutation.ts
index 3d4b1060d56..337b72bb0b3 100644
--- a/packages/client/mutations/StartCheckInMutation.ts
+++ b/packages/client/mutations/StartCheckInMutation.ts
@@ -16,12 +16,8 @@ graphql`
 `
 
 const mutation = graphql`
-  mutation StartCheckInMutation(
-    $teamId: ID
-    $gcalInput: CreateGcalEventInput
-    $oneOnOneTeamInput: CreateOneOnOneTeamInput
-  ) {
-    startCheckIn(teamId: $teamId, gcalInput: $gcalInput, oneOnOneTeamInput: $oneOnOneTeamInput) {
+  mutation StartCheckInMutation($teamId: ID!, $gcalInput: CreateGcalEventInput) {
+    startCheckIn(teamId: $teamId, gcalInput: $gcalInput) {
       ... on ErrorPayload {
         error {
           message
diff --git a/packages/server/database/types/Team.ts b/packages/server/database/types/Team.ts
index e05dd91083e..0e6055d6281 100644
--- a/packages/server/database/types/Team.ts
+++ b/packages/server/database/types/Team.ts
@@ -17,7 +17,6 @@ interface Input {
   orgId: string
   qualAIMeetingsCount?: number
   isOnboardTeam?: boolean
-  isOneOnOneTeam?: boolean
   giveKudosWithEmoji?: boolean
   kudosEmoji?: string
   updatedAt?: Date
@@ -37,7 +36,6 @@ export default class Team {
   trialStartDate?: Date | null
   orgId: string
   isOnboardTeam: boolean
-  isOneOnOneTeam?: boolean
   giveKudosWithEmoji: boolean
   kudosEmoji: string
   qualAIMeetingsCount: number
@@ -50,7 +48,6 @@ export default class Team {
       id,
       isArchived,
       isOnboardTeam,
-      isOneOnOneTeam,
       giveKudosWithEmoji,
       kudosEmoji,
       lastMeetingType,
@@ -74,7 +71,6 @@ export default class Team {
     this.lastMeetingType = lastMeetingType ?? 'retrospective'
     this.isArchived = isArchived ?? false
     this.isOnboardTeam = isOnboardTeam ?? false
-    this.isOneOnOneTeam = isOneOnOneTeam ?? false
     this.giveKudosWithEmoji = giveKudosWithEmoji ?? true
     this.kudosEmoji = kudosEmoji ?? 'heart'
     this.isPaid = isPaid ?? true
diff --git a/packages/server/graphql/mutations/endCheckIn.ts b/packages/server/graphql/mutations/endCheckIn.ts
index e009f7351c2..c22425619d9 100644
--- a/packages/server/graphql/mutations/endCheckIn.ts
+++ b/packages/server/graphql/mutations/endCheckIn.ts
@@ -230,7 +230,7 @@ export default {
     IntegrationNotifier.endMeeting(dataLoader, meetingId, teamId)
     const updatedTaskIds = (result && result.updatedTaskIds) || []
 
-    analytics.checkInEnd(completedCheckIn, meetingMembers, team, dataLoader)
+    analytics.checkInEnd(completedCheckIn, meetingMembers, dataLoader)
     sendNewMeetingSummary(completedCheckIn, context).catch(Logger.log)
     checkTeamsLimit(team.orgId, dataLoader)
 
diff --git a/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts b/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts
index 1daa2d8730e..2e972dd3e6f 100644
--- a/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts
+++ b/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts
@@ -16,10 +16,9 @@ interface ValidNewTeam {
   name: string
   orgId: string
   isOnboardTeam: boolean
-  isOneOnOneTeam?: boolean
 }
 
-// used for addorg, addTeam, maybeCreateOneOnOneTeam
+// used for addorg, addTeam
 export default async function createTeamAndLeader(user: IUser, newTeam: ValidNewTeam) {
   const r = await getRethink()
   const {id: userId} = user
diff --git a/packages/server/graphql/mutations/helpers/getExistingOneOnOneTeam.ts b/packages/server/graphql/mutations/helpers/getExistingOneOnOneTeam.ts
deleted file mode 100644
index 8eb4ad1b6b9..00000000000
--- a/packages/server/graphql/mutations/helpers/getExistingOneOnOneTeam.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import getRethink from '../../../database/rethinkDriver'
-import getKysely from '../../../postgres/getKysely'
-import {RValue} from '../../../database/stricterR'
-
-export const getExistingOneOnOneTeam = async (
-  userId: string,
-  secondUserId: string,
-  orgId: string
-) => {
-  const r = await getRethink()
-  const pg = getKysely()
-  const userIds = [userId, secondUserId]
-  const existingTeamIds = await (
-    r
-      .table('TeamMember')
-      // Select teams where both users exists
-      .getAll(r.args(userIds), {index: 'userId'})
-      .filter({isNotRemoved: true}) // Only consider users who are not removed
-      .group('teamId') as RValue
-  )
-    .count()
-    .ungroup()
-    .filter(r.row('reduction').eq(userIds.length))
-    .without('reduction')
-    .getField('group')
-    .coerceTo('array')
-    .run()
-
-  if (!existingTeamIds.length) {
-    return null
-  }
-
-  const teams = await pg
-    .selectFrom('Team')
-    .selectAll()
-    .where('id', 'in', existingTeamIds)
-    .where('orgId', '=', orgId)
-    .where('isOneOnOneTeam', '=', true)
-    .where('isArchived', '=', false)
-    .execute()
-
-  return teams[0]
-}
diff --git a/packages/server/graphql/mutations/helpers/maybeCreateOneOnOneTeam.ts b/packages/server/graphql/mutations/helpers/maybeCreateOneOnOneTeam.ts
deleted file mode 100644
index 20e420e3d2b..00000000000
--- a/packages/server/graphql/mutations/helpers/maybeCreateOneOnOneTeam.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
-import generateUID from '../../../generateUID'
-import createTeamAndLeader from './createTeamAndLeader'
-import IUser from '../../../postgres/types/IUser'
-import inviteToTeamHelper from './inviteToTeamHelper'
-import {GQLContext} from '../../graphql'
-import publish from '../../../utils/publish'
-import {SubscriptionChannel} from '~/types/constEnums'
-import toTeamMemberId from '~/utils/relay/toTeamMemberId'
-import {getExistingOneOnOneTeam} from './getExistingOneOnOneTeam'
-import getTeamsByOrgIds from '../../../postgres/queries/getTeamsByOrgIds'
-import {analytics} from '../../../utils/analytics/analytics'
-
-type OneOnOneTeam = {
-  email: string
-  orgId: string
-}
-
-const createNewTeamAndInvite = async (
-  viewer: IUser,
-  name: string,
-  orgId: string,
-  invitees: string[],
-  context: GQLContext
-) => {
-  const {authToken, socketId: mutatorId, dataLoader} = context
-  const {id: viewerId} = viewer
-  const operationId = dataLoader.share()
-  const subOptions = {mutatorId, operationId}
-  const teamId = generateUID()
-  await createTeamAndLeader(viewer, {
-    id: teamId,
-    isOnboardTeam: false,
-    isOneOnOneTeam: true,
-    name,
-    orgId
-  })
-
-  const orgTeams = await getTeamsByOrgIds([orgId], {isArchived: false})
-
-  const {tms} = authToken
-  // MUTATIVE
-  tms.push(teamId)
-  analytics.newTeam(viewer, orgId, teamId, orgTeams.length + 1, true)
-  publish(SubscriptionChannel.NOTIFICATION, viewerId, 'AuthTokenPayload', {tms})
-
-  const teamMemberId = toTeamMemberId(teamId, viewerId)
-  const teamData = {
-    orgId,
-    teamId,
-    teamMemberId
-  }
-  publish(SubscriptionChannel.TEAM, viewerId, 'AddTeamPayload', teamData, subOptions)
-
-  await inviteToTeamHelper(invitees, teamId, undefined, context)
-
-  return teamId
-}
-
-const generateOneOnOneTeamName = (
-  firstUserName: string,
-  secondUserEmail: string,
-  secondUserName?: string
-) => {
-  if (secondUserName) {
-    return `${firstUserName} / ${secondUserName}`
-  }
-
-  return `${firstUserName} / ${secondUserEmail.split('@')[0]!}`
-}
-
-export default async function maybeCreateOneOnOneTeam(
-  viewer: IUser,
-  oneOnOneTeam: OneOnOneTeam,
-  context: GQLContext
-) {
-  const {email, orgId} = oneOnOneTeam
-
-  const existingUser = await getUserByEmail(email)
-
-  const teamName = generateOneOnOneTeamName(
-    viewer.preferredName,
-    email,
-    existingUser?.preferredName
-  )
-
-  if (!existingUser) {
-    return createNewTeamAndInvite(viewer, teamName, orgId, [email], context)
-  }
-
-  // If user exists, check if the team with that user already exists
-  const existingTeam = await getExistingOneOnOneTeam(existingUser.id, viewer.id, orgId)
-  if (existingTeam) {
-    return existingTeam.id
-  }
-
-  return createNewTeamAndInvite(viewer, teamName, orgId, [existingUser.email], context)
-}
diff --git a/packages/server/graphql/mutations/joinMeeting.ts b/packages/server/graphql/mutations/joinMeeting.ts
index c82e1f25dd4..4454425cef3 100644
--- a/packages/server/graphql/mutations/joinMeeting.ts
+++ b/packages/server/graphql/mutations/joinMeeting.ts
@@ -164,8 +164,7 @@ const joinMeeting = {
 
     const data = {meetingId}
     publish(SubscriptionChannel.MEETING, meetingId, 'JoinMeetingSuccess', data, subOptions)
-    const team = await dataLoader.get('teams').loadNonNull(teamId)
-    analytics.meetingJoined(viewer, meeting, team)
+    analytics.meetingJoined(viewer, meeting)
     return data
   }
 }
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
index 925a360df83..9d7fad91919 100644
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
@@ -10,7 +10,6 @@ enum OrganizationFeatureFlagsEnum {
   shareSummary
   teamsLimit
   noTeamInsights
-  oneOnOne
   singleColumnStandups
   publicTeams
   kudos
diff --git a/packages/server/graphql/public/mutations/startCheckIn.ts b/packages/server/graphql/public/mutations/startCheckIn.ts
index b3997933509..9c5f10de62b 100644
--- a/packages/server/graphql/public/mutations/startCheckIn.ts
+++ b/packages/server/graphql/public/mutations/startCheckIn.ts
@@ -12,13 +12,12 @@ import standardError from '../../../utils/standardError'
 import createGcalEvent from '../../mutations/helpers/createGcalEvent'
 import createNewMeetingPhases from '../../mutations/helpers/createNewMeetingPhases'
 import isStartMeetingLocked from '../../mutations/helpers/isStartMeetingLocked'
-import maybeCreateOneOnOneTeam from '../../mutations/helpers/maybeCreateOneOnOneTeam'
 import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
 import {MutationResolvers} from '../resolverTypes'
 
 const startCheckIn: MutationResolvers['startCheckIn'] = async (
   _source,
-  {teamId: existingTeamId, gcalInput, oneOnOneTeamInput},
+  {teamId, gcalInput},
   context
 ) => {
   const r = await getRethink()
@@ -28,31 +27,13 @@ const startCheckIn: MutationResolvers['startCheckIn'] = async (
   // AUTH
   const viewerId = getUserId(authToken)
 
-  if (existingTeamId && oneOnOneTeamInput) {
-    return standardError(
-      new Error('Please provide either "teamId" or "oneOnOneTeamInput", but not both'),
-      {
-        userId: viewerId
-      }
-    )
+  if (!isTeamMember(authToken, teamId)) {
+    return standardError(new Error('Team not found'), {userId: viewerId})
   }
+  const unpaidError = await isStartMeetingLocked(teamId, dataLoader)
+  if (unpaidError) return standardError(new Error(unpaidError), {userId: viewerId})
 
-  if (existingTeamId) {
-    if (!isTeamMember(authToken, existingTeamId)) {
-      return standardError(new Error('Team not found'), {userId: viewerId})
-    }
-    const unpaidError = await isStartMeetingLocked(existingTeamId, dataLoader)
-    if (unpaidError) return standardError(new Error(unpaidError), {userId: viewerId})
-  }
   const viewer = await dataLoader.get('users').loadNonNull(viewerId)
-  const teamId = oneOnOneTeamInput
-    ? await maybeCreateOneOnOneTeam(viewer, oneOnOneTeamInput, context)
-    : existingTeamId
-  if (!teamId) {
-    return standardError(new Error('Must provide teamId or oneOnOneTeamInput'), {
-      userId: viewerId
-    })
-  }
 
   const meetingType: MeetingTypeEnum = 'action'
 
@@ -79,7 +60,6 @@ const startCheckIn: MutationResolvers['startCheckIn'] = async (
     id: meetingId,
     teamId,
     meetingCount,
-    name: oneOnOneTeamInput ? `One on One #${meetingCount + 1}` : undefined,
     phases,
     facilitatorUserId: viewerId
   })
@@ -111,8 +91,7 @@ const startCheckIn: MutationResolvers['startCheckIn'] = async (
     r.table('AgendaItem').getAll(r.args(agendaItemIds)).update({meetingId}).run()
   ])
   IntegrationNotifier.startMeeting(dataLoader, meetingId, teamId)
-  const team = await dataLoader.get('teams').loadNonNull(teamId)
-  analytics.meetingStarted(viewer, meeting, undefined, team)
+  analytics.meetingStarted(viewer, meeting)
   const {error} = await createGcalEvent({gcalInput, teamId, meetingId, viewerId, dataLoader})
   const data = {teamId, meetingId, hasGcalError: !!error?.message}
   publish(SubscriptionChannel.TEAM, teamId, 'StartCheckInSuccess', data, subOptions)
diff --git a/packages/server/graphql/public/typeDefs/CreateOneOnOneTeamInput.graphql b/packages/server/graphql/public/typeDefs/CreateOneOnOneTeamInput.graphql
deleted file mode 100644
index 36189d3aa47..00000000000
--- a/packages/server/graphql/public/typeDefs/CreateOneOnOneTeamInput.graphql
+++ /dev/null
@@ -1,4 +0,0 @@
-input CreateOneOnOneTeamInput {
-  email: Email!
-  orgId: String!
-}
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index 40fe0800f8a..b7471c75dcf 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -141,11 +141,6 @@ type Organization {
   """
   orgUserCount: OrgUserCount!
 
-  """
-  Returns one on one team if exists
-  """
-  oneOnOneTeam(email: Email!): Team
-
   """
   The leaders of the org
   """
@@ -190,7 +185,6 @@ type OrganizationFeatureFlags {
   shareSummary: Boolean!
   teamsLimit: Boolean!
   noTeamInsights: Boolean!
-  oneOnOne: Boolean!
   singleColumnStandups: Boolean!
   publicTeams: Boolean!
   kudos: Boolean!
diff --git a/packages/server/graphql/public/typeDefs/startCheckIn.graphql b/packages/server/graphql/public/typeDefs/startCheckIn.graphql
index 8fde46f9b80..35a8c0f4b69 100644
--- a/packages/server/graphql/public/typeDefs/startCheckIn.graphql
+++ b/packages/server/graphql/public/typeDefs/startCheckIn.graphql
@@ -18,14 +18,10 @@ extend type Mutation {
     """
     The team starting the meeting
     """
-    teamId: ID
+    teamId: ID!
     """
     The gcal input if creating a gcal event
     """
     gcalInput: CreateGcalEventInput
-    """
-    One-on-one ad-hoc team input
-    """
-    oneOnOneTeamInput: CreateOneOnOneTeamInput
   ): StartCheckInPayload!
 }
diff --git a/packages/server/graphql/public/types/CreateOneOnOneTeamInput.ts b/packages/server/graphql/public/types/CreateOneOnOneTeamInput.ts
deleted file mode 100644
index fe4af051167..00000000000
--- a/packages/server/graphql/public/types/CreateOneOnOneTeamInput.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {GraphQLInputObjectType, GraphQLNonNull, GraphQLString} from 'graphql'
-import GraphQLEmailType from '../../types/GraphQLEmailType'
-
-const CreateOneOnOneTeamInput = new GraphQLInputObjectType({
-  name: 'CreateOneOnOneTeamInput',
-  fields: () => ({
-    email: {
-      type: new GraphQLNonNull(GraphQLEmailType)
-    },
-    orgId: {
-      type: new GraphQLNonNull(GraphQLString)
-    }
-  })
-})
-
-export type CreateOneOnOneTeamInputType = {
-  email: string
-  orgId: string
-}
-
-export default CreateOneOnOneTeamInput
diff --git a/packages/server/graphql/public/types/Organization.ts b/packages/server/graphql/public/types/Organization.ts
index 617cc39d5ec..b1164b14f7e 100644
--- a/packages/server/graphql/public/types/Organization.ts
+++ b/packages/server/graphql/public/types/Organization.ts
@@ -1,10 +1,5 @@
-import {getUserId, isSuperUser} from '../../../utils/authorization'
+import {isSuperUser} from '../../../utils/authorization'
 import {OrganizationResolvers} from '../resolverTypes'
-import {GQLContext} from '../../graphql'
-import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
-import {getExistingOneOnOneTeam} from '../../mutations/helpers/getExistingOneOnOneTeam'
-import {mapToTeam} from '../../../postgres/queries/getTeamsByIds'
-import {IGetTeamsByIdsQueryResult} from '../../../postgres/queries/generated/getTeamsByIdsQuery'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
 const Organization: OrganizationResolvers = {
@@ -29,32 +24,6 @@ const Organization: OrganizationResolvers = {
     return getFeatureTier({tier, trialStartDate})
   },
   billingTier: ({tier}) => tier,
-  oneOnOneTeam: async (
-    {id: orgId}: {id: string},
-    {email}: {email: string},
-    context: GQLContext
-  ) => {
-    const {authToken} = context
-    const viewerId = getUserId(authToken)
-
-    const existingUser = await getUserByEmail(email)
-
-    if (!existingUser) {
-      return null
-    }
-
-    // TODO: refactor mapToTeam to use kysely and remove IGetTeamsByIdsQueryResult
-    const existingTeam = (await getExistingOneOnOneTeam(
-      existingUser.id,
-      viewerId,
-      orgId
-    )) as IGetTeamsByIdsQueryResult
-    if (existingTeam) {
-      return mapToTeam([existingTeam])[0] ?? null
-    }
-
-    return null
-  },
   saml: async ({id: orgId}, _args, {dataLoader}) => {
     const saml = await dataLoader.get('samlByOrgId').load(orgId)
     return saml || null
diff --git a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
index 9903dc8dd4e..8a0a0cec364 100644
--- a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
+++ b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
@@ -9,7 +9,6 @@ const OrganizationFeatureFlags: OrganizationFeatureFlagsResolvers = {
   suggestGroups: ({suggestGroups}) => !!suggestGroups,
   teamsLimit: ({teamsLimit}) => !!teamsLimit,
   noTeamInsights: ({noTeamInsights}) => !!noTeamInsights,
-  oneOnOne: ({oneOnOne}) => !!oneOnOne,
   publicTeams: ({publicTeams}) => !!publicTeams,
   singleColumnStandups: ({singleColumnStandups}) => !!singleColumnStandups,
   kudos: ({kudos}) => !!kudos,
diff --git a/packages/server/postgres/migrations/1712073121060_removeOneOnOne.ts b/packages/server/postgres/migrations/1712073121060_removeOneOnOne.ts
new file mode 100644
index 00000000000..c145dc0c8f6
--- /dev/null
+++ b/packages/server/postgres/migrations/1712073121060_removeOneOnOne.ts
@@ -0,0 +1,16 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`UPDATE "MeetingTemplate" SET "isActive" = false WHERE id = 'oneOnOneAction';`)
+  await client.end()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`UPDATE "MeetingTemplate" SET "isActive" = true WHERE id = 'oneOnOneAction';`)
+  await client.end()
+}
diff --git a/packages/server/postgres/queries/src/insertTeamQuery.sql b/packages/server/postgres/queries/src/insertTeamQuery.sql
index 6401f533646..e2caacf620c 100644
--- a/packages/server/postgres/queries/src/insertTeamQuery.sql
+++ b/packages/server/postgres/queries/src/insertTeamQuery.sql
@@ -13,7 +13,6 @@ INSERT INTO "Team" (
   "tier",
   "orgId",
   "isOnboardTeam",
-  "isOneOnOneTeam",
   "updatedAt"
 ) VALUES (
   :id,
@@ -27,6 +26,5 @@ INSERT INTO "Team" (
   :tier,
   :orgId,
   :isOnboardTeam,
-  :isOneOnOneTeam,
   :updatedAt
 );
diff --git a/packages/server/utils/analytics/analytics.ts b/packages/server/utils/analytics/analytics.ts
index 305839e2651..df6d07c69ce 100644
--- a/packages/server/utils/analytics/analytics.ts
+++ b/packages/server/utils/analytics/analytics.ts
@@ -14,7 +14,6 @@ import {ModifyType} from '../../graphql/public/resolverTypes'
 import {IntegrationProviderServiceEnumType} from '../../graphql/types/IntegrationProviderServiceEnum'
 import {UpgradeCTALocationEnumType} from '../../graphql/types/UpgradeCTALocationEnum'
 import {TeamPromptResponse} from '../../postgres/queries/getTeamPromptResponsesByIds'
-import {Team} from '../../postgres/queries/getTeamsByIds'
 import {MeetingTypeEnum} from '../../postgres/types/Meeting'
 import {MeetingSeries} from '../../postgres/types/MeetingSeries'
 import {AmplitudeAnalytics} from './amplitude/AmplitudeAnalytics'
@@ -228,7 +227,6 @@ class Analytics {
   checkInEnd = async (
     completedMeeting: Meeting,
     meetingMembers: MeetingMember[],
-    team: Team,
     dataLoader: DataLoaderWorker
   ) =>
     Promise.all(
@@ -239,8 +237,7 @@ class Analytics {
           completedMeeting,
           meetingMembers,
           undefined,
-          undefined,
-          team
+          undefined
         )
       )
     )
@@ -293,24 +290,18 @@ class Analytics {
     completedMeeting: Meeting,
     meetingMembers: MeetingMember[],
     template?: MeetingTemplate,
-    meetingSpecificProperties?: any,
-    team?: Team
+    meetingSpecificProperties?: any
   ) => {
     const user = await dataloader.get('users').load(userId)
     this.track({id: userId, email: user?.email}, 'Meeting Completed', {
       wasFacilitator: completedMeeting.facilitatorUserId === userId,
-      ...createMeetingProperties(completedMeeting, meetingMembers, template, team),
+      ...createMeetingProperties(completedMeeting, meetingMembers, template),
       ...meetingSpecificProperties
     })
   }
 
-  meetingStarted = (
-    user: AnalyticsUser,
-    meeting: Meeting,
-    template?: MeetingTemplate,
-    team?: Team
-  ) => {
-    this.track(user, 'Meeting Started', createMeetingProperties(meeting, undefined, template, team))
+  meetingStarted = (user: AnalyticsUser, meeting: Meeting, template?: MeetingTemplate) => {
+    this.track(user, 'Meeting Started', createMeetingProperties(meeting, undefined, template))
   }
 
   recurrenceStarted = (user: AnalyticsUser, meetingSeries: MeetingSeriesAnalyticsProperties) => {
@@ -321,8 +312,8 @@ class Analytics {
     this.track(user, 'Meeting Recurrence Stopped', meetingSeries)
   }
 
-  meetingJoined = (user: AnalyticsUser, meeting: Meeting, team: Team) => {
-    this.track(user, 'Meeting Joined', createMeetingProperties(meeting, undefined, undefined, team))
+  meetingJoined = (user: AnalyticsUser, meeting: Meeting) => {
+    this.track(user, 'Meeting Joined', createMeetingProperties(meeting, undefined, undefined))
   }
 
   meetingSettingsChanged = (
@@ -670,14 +661,8 @@ class Analytics {
     this.track(user, 'New Org', {orgId, teamId, fromSignup})
   }
 
-  newTeam = (
-    user: AnalyticsUser,
-    orgId: string,
-    teamId: string,
-    teamNumber: number,
-    isOneOnOneTeam = false
-  ) => {
-    this.track(user, 'New Team', {orgId, teamId, teamNumber, isOneOnOneTeam})
+  newTeam = (user: AnalyticsUser, orgId: string, teamId: string, teamNumber: number) => {
+    this.track(user, 'New Team', {orgId, teamId, teamNumber})
   }
 
   pollAdded = (user: AnalyticsUser, teamId: string, meetingId: string) => {
diff --git a/packages/server/utils/analytics/helpers.ts b/packages/server/utils/analytics/helpers.ts
index 9dfcaece2cf..fb3b90cddeb 100644
--- a/packages/server/utils/analytics/helpers.ts
+++ b/packages/server/utils/analytics/helpers.ts
@@ -1,6 +1,5 @@
 import {CHECKIN} from '../../../client/utils/constants'
 import Meeting from '../../database/types/Meeting'
-import {Team} from '../../postgres/queries/getTeamsByIds'
 import MeetingMember from '../../database/types/MeetingMember'
 import MeetingRetrospective from '../../database/types/MeetingRetrospective'
 import MeetingTemplate from '../../database/types/MeetingTemplate'
@@ -8,8 +7,7 @@ import MeetingTemplate from '../../database/types/MeetingTemplate'
 export const createMeetingProperties = (
   meeting: Meeting,
   meetingMembers?: MeetingMember[],
-  template?: MeetingTemplate,
-  team?: Team
+  template?: MeetingTemplate
 ) => {
   const {id: meetingId, teamId, facilitatorUserId, meetingType, phases} = meeting
   const hasIcebreaker = phases.some(({phaseType}) => phaseType === CHECKIN)
@@ -32,7 +30,6 @@ export const createMeetingProperties = (
     disableAnonymity:
       meetingType === 'retrospective'
         ? (meeting as MeetingRetrospective).disableAnonymity ?? false
-        : undefined,
-    isOneOnOneTeam: team?.isOneOnOneTeam
+        : undefined
   }
 }
diff --git a/static/images/illustrations/meeting_types-one_on_one.svg b/static/images/illustrations/meeting_types-one_on_one.svg
deleted file mode 100644
index 6a6e21b4eec..00000000000
--- a/static/images/illustrations/meeting_types-one_on_one.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<svg viewBox="0 0 2048 1536" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M604.26 843.67C604.26 934.39 530.71 1007.92 439.99 1007.92C349.29 1007.92 275.74 934.39 275.74 843.67C275.74 780.67 311.22 725.95 363.28 698.39C365.05 697.46 366.83 696.55 368.65 695.67C370.51 694.77 372.37 693.92 374.26 693.11C394.39 684.29 416.62 679.4 439.99 679.4C474.12 679.4 505.81 689.8 532.06 707.63C533.76 708.79 535.42 709.97 537.07 711.17L537.09 711.19C577.82 741.06 604.26 789.28 604.26 843.67Z" fill="#F16259"/>
-<path d="M1818 949.93H230V1277.93H1818V949.93Z" fill="#F1F1F8"/>
-<path d="M934 813.93L1109.2 601.63C1138.83 565.72 1182.96 544.93 1229.52 544.93H1604C1690.16 544.93 1760 614.77 1760 700.93V949.93H1262L1206 724.93L1013 944.93L934 813.93Z" fill="#54C0D0"/>
-<path d="M1670.81 604.29C1710.98 574.67 1737.75 530.32 1745.25 480.98L1750.88 443.92C1752.19 435.33 1746.91 427.101 1738.56 424.701C1729.51 422.101 1720.04 427.211 1717.27 436.211L1706.29 479.74C1705.96 481.03 1704.04 480.641 1704.24 479.331L1718.51 385.321C1720.18 375.991 1714.59 366.891 1705.52 364.141C1695.21 361.011 1684.4 367.221 1681.91 377.691L1655 470.841C1654.54 472.421 1652.83 473.26 1651.3 472.66C1649.92 472.11 1649.21 470.59 1649.68 469.19L1669.32 404.941C1672 396.931 1668.97 387.88 1661.63 383.67C1660.57 383.06 1659.44 382.56 1658.24 382.16C1649.74 379.37 1640.49 383.181 1636.43 391.141L1569.68 539.531L1564.64 550.131L1670.81 604.29Z" fill="#7C4C59"/>
-<path d="M1542 544.93H1723L1762.3 970.66C1767.51 1028.28 1722.14 1077.93 1664.29 1077.93C1611.98 1077.93 1568.81 1037.01 1566.02 984.78L1542 544.93Z" fill="#31AAB9"/>
-<path d="M1561.93 450.64L1567.52 544.1L1623.97 532L1589.94 458.97C1583.85 449.78 1572.05 446.28 1561.93 450.64Z" fill="#7C4C59"/>
-<path d="M1509.88 438.07C1491.94 486.56 1455.26 517.61 1423.3 509.05C1388.08 499.61 1371.94 445.69 1387.24 388.61C1389.74 379.3 1392.92 370.46 1396.65 362.26C1411.65 356.06 1426.23 348.89 1440.3 340.79C1457.97 376.78 1481.47 409.68 1509.88 438.07Z" fill="#7C4C59"/>
-<path d="M418 487.93C439.4 525.28 450.67 567.58 450.67 610.63V741.93" stroke="#61C08B" stroke-width="8" stroke-miterlimit="10"/>
-<path d="M362.66 493.26L376.19 516.16C377.3 518.04 378.4 519.92 379.48 521.82C414.78 583.63 433.46 653.54 435.25 724.7L435.66 740.93" stroke="#61C08B" stroke-width="8" stroke-miterlimit="10"/>
-<path d="M393.19 544.93H344.66" stroke="#61C08B" stroke-width="8" stroke-miterlimit="10"/>
-<path d="M518.66 487.93L475.33 744.3" stroke="#61C08B" stroke-width="8" stroke-miterlimit="10"/>
-<path d="M507.21 555.68L475.33 513.93" stroke="#61C08B" stroke-width="8" stroke-miterlimit="10"/>
-<path d="M573.33 544.93L567.32 553.99C541.29 593.23 522.05 636.56 510.4 682.18L493.56 735.93" stroke="#61C08B" stroke-width="8" stroke-miterlimit="10"/>
-<path d="M440 744.3L406.28 667.8C397.4 638.35 377.49 613.2 350.3 598.83C349.34 598.32 348.36 597.82 347.38 597.34L328.33 587.92C324.19 629.29 348.3 661.2 382 693.26L440 744.3Z" fill="#61C08B"/>
-<path d="M581 560.93C596.282 560.93 608.67 548.542 608.67 533.26C608.67 517.978 596.282 505.59 581 505.59C565.718 505.59 553.33 517.978 553.33 533.26C553.33 548.542 565.718 560.93 581 560.93Z" fill="#FFCC65"/>
-<path d="M524.27 500.26C542.495 500.26 557.27 485.485 557.27 467.26C557.27 449.034 542.495 434.26 524.27 434.26C506.045 434.26 491.27 449.034 491.27 467.26C491.27 485.485 506.045 500.26 524.27 500.26Z" fill="#FFCC65"/>
-<path d="M409.6 500.26C427.825 500.26 442.6 485.485 442.6 467.26C442.6 449.034 427.825 434.26 409.6 434.26C391.375 434.26 376.6 449.034 376.6 467.26C376.6 485.485 391.375 500.26 409.6 500.26Z" fill="#FFCC65"/>
-<path d="M350.8 507.26C363.243 507.26 373.33 497.173 373.33 484.73C373.33 472.287 363.243 462.2 350.8 462.2C338.357 462.2 328.27 472.287 328.27 484.73C328.27 497.173 338.357 507.26 350.8 507.26Z" fill="#FFCC65"/>
-<path d="M330.2 571.01C344.305 571.01 355.74 559.575 355.74 545.47C355.74 531.364 344.305 519.93 330.2 519.93C316.095 519.93 304.66 531.364 304.66 545.47C304.66 559.575 316.095 571.01 330.2 571.01Z" fill="#FFCC65"/>
-<path d="M471.78 524.52C480.412 524.52 487.41 517.522 487.41 508.89C487.41 500.258 480.412 493.26 471.78 493.26C463.148 493.26 456.15 500.258 456.15 508.89C456.15 517.522 463.148 524.52 471.78 524.52Z" fill="#FFCC65"/>
-<path d="M541.11 715.63C518.88 735.8 490.07 746.92 460.01 746.92C421.98 746.92 386.96 729.56 363.89 699.32L363.48 698.72L363.28 698.39C365.05 697.46 366.83 696.55 368.65 695.67C370.51 694.77 372.37 693.92 374.26 693.11C395.04 719.69 426.21 734.92 460 734.92C486.63 734.92 512.17 725.24 532.06 707.63C532.39 707.33 532.72 707.05 533.05 706.74L537.07 711.17L537.09 711.19L541.11 715.63Z" fill="#DB4643"/>
-<path d="M1051.5 949.93L961.94 605.32C960.5 599.79 955.51 595.93 949.79 595.93H488.22C480.01 595.93 474.01 603.69 476.07 611.64L563.99 949.93H1051.5Z" fill="#444258"/>
-<path d="M986.5 949.93H1315.83C1329.45 949.93 1340.5 938.89 1340.5 925.26V912.93H986.5V949.93V949.93Z" fill="#444258"/>
-<path d="M755.656 817.62C772.196 811.566 778.278 786.641 769.241 761.949C760.203 737.256 739.469 722.145 722.929 728.199C706.39 734.252 700.308 759.177 709.345 783.87C718.382 808.563 739.117 823.673 755.656 817.62Z" fill="#62626E"/>
-<path d="M1514.74 422.79C1513.33 428.05 1511.69 433.15 1509.88 438.07C1481.47 409.67 1457.96 376.78 1440.29 340.79C1426.22 348.89 1411.64 356.06 1396.64 362.26C1405.27 343.29 1416.81 327.62 1429.59 316.87C1445.14 303.82 1462.51 298.02 1478.68 302.35C1479.21 302.48 1479.73 302.63 1480.24 302.8C1514.38 313.39 1529.82 366.57 1514.74 422.79Z" fill="#F16259"/>
-<path d="M1533.73 321.1C1551.15 321.1 1565.28 306.975 1565.28 289.55C1565.28 272.125 1551.15 258 1533.73 258C1516.31 258 1502.18 272.125 1502.18 289.55C1502.18 306.975 1516.31 321.1 1533.73 321.1Z" fill="#F16259"/>
-</svg>
diff --git a/static/images/illustrations/oneOnOne.svg b/static/images/illustrations/oneOnOne.svg
deleted file mode 100644
index c996500e76f..00000000000
--- a/static/images/illustrations/oneOnOne.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1033 601.43">
-	<defs>
-		<style>
-			.cls-1{fill:#f1f1f8;}.cls-2{fill:#f16259;}.cls-3{fill:#54c0d0;}.cls-4{fill:#7c4c59;}.cls-5{fill:#31aab9;}.cls-6{fill:none;stroke:#61c08b;stroke-miterlimit:10;stroke-width:8px;}.cls-7{fill:#61c08b;}.cls-8{fill:#ffcc65;}.cls-9{fill:#db4643;}.cls-10{fill:#444258;}.cls-11{fill:#62626e;}
-		</style>
-	</defs>
-	<path class="cls-1" d="M1033,516.5H0C0,231.24,231.25,0,516.5,0S1033,231.24,1033,516.5Z" />
-	<path class="cls-2" d="M230.29,445.26A109,109,0,0,1,204,516.5H37.62a109.53,109.53,0,0,1,32-168.09c1.18-.62,2.37-1.23,3.58-1.81s2.48-1.17,3.74-1.71a109.55,109.55,0,0,1,105.2,9.68c1.13.77,2.24,1.56,3.35,2.36h0A109.3,109.3,0,0,1,230.29,445.26Z" />
-	<path class="cls-3" d="M450.12,425.43,566.92,283.9a104,104,0,0,1,80.21-37.8H896.78a104,104,0,0,1,104,104v166h-332l-37.33-150L502.78,512.77Z" />
-	<path class="cls-4" d="M941.33,285.68h0A125.61,125.61,0,0,0,991,203.47l3.75-24.71A11.52,11.52,0,0,0,986.5,166h0a11.51,11.51,0,0,0-14.19,7.67l-7.32,29a.7.7,0,0,1-1.37-.28l9.51-62.67a12.48,12.48,0,0,0-8.66-14.13h0a12.47,12.47,0,0,0-15.74,9l-17.94,62.1a1.85,1.85,0,0,1-2.47,1.21h0a1.85,1.85,0,0,1-1.07-2.31l13.09-42.83a12,12,0,0,0-5.12-14.19,12.41,12.41,0,0,0-2.26-1h0a12.08,12.08,0,0,0-14.54,6l-44.5,98.93-3.36,7.06Z" />
-	<path class="cls-5" d="M855.45,246.1H976.12l26.2,283.82A65.61,65.61,0,0,1,937,601.43h0a65.61,65.61,0,0,1-65.52-62.1Z" />
-	<path class="cls-4" d="M868.74,183.24l3.73,62.31,37.63-8.07-22.68-48.69a15.2,15.2,0,0,0-18.68-5.55Z" />
-	<path class="cls-4" d="M834,174.86c-12,32.33-36.41,53-57.72,47.32-23.48-6.29-34.24-42.24-24-80.29a114.83,114.83,0,0,1,6.27-17.57A248.29,248.29,0,0,0,787.65,110,243.36,243.36,0,0,0,834,174.86Z" />
-	<path class="cls-6" d="M106.12,208.1h0a164.51,164.51,0,0,1,21.78,81.8v87.53" />
-	<path class="cls-6" d="M69.23,211.65l9,15.27c.74,1.25,1.47,2.51,2.19,3.77,23.53,41.21,36,87.81,37.18,135.25l.28,10.82" />
-	<line class="cls-6" x1="89.58" y1="246.1" x2="57.23" y2="246.1" />
-	<line class="cls-6" x1="173.23" y1="208.1" x2="144.34" y2="379.01" />
-	<line class="cls-6" x1="165.59" y1="253.27" x2="144.34" y2="225.43" />
-	<path class="cls-6" d="M209.67,246.1l-4,6a279.82,279.82,0,0,0-37.95,85.46L156.5,373.44" />
-	<path class="cls-7" d="M120.79,379,98.3,328A76.93,76.93,0,0,0,61,282c-.65-.34-1.29-.67-2-1l-12.7-6.28h0C43.58,302.34,59.65,323.61,82.12,345Z" />
-	<circle class="cls-8" cx="214.78" cy="238.32" r="18.44" />
-	<circle class="cls-8" cx="176.97" cy="194.32" r="22" />
-	<circle class="cls-8" cx="100.52" cy="194.32" r="22" />
-	<circle class="cls-8" cx="61.32" cy="205.97" r="15.02" />
-	<circle class="cls-8" cx="47.59" cy="246.46" r="17.03" />
-	<circle class="cls-8" cx="141.97" cy="222.07" r="10.42" />
-	<path class="cls-9" d="M188.19,359.9A80.54,80.54,0,0,1,70,349l-.27-.4-.13-.22c1.18-.62,2.37-1.23,3.58-1.81s2.48-1.17,3.74-1.71a72.54,72.54,0,0,0,105.2,9.68l.66-.59,2.68,2.95h0Z" />
-	<path class="cls-10" d="M528.45,516.1l-59.7-229.74a8.37,8.37,0,0,0-8.1-6.26H152.94a8.36,8.36,0,0,0-8.1,10.47L203.45,516.1Z" />
-	<path class="cls-10" d="M485.12,491.43h236a0,0,0,0,1,0,0v0a24.67,24.67,0,0,1-24.67,24.67H485.12a0,0,0,0,1,0,0V491.43A0,0,0,0,1,485.12,491.43Z" />
-	<ellipse class="cls-11" cx="320.28" cy="398.1" rx="21.26" ry="31.74" transform="translate(-117.3 134.32) rotate(-20.1)" />
-	<path class="cls-2" d="M837.28,164.67c-.94,3.51-2,6.91-3.24,10.19A243.36,243.36,0,0,1,787.65,110a248.29,248.29,0,0,1-29.1,14.31c5.75-12.65,13.45-23.09,22-30.26,10.37-8.7,22-12.57,32.73-9.68.35.09.7.19,1,.3C837,91.74,847.33,127.19,837.28,164.67Z" />
-	<circle class="cls-2" cx="849.94" cy="75.85" r="21.03" />
-</svg>

From 9794033249ee5c20a8f014a8b5ae38ce87294ead Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 4 Apr 2024 18:47:38 +0200
Subject: [PATCH 124/183] fix: Don't reuse another team members integrated task
 (#9600)

---
 packages/client/utils/AtlassianManager.ts                       | 1 -
 packages/client/utils/JiraServerClientManager.ts                | 1 +
 .../server/graphql/mutations/helpers/importTasksForPoker.ts     | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/utils/AtlassianManager.ts b/packages/client/utils/AtlassianManager.ts
index 5726a0e5636..c412ca64a66 100644
--- a/packages/client/utils/AtlassianManager.ts
+++ b/packages/client/utils/AtlassianManager.ts
@@ -58,7 +58,6 @@ export default abstract class AtlassianManager {
     'write:jira-work',
     'offline_access'
   ]
-  static MANAGE_SCOPE: JiraPermissionScope[] = [...AtlassianManager.SCOPE, 'manage:jira-project']
   accessToken: string
   protected headers = {
     Authorization: '',
diff --git a/packages/client/utils/JiraServerClientManager.ts b/packages/client/utils/JiraServerClientManager.ts
index 7739829683f..fff47331c60 100644
--- a/packages/client/utils/JiraServerClientManager.ts
+++ b/packages/client/utils/JiraServerClientManager.ts
@@ -4,6 +4,7 @@ import {MenuMutationProps} from '../hooks/useMutationProps'
 import AddTeamMemberIntegrationAuthMutation from '../mutations/AddTeamMemberIntegrationAuthMutation'
 import CreateOAuth1AuthorizeUrlMutation from '../mutations/CreateOAuth1AuthorizeUrlMutation'
 import getOAuthPopupFeatures from './getOAuthPopupFeatures'
+
 class JiraServerClientManager {
   static SCOPES = 'read_api'
   static openOAuth(
diff --git a/packages/server/graphql/mutations/helpers/importTasksForPoker.ts b/packages/server/graphql/mutations/helpers/importTasksForPoker.ts
index 8909fd96a38..11fd8a65ad7 100644
--- a/packages/server/graphql/mutations/helpers/importTasksForPoker.ts
+++ b/packages/server/graphql/mutations/helpers/importTasksForPoker.ts
@@ -16,7 +16,7 @@ const importTasksForPoker = async (
   const existingTasks = await r
     .table('Task')
     .getAll(r.args(integrationHashes), {index: 'integrationHash'})
-    .filter({teamId})
+    .filter({teamId, userId})
     .run()
   const integrationHashToTaskId = {} as Record<string, string>
   additiveUpdates.map((update) => {

From d409ea253e7da08ec3a9d5d2f4f8e15df632dd05 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 18:55:06 +0200
Subject: [PATCH 125/183] chore(release): release v7.25.0 (#9591)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 24 ++++++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 2fb3566ccf3..160020c170d 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.24.1"
+  ".": "7.25.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5ed33f4256..b34ae7c1533 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,30 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.25.0](https://github.com/ParabolInc/parabol/compare/v7.24.1...v7.25.0) (2024-04-04)
+
+
+### Added
+
+* update pricing page with template changes ([#9596](https://github.com/ParabolInc/parabol/issues/9596)) ([01f69de](https://github.com/ParabolInc/parabol/commit/01f69de9eb809ef16ac954e5d75ac884b11f8342))
+
+
+### Fixed
+
+* Add graphql-relay to predeploy ([#9595](https://github.com/ParabolInc/parabol/issues/9595)) ([b92d96e](https://github.com/ParabolInc/parabol/commit/b92d96e2972560ee16f83d90a82ebbb946e39dc0))
+* Don't reuse another team members integrated task ([#9600](https://github.com/ParabolInc/parabol/issues/9600)) ([9794033](https://github.com/ParabolInc/parabol/commit/9794033249ee5c20a8f014a8b5ae38ce87294ead))
+* **single-tenant:** application upgrades do not need --profile databases ([#9593](https://github.com/ParabolInc/parabol/issues/9593)) ([9486587](https://github.com/ParabolInc/parabol/commit/9486587c9f7d4b1c40a0eff549e819ed4565aa23))
+* trim inet address ([#9598](https://github.com/ParabolInc/parabol/issues/9598)) ([c6da00c](https://github.com/ParabolInc/parabol/commit/c6da00c06929d377b8b698c82352559d1da85467))
+
+
+### Changed
+
+* **deps-dev:** bump webpack-dev-middleware from 4.0.2 to 5.3.4 ([#9561](https://github.com/ParabolInc/parabol/issues/9561)) ([dbc9f09](https://github.com/ParabolInc/parabol/commit/dbc9f091a4c93efc0eca24c5cd42b80bae95cff3))
+* **deps:** bump express from 4.18.2 to 4.19.2 ([#9566](https://github.com/ParabolInc/parabol/issues/9566)) ([8ab86b4](https://github.com/ParabolInc/parabol/commit/8ab86b4cd8698ba6f0a4cdec8eca2bf31a290599))
+* **deps:** bump follow-redirects from 1.15.2 to 1.15.6 ([#9536](https://github.com/ParabolInc/parabol/issues/9536)) ([e372f5f](https://github.com/ParabolInc/parabol/commit/e372f5f7bccd0a2fd1b4fea414610ad12fe0ec89))
+* **deps:** bump jose from 4.14.4 to 4.15.5 ([#9515](https://github.com/ParabolInc/parabol/issues/9515)) ([c312f48](https://github.com/ParabolInc/parabol/commit/c312f4821698ae7966dee8889a0c8c3353733dcc))
+* Remove one on one meeting type ([#9590](https://github.com/ParabolInc/parabol/issues/9590)) ([415d03b](https://github.com/ParabolInc/parabol/commit/415d03b2ce5216608a2dd144166666013d1752a0))
+
 ## [7.24.1](https://github.com/ParabolInc/parabol/compare/v7.24.0...v7.24.1) (2024-04-02)
 
 
diff --git a/package.json b/package.json
index c6c630d2461..614a5c7190b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.1",
+  "version": "7.25.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index b8e0b4886a7..cfab39c0d92 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.24.1",
+  "version": "7.25.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.24.1"
+    "parabol-server": "7.25.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 905829c12f1..71ada11a05a 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.1",
+  "version": "7.25.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 975309bdb62..633d0c60f05 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.24.1",
+  "version": "7.25.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 3797dee3e75..a8d4f1e9c4b 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.24.1",
+  "version": "7.25.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.24.1",
-    "parabol-server": "7.24.1",
+    "parabol-client": "7.25.0",
+    "parabol-server": "7.25.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 84ae4bb4e29..1a5d8b79919 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.1",
+  "version": "7.25.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 4f82eb5a892..79c04b57b38 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.24.1",
+  "version": "7.25.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -122,7 +122,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.24.1",
+    "parabol-client": "7.25.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 96f29b56e7a5bd63cb8ec5c879a7c2fb80ef803d Mon Sep 17 00:00:00 2001
From: Bruce Tian <tianrunhe@gmail.com>
Date: Thu, 4 Apr 2024 09:56:38 -0700
Subject: [PATCH 126/183] fix: fix the issue where timer doesn't work in
 TEAM_HEALTH phase (#9597)

---
 packages/client/components/MeetingControlBar.tsx | 3 ++-
 packages/client/components/TeamHealth.tsx        | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/client/components/MeetingControlBar.tsx b/packages/client/components/MeetingControlBar.tsx
index 2e25542b810..9453836abb7 100644
--- a/packages/client/components/MeetingControlBar.tsx
+++ b/packages/client/components/MeetingControlBar.tsx
@@ -57,7 +57,8 @@ const DEFAULT_TIME_LIMIT = {
   vote: 3,
   discuss: 5,
   ESTIMATE: 5,
-  SCOPE: 3
+  SCOPE: 3,
+  TEAM_HEALTH: 1
 } as Record<NewMeetingPhaseTypeEnum, number>
 
 interface Props {
diff --git a/packages/client/components/TeamHealth.tsx b/packages/client/components/TeamHealth.tsx
index 8f7651cd099..6c62b85061f 100644
--- a/packages/client/components/TeamHealth.tsx
+++ b/packages/client/components/TeamHealth.tsx
@@ -18,6 +18,7 @@ import * as RadioGroup from '@radix-ui/react-radio-group'
 import clsx from 'clsx'
 import RaisedButton from './RaisedButton'
 import getTeamHealthVoteColor from '../utils/getTeamHealthVoteColor'
+import StageTimerDisplay from './StageTimerDisplay'
 
 interface Props {
   avatarGroup: ReactElement
@@ -32,6 +33,8 @@ const TeamHealth = (props: Props) => {
   const meeting = useFragment(
     graphql`
       fragment TeamHealth_meeting on NewMeeting {
+        ...StageTimerDisplay_meeting
+        ...StageTimerControl_meeting
         id
         endedAt
         showSidebar
@@ -83,6 +86,7 @@ const TeamHealth = (props: Props) => {
           <PhaseHeaderTitle>{phaseLabelLookup.TEAM_HEALTH}</PhaseHeaderTitle>
         </MeetingTopBar>
         <PhaseWrapper>
+          <StageTimerDisplay meeting={meeting} />
           <div className='flex h-[300px] flex-col items-center'>
             <div className='text-center text-2xl'>{question}</div>
             {isRevealed && votes ? (

From 89aeea362ac46d365cb2ff9ab9971c30f816103c Mon Sep 17 00:00:00 2001
From: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com>
Date: Thu, 4 Apr 2024 09:57:01 -0700
Subject: [PATCH 127/183] chore: update ironbank GH action to copy
 ip-to-server-id script (#9594)

---
 .github/workflows/ironbank.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ironbank.yml b/.github/workflows/ironbank.yml
index e9782493f43..c60df2b134f 100644
--- a/.github/workflows/ironbank.yml
+++ b/.github/workflows/ironbank.yml
@@ -50,6 +50,7 @@ jobs:
         run: |
           docker cp temp-container:/home/node/parabol/dist ./dist
           docker cp temp-container:/home/node/parabol/build ./build
+          docker cp temp-container:/home/node/tools/ip-to-server_id ./tools/ip-to-server_id
 
       - name: Zip the files
         run: zip -r ${{ github.event.inputs.version_number }}.zip dist build

From 1a7e298a6fbd4c6a06acdfdca4d815029811178f Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 4 Apr 2024 19:10:10 -0700
Subject: [PATCH 128/183] fix: fallback for missing avatar images (#9603)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/client/components/Avatar/Avatar.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/client/components/Avatar/Avatar.tsx b/packages/client/components/Avatar/Avatar.tsx
index 99b6dd0fb29..8b1329a6253 100644
--- a/packages/client/components/Avatar/Avatar.tsx
+++ b/packages/client/components/Avatar/Avatar.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled'
-import React, {forwardRef} from 'react'
+import React, {forwardRef, useState} from 'react'
 import defaultUserAvatar from '../../styles/theme/images/avatar-user.svg'
 import AvatarBadge from '../AvatarBadge/AvatarBadge'
 
@@ -7,7 +7,7 @@ type ImageBlockProps = Pick<Props, 'sansRadius' | 'sansShadow' | 'picture' | 'si
 
 const ImageBlock = styled('div')<ImageBlockProps>(
   ({sansRadius, sansShadow, picture, size, onClick}) => ({
-    backgroundImage: `url(${picture ?? defaultUserAvatar})`,
+    backgroundImage: `url(${picture})`,
     backgroundPosition: 'center center',
     backgroundRepeat: 'no-repeat',
     backgroundSize: 'cover',
@@ -62,7 +62,10 @@ const Avatar = forwardRef((props: Props, ref: any) => {
     sansShadow,
     size
   } = props
-
+  const [imageUrl, setImageUrl] = useState(picture || defaultUserAvatar)
+  const onError = () => {
+    setImageUrl(defaultUserAvatar)
+  }
   return (
     <ImageBlock
       onTransitionEnd={onTransitionEnd}
@@ -72,9 +75,10 @@ const Avatar = forwardRef((props: Props, ref: any) => {
       onMouseEnter={onMouseEnter}
       sansRadius={sansRadius}
       sansShadow={sansShadow}
-      picture={picture}
+      picture={imageUrl}
       size={size}
     >
+      <img src={imageUrl} className='hidden' onError={onError} />
       {hasBadge && (
         <BadgeBlock>
           <BadgeBlockInner>

From cb52596c2f69b4b6e1641654610bb2335cefd0f2 Mon Sep 17 00:00:00 2001
From: Bruce Tian <tianrunhe@gmail.com>
Date: Mon, 8 Apr 2024 02:16:11 -0700
Subject: [PATCH 129/183] fix: fix an issue where upcoming invoice doesn't have
 the nextPeriodCharges field (#9580)

---
 .../components/InvoiceRow/InvoiceRow.tsx      |  5 ++--
 packages/client/utils/makeMonthDateString.ts  | 10 -------
 .../queries/helpers/makeUpcomingInvoice.ts    | 28 +++++++++++++++++--
 packages/server/graphql/queries/invoices.ts   |  3 +-
 4 files changed, 30 insertions(+), 16 deletions(-)
 delete mode 100644 packages/client/utils/makeMonthDateString.ts

diff --git a/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx b/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
index 6651c90663a..4148969d317 100644
--- a/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
+++ b/packages/client/modules/userDashboard/components/InvoiceRow/InvoiceRow.tsx
@@ -9,7 +9,6 @@ import RowInfo from '../../../../components/Row/RowInfo'
 import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
 import {PALETTE} from '../../../../styles/paletteV3'
 import makeDateString from '../../../../utils/makeDateString'
-import makeMonthDateString from '../../../../utils/makeMonthDateString'
 import invoiceLineFormat from '../../../invoice/helpers/invoiceLineFormat'
 
 const InvoiceAmount = styled('span')({
@@ -105,7 +104,9 @@ const InvoiceRow = (props: Props) => {
         <InvoiceInfo>
           <InfoRow>
             <InvoiceTitle>
-              {makeMonthDateString(endAt)} to {makeMonthDateString(nextPeriodEnd)}
+              {status === 'UPCOMING'
+                ? `Due on ${makeDateString(endAt)}`
+                : `${makeDateString(endAt)} to ${makeDateString(nextPeriodEnd)}`}
             </InvoiceTitle>
             <InfoRowRight>
               <InvoiceAmount>
diff --git a/packages/client/utils/makeMonthDateString.ts b/packages/client/utils/makeMonthDateString.ts
deleted file mode 100644
index fd242ebffcc..00000000000
--- a/packages/client/utils/makeMonthDateString.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import ensureDate from './ensureDate'
-
-export default function makeMonthDateString(datetime: Date | string | null) {
-  const timestamp = ensureDate(datetime)
-  return timestamp.toLocaleDateString('en-US', {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric'
-  })
-}
diff --git a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts
index ce6b3949afa..55c0051c6f1 100644
--- a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts
+++ b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts
@@ -4,12 +4,14 @@ import {fromEpochSeconds} from '../../../utils/epochTime'
 import getUpcomingInvoiceId from '../../../utils/getUpcomingInvoiceId'
 import {getStripeManager} from '../../../utils/stripe'
 import StripeManager from '../../../utils/stripe/StripeManager'
+import Invoice from '../../../database/types/Invoice'
+import Organization from '../../../database/types/Organization'
 
 export default async function makeUpcomingInvoice(
-  orgId: string,
+  org: Organization,
   quantity: number,
   stripeId?: string | null
-) {
+): Promise<Invoice | undefined> {
   if (!stripeId) return undefined
   const manager = getStripeManager()
   let stripeInvoice: Stripe.Invoice
@@ -41,6 +43,10 @@ export default async function makeUpcomingInvoice(
     stripeInvoice = await manager.retrieveUpcomingInvoice(stripeId)
   }
 
+  const {id: orgId, tier, name: orgName, picture} = org
+  const unitPrice = subscription?.plan?.amount ?? 0
+  const amount = unitPrice * quantity
+
   return {
     id: getUpcomingInvoiceId(orgId),
     amountDue: stripeInvoice.amount_due,
@@ -51,6 +57,22 @@ export default async function makeUpcomingInvoice(
     orgId,
     startAt: fromEpochSeconds(stripeInvoice.period_start),
     startingBalance: stripeInvoice.starting_balance,
-    status: 'UPCOMING'
+    status: 'UPCOMING',
+    createdAt: fromEpochSeconds(stripeInvoice.period_start),
+    billingLeaderEmails: [],
+    lines: [],
+    orgName,
+    tier,
+    paidAt: null,
+    picture: picture ?? null,
+    nextPeriodCharges: {
+      amount,
+      quantity,
+      nextPeriodEnd: fromEpochSeconds(
+        stripeInvoice.period_end - stripeInvoice.period_start + stripeInvoice.period_end
+      ),
+      unitPrice,
+      interval: subscription?.plan?.interval ?? 'month'
+    }
   }
 }
diff --git a/packages/server/graphql/queries/invoices.ts b/packages/server/graphql/queries/invoices.ts
index c4ec9526185..9454ec627c7 100644
--- a/packages/server/graphql/queries/invoices.ts
+++ b/packages/server/graphql/queries/invoices.ts
@@ -64,9 +64,10 @@ export default {
         .count()
         .run()
     ])
+    const org = await dataLoader.get('organizations').load(orgId)
     const upcomingInvoice = after
       ? undefined
-      : await makeUpcomingInvoice(orgId, orgUserCount, stripeId)
+      : await makeUpcomingInvoice(org, orgUserCount, stripeId)
     const extraInvoices: Invoice[] = tooManyInvoices || []
     const paginatedInvoices = after ? extraInvoices.slice(1) : extraInvoices
     const allInvoices = upcomingInvoice

From cd5a3a844a90d5160f11ff38ee63b3db87894b20 Mon Sep 17 00:00:00 2001
From: Mohd Muneeb <mr.mohdmuneeb123@gmail.com>
Date: Mon, 8 Apr 2024 14:56:28 +0530
Subject: [PATCH 130/183] chore: Add inviter name to invite email subject
 (#9604)

Co-authored-by: Muneeb-Ventures <mohd.muneeb@m0.ventures>
---
 packages/server/email/teamInviteEmailCreator.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/email/teamInviteEmailCreator.tsx b/packages/server/email/teamInviteEmailCreator.tsx
index a625e55d73a..98243b834e8 100644
--- a/packages/server/email/teamInviteEmailCreator.tsx
+++ b/packages/server/email/teamInviteEmailCreator.tsx
@@ -3,7 +3,7 @@ import TeamInvite, {TeamInviteProps} from 'parabol-client/modules/email/componen
 import {headCSS} from 'parabol-client/modules/email/styles'
 import React from 'react'
 
-const subject = 'You’ve been invited to Parabol'
+const subject = (inviterName: string) : string => `${inviterName} has invited you to Parabol`
 
 const teamInviteText = (props: TeamInviteProps) => {
   const {inviteeName, inviteeEmail, inviterName, inviterEmail, inviteLink, teamName} = props
@@ -22,7 +22,7 @@ The Parabol Product Team
 }
 
 export default (props: TeamInviteProps) => ({
-  subject,
+  subject: subject(props.inviterName),
   body: teamInviteText(props),
   html: Oy.renderTemplate(<TeamInvite {...props} />, {
     headCSS,

From 6ead321741734cff47a953b3b1ac1e8999f16594 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 8 Apr 2024 12:22:38 +0200
Subject: [PATCH 131/183] fix: type error in invite email (#9606)

---
 .../server/email/teamInviteEmailCreator.tsx   | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/server/email/teamInviteEmailCreator.tsx b/packages/server/email/teamInviteEmailCreator.tsx
index 98243b834e8..71a75c88b35 100644
--- a/packages/server/email/teamInviteEmailCreator.tsx
+++ b/packages/server/email/teamInviteEmailCreator.tsx
@@ -3,7 +3,7 @@ import TeamInvite, {TeamInviteProps} from 'parabol-client/modules/email/componen
 import {headCSS} from 'parabol-client/modules/email/styles'
 import React from 'react'
 
-const subject = (inviterName: string) : string => `${inviterName} has invited you to Parabol`
+const subjectLine = (inviterName: string): string => `${inviterName} has invited you to Parabol`
 
 const teamInviteText = (props: TeamInviteProps) => {
   const {inviteeName, inviteeEmail, inviterName, inviterEmail, inviteLink, teamName} = props
@@ -21,12 +21,15 @@ The Parabol Product Team
 `
 }
 
-export default (props: TeamInviteProps) => ({
-  subject: subject(props.inviterName),
-  body: teamInviteText(props),
-  html: Oy.renderTemplate(<TeamInvite {...props} />, {
-    headCSS,
-    title: subject,
-    previewText: subject
-  })
-})
+export default (props: TeamInviteProps) => {
+  const subject = subjectLine(props.inviterName)
+  return {
+    subject,
+    body: teamInviteText(props),
+    html: Oy.renderTemplate(<TeamInvite {...props} />, {
+      headCSS,
+      title: subject,
+      previewText: subject
+    })
+  }
+}

From 26ba568e0debeaf91c82df2a908231193e65ab97 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 12:44:43 +0200
Subject: [PATCH 132/183] chore(release): release v7.25.1 (#9602)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 16 ++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 160020c170d..2cda30f8878 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.25.0"
+  ".": "7.25.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b34ae7c1533..bfba305bd54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.25.1](https://github.com/ParabolInc/parabol/compare/v7.25.0...v7.25.1) (2024-04-08)
+
+
+### Fixed
+
+* fallback for missing avatar images ([#9603](https://github.com/ParabolInc/parabol/issues/9603)) ([1a7e298](https://github.com/ParabolInc/parabol/commit/1a7e298a6fbd4c6a06acdfdca4d815029811178f))
+* fix an issue where upcoming invoice doesn't have the nextPeriodCharges field ([#9580](https://github.com/ParabolInc/parabol/issues/9580)) ([cb52596](https://github.com/ParabolInc/parabol/commit/cb52596c2f69b4b6e1641654610bb2335cefd0f2))
+* fix the issue where timer doesn't work in TEAM_HEALTH phase ([#9597](https://github.com/ParabolInc/parabol/issues/9597)) ([96f29b5](https://github.com/ParabolInc/parabol/commit/96f29b56e7a5bd63cb8ec5c879a7c2fb80ef803d))
+* type error in invite email ([#9606](https://github.com/ParabolInc/parabol/issues/9606)) ([6ead321](https://github.com/ParabolInc/parabol/commit/6ead321741734cff47a953b3b1ac1e8999f16594))
+
+
+### Changed
+
+* Add inviter name to invite email subject ([#9604](https://github.com/ParabolInc/parabol/issues/9604)) ([cd5a3a8](https://github.com/ParabolInc/parabol/commit/cd5a3a844a90d5160f11ff38ee63b3db87894b20))
+* update ironbank GH action to copy ip-to-server-id script ([#9594](https://github.com/ParabolInc/parabol/issues/9594)) ([89aeea3](https://github.com/ParabolInc/parabol/commit/89aeea362ac46d365cb2ff9ab9971c30f816103c))
+
 ## [7.25.0](https://github.com/ParabolInc/parabol/compare/v7.24.1...v7.25.0) (2024-04-04)
 
 
diff --git a/package.json b/package.json
index 614a5c7190b..c86f1088b39 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index cfab39c0d92..ca47c22cce4 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.25.0"
+    "parabol-server": "7.25.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 71ada11a05a..4371591433b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 633d0c60f05..32f20d87d65 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index a8d4f1e9c4b..bc55fb09300 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.25.0",
-    "parabol-server": "7.25.0",
+    "parabol-client": "7.25.1",
+    "parabol-server": "7.25.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 1a5d8b79919..9b5ff728403 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 79c04b57b38..4912521e0e1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.0",
+  "version": "7.25.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -122,7 +122,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.25.0",
+    "parabol-client": "7.25.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 7a26009931fdb55d298390eb7871937d3a09eca7 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 8 Apr 2024 09:24:08 -0700
Subject: [PATCH 133/183] fix: return 100 gitlab pipeline jobs (#9607)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .github/workflows/release-to-staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml
index bc30de202b3..329268d89d9 100644
--- a/.github/workflows/release-to-staging.yml
+++ b/.github/workflows/release-to-staging.yml
@@ -70,7 +70,7 @@ jobs:
               --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}')
             PIPELINE_ID=$(echo $PIPELINES | jq ".[] | select(.sha == \"${{ env.COMMIT_ID }}\")" | jq .id)
             [ -z "$PIPELINE_ID" ] && exit 1
-            JOBS=$(curl "https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/pipelines/$PIPELINE_ID/jobs" \
+            JOBS=$(curl "https://gitlab.com/api/v4/projects/${{ vars.GITLAB_PROJECT_ID }}/pipelines/$PIPELINE_ID/jobs?per_page=100" \
               --header 'PRIVATE-TOKEN: ${{ secrets.GITLAB_DEPLOYMENT_ACCESS_TOKEN }}')
             JOB_ID=$(echo $JOBS | jq '.[] | select(.name == "${{ env.STAGING_JOB }}")' | jq .id)
             PROD_JOB_ID=$(echo $JOBS | jq '.[] | select(.name == "${{ env.PRODUCTION_JOB}}")' | jq .id)

From c6b911c016f7f5624a33d62a2aaf482c56b94ff9 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 09:28:20 -0700
Subject: [PATCH 134/183] chore(release): release v7.25.2 (#9608)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/embedder/package.json          | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 9 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 2cda30f8878..aedd917ff98 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.25.1"
+  ".": "7.25.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfba305bd54..51a3a378cf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.25.2](https://github.com/ParabolInc/parabol/compare/v7.25.1...v7.25.2) (2024-04-08)
+
+
+### Fixed
+
+* return 100 gitlab pipeline jobs ([#9607](https://github.com/ParabolInc/parabol/issues/9607)) ([7a26009](https://github.com/ParabolInc/parabol/commit/7a26009931fdb55d298390eb7871937d3a09eca7))
+
 ## [7.25.1](https://github.com/ParabolInc/parabol/compare/v7.25.0...v7.25.1) (2024-04-08)
 
 
diff --git a/package.json b/package.json
index c86f1088b39..e81cc44c597 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index ca47c22cce4..dd1563cee6d 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.25.1"
+    "parabol-server": "7.25.2"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 4371591433b..c499c9fda0d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 32f20d87d65..202ce2855b6 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index bc55fb09300..ea515e04e0a 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.25.1",
-    "parabol-server": "7.25.1",
+    "parabol-client": "7.25.2",
+    "parabol-server": "7.25.2",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 9b5ff728403..11cc3c18f0a 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 4912521e0e1..2b9347ddd04 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.1",
+  "version": "7.25.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -122,7 +122,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.25.1",
+    "parabol-client": "7.25.2",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 537a8afce7702251337bc8946a6703c25d668133 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Mon, 8 Apr 2024 18:33:16 +0100
Subject: [PATCH 135/183] chore(segment): remove Segment (#9599)

---
 .env.example | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env.example b/.env.example
index 5f0285650a9..063f74160a9 100644
--- a/.env.example
+++ b/.env.example
@@ -44,7 +44,6 @@ AI_EMBEDDER_WORKERS='1'
 # AWS_SECRET_ACCESS_KEY='key_AWS_SECRET_ACCESS_KEY'
 
 # MONITORING
-# SEGMENT_WRITE_KEY='key_SEGMENT_WRITE_KEY'
 # SENTRY_DSN='key_SENTRY_DSN'
 
 # CDN SETTINGS

From 72fc2940bb912f9c81056d2d3ac539602a6aa8b2 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 9 Apr 2024 13:37:18 +0200
Subject: [PATCH 136/183] fix: remove top level graphql-relay dependency
 (#9611)

---
 package.json                                  |  1 -
 .../shared/gqlIds/DomainJoinRequestId.ts      | 23 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e81cc44c597..f316d66f289 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,6 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "graphql": "15.7.2",
-    "graphql-relay": "^0.10.0",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
     "jscodeshift": "^0.14.0",
diff --git a/packages/client/shared/gqlIds/DomainJoinRequestId.ts b/packages/client/shared/gqlIds/DomainJoinRequestId.ts
index 743c74dbdab..331d5d174f1 100644
--- a/packages/client/shared/gqlIds/DomainJoinRequestId.ts
+++ b/packages/client/shared/gqlIds/DomainJoinRequestId.ts
@@ -1,4 +1,25 @@
-import {toGlobalId, fromGlobalId} from 'graphql-relay'
+import {GraphQLID} from 'graphql'
+
+/**
+ * Takes a type name and an ID specific to that type name, and returns a
+ * "global ID" that is unique among all types.
+ */
+const toGlobalId = (type: string, id: string | number) => {
+  return btoa([type, GraphQLID.serialize(id)].join(':'))
+}
+
+/**
+ * Takes the "global ID" created by toGlobalID, and returns the type name and ID
+ * used to create it.
+ */
+const fromGlobalId = (globalId: string) => {
+  const unbasedGlobalId = atob(globalId)
+  const delimiterPos = unbasedGlobalId.indexOf(':')
+  return {
+    type: unbasedGlobalId.substring(0, delimiterPos),
+    id: unbasedGlobalId.substring(delimiterPos + 1)
+  }
+}
 
 const DomainJoinRequestId = {
   join: (id: number): string => toGlobalId('DomainJoinRequest', id),

From e3d8b3899845b565e91259217e96f222d116b70c Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 9 Apr 2024 14:18:16 +0200
Subject: [PATCH 137/183] fix: Add AuthIdentityMicrosoft (#9612)

---
 .../graphql/public/typeDefs/_legacy.graphql      | 16 ++++++++++++++++
 packages/server/graphql/rootTypes.ts             |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/packages/server/graphql/public/typeDefs/_legacy.graphql b/packages/server/graphql/public/typeDefs/_legacy.graphql
index e0e09d93056..1f65bf27ca9 100644
--- a/packages/server/graphql/public/typeDefs/_legacy.graphql
+++ b/packages/server/graphql/public/typeDefs/_legacy.graphql
@@ -249,6 +249,22 @@ type AuthIdentityGoogle implements AuthIdentity {
   id: ID!
 }
 
+"""
+An authentication strategy using Microsoft
+"""
+type AuthIdentityMicrosoft implements AuthIdentity {
+  """
+  true if the email address using this strategy is verified, else false
+  """
+  isEmailVerified: Boolean!
+  type: AuthIdentityTypeEnum!
+
+  """
+  The Microsoft ID for this strategy
+  """
+  id: ID!
+}
+
 """
 An authentication strategy to log in to Parabol
 """
diff --git a/packages/server/graphql/rootTypes.ts b/packages/server/graphql/rootTypes.ts
index e0bfb77c349..823f80ef4a6 100644
--- a/packages/server/graphql/rootTypes.ts
+++ b/packages/server/graphql/rootTypes.ts
@@ -2,6 +2,7 @@ import ActionMeetingMember from './types/ActionMeetingMember'
 import ActionMeetingSettings from './types/ActionMeetingSettings'
 import AgendaItemsPhase from './types/AgendaItemsPhase'
 import AuthIdentityGoogle from './types/AuthIdentityGoogle'
+import AuthIdentityMicrosoft from './types/AuthIdentityMicrosoft'
 import AuthIdentityLocal from './types/AuthIdentityLocal'
 import AzureDevOpsWorkItem from './types/AzureDevOpsWorkItem'
 import CheckInPhase from './types/CheckInPhase'
@@ -40,6 +41,7 @@ const rootTypes = [
   IntegrationProviderOAuth2,
   IntegrationProviderWebhook,
   AuthIdentityGoogle,
+  AuthIdentityMicrosoft,
   AuthIdentityLocal,
   CheckInPhase,
   ReflectPhase,

From 62fd775afb625acfe1ebcae3a37b6470928a0e1b Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2024 14:36:20 +0200
Subject: [PATCH 138/183] chore(release): release v7.25.3 (#9609)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 13 +++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index aedd917ff98..0b077b406b2 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.25.2"
+  ".": "7.25.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51a3a378cf0..0e41edf402b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.25.3](https://github.com/ParabolInc/parabol/compare/v7.25.2...v7.25.3) (2024-04-09)
+
+
+### Fixed
+
+* Add AuthIdentityMicrosoft ([#9612](https://github.com/ParabolInc/parabol/issues/9612)) ([e3d8b38](https://github.com/ParabolInc/parabol/commit/e3d8b3899845b565e91259217e96f222d116b70c))
+* remove top level graphql-relay dependency ([#9611](https://github.com/ParabolInc/parabol/issues/9611)) ([72fc294](https://github.com/ParabolInc/parabol/commit/72fc2940bb912f9c81056d2d3ac539602a6aa8b2))
+
+
+### Changed
+
+* **segment:** remove Segment ([#9599](https://github.com/ParabolInc/parabol/issues/9599)) ([537a8af](https://github.com/ParabolInc/parabol/commit/537a8afce7702251337bc8946a6703c25d668133))
+
 ## [7.25.2](https://github.com/ParabolInc/parabol/compare/v7.25.1...v7.25.2) (2024-04-08)
 
 
diff --git a/package.json b/package.json
index f316d66f289..9c393533b42 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.2",
+  "version": "7.25.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index dd1563cee6d..c648d295e44 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.25.2",
+  "version": "7.25.3",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.25.2"
+    "parabol-server": "7.25.3"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index c499c9fda0d..88dbdaa7510 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.2",
+  "version": "7.25.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 202ce2855b6..8fa608fca0b 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.25.2",
+  "version": "7.25.3",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index ea515e04e0a..29a8cbed2aa 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.25.2",
+  "version": "7.25.3",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.25.2",
-    "parabol-server": "7.25.2",
+    "parabol-client": "7.25.3",
+    "parabol-server": "7.25.3",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 11cc3c18f0a..f939223ad2e 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.2",
+  "version": "7.25.3",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 2b9347ddd04..68e81d49502 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.2",
+  "version": "7.25.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -122,7 +122,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.25.2",
+    "parabol-client": "7.25.3",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From ecc2cdc4b67e1788763af601984e1cbf76f02235 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 9 Apr 2024 16:27:51 +0200
Subject: [PATCH 139/183] fix: Revert "[Snyk] Upgrade graphql from 15.7.2 to
 15.8.0 (#9569)" (#9614)

---
 packages/server/package.json | 2 +-
 yarn.lock                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/server/package.json b/packages/server/package.json
index 68e81d49502..4a683629cac 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -100,7 +100,7 @@
     "fast-json-stable-stringify": "^2.1.0",
     "fast-xml-parser": "^4.2.7",
     "googleapis": "^118.0.0",
-    "graphql": "15.8.0",
+    "graphql": "15.7.2",
     "graphql-jit": "^0.8.4",
     "graphql-middleware": "^6.1.18",
     "graphql-relay": "^0.10.0",
diff --git a/yarn.lock b/yarn.lock
index 558fd3223ec..7e3593cb3d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13115,7 +13115,7 @@ graphql@15.7.2:
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.7.2.tgz#85ab0eeb83722977151b3feb4d631b5f2ab287ef"
   integrity sha512-AnnKk7hFQFmU/2I9YSQf3xw44ctnSFCfp3zE0N6W174gqe9fWG/2rKaKxROK7CcI3XtERpjEKFqts8o319Kf7A==
 
-graphql@15.8.0, graphql@^15.0.0:
+graphql@^15.0.0:
   version "15.8.0"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38"
   integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==

From d62e488c3349f037c7b92cc9da7593254d7cb472 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:53:11 +0200
Subject: [PATCH 140/183] chore(release): release v7.25.4 (#9615)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/embedder/package.json          | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 9 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 0b077b406b2..c7c1488dff8 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.25.3"
+  ".": "7.25.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e41edf402b..e62ca7d5066 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.25.4](https://github.com/ParabolInc/parabol/compare/v7.25.3...v7.25.4) (2024-04-09)
+
+
+### Fixed
+
+* Revert "[Snyk] Upgrade graphql from 15.7.2 to 15.8.0 ([#9569](https://github.com/ParabolInc/parabol/issues/9569))" ([#9614](https://github.com/ParabolInc/parabol/issues/9614)) ([ecc2cdc](https://github.com/ParabolInc/parabol/commit/ecc2cdc4b67e1788763af601984e1cbf76f02235))
+
 ## [7.25.3](https://github.com/ParabolInc/parabol/compare/v7.25.2...v7.25.3) (2024-04-09)
 
 
diff --git a/package.json b/package.json
index 9c393533b42..a389d66f66b 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.3",
+  "version": "7.25.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index c648d295e44..7305021cd2d 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.25.3",
+  "version": "7.25.4",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.25.3"
+    "parabol-server": "7.25.4"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 88dbdaa7510..cd417b82637 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.3",
+  "version": "7.25.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 8fa608fca0b..74bca7e11af 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.25.3",
+  "version": "7.25.4",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 29a8cbed2aa..3628d2ab1af 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.25.3",
+  "version": "7.25.4",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.25.3",
-    "parabol-server": "7.25.3",
+    "parabol-client": "7.25.4",
+    "parabol-server": "7.25.4",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index f939223ad2e..0916770ef69 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.3",
+  "version": "7.25.4",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 4a683629cac..c12b1ae3fc8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.3",
+  "version": "7.25.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -122,7 +122,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.25.3",
+    "parabol-client": "7.25.4",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From fc1b9e7e364c15fafa19d502b061c96cc1e07837 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Tue, 9 Apr 2024 20:41:57 +0100
Subject: [PATCH 141/183] chore: disable change template ui if phase complete
 (#9592)

---
 packages/client/components/MeetingOptions.tsx | 17 ++++++++++-------
 packages/client/components/RetroDrawer.tsx    |  5 +++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/client/components/MeetingOptions.tsx b/packages/client/components/MeetingOptions.tsx
index d0fd3d97a7c..0c39571d8d7 100644
--- a/packages/client/components/MeetingOptions.tsx
+++ b/packages/client/components/MeetingOptions.tsx
@@ -12,19 +12,24 @@ type Props = {
   setShowDrawer: (showDrawer: boolean) => void
   showDrawer: boolean
   hasReflections: boolean
+  isPhaseComplete: boolean
 }
 
 const MeetingOptions = (props: Props) => {
-  const {setShowDrawer, showDrawer, hasReflections} = props
+  const {setShowDrawer, showDrawer, hasReflections, isPhaseComplete} = props
   const [isOpen, setIsOpen] = useState(false)
+  const isDisabled = hasReflections || isPhaseComplete
+  const tooltipCopy = hasReflections
+    ? 'You can only change the template if no reflections have been added.'
+    : 'You can only change the template if the phase is not complete.'
 
   const handleClick = () => {
-    if (hasReflections) return
+    if (isDisabled) return
     setShowDrawer(!showDrawer)
   }
 
   const handleMouseEnter = () => {
-    if (hasReflections) {
+    if (isDisabled) {
       setIsOpen(true)
     }
   }
@@ -45,15 +50,13 @@ const MeetingOptions = (props: Props) => {
       <Tooltip open={isOpen}>
         <div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
           <TooltipTrigger asChild>
-            <MenuItem onClick={handleClick} isDisabled={hasReflections}>
+            <MenuItem onClick={handleClick} isDisabled={isDisabled}>
               <div className='mr-3 flex text-slate-700'>{<SwapHorizIcon />}</div>
               Change template
             </MenuItem>
           </TooltipTrigger>
         </div>
-        <TooltipContent>
-          {'You can only change the template if no reflections have been added.'}
-        </TooltipContent>
+        <TooltipContent>{tooltipCopy}</TooltipContent>
       </Tooltip>
     </Menu>
   )
diff --git a/packages/client/components/RetroDrawer.tsx b/packages/client/components/RetroDrawer.tsx
index 6249386cabf..e03b4949533 100644
--- a/packages/client/components/RetroDrawer.tsx
+++ b/packages/client/components/RetroDrawer.tsx
@@ -31,6 +31,9 @@ const RetroDrawer = (props: Props) => {
               localPhase {
                 ... on ReflectPhase {
                   phaseType
+                  stages {
+                    isComplete
+                  }
                 }
               }
             }
@@ -56,6 +59,7 @@ const RetroDrawer = (props: Props) => {
   const phaseType = meeting?.localPhase?.phaseType
   const isMobile = !useBreakpoint(Breakpoint.FUZZY_TABLET)
   const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
+  const isPhaseComplete = meeting?.localPhase?.stages?.every((stage) => stage.isComplete) ?? false
 
   const toggleDrawer = () => {
     setShowDrawer(!showDrawer)
@@ -77,6 +81,7 @@ const RetroDrawer = (props: Props) => {
       <MeetingOptions
         hasReflections={hasReflections}
         showDrawer={showDrawer}
+        isPhaseComplete={isPhaseComplete}
         setShowDrawer={setShowDrawer}
       />
       <ResponsiveDashSidebar

From 82ac337949e6767728a695a7c60f14b4257c5334 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 9 Apr 2024 12:52:46 -0700
Subject: [PATCH 142/183] fix: bump prettier version (#9618)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 package.json                                  |  6 +-
 .../ActivityDetailsSidebar.tsx                | 18 +++---
 .../ActivityLibrary/ActivityLibrary.tsx       | 31 +++++----
 packages/client/components/AvatarListUser.tsx |  8 +--
 .../AzureDevOpsScopingSelectAllIssues.tsx     |  2 +-
 packages/client/components/BaseButton.tsx     | 45 +++++++------
 .../client/components/BottomNavControl.tsx    |  4 +-
 .../client/components/DeckActivityAvatars.tsx |  4 +-
 .../client/components/EstimatePhaseArea.tsx   |  4 +-
 .../GitHubScopingSelectAllIssues.tsx          |  2 +-
 .../GitLabScopingSelectAllIssues.tsx          |  2 +-
 .../components/JiraScopingSelectAllIssues.tsx |  2 +-
 packages/client/components/MiniPokerCard.tsx  |  4 +-
 packages/client/components/OverflowAvatar.tsx |  8 +--
 .../ParabolScopingSelectAllTasks.tsx          |  2 +-
 packages/client/components/PokerCard.tsx      | 64 +++++++++----------
 packages/client/components/RaisedButton.tsx   | 24 +++----
 .../UpdateRecurrenceSettingsModal.tsx         |  4 +-
 .../ReflectionGroup/RemoteReflection.tsx      | 16 ++---
 .../components/ReflectionGroupVoting.tsx      |  4 +-
 .../components/SwipeableDashSidebar.tsx       |  4 +-
 .../client/components/TaskEditor/useLinks.tsx |  4 +-
 .../TeamPrompt/TeamPromptOverflowAvatar.tsx   |  8 +--
 .../hooks/useDraggableReflectionCard.tsx      |  4 +-
 packages/client/hooks/useUnusedRecords.ts     |  4 +-
 .../containers/Graphql/GraphqlContainer.tsx   |  4 +-
 .../MeetingSummaryEmail/QuickStats.tsx        |  4 +-
 .../MeetingSummaryEmail/RetroTopic.tsx        |  4 +-
 .../meeting/components/TemplateSharing.tsx    |  4 +-
 .../components/OutcomeCard/OutcomeCard.tsx    | 12 ++--
 .../ProviderRow/SlackChannelPicker.tsx        |  8 +--
 .../components/OrgBilling/OrgPlan.tsx         | 20 +++---
 .../UserColumns/UserColumnsContainer.tsx      |  4 +-
 packages/client/package.json                  |  1 -
 packages/client/types/generics.ts             | 20 +++---
 packages/client/types/relayMutations.ts       | 12 ++--
 packages/client/utils/relay/insertEdge.ts     |  4 +-
 packages/client/utils/screenBugs/Bug.ts       | 22 ++++---
 packages/client/utils/sortByTier.ts           |  8 +--
 .../indexing/retrospectiveDiscussionTopic.ts  |  2 +-
 packages/embedder/textEmbeddingsnterface.d.ts |  4 +-
 packages/server/.eslintignore                 |  1 +
 .../server/billing/helpers/generateInvoice.ts | 15 +++--
 packages/server/database/stricterR.ts         |  8 +--
 .../server/database/types/CheckInStage.ts     |  5 +-
 .../database/types/GenericMeetingPhase.ts     |  5 +-
 .../server/database/types/ReflectPhase.ts     |  5 +-
 .../server/database/types/ScheduledJob.ts     |  5 +-
 .../types/ScheduledJobMetingStageTimeLimit.ts |  5 +-
 .../database/types/ScheduledTeamLimitsJob.ts  |  6 +-
 .../server/database/types/TeamHealthStage.ts  |  6 +-
 .../server/database/types/UpdatesStage.ts     |  5 +-
 packages/server/dataloader/RootDataLoader.ts  |  4 +-
 .../server/dataloader/atlassianLoaders.ts     |  4 +-
 .../dataloader/foreignKeyLoaderMaker.ts       |  9 +--
 .../server/email/teamLimitsEmailCreator.tsx   |  8 +--
 packages/server/fileStorage/GCSManager.ts     |  9 ++-
 .../graphql/mutations/changeTaskTeam.ts       |  4 +-
 .../mutations/helpers/generateGroups.ts       |  5 +-
 .../makeMattermostAttachments.ts              |  2 +-
 .../mutations/helpers/removeFromOrg.ts        |  5 +-
 .../mutations/helpers/updateTeamInsights.ts   | 17 +++--
 .../graphql/mutations/removeAgendaItem.ts     |  5 +-
 .../public/mutations/createImposterToken.ts   |  4 +-
 .../SAMLHelpers/getURLWithSAMLRequestParam.ts |  4 +-
 .../public/mutations/uploadUserImage.ts       |  5 +-
 .../graphql/public/rules/isUserViewer.ts      | 14 ++--
 .../public/rules/isViewerBillingLeader.ts     | 24 ++++---
 .../removeApprovedOrganizationDomains.graphql |  2 +-
 .../server/graphql/public/types/Company.ts    | 19 +++---
 packages/server/graphql/rootMutation.ts       |  2 +-
 packages/server/graphql/types/CheckInStage.ts |  2 +-
 packages/server/package.json                  |  2 -
 .../queries/getAtlassianAuthsToUpdate.ts      |  2 +-
 .../safeMutations/removeSuggestedAction.ts    |  5 +-
 .../server/utils/MattermostServerManager.ts   |  4 +-
 packages/server/utils/SlackServerManager.ts   |  5 +-
 scripts/codeshift/newMutation.ts              |  2 +-
 yarn.lock                                     | 54 +++++-----------
 79 files changed, 359 insertions(+), 340 deletions(-)

diff --git a/package.json b/package.json
index a389d66f66b..4c634718ee7 100644
--- a/package.json
+++ b/package.json
@@ -114,9 +114,9 @@
     "pm2": "^5.3.0",
     "postcss": "^8.4.21",
     "postcss-loader": "^7.0.2",
-    "prettier": "^2.8.8",
-    "prettier-plugin-organize-imports": "^2.3.4",
-    "prettier-plugin-tailwindcss": "^0.2.1",
+    "prettier": "^3.2.5",
+    "prettier-plugin-organize-imports": "^3.2.4",
+    "prettier-plugin-tailwindcss": "^0.5.13",
     "raw-loader": "^4.0.2",
     "relay-compiler": "^14.1.0",
     "relay-config": "^12.0.0",
diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index d0721f72af5..1d335f21a90 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -122,9 +122,9 @@ const ActivityDetailsSidebar = (props: Props) => {
     selectedTemplate.scope === 'PUBLIC'
       ? teams
       : selectedTemplate.scope === 'ORGANIZATION'
-      ? teams.filter((team) => team.orgId === selectedTemplate.orgId)
-      : // it is a team-scoped template, templateTeam  must exist
-        [templateTeam!]
+        ? teams.filter((team) => team.orgId === selectedTemplate.orgId)
+        : // it is a team-scoped template, templateTeam  must exist
+          [templateTeam!]
 
   const availableTeamsRef = useRef(availableTeams)
 
@@ -246,12 +246,12 @@ const ActivityDetailsSidebar = (props: Props) => {
     type === 'retrospective'
       ? 'Retro'
       : type === 'teamPrompt'
-      ? 'Standup'
-      : type === 'poker'
-      ? 'Poker'
-      : type === 'action'
-      ? 'Check-in'
-      : 'Meeting'
+        ? 'Standup'
+        : type === 'poker'
+          ? 'Poker'
+          : type === 'action'
+            ? 'Check-in'
+            : 'Meeting'
   const withRecurrence =
     type === 'teamPrompt' ||
     (selectedTeam.organization.featureFlags.recurringRetros && type === 'retrospective')
diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 2bf9f7cb5ab..2c84540e135 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -173,19 +173,22 @@ const mapRetroSubCategories = (templates: readonly Template[]) => {
 const mapTeamCategories = (templates: readonly Template[]) => {
   // list public templates last
   const publicTemplates = [] as Template[]
-  const mapped = templates.reduce((acc, template) => {
-    const {team, scope} = template
-    if (scope === 'PUBLIC') {
-      publicTemplates.push(template)
-    } else {
-      const {name} = team
-      if (!acc[name]) {
-        acc[name] = []
+  const mapped = templates.reduce(
+    (acc, template) => {
+      const {team, scope} = template
+      if (scope === 'PUBLIC') {
+        publicTemplates.push(template)
+      } else {
+        const {name} = team
+        if (!acc[name]) {
+          acc[name] = []
+        }
+        acc[name]!.push(template)
       }
-      acc[name]!.push(template)
-    }
-    return acc
-  }, {} as Record<string, Template[]>)
+      return acc
+    },
+    {} as Record<string, Template[]>
+  )
 
   mapped['Parabol'] = publicTemplates
   return mapped
@@ -245,8 +248,8 @@ export const ActivityLibrary = (props: Props) => {
       categoryId === QUICK_START_CATEGORY_ID
         ? template.isRecommended
         : categoryId === CUSTOM_CATEGORY_ID
-        ? template.scope !== 'PUBLIC'
-        : template.category === categoryId
+          ? template.scope !== 'PUBLIC'
+          : template.category === categoryId
     )
   }, [searchQuery, filteredTemplates, categoryId])
 
diff --git a/packages/client/components/AvatarListUser.tsx b/packages/client/components/AvatarListUser.tsx
index af6234b5a4e..e3f6a7d14a3 100644
--- a/packages/client/components/AvatarListUser.tsx
+++ b/packages/client/components/AvatarListUser.tsx
@@ -25,13 +25,13 @@ const StyledAvatar = styled(Avatar)<{
   opacity: !isAnimated
     ? undefined
     : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-    ? 0
-    : 1,
+      ? 0
+      : 1,
   transform: !isAnimated
     ? undefined
     : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-    ? 'scale(0)'
-    : 'scale(1)',
+      ? 'scale(0)'
+      : 'scale(1)',
   transition: `all 300ms ${BezierCurve.DECELERATE}`
 }))
 
diff --git a/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx b/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
index 24c42792294..bec857e9393 100644
--- a/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
+++ b/packages/client/components/AzureDevOpsScopingSelectAllIssues.tsx
@@ -86,7 +86,7 @@ const AzureDevOpsScopingSelectAllIssues = (props: Props) => {
           service: 'azureDevOps',
           serviceTaskId,
           action
-        } as const)
+        }) as const
     )
 
     const variables = {
diff --git a/packages/client/components/BaseButton.tsx b/packages/client/components/BaseButton.tsx
index 8fa371483f8..b505e4af7af 100644
--- a/packages/client/components/BaseButton.tsx
+++ b/packages/client/components/BaseButton.tsx
@@ -13,28 +13,33 @@ interface Root {
   size: 'small' | 'medium' | 'large'
 }
 
-const ButtonRoot = styled(PlainButton)<Root>(
-  ({disabled, elevationResting, elevationHovered, elevationPressed, pressedDown, size}) => {
-    return {
-      // size is easy to override, it adds: fontSize, lineHeight, padding
-      ...(ui.buttonSizeStyles[size] as any),
-      alignItems: 'center',
-      border: '1px solid transparent',
-      boxShadow: disabled ? undefined : pressedDown ? elevationPressed : elevationResting,
-      display: 'flex',
-      flexShrink: 0,
-      justifyContent: 'center',
-      textAlign: 'center',
-      transition: `box-shadow 100ms ease-in`,
-      userSelect: 'none',
-      whiteSpace: 'nowrap',
-      ':hover,:focus,:active': {
-        boxShadow: disabled ? undefined : pressedDown ? elevationPressed : elevationHovered,
-        outline: pressedDown && 0
-      }
+const ButtonRoot = styled(PlainButton)<Root>(({
+  disabled,
+  elevationResting,
+  elevationHovered,
+  elevationPressed,
+  pressedDown,
+  size
+}) => {
+  return {
+    // size is easy to override, it adds: fontSize, lineHeight, padding
+    ...(ui.buttonSizeStyles[size] as any),
+    alignItems: 'center',
+    border: '1px solid transparent',
+    boxShadow: disabled ? undefined : pressedDown ? elevationPressed : elevationResting,
+    display: 'flex',
+    flexShrink: 0,
+    justifyContent: 'center',
+    textAlign: 'center',
+    transition: `box-shadow 100ms ease-in`,
+    userSelect: 'none',
+    whiteSpace: 'nowrap',
+    ':hover,:focus,:active': {
+      boxShadow: disabled ? undefined : pressedDown ? elevationPressed : elevationHovered,
+      outline: pressedDown && 0
     }
   }
-)
+})
 
 export interface BaseButtonProps extends PlainButtonProps {
   'aria-label'?: string
diff --git a/packages/client/components/BottomNavControl.tsx b/packages/client/components/BottomNavControl.tsx
index 79c4aa58880..4d99fa1de24 100644
--- a/packages/client/components/BottomNavControl.tsx
+++ b/packages/client/components/BottomNavControl.tsx
@@ -25,8 +25,8 @@ const BottomNavControl = styled(FlatButton)<Props>((props) => {
     opacity: confirming
       ? 0.5
       : status === TransitionStatus.MOUNTED || status === TransitionStatus.EXITING
-      ? 0
-      : 1,
+        ? 0
+        : 1,
     padding: 0,
     transformOrigin: 'center bottom',
     transition: `all 300ms ${BezierCurve.DECELERATE}`,
diff --git a/packages/client/components/DeckActivityAvatars.tsx b/packages/client/components/DeckActivityAvatars.tsx
index 034f09894d6..dbe21bd9462 100644
--- a/packages/client/components/DeckActivityAvatars.tsx
+++ b/packages/client/components/DeckActivityAvatars.tsx
@@ -25,8 +25,8 @@ const PeekingAvatar = styled(AvatarListUser)<{status?: TransitionStatus}>(({stat
     status === TransitionStatus.MOUNTED
       ? `translate(64px)`
       : status === TransitionStatus.EXITING
-      ? 'scale(0)'
-      : undefined
+        ? 'scale(0)'
+        : undefined
 }))
 
 interface Props {
diff --git a/packages/client/components/EstimatePhaseArea.tsx b/packages/client/components/EstimatePhaseArea.tsx
index a643b072273..ca0e6a12d0d 100644
--- a/packages/client/components/EstimatePhaseArea.tsx
+++ b/packages/client/components/EstimatePhaseArea.tsx
@@ -55,8 +55,8 @@ const innerStyle = (isDesktop: boolean, hasSingleDimension: boolean): React.CSSP
         ? '12px 8px 0'
         : '4px 4px 0'
       : isDesktop
-      ? '8px 40px 0'
-      : '8px 16px 0',
+        ? '8px 40px 0'
+        : '8px 16px 0',
     width: '100%',
     overflow: 'visible'
   }
diff --git a/packages/client/components/GitHubScopingSelectAllIssues.tsx b/packages/client/components/GitHubScopingSelectAllIssues.tsx
index 7430ba523f1..2c9599eab2c 100644
--- a/packages/client/components/GitHubScopingSelectAllIssues.tsx
+++ b/packages/client/components/GitHubScopingSelectAllIssues.tsx
@@ -72,7 +72,7 @@ const GitHubScopingSelectAllIssues = (props: Props) => {
           service: 'github',
           serviceTaskId,
           action
-        } as const)
+        }) as const
     )
 
     const variables = {
diff --git a/packages/client/components/GitLabScopingSelectAllIssues.tsx b/packages/client/components/GitLabScopingSelectAllIssues.tsx
index 27271bf7fc8..1ad0082e02a 100644
--- a/packages/client/components/GitLabScopingSelectAllIssues.tsx
+++ b/packages/client/components/GitLabScopingSelectAllIssues.tsx
@@ -70,7 +70,7 @@ const GitLabScopingSelectAllIssues = (props: Props) => {
           service: 'gitlab',
           serviceTaskId,
           action
-        } as const)
+        }) as const
     )
 
     const variables = {
diff --git a/packages/client/components/JiraScopingSelectAllIssues.tsx b/packages/client/components/JiraScopingSelectAllIssues.tsx
index c8c248cb982..bbba141580e 100644
--- a/packages/client/components/JiraScopingSelectAllIssues.tsx
+++ b/packages/client/components/JiraScopingSelectAllIssues.tsx
@@ -67,7 +67,7 @@ const JiraScopingSelectAllIssues = (props: Props) => {
           service: 'jira',
           serviceTaskId,
           action
-        } as const)
+        }) as const
     )
 
     const variables = {
diff --git a/packages/client/components/MiniPokerCard.tsx b/packages/client/components/MiniPokerCard.tsx
index b380aa4bc04..cb85637e81d 100644
--- a/packages/client/components/MiniPokerCard.tsx
+++ b/packages/client/components/MiniPokerCard.tsx
@@ -17,8 +17,8 @@ const MiniPokerCardPlaceholder = styled('div')<{
   border: color
     ? 0
     : isFinal
-    ? `1px solid ${PALETTE.SLATE_400}`
-    : `1px dashed ${PALETTE.SLATE_600}`,
+      ? `1px solid ${PALETTE.SLATE_400}`
+      : `1px dashed ${PALETTE.SLATE_600}`,
   borderRadius: 2,
   color: color ? '#fff' : PALETTE.SLATE_600,
   cursor: onClick || canEdit ? 'pointer' : 'default',
diff --git a/packages/client/components/OverflowAvatar.tsx b/packages/client/components/OverflowAvatar.tsx
index ce914f71115..3d404c16d4d 100644
--- a/packages/client/components/OverflowAvatar.tsx
+++ b/packages/client/components/OverflowAvatar.tsx
@@ -30,14 +30,14 @@ const OverflowCount = styled('div')<{
   opacity: !isAnimated
     ? undefined
     : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-    ? 0
-    : 1,
+      ? 0
+      : 1,
   overflow: 'hidden',
   transform: !isAnimated
     ? undefined
     : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-    ? 'scale(0)'
-    : 'scale(1)',
+      ? 'scale(0)'
+      : 'scale(1)',
   transition: `all 300ms ${BezierCurve.DECELERATE}`,
   userSelect: 'none',
   width
diff --git a/packages/client/components/ParabolScopingSelectAllTasks.tsx b/packages/client/components/ParabolScopingSelectAllTasks.tsx
index 58ea715b2e1..23406f7e8db 100644
--- a/packages/client/components/ParabolScopingSelectAllTasks.tsx
+++ b/packages/client/components/ParabolScopingSelectAllTasks.tsx
@@ -56,7 +56,7 @@ const ParabolScopingSelectAllTasks = (props: Props) => {
           service: 'PARABOL',
           serviceTaskId,
           action
-        } as const)
+        }) as const
     )
     const variables = {
       meetingId,
diff --git a/packages/client/components/PokerCard.tsx b/packages/client/components/PokerCard.tsx
index 4c42aafd8db..418eecd46c9 100644
--- a/packages/client/components/PokerCard.tsx
+++ b/packages/client/components/PokerCard.tsx
@@ -40,41 +40,39 @@ const getRotation = (
   return `translate(${x}px, ${y + selectedOffset}px)rotate(${rotation}deg)`
 }
 
-const CardBase = styled('div')<CardBaseProps>(
-  ({
-    color,
-    isCollapsed,
-    isDesktop,
-    isSelected,
-    leftEdge,
-    radius,
-    rotation,
-    yOffset,
-    showTransition
-  }) => {
-    const transform = getRotation(isSelected, isCollapsed, leftEdge, radius, rotation, yOffset)
-    const hoverTransform = `${transform} translateY(-8px)`
-    return {
-      background: getPokerCardBackground(color),
-      borderRadius: 6,
-      cursor: 'pointer',
-      display: 'flex',
-      height: PokerCards.HEIGHT,
-      justifyContent: 'center',
-      position: 'absolute',
-      transform,
-      transition: showTransition
-        ? `transform ${isCollapsed ? COLLAPSE_DUR : EXPAND_DUR}ms ${BezierCurve.DECELERATE}`
-        : undefined,
-      userSelect: 'none',
-      width: PokerCards.WIDTH,
-      zIndex: isSelected && isCollapsed ? 1 : undefined,
-      '&:hover': {
-        transform: isCollapsed ? undefined : isDesktop ? hoverTransform : undefined
-      }
+const CardBase = styled('div')<CardBaseProps>(({
+  color,
+  isCollapsed,
+  isDesktop,
+  isSelected,
+  leftEdge,
+  radius,
+  rotation,
+  yOffset,
+  showTransition
+}) => {
+  const transform = getRotation(isSelected, isCollapsed, leftEdge, radius, rotation, yOffset)
+  const hoverTransform = `${transform} translateY(-8px)`
+  return {
+    background: getPokerCardBackground(color),
+    borderRadius: 6,
+    cursor: 'pointer',
+    display: 'flex',
+    height: PokerCards.HEIGHT,
+    justifyContent: 'center',
+    position: 'absolute',
+    transform,
+    transition: showTransition
+      ? `transform ${isCollapsed ? COLLAPSE_DUR : EXPAND_DUR}ms ${BezierCurve.DECELERATE}`
+      : undefined,
+    userSelect: 'none',
+    width: PokerCards.WIDTH,
+    zIndex: isSelected && isCollapsed ? 1 : undefined,
+    '&:hover': {
+      transform: isCollapsed ? undefined : isDesktop ? hoverTransform : undefined
     }
   }
-)
+})
 
 const UpperLeftCardValue = styled('div')({
   color: '#fff',
diff --git a/packages/client/components/RaisedButton.tsx b/packages/client/components/RaisedButton.tsx
index 08985122ca8..bf9a9cd36c8 100644
--- a/packages/client/components/RaisedButton.tsx
+++ b/packages/client/components/RaisedButton.tsx
@@ -17,19 +17,19 @@ const paletteColors = {
 
 const buttonLightThemes = ['white', 'gray']
 
-const StyledBaseButton = styled(BaseButton)<{palette?: keyof typeof paletteColors}>(
-  ({palette = 'gray'}) => {
-    const backgroundColor = paletteColors[palette]
-    const color = buttonLightThemes.includes(palette) ? PALETTE.SLATE_700 : '#FFFFFF'
-    return {
-      backgroundColor,
-      borderRadius: Radius.BUTTON_PILL,
-      color,
-      fontWeight: 600,
-      outline: 0
-    }
+const StyledBaseButton = styled(BaseButton)<{palette?: keyof typeof paletteColors}>(({
+  palette = 'gray'
+}) => {
+  const backgroundColor = paletteColors[palette]
+  const color = buttonLightThemes.includes(palette) ? PALETTE.SLATE_700 : '#FFFFFF'
+  return {
+    backgroundColor,
+    borderRadius: Radius.BUTTON_PILL,
+    color,
+    fontWeight: 600,
+    outline: 0
   }
-)
+})
 
 export interface RaisedButtonProps extends BaseButtonProps {
   palette?: keyof typeof paletteColors
diff --git a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
index e3e82f88859..355d4137c9b 100644
--- a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
+++ b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
@@ -115,8 +115,8 @@ export const UpdateRecurrenceSettingsModal = (props: Props) => {
     meetingType === 'teamPrompt'
       ? 'Standup'
       : meetingType === 'retrospective'
-      ? 'Retrospective'
-      : 'Meeting'
+        ? 'Retrospective'
+        : 'Meeting'
   const currentRecurrenceRule = meeting.meetingSeries?.recurrenceRule
   const atmosphere = useAtmosphere()
   const isMeetingSeriesActive = meeting.meetingSeries?.cancelledAt === null
diff --git a/packages/client/components/ReflectionGroup/RemoteReflection.tsx b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
index abda2bda207..522533d3f7d 100644
--- a/packages/client/components/ReflectionGroup/RemoteReflection.tsx
+++ b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
@@ -58,8 +58,8 @@ const RemoteReflectionModal = styled('div')<{
   animation: animation
     ? animation
     : isSpotlight && !isDropping
-    ? `${circleAnimation(transform)} 3s ease infinite;`
-    : undefined,
+      ? `${circleAnimation(transform)} 3s ease infinite;`
+      : undefined,
   zIndex: isInViewerSpotlightResults
     ? ZIndex.REFLECTION_IN_FLIGHT_SPOTLIGHT
     : ZIndex.REFLECTION_IN_FLIGHT
@@ -117,10 +117,10 @@ const getHeaderTransform = (ref: RefObject<HTMLDivElement>, topPadding = 18) =>
     headerTop === maxTop
       ? 'arrow_downward'
       : headerLeft === maxLeft
-      ? 'arrow_forward'
-      : headerLeft === minLeft
-      ? 'arrow_back'
-      : ('arrow_upward' as RemoteReflectionArrow)
+        ? 'arrow_forward'
+        : headerLeft === minLeft
+          ? 'arrow_back'
+          : ('arrow_upward' as RemoteReflectionArrow)
   return {
     arrow,
     headerTransform: `translate(${headerLeft}px,${headerTop}px)`
@@ -234,8 +234,8 @@ const RemoteReflection = (props: Props) => {
       remoteDrag?.isSpotlight
         ? Times.REFLECTION_SPOTLIGHT_DRAG_STALE_TIMEOUT
         : localPhase.phaseType === VOTE
-        ? 0
-        : Times.REFLECTION_DRAG_STALE_TIMEOUT
+          ? 0
+          : Times.REFLECTION_DRAG_STALE_TIMEOUT
     )
     return () => {
       window.clearTimeout(timeoutRef.current)
diff --git a/packages/client/components/ReflectionGroupVoting.tsx b/packages/client/components/ReflectionGroupVoting.tsx
index 3e57244b5a8..0797172425e 100644
--- a/packages/client/components/ReflectionGroupVoting.tsx
+++ b/packages/client/components/ReflectionGroupVoting.tsx
@@ -63,8 +63,8 @@ const Votes = styled('span')<{voteCount: number; isExpanded: boolean}>(
         ? PALETTE.SLATE_200
         : '#fff'
       : voteCount === 0
-      ? PALETTE.SLATE_700
-      : PALETTE.SKY_500,
+        ? PALETTE.SLATE_700
+        : PALETTE.SKY_500,
     fontWeight: 600,
     padding: '0 4px',
     display: 'flex',
diff --git a/packages/client/components/SwipeableDashSidebar.tsx b/packages/client/components/SwipeableDashSidebar.tsx
index 9eab7a71a54..f59b6294c86 100644
--- a/packages/client/components/SwipeableDashSidebar.tsx
+++ b/packages/client/components/SwipeableDashSidebar.tsx
@@ -78,8 +78,8 @@ const updateIsSwipe = (clientX: number, clientY: number, isRightDrawer: boolean)
         ? swipingRight
         : swipingLeft
       : isRightDrawer
-      ? swipingLeft
-      : swipingRight
+        ? swipingLeft
+        : swipingRight
   }
 }
 
diff --git a/packages/client/components/TaskEditor/useLinks.tsx b/packages/client/components/TaskEditor/useLinks.tsx
index 81f103396a0..70cab4436e1 100644
--- a/packages/client/components/TaskEditor/useLinks.tsx
+++ b/packages/client/components/TaskEditor/useLinks.tsx
@@ -314,8 +314,8 @@ const useLinks = (editorState: EditorState, setEditorState: SetEditorState, hand
     renderModal: linkViewerData
       ? renderViewerModal
       : linkChangerData
-      ? renderChangerModal
-      : renderModal,
+        ? renderChangerModal
+        : renderModal,
     removeModal: linkViewerData || linkChangerData ? onRemoveModal : removeModal
   }
 }
diff --git a/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx b/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx
index adb79ceaa8e..b970988fdf5 100644
--- a/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptOverflowAvatar.tsx
@@ -29,14 +29,14 @@ const OverflowCount = styled('div')<{
   opacity: !isAnimated
     ? undefined
     : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-    ? 0
-    : 1,
+      ? 0
+      : 1,
   overflow: 'hidden',
   transform: !isAnimated
     ? undefined
     : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-    ? 'scale(0)'
-    : 'scale(1)',
+      ? 'scale(0)'
+      : 'scale(1)',
   transition: `all 300ms ${BezierCurve.DECELERATE}`,
   userSelect: 'none',
   width
diff --git a/packages/client/hooks/useDraggableReflectionCard.tsx b/packages/client/hooks/useDraggableReflectionCard.tsx
index fd04ccb23c8..8d4d0e2df69 100644
--- a/packages/client/hooks/useDraggableReflectionCard.tsx
+++ b/packages/client/hooks/useDraggableReflectionCard.tsx
@@ -261,8 +261,8 @@ const useDragAndDrop = (
       targetGroupId && reflectionGroupId !== targetGroupId
         ? 'REFLECTION_GROUP'
         : !targetGroupId && reflectionCount > 0 && !isReflectionInSpotlightResults
-        ? 'REFLECTION_GRID'
-        : null
+          ? 'REFLECTION_GRID'
+          : null
     handleDrop(atmosphere, reflectionId, drag, targetType, targetGroupId)
     if (spotlightGroup?.id) {
       const event = isReflectionInSpotlightResults
diff --git a/packages/client/hooks/useUnusedRecords.ts b/packages/client/hooks/useUnusedRecords.ts
index 9ad347d83fd..57a65d52fba 100644
--- a/packages/client/hooks/useUnusedRecords.ts
+++ b/packages/client/hooks/useUnusedRecords.ts
@@ -14,8 +14,8 @@ const useUnusedRecords = (
       unusedServiceTaskIds.length === 0 || usedServiceTaskIds.size === Threshold.MAX_POKER_STORIES
         ? true
         : unusedServiceTaskIds.length === serviceTaskIds.length
-        ? false
-        : null
+          ? false
+          : null
     return [unusedServiceTaskIds, allSelected]
   }, [serviceTaskIds, usedServiceTaskIds])
 }
diff --git a/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx b/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx
index 36a2757d828..69217cf5b4c 100644
--- a/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx
+++ b/packages/client/modules/admin/containers/Graphql/GraphqlContainer.tsx
@@ -35,8 +35,8 @@ const GraphqlContainer = () => {
       setMode === 'dark'
         ? true
         : setMode === 'light'
-        ? false
-        : window.matchMedia('(prefers-color-scheme: dark)').matches
+          ? false
+          : window.matchMedia('(prefers-color-scheme: dark)').matches
     setIsDarkMode(nextTheme)
   })
 
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
index ce147e9e4b3..67b3e25f034 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
@@ -19,7 +19,7 @@ const statLabel = (idx: number, len: number) =>
     fontSize: 36,
     lineHeight: '40px',
     paddingTop: 12
-  } as React.CSSProperties)
+  }) as React.CSSProperties
 
 const descriptionLabel = (idx: number, len: number) =>
   ({
@@ -31,7 +31,7 @@ const descriptionLabel = (idx: number, len: number) =>
     fontWeight: 600,
     paddingBottom: 12,
     textTransform: 'uppercase'
-  } as React.CSSProperties)
+  }) as React.CSSProperties
 
 const tableStyle = {
   borderSpacing: '2px 0',
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
index abbfc8a2e67..15eb9aeb052 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
@@ -130,8 +130,8 @@ const RetroTopic = (props: Props) => {
     commentCount === 0
       ? 'No Comments'
       : commentCount >= 101
-      ? 'See 100+ Comments'
-      : `See ${commentCount} ${plural(commentCount, 'Comment')}`
+        ? 'See 100+ Comments'
+        : `See ${commentCount} ${plural(commentCount, 'Comment')}`
   const commentLinkStyle = commentCount === 0 ? noCommentLinkStyle : someCommentsLinkStyle
   const corsOptions = isEmail ? EMAIL_CORS_OPTIONS : APP_CORS_OPTIONS
   return (
diff --git a/packages/client/modules/meeting/components/TemplateSharing.tsx b/packages/client/modules/meeting/components/TemplateSharing.tsx
index 6bc08889246..874fbe3b3a1 100644
--- a/packages/client/modules/meeting/components/TemplateSharing.tsx
+++ b/packages/client/modules/meeting/components/TemplateSharing.tsx
@@ -122,8 +122,8 @@ export const UnstyledTemplateSharing = (props: Props) => {
     scope === 'TEAM'
       ? `Only visible to ${teamName}`
       : scope === 'ORGANIZATION'
-      ? `Sharing with ${orgName}`
-      : 'Sharing publicly'
+        ? `Sharing with ${orgName}`
+        : 'Sharing publicly'
   return (
     <>
       <DropdownBlock
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
index 7c9f7a61883..30a500b6392 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
@@ -38,12 +38,12 @@ const RootCard = styled('div')<{
   boxShadow: isDragging
     ? Elevation.CARD_DRAGGING
     : isTaskHighlighted
-    ? cardHoverShadow
-    : isTaskFocused
-    ? cardFocusShadow
-    : isTaskHovered
-    ? cardHoverShadow
-    : cardShadow
+      ? cardHoverShadow
+      : isTaskFocused
+        ? cardFocusShadow
+        : isTaskHovered
+          ? cardHoverShadow
+          : cardShadow
 }))
 
 const ContentBlock = styled('div')({
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
index 9daf20ccc41..793b7dee707 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
@@ -42,13 +42,13 @@ const SlackChannelPicker = (props: Props) => {
   const channelState = activeChannel
     ? ChannelState.ready
     : localChannelId && isTokenValid
-    ? ChannelState.loading
-    : ChannelState.error
+      ? ChannelState.loading
+      : ChannelState.error
   const activeText = activeChannel
     ? activeChannel.name
     : channelState === ChannelState.loading
-    ? ''
-    : 'Token Expired! Click to renew'
+      ? ''
+      : 'Token Expired! Click to renew'
   const {togglePortal, menuPortal, originRef, menuProps} = useMenu<HTMLDivElement>(
     MenuPosition.UPPER_RIGHT,
     {
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
index 93f2d865896..f7df386a5b6 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
@@ -93,8 +93,8 @@ const Plan = styled('div')<{tier: TierEnum; isTablet: boolean; isActive: boolean
       ? tier === 'starter'
         ? `2px solid ${PALETTE.GRAPE_500}`
         : tier === 'team'
-        ? `2px solid ${PALETTE.AQUA_400}`
-        : `2px solid ${PALETTE.TOMATO_400}`
+          ? `2px solid ${PALETTE.AQUA_400}`
+          : `2px solid ${PALETTE.TOMATO_400}`
       : '2px solid transparent',
     transition: 'all ease 0.5s',
     '&:hover': {
@@ -102,8 +102,8 @@ const Plan = styled('div')<{tier: TierEnum; isTablet: boolean; isActive: boolean
         tier === 'starter'
           ? PALETTE.GRAPE_500
           : tier === 'team'
-          ? PALETTE.AQUA_400
-          : PALETTE.TOMATO_500
+            ? PALETTE.AQUA_400
+            : PALETTE.TOMATO_500
       }`
     },
     '&:last-of-type': {
@@ -125,14 +125,14 @@ const CTAButton = styled(BaseButton)<{
     buttonStyle === 'primary'
       ? PALETTE.GRADIENT_TOMATO_600_ROSE_500
       : buttonStyle === 'secondary'
-      ? PALETTE.WHITE
-      : PALETTE.SLATE_300,
+        ? PALETTE.WHITE
+        : PALETTE.SLATE_300,
   color:
     buttonStyle === 'primary'
       ? PALETTE.WHITE
       : buttonStyle === 'secondary'
-      ? PALETTE.SLATE_900
-      : PALETTE.SLATE_600,
+        ? PALETTE.SLATE_900
+        : PALETTE.SLATE_600,
   border: buttonStyle === 'secondary' ? `1px solid ${PALETTE.SLATE_600}` : 'none',
   transition: 'all ease 0.5s',
   ':hover': {
@@ -141,8 +141,8 @@ const CTAButton = styled(BaseButton)<{
       buttonStyle === 'primary'
         ? PALETTE.GRADIENT_TOMATO_700_ROSE_600
         : buttonStyle === 'secondary'
-        ? PALETTE.SLATE_300
-        : PALETTE.SLATE_300
+          ? PALETTE.SLATE_300
+          : PALETTE.SLATE_300
   }
 }))
 
diff --git a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
index dace313f1f2..72aebf89936 100644
--- a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
+++ b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
@@ -77,8 +77,8 @@ const UserColumnsContainer = (props: Props) => {
         return teamFiltered && inTeam
       })
     : teamIds
-    ? teams.filter(({id}) => teamIds.includes(id))
-    : teams
+      ? teams.filter(({id}) => teamIds.includes(id))
+      : teams
 
   const firstTeam = filteredTeams[0]
   if (firstTeam) {
diff --git a/packages/client/package.json b/packages/client/package.json
index cd417b82637..c03cbaeb9ce 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -55,7 +55,6 @@
     "eslint-plugin-react-hooks": "^1.6.1",
     "jest": "^29.5.0",
     "lint-staged": "^10.1.7",
-    "prettier": "^2.8.8",
     "react-refresh": "^0.9.0",
     "strict-event-emitter-types": "^2.0.0",
     "typescript": "^5.3.3",
diff --git a/packages/client/types/generics.ts b/packages/client/types/generics.ts
index 7a1d76dafb0..81611879c63 100644
--- a/packages/client/types/generics.ts
+++ b/packages/client/types/generics.ts
@@ -7,24 +7,24 @@ export type DeepPartial<T> = {
   [P in keyof T]?: T[P] extends (infer U)[]
     ? DeepPartial<U>[]
     : T[P] extends readonly (infer U)[]
-    ? readonly DeepPartial<U>[]
-    : DeepPartial<T[P]>
+      ? readonly DeepPartial<U>[]
+      : DeepPartial<T[P]>
 }
 export type DeepNullable<T> = {
   [P in keyof T]: T[P] extends (infer U)[]
     ? DeepNullable<U>[] | null
     : T[P] extends readonly (infer U)[]
-    ? readonly DeepNullable<U>[] | null
-    : DeepNullable<T[P]> | null
+      ? readonly DeepNullable<U>[] | null
+      : DeepNullable<T[P]> | null
 }
 
 export type DeepNonNullable<T> = T extends (...args: any[]) => any
   ? T
   : T extends any[]
-  ? DeepNonNullableArray<T[number]>
-  : T extends object
-  ? DeepNonNullableObject<T>
-  : T
+    ? DeepNonNullableArray<T[number]>
+    : T extends object
+      ? DeepNonNullableObject<T>
+      : T
 
 interface DeepNonNullableArray<T> extends Array<DeepNonNullable<NonNullable<T>>> {}
 
@@ -96,8 +96,8 @@ export type WithFieldsAsType<TObj, NType, F> = {
   [K in keyof TObj]: K extends F
     ? NType
     : TObj[K] extends object
-    ? WithFieldsAsType<TObj[K], NType, F>
-    : TObj[K]
+      ? WithFieldsAsType<TObj[K], NType, F>
+      : TObj[K]
 }
 
 export type Tuple<T, N, R extends T[] = []> = R['length'] extends N ? R : Tuple<T, N, [...R, T]>
diff --git a/packages/client/types/relayMutations.ts b/packages/client/types/relayMutations.ts
index 9fb3ff8f125..cec183ca685 100644
--- a/packages/client/types/relayMutations.ts
+++ b/packages/client/types/relayMutations.ts
@@ -61,8 +61,8 @@ export type OnNextHandler<TSubResponse, C = OnNextBaseContext> = (
   payload: null extends TSubResponse
     ? Omit<NonNullable<TSubResponse>, ' $fragmentType'> | null
     : undefined extends TSubResponse
-    ? Omit<NonNullable<TSubResponse>, ' $fragmentType'> | undefined
-    : Omit<TSubResponse, ' $fragmentType'>,
+      ? Omit<NonNullable<TSubResponse>, ' $fragmentType'> | undefined
+      : Omit<TSubResponse, ' $fragmentType'>,
   context: C
 ) => void
 
@@ -70,9 +70,11 @@ export type SimpleMutation<T extends MutationParameters> = {
   (atmosphere: Atmosphere, variables: T['variables']): ReturnType<typeof commitMutation> | undefined
 }
 export type StandardMutation<T extends MutationParameters, C = BaseLocalHandlers> = {
-  (atmosphere: Atmosphere, variables: T['variables'], localHandlers: C): ReturnType<
-    typeof commitMutation
-  >
+  (
+    atmosphere: Atmosphere,
+    variables: T['variables'],
+    localHandlers: C
+  ): ReturnType<typeof commitMutation>
 }
 
 export type RelayDateHack<T extends {variables: any}, P> = Omit<T, 'variables'> & {
diff --git a/packages/client/utils/relay/insertEdge.ts b/packages/client/utils/relay/insertEdge.ts
index dc50f7c86e8..4242b17e4e8 100644
--- a/packages/client/utils/relay/insertEdge.ts
+++ b/packages/client/utils/relay/insertEdge.ts
@@ -50,8 +50,8 @@ export const insertEdgeAfter = (
   const nextIdx = sortValue
     ? idxFinder(newName, nodes, sortValue)
     : isAscending
-    ? edges.length - 1
-    : 0
+      ? edges.length - 1
+      : 0
   const nextEdges = [...edges.slice(0, nextIdx), newEdge, ...edges.slice(nextIdx)]
   connection.setLinkedRecords(nextEdges, 'edges')
 }
diff --git a/packages/client/utils/screenBugs/Bug.ts b/packages/client/utils/screenBugs/Bug.ts
index 0ab7411d40d..e9703da829e 100644
--- a/packages/client/utils/screenBugs/Bug.ts
+++ b/packages/client/utils/screenBugs/Bug.ts
@@ -586,16 +586,22 @@ export default class Bug {
   twitch = (deathType: number, _legPos?: number) => {
     let legPos = _legPos || 0
     if (deathType === 0 || deathType === 1) {
-      this.twitchTimer = window.setTimeout(() => {
-        this.bug.style.backgroundPosition =
-          '-' + (deathType * 2 + (legPos % 2)) * this.options.bugWidth + 'px 100%'
-        this.twitchTimer = window.setTimeout(() => {
-          legPos++
+      this.twitchTimer = window.setTimeout(
+        () => {
           this.bug.style.backgroundPosition =
             '-' + (deathType * 2 + (legPos % 2)) * this.options.bugWidth + 'px 100%'
-          this.twitch(deathType, ++legPos)
-        }, this.random(300, 800))
-      }, this.random(1000, 10000))
+          this.twitchTimer = window.setTimeout(
+            () => {
+              legPos++
+              this.bug.style.backgroundPosition =
+                '-' + (deathType * 2 + (legPos % 2)) * this.options.bugWidth + 'px 100%'
+              this.twitch(deathType, ++legPos)
+            },
+            this.random(300, 800)
+          )
+        },
+        this.random(1000, 10000)
+      )
     }
   }
 
diff --git a/packages/client/utils/sortByTier.ts b/packages/client/utils/sortByTier.ts
index 33ff202a964..7f0751b36e9 100644
--- a/packages/client/utils/sortByTier.ts
+++ b/packages/client/utils/sortByTier.ts
@@ -9,10 +9,10 @@ const sortByTier = <T extends readonly {tier: TierEnum | string; name: string}[]
     tierVal(a) < tierVal(b)
       ? -1
       : tierVal(a) > tierVal(b)
-      ? 1
-      : a.name.toLowerCase() < b.name.toLowerCase()
-      ? -1
-      : 1
+        ? 1
+        : a.name.toLowerCase() < b.name.toLowerCase()
+          ? -1
+          : 1
   )
   return teamsSlice as unknown as T
 }
diff --git a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
index 03af3b510ba..5a9d1c423cc 100644
--- a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
+++ b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
@@ -154,7 +154,7 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
     }
   }
 
-  markdown = prettier.format(markdown, {
+  markdown = await prettier.format(markdown, {
     parser: 'markdown',
     proseWrap: 'always',
     printWidth: 72
diff --git a/packages/embedder/textEmbeddingsnterface.d.ts b/packages/embedder/textEmbeddingsnterface.d.ts
index 618eea7db91..da30347ab11 100644
--- a/packages/embedder/textEmbeddingsnterface.d.ts
+++ b/packages/embedder/textEmbeddingsnterface.d.ts
@@ -9,8 +9,8 @@ type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T
 type OneOf<T extends any[]> = T extends [infer Only]
   ? Only
   : T extends [infer A, infer B, ...infer Rest]
-  ? OneOf<[XOR<A, B>, ...Rest]>
-  : never
+    ? OneOf<[XOR<A, B>, ...Rest]>
+    : never
 
 export interface paths {
   '/decode': {
diff --git a/packages/server/.eslintignore b/packages/server/.eslintignore
index 18e5758e413..0f0f4df4e30 100644
--- a/packages/server/.eslintignore
+++ b/packages/server/.eslintignore
@@ -10,3 +10,4 @@ graphql/public/schema.graphql
 _legacy.graphql
 migrationTemplate.ts
 billing/debug.ts
+pg.d.ts
diff --git a/packages/server/billing/helpers/generateInvoice.ts b/packages/server/billing/helpers/generateInvoice.ts
index 50adc213ef6..8a94adaffea 100644
--- a/packages/server/billing/helpers/generateInvoice.ts
+++ b/packages/server/billing/helpers/generateInvoice.ts
@@ -73,12 +73,15 @@ interface DetailedLineItemDict {
 
 const getEmailLookup = async (userIds: string[], dataLoader: DataLoaderWorker) => {
   const usersAndEmails = (await dataLoader.get('users').loadMany(userIds)).filter(isValid)
-  return usersAndEmails.reduce((dict, doc) => {
-    if (doc) {
-      dict[doc.id] = doc.email
-    }
-    return dict
-  }, {} as {[key: string]: string}) as EmailLookup
+  return usersAndEmails.reduce(
+    (dict, doc) => {
+      if (doc) {
+        dict[doc.id] = doc.email
+      }
+      return dict
+    },
+    {} as {[key: string]: string}
+  ) as EmailLookup
 }
 
 const reduceItemsByType = (typesDict: TypesDict, email: string) => {
diff --git a/packages/server/database/stricterR.ts b/packages/server/database/stricterR.ts
index 3878ad34cd1..434b2cd3434 100644
--- a/packages/server/database/stricterR.ts
+++ b/packages/server/database/stricterR.ts
@@ -9,8 +9,8 @@ type DeepPartial<T> =
       [P in keyof T]?: T[P] extends Array<infer U1>
         ? Array<DeepPartial<U1>>
         : T[P] extends ReadonlyArray<infer U2>
-        ? ReadonlyArray<DeepPartial<U2>>
-        : DeepPartial<T[P]>
+          ? ReadonlyArray<DeepPartial<U2>>
+          : DeepPartial<T[P]>
     }
 
 // User defined schemas
@@ -421,8 +421,8 @@ export interface RQuery<T = any> {
   ): T extends Array<infer T1>
     ? Promise<RCursor<T1>>
     : T extends RCursor<unknown>
-    ? Promise<T>
-    : Promise<RCursor<T>>
+      ? Promise<T>
+      : Promise<RCursor<T>>
   then(): never
 }
 export interface RDatum<T = any> extends RQuery<T> {
diff --git a/packages/server/database/types/CheckInStage.ts b/packages/server/database/types/CheckInStage.ts
index f5ad00e97d0..4d7ef6b5f69 100644
--- a/packages/server/database/types/CheckInStage.ts
+++ b/packages/server/database/types/CheckInStage.ts
@@ -2,7 +2,10 @@ import GenericMeetingStage from './GenericMeetingStage'
 
 export default class CheckInStage extends GenericMeetingStage {
   phaseType!: 'checkin'
-  constructor(public teamMemberId: string, durations?: number[] | undefined) {
+  constructor(
+    public teamMemberId: string,
+    durations?: number[] | undefined
+  ) {
     super({phaseType: 'checkin', durations})
   }
 }
diff --git a/packages/server/database/types/GenericMeetingPhase.ts b/packages/server/database/types/GenericMeetingPhase.ts
index a419506d11d..5082d153812 100644
--- a/packages/server/database/types/GenericMeetingPhase.ts
+++ b/packages/server/database/types/GenericMeetingPhase.ts
@@ -21,7 +21,10 @@ export type NewMeetingPhaseTypeEnum =
 export default class GenericMeetingPhase {
   id = generateUID()
   stages: GenericMeetingStage[]
-  constructor(public phaseType: NewMeetingPhaseTypeEnum, durations?: number[] | undefined) {
+  constructor(
+    public phaseType: NewMeetingPhaseTypeEnum,
+    durations?: number[] | undefined
+  ) {
     this.stages = [new GenericMeetingStage({phaseType, durations})]
   }
 }
diff --git a/packages/server/database/types/ReflectPhase.ts b/packages/server/database/types/ReflectPhase.ts
index 4f446ed7f50..4de28d532c2 100644
--- a/packages/server/database/types/ReflectPhase.ts
+++ b/packages/server/database/types/ReflectPhase.ts
@@ -6,7 +6,10 @@ export default class ReflectPhase extends GenericMeetingPhase {
   stages: [GenericMeetingStage, ...GenericMeetingStage[]]
   focusedPromptId?: string
 
-  constructor(public teamId: string, durations: number[] | undefined) {
+  constructor(
+    public teamId: string,
+    durations: number[] | undefined
+  ) {
     super('reflect')
     this.stages = [
       new GenericMeetingStage({
diff --git a/packages/server/database/types/ScheduledJob.ts b/packages/server/database/types/ScheduledJob.ts
index ad42dce95a6..5f9c31158e0 100644
--- a/packages/server/database/types/ScheduledJob.ts
+++ b/packages/server/database/types/ScheduledJob.ts
@@ -4,5 +4,8 @@ export type ScheduledJobType =
   | 'WARN_ORGANIZATION'
 
 export default abstract class ScheduledJob {
-  protected constructor(public type: ScheduledJobType, public runAt: Date) {}
+  protected constructor(
+    public type: ScheduledJobType,
+    public runAt: Date
+  ) {}
 }
diff --git a/packages/server/database/types/ScheduledJobMetingStageTimeLimit.ts b/packages/server/database/types/ScheduledJobMetingStageTimeLimit.ts
index 2a340f87ec1..35b563df251 100644
--- a/packages/server/database/types/ScheduledJobMetingStageTimeLimit.ts
+++ b/packages/server/database/types/ScheduledJobMetingStageTimeLimit.ts
@@ -1,7 +1,10 @@
 import ScheduledJob from './ScheduledJob'
 
 export default class ScheduledJobMeetingStageTimeLimit extends ScheduledJob {
-  constructor(public runAt: Date, public meetingId: string) {
+  constructor(
+    public runAt: Date,
+    public meetingId: string
+  ) {
     super('MEETING_STAGE_TIME_LIMIT_END', runAt)
   }
 }
diff --git a/packages/server/database/types/ScheduledTeamLimitsJob.ts b/packages/server/database/types/ScheduledTeamLimitsJob.ts
index e222f3315e1..8bf64fa26de 100644
--- a/packages/server/database/types/ScheduledTeamLimitsJob.ts
+++ b/packages/server/database/types/ScheduledTeamLimitsJob.ts
@@ -1,7 +1,11 @@
 import ScheduledJob, {ScheduledJobType} from './ScheduledJob'
 
 export default class ScheduledTeamLimitsJob extends ScheduledJob {
-  constructor(public runAt: Date, public orgId: string, public type: ScheduledJobType) {
+  constructor(
+    public runAt: Date,
+    public orgId: string,
+    public type: ScheduledJobType
+  ) {
     super(type, runAt)
   }
 }
diff --git a/packages/server/database/types/TeamHealthStage.ts b/packages/server/database/types/TeamHealthStage.ts
index 87d366d92dd..77111215195 100644
--- a/packages/server/database/types/TeamHealthStage.ts
+++ b/packages/server/database/types/TeamHealthStage.ts
@@ -6,7 +6,11 @@ export default class TeamHealthStage extends GenericMeetingStage {
   votes: TeamHealthVote[] = []
   isRevealed = false
 
-  constructor(public question: string, public labels: string[], durations?: number[] | undefined) {
+  constructor(
+    public question: string,
+    public labels: string[],
+    durations?: number[] | undefined
+  ) {
     super({phaseType: 'TEAM_HEALTH', durations, isNavigable: true})
   }
 }
diff --git a/packages/server/database/types/UpdatesStage.ts b/packages/server/database/types/UpdatesStage.ts
index 4fff548858c..5cae1c5c3ed 100644
--- a/packages/server/database/types/UpdatesStage.ts
+++ b/packages/server/database/types/UpdatesStage.ts
@@ -2,7 +2,10 @@ import GenericMeetingStage from './GenericMeetingStage'
 
 export default class UpdatesStage extends GenericMeetingStage {
   phaseType!: 'updates'
-  constructor(public teamMemberId: string, durations?: number[] | undefined) {
+  constructor(
+    public teamMemberId: string,
+    durations?: number[] | undefined
+  ) {
     super({phaseType: 'updates', durations})
   }
 }
diff --git a/packages/server/dataloader/RootDataLoader.ts b/packages/server/dataloader/RootDataLoader.ts
index 1c58cb7df78..3bf5f7c3acd 100644
--- a/packages/server/dataloader/RootDataLoader.ts
+++ b/packages/server/dataloader/RootDataLoader.ts
@@ -79,8 +79,8 @@ export type TypedDataLoader<LoaderName> = LoaderName extends CustomLoaders
       LoaderName extends ForeignLoaders
         ? TypeFromForeign<LoaderName>[]
         : LoaderName extends PrimaryLoaders
-        ? TypeFromPrimary<LoaderName>
-        : never
+          ? TypeFromPrimary<LoaderName>
+          : never
     >
 
 /**
diff --git a/packages/server/dataloader/atlassianLoaders.ts b/packages/server/dataloader/atlassianLoaders.ts
index efe9881f48a..de3358bb0e2 100644
--- a/packages/server/dataloader/atlassianLoaders.ts
+++ b/packages/server/dataloader/atlassianLoaders.ts
@@ -263,8 +263,8 @@ export const jiraIssue = (
               hasDefaultEstimationField(possibleEstimationFields.map(({fieldName}) => fieldName))
                 ? undefined
                 : simplified
-                ? 'teamManagedStoryPoints'
-                : 'companyManagedStoryPoints'
+                  ? 'teamManagedStoryPoints'
+                  : 'companyManagedStoryPoints'
 
             return {
               ...fields,
diff --git a/packages/server/dataloader/foreignKeyLoaderMaker.ts b/packages/server/dataloader/foreignKeyLoaderMaker.ts
index 363a3d64363..e21ec3a9f2d 100644
--- a/packages/server/dataloader/foreignKeyLoaderMaker.ts
+++ b/packages/server/dataloader/foreignKeyLoaderMaker.ts
@@ -6,13 +6,8 @@ import UpdatableCacheDataLoader from './UpdatableCacheDataLoader'
 type LoaderMakers = typeof primaryKeyLoaderMakers
 type LoaderKeys = keyof LoaderMakers
 type Loader<LoaderName extends LoaderKeys> = ReturnType<LoaderMakers[LoaderName]>
-type LoaderType<LoaderName extends LoaderKeys> = Loader<LoaderName> extends DataLoader<
-  any,
-  infer T,
-  any
->
-  ? NonNullable<T>
-  : any
+type LoaderType<LoaderName extends LoaderKeys> =
+  Loader<LoaderName> extends DataLoader<any, infer T, any> ? NonNullable<T> : any
 
 /**
  * Used to register loaders for types by foreign key.
diff --git a/packages/server/email/teamLimitsEmailCreator.tsx b/packages/server/email/teamLimitsEmailCreator.tsx
index 931a0ddd7a9..337be985c06 100644
--- a/packages/server/email/teamLimitsEmailCreator.tsx
+++ b/packages/server/email/teamLimitsEmailCreator.tsx
@@ -76,8 +76,8 @@ const teamLimitsEmailCreator = (props: Props) => {
     emailType === 'locked'
       ? LockedEmail
       : emailType === 'sevenDayWarning'
-      ? SevenDayWarningEmail
-      : ThirtyDayWarningEmail
+        ? SevenDayWarningEmail
+        : ThirtyDayWarningEmail
   const bodyContent = ReactDOMServer.renderToStaticMarkup(
     <Email preferredName={preferredName} orgId={orgId} orgName={orgName} appOrigin={appOrigin} />
   )
@@ -86,8 +86,8 @@ const teamLimitsEmailCreator = (props: Props) => {
     emailType === 'locked'
       ? `Parabol Account Deactivated`
       : emailType === 'sevenDayWarning'
-      ? `Parabol Account - Action Required`
-      : `Parabol Account - Team Limit Reached`
+        ? `Parabol Account - Action Required`
+        : `Parabol Account - Team Limit Reached`
 
   const html = emailTemplate({
     bodyContent,
diff --git a/packages/server/fileStorage/GCSManager.ts b/packages/server/fileStorage/GCSManager.ts
index fe952eed138..d99cf943f69 100644
--- a/packages/server/fileStorage/GCSManager.ts
+++ b/packages/server/fileStorage/GCSManager.ts
@@ -64,9 +64,12 @@ export default class GCSManager extends FileStoreManager {
     // refresh the token every hour
     // do this on an interval vs. on demand to reduce request latency
     // unref it so things like pushToCDN can exit
-    setInterval(async () => {
-      this.accessToken = await this.getFreshAccessToken()
-    }, (GCSManager.GOOGLE_EXPIRY - 100) * 1000).unref()
+    setInterval(
+      async () => {
+        this.accessToken = await this.getFreshAccessToken()
+      },
+      (GCSManager.GOOGLE_EXPIRY - 100) * 1000
+    ).unref()
   }
 
   private async getFreshAccessToken() {
diff --git a/packages/server/graphql/mutations/changeTaskTeam.ts b/packages/server/graphql/mutations/changeTaskTeam.ts
index 10a5efa4ea4..bd861bdb164 100644
--- a/packages/server/graphql/mutations/changeTaskTeam.ts
+++ b/packages/server/graphql/mutations/changeTaskTeam.ts
@@ -76,8 +76,8 @@ export default {
         task.integration?.service === 'jira'
           ? await Promise.all(authKeys.map((key) => dataLoader.get('freshAtlassianAuth').load(key)))
           : task.integration?.service === 'github'
-          ? await Promise.all(authKeys.map((key) => dataLoader.get('githubAuth').load(key)))
-          : authKeys.map(() => null)
+            ? await Promise.all(authKeys.map((key) => dataLoader.get('githubAuth').load(key)))
+            : authKeys.map(() => null)
 
       if (!targetTeamAuth && !sourceTeamAuth && !accessUsersTargetTeamAuth) {
         return standardError(new Error('No valid integration found'), {
diff --git a/packages/server/graphql/mutations/helpers/generateGroups.ts b/packages/server/graphql/mutations/helpers/generateGroups.ts
index f487119ecc0..adee86de361 100644
--- a/packages/server/graphql/mutations/helpers/generateGroups.ts
+++ b/packages/server/graphql/mutations/helpers/generateGroups.ts
@@ -57,10 +57,7 @@ const generateGroups = async (
   const meetingRes = await r
     .table('NewMeeting')
     .get(meetingId)
-    .update(
-      {autogroupReflectionGroups},
-      {returnChanges: true}
-    )('changes')(0)('new_val')
+    .update({autogroupReflectionGroups}, {returnChanges: true})('changes')(0)('new_val')
     .run()
   const {facilitatorUserId} = meetingRes
   const data = {meetingId}
diff --git a/packages/server/graphql/mutations/helpers/notifications/makeMattermostAttachments.ts b/packages/server/graphql/mutations/helpers/notifications/makeMattermostAttachments.ts
index 6466e1bd363..fa55a1083da 100644
--- a/packages/server/graphql/mutations/helpers/notifications/makeMattermostAttachments.ts
+++ b/packages/server/graphql/mutations/helpers/notifications/makeMattermostAttachments.ts
@@ -53,4 +53,4 @@ export const makeHackedFieldButtonValue = (spec: ButtonSpec): string => `
 ||`
 
 export const makeHackedButtonPairFields = (button1: ButtonSpec, button2: ButtonSpec) =>
-  [button1, button2].map((i) => ({short: true, value: makeHackedFieldButtonValue(i)} as Field))
+  [button1, button2].map((i) => ({short: true, value: makeHackedFieldButtonValue(i)}) as Field)
diff --git a/packages/server/graphql/mutations/helpers/removeFromOrg.ts b/packages/server/graphql/mutations/helpers/removeFromOrg.ts
index 6d2747e227b..98db329798f 100644
--- a/packages/server/graphql/mutations/helpers/removeFromOrg.ts
+++ b/packages/server/graphql/mutations/helpers/removeFromOrg.ts
@@ -48,10 +48,7 @@ const removeFromOrg = async (
       .getAll(userId, {index: 'userId'})
       .filter({orgId, removedAt: null})
       .nth(0)
-      .update(
-        {removedAt: now},
-        {returnChanges: true}
-      )('changes')(0)('new_val')
+      .update({removedAt: now}, {returnChanges: true})('changes')(0)('new_val')
       .default(null)
       .run() as unknown as OrganizationUser,
     dataLoader.get('users').loadNonNull(userId)
diff --git a/packages/server/graphql/mutations/helpers/updateTeamInsights.ts b/packages/server/graphql/mutations/helpers/updateTeamInsights.ts
index dd0ddf0a310..ba9bc32cc5f 100644
--- a/packages/server/graphql/mutations/helpers/updateTeamInsights.ts
+++ b/packages/server/graphql/mutations/helpers/updateTeamInsights.ts
@@ -48,13 +48,16 @@ const updateTeamInsights = async (teamId: string, dataLoader: DataLoaderWorker)
   ])
 
   // emojis
-  const allUsedEmojis = meetingInsights.reduce((acc, meeting) => {
-    if (!meeting?.usedReactjis) return acc
-    Object.entries(meeting?.usedReactjis).forEach(([emoji, count]) => {
-      acc[emoji] = (acc[emoji] ?? 0) + count
-    })
-    return acc
-  }, {} as Record<string, number>)
+  const allUsedEmojis = meetingInsights.reduce(
+    (acc, meeting) => {
+      if (!meeting?.usedReactjis) return acc
+      Object.entries(meeting?.usedReactjis).forEach(([emoji, count]) => {
+        acc[emoji] = (acc[emoji] ?? 0) + count
+      })
+      return acc
+    },
+    {} as Record<string, number>
+  )
 
   const mostUsedEmojis = Object.entries(allUsedEmojis)
     .map(([id, count]) => ({id, count}))
diff --git a/packages/server/graphql/mutations/removeAgendaItem.ts b/packages/server/graphql/mutations/removeAgendaItem.ts
index 2b6c8233176..4cf87cb57bd 100644
--- a/packages/server/graphql/mutations/removeAgendaItem.ts
+++ b/packages/server/graphql/mutations/removeAgendaItem.ts
@@ -39,10 +39,7 @@ export default {
     const agendaItem = await r
       .table('AgendaItem')
       .get(agendaItemId)
-      .update(
-        {isActive: false},
-        {returnChanges: true}
-      )('changes')(0)('old_val')
+      .update({isActive: false}, {returnChanges: true})('changes')(0)('old_val')
       .default(null)
       .run()
     if (!agendaItem) {
diff --git a/packages/server/graphql/public/mutations/createImposterToken.ts b/packages/server/graphql/public/mutations/createImposterToken.ts
index 50a2a1b63ab..d2106ec34b0 100644
--- a/packages/server/graphql/public/mutations/createImposterToken.ts
+++ b/packages/server/graphql/public/mutations/createImposterToken.ts
@@ -14,8 +14,8 @@ const createImposterToken: MutationResolvers['createImposterToken'] = async (
   const user = userId
     ? await dataLoader.get('users').load(userId)
     : email
-    ? await getUserByEmail(email)
-    : null
+      ? await getUserByEmail(email)
+      : null
 
   if (!user) {
     return standardError(new Error('User not found'), {userId: viewerId})
diff --git a/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts b/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts
index d3fa3b7e98f..e0a9155c0cc 100644
--- a/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts
+++ b/packages/server/graphql/public/mutations/helpers/SAMLHelpers/getURLWithSAMLRequestParam.ts
@@ -7,8 +7,8 @@ const getURLWithSAMLRequestParam = (destination: string, slug: string) => {
   <samlp:AuthnRequest
       xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
       xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="_${uuid()}" Version="2.0" IssueInstant="${new Date().toISOString()}" Destination="${destination}" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" AssertionConsumerServiceURL="https://${
-    process.env.HOST
-  }/saml/${slug}">
+        process.env.HOST
+      }/saml/${slug}">
   <saml:Issuer>${issuer}</saml:Issuer>
       <samlp:NameIDPolicy Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress" AllowCreate="false"/>
   </samlp:AuthnRequest>
diff --git a/packages/server/graphql/public/mutations/uploadUserImage.ts b/packages/server/graphql/public/mutations/uploadUserImage.ts
index 7c3c47106a3..05c1e9fa3eb 100644
--- a/packages/server/graphql/public/mutations/uploadUserImage.ts
+++ b/packages/server/graphql/public/mutations/uploadUserImage.ts
@@ -36,10 +36,7 @@ const uploadUserImage: MutationResolvers['uploadUserImage'] = async (
     r
       .table('TeamMember')
       .getAll(userId, {index: 'userId'})
-      .update(
-        {picture: publicLocation},
-        {returnChanges: true}
-      )('changes')('new_val')
+      .update({picture: publicLocation}, {returnChanges: true})('changes')('new_val')
       .default([])
       .run() as unknown as TeamMember[],
     updateUser({picture: publicLocation}, userId)
diff --git a/packages/server/graphql/public/rules/isUserViewer.ts b/packages/server/graphql/public/rules/isUserViewer.ts
index 4fcb3e4443d..67b2734043a 100644
--- a/packages/server/graphql/public/rules/isUserViewer.ts
+++ b/packages/server/graphql/public/rules/isUserViewer.ts
@@ -2,11 +2,13 @@ import {rule} from 'graphql-shield'
 import {getUserId} from '../../../utils/authorization'
 import {GQLContext} from '../../graphql'
 
-const isUserViewer = rule({cache: 'strict'})(
-  async ({id: userId}, _args, {authToken}: GQLContext) => {
-    const viewerId = getUserId(authToken)
-    return userId === viewerId ? true : new Error('Must be logged in as user')
-  }
-)
+const isUserViewer = rule({cache: 'strict'})(async (
+  {id: userId},
+  _args,
+  {authToken}: GQLContext
+) => {
+  const viewerId = getUserId(authToken)
+  return userId === viewerId ? true : new Error('Must be logged in as user')
+})
 
 export default isUserViewer
diff --git a/packages/server/graphql/public/rules/isViewerBillingLeader.ts b/packages/server/graphql/public/rules/isViewerBillingLeader.ts
index 5af6b47af5b..87462f99486 100644
--- a/packages/server/graphql/public/rules/isViewerBillingLeader.ts
+++ b/packages/server/graphql/public/rules/isViewerBillingLeader.ts
@@ -14,14 +14,18 @@ const resolve = async (orgId: string, {authToken, dataLoader}: GQLContext) => {
   return true
 }
 
-export const isViewerBillingLeader = rule({cache: 'strict'})(
-  async (_source, {orgId}, context: GQLContext) => {
-    return resolve(orgId, context)
-  }
-)
+export const isViewerBillingLeader = rule({cache: 'strict'})(async (
+  _source,
+  {orgId},
+  context: GQLContext
+) => {
+  return resolve(orgId, context)
+})
 
-export const isViewerBillingLeaderSource = rule({cache: 'strict'})(
-  async ({id: orgId}, _args, context: GQLContext) => {
-    return resolve(orgId, context)
-  }
-)
+export const isViewerBillingLeaderSource = rule({cache: 'strict'})(async (
+  {id: orgId},
+  _args,
+  context: GQLContext
+) => {
+  return resolve(orgId, context)
+})
diff --git a/packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql b/packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql
index 61a3e3cb689..44039d7c1c1 100644
--- a/packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql
+++ b/packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql
@@ -18,7 +18,7 @@ extend type Mutation {
 Return value for removeApprovedOrganizationDomains, which could be an error
 """
 union RemoveApprovedOrganizationDomainsPayload =
-    ErrorPayload
+  | ErrorPayload
   | RemoveApprovedOrganizationDomainsSuccess
 
 type RemoveApprovedOrganizationDomainsSuccess {
diff --git a/packages/server/graphql/public/types/Company.ts b/packages/server/graphql/public/types/Company.ts
index 351d4fb7981..cd21ce19d81 100644
--- a/packages/server/graphql/public/types/Company.ts
+++ b/packages/server/graphql/public/types/Company.ts
@@ -89,14 +89,17 @@ const Company: CompanyResolvers = {
       .flat()
       .filter(isValid)
     // group by teamId
-    const teamMembersByTeamId = teamMembers.reduce((obj, teamMember) => {
-      if (obj[teamMember.teamId]) {
-        obj[teamMember.teamId]!.push(teamMember)
-      } else {
-        obj[teamMember.teamId] = [teamMember]
-      }
-      return obj
-    }, {} as Record<string, [TeamMember, ...TeamMember[]]>)
+    const teamMembersByTeamId = teamMembers.reduce(
+      (obj, teamMember) => {
+        if (obj[teamMember.teamId]) {
+          obj[teamMember.teamId]!.push(teamMember)
+        } else {
+          obj[teamMember.teamId] = [teamMember]
+        }
+        return obj
+      },
+      {} as Record<string, [TeamMember, ...TeamMember[]]>
+    )
 
     // filter out teams that have less than 2 unremoved team members
     const teamsWithSufficientTeamMembers = Object.values(teamMembersByTeamId)
diff --git a/packages/server/graphql/rootMutation.ts b/packages/server/graphql/rootMutation.ts
index 1fd42b72e43..fe3ff00f0cf 100644
--- a/packages/server/graphql/rootMutation.ts
+++ b/packages/server/graphql/rootMutation.ts
@@ -243,5 +243,5 @@ export default new GraphQLObjectType<any, GQLContext>({
       removeTeamMemberIntegrationAuth,
       endTeamPrompt,
       updateAzureDevOpsDimensionField
-    } as any)
+    }) as any
 })
diff --git a/packages/server/graphql/types/CheckInStage.ts b/packages/server/graphql/types/CheckInStage.ts
index 54585f85bbc..b7ee2e8415b 100644
--- a/packages/server/graphql/types/CheckInStage.ts
+++ b/packages/server/graphql/types/CheckInStage.ts
@@ -19,7 +19,7 @@ const CheckInStage: GraphQLObjectType<CheckInStageDB, GQLContext> = new GraphQLO
     ({
       ...newMeetingStageFields(),
       ...newMeetingTeamMemberStageFields()
-    } as any)
+    }) as any
 })
 
 export default CheckInStage
diff --git a/packages/server/package.json b/packages/server/package.json
index c12b1ae3fc8..7dc40f74bbd 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -60,8 +60,6 @@
     "jest-transform-graphql": "^2.1.0",
     "json-loader": "^0.5.7",
     "lint-staged": "^10.1.7",
-    "prettier": "^2.8.8",
-    "prettier-plugin-organize-imports": "^2.3.4",
     "rethinkdb-ts-migrate": "^0.3.6",
     "style-loader": "2.0.0",
     "sucrase": "^3.32.0",
diff --git a/packages/server/postgres/queries/getAtlassianAuthsToUpdate.ts b/packages/server/postgres/queries/getAtlassianAuthsToUpdate.ts
index 1672c6c912a..47653146047 100644
--- a/packages/server/postgres/queries/getAtlassianAuthsToUpdate.ts
+++ b/packages/server/postgres/queries/getAtlassianAuthsToUpdate.ts
@@ -12,7 +12,7 @@ const getAtlassianAuthsToUpdate = async (updatedAtThreshold: Date) => {
           ...jsq,
           lastUsedAt: new Date(jsq.lastUsedAt)
         }))
-      } as AtlassianAuth)
+      }) as AtlassianAuth
   )
 }
 
diff --git a/packages/server/safeMutations/removeSuggestedAction.ts b/packages/server/safeMutations/removeSuggestedAction.ts
index 0909b52315a..76d7aca0ad4 100644
--- a/packages/server/safeMutations/removeSuggestedAction.ts
+++ b/packages/server/safeMutations/removeSuggestedAction.ts
@@ -7,10 +7,7 @@ const removeSuggestedAction = async (userId: string, type: TSuggestedActionTypeE
     .table('SuggestedAction')
     .getAll(userId, {index: 'userId'})
     .filter({removedAt: null, type})
-    .update(
-      {removedAt: new Date()},
-      {returnChanges: true}
-    )('changes')(0)('new_val')('id')
+    .update({removedAt: new Date()}, {returnChanges: true})('changes')(0)('new_val')('id')
     .default(null)
     .run()
 }
diff --git a/packages/server/utils/MattermostServerManager.ts b/packages/server/utils/MattermostServerManager.ts
index 6471d00a3e6..be383baf670 100644
--- a/packages/server/utils/MattermostServerManager.ts
+++ b/packages/server/utils/MattermostServerManager.ts
@@ -66,8 +66,8 @@ abstract class MattermostManager {
       typeof textOrAttachmentsArray === 'string'
         ? 'text'
         : Array.isArray(textOrAttachmentsArray)
-        ? 'attachments'
-        : null
+          ? 'attachments'
+          : null
     if (!prop) return new Error('Invalid mattermost message')
     const defaultPayload = {
       [prop]: textOrAttachmentsArray
diff --git a/packages/server/utils/SlackServerManager.ts b/packages/server/utils/SlackServerManager.ts
index 0472f222b53..715d5670f0b 100644
--- a/packages/server/utils/SlackServerManager.ts
+++ b/packages/server/utils/SlackServerManager.ts
@@ -57,7 +57,10 @@ class SlackServerManager extends SlackManager {
     return new SlackServerManager(tokenJson.access_token, tokenJson) as Required<SlackServerManager>
   }
 
-  constructor(botAccessToken: string, public response?: OAuth2Response) {
+  constructor(
+    botAccessToken: string,
+    public response?: OAuth2Response
+  ) {
     super(botAccessToken)
   }
 }
diff --git a/scripts/codeshift/newMutation.ts b/scripts/codeshift/newMutation.ts
index 1238819f57d..7fbf0ea2729 100644
--- a/scripts/codeshift/newMutation.ts
+++ b/scripts/codeshift/newMutation.ts
@@ -133,7 +133,7 @@ const addSuccessSourceToCodegen = async (camelMutationName: string) => {
   // stable stringify first to sort
   const stableString = stringify(codegenJSON)
   const options = await prettier.resolveConfig(codegenPath)
-  const prettyStableString = prettier.format(stableString, {...options, parser: 'json'})
+  const prettyStableString = await prettier.format(stableString, {...options, parser: 'json'})
   fs.writeFileSync(codegenPath, prettyStableString)
 }
 
diff --git a/yarn.lock b/yarn.lock
index 7e3593cb3d0..c5316801eb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17802,21 +17802,26 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prettier-plugin-organize-imports@^2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-2.3.4.tgz#65473861ae5ab7960439fff270a2258558fbe9ba"
-  integrity sha512-R8o23sf5iVL/U71h9SFUdhdOEPsi3nm42FD/oDYIZ2PQa4TNWWuWecxln6jlIQzpZTDMUeO1NicJP6lLn2TtRw==
+prettier-plugin-organize-imports@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz#77967f69d335e9c8e6e5d224074609309c62845e"
+  integrity sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==
 
-prettier-plugin-tailwindcss@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.1.tgz#989b35afd86c550cb671da69891aba4f4a051159"
-  integrity sha512-aIO8IguumORyRsmT+E7JfJ3A9FEoyhqZR7Au7TBOege3VZkgMvHJMkufeYp4zjnDK2iq4ktkvGMNOQR9T8lisQ==
+prettier-plugin-tailwindcss@^0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.13.tgz#ee3c1e07848c90abdd1edde36a09366327e31e26"
+  integrity sha512-2tPWHCFNC+WRjAC4SIWQNSOdcL1NNkydXim8w7TDqlZi+/ulZYz2OouAI6qMtkggnPt7lGamboj6LcTMwcCvoQ==
 
-prettier@^2.8.3, prettier@^2.8.8:
+prettier@^2.8.3:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
+prettier@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
+  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
+
 pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -20036,7 +20041,7 @@ string-similarity@^3.0.0:
   resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-3.0.0.tgz#07b0bc69fae200ad88ceef4983878d03793847c7"
   integrity sha512-7kS7LyTp56OqOI2BDWQNVnLX/rCxIQn+/5M0op1WV6P8Xx6TZNdajpuqQdiJ7Xx+p1C5CsWMvdiBp9ApMhxzEQ==
 
-"string-width-cjs@npm:string-width@^4.2.0":
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -20054,15 +20059,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.0.tgz#5ab00980cfb29f43e736b113a120a73a0fb569d3"
@@ -20139,7 +20135,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -20153,13 +20149,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
@@ -22009,7 +21998,7 @@ workbox-window@6.5.4:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.5.4"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -22027,15 +22016,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 0e06d1fcabaf563583a0c4776857ec1b0d07cf7b Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 9 Apr 2024 13:18:48 -0700
Subject: [PATCH 143/183] chore: remove build steps from readme and reference
 build.yml (#9558)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 docker/images/parabol-ubi/README.md           | 106 +-----------------
 .../{cloudbuild.yaml => cloudbuild.yml}       |   0
 2 files changed, 3 insertions(+), 103 deletions(-)
 rename docker/images/parabol-ubi/{cloudbuild.yaml => cloudbuild.yml} (100%)

diff --git a/docker/images/parabol-ubi/README.md b/docker/images/parabol-ubi/README.md
index 518269140bc..7be2429b457 100644
--- a/docker/images/parabol-ubi/README.md
+++ b/docker/images/parabol-ubi/README.md
@@ -2,111 +2,11 @@
 
 This repo was created to build a Parabol base image that is **agnostic to configuration and can be used anywhere**. Once an image is built, it can be pushed to any repository.
 
-## Requirements
-
-Required:
-
-- RethinkDB up and running.
-- PostgreSQL up and running.
-- Redis up and running.
-
-Recommended:
-
-- [jq](https://jqlang.github.io/jq/) installed. It is used to get the version of the application.
-
-## Variables
-
-| Name                 | Description                                                                                     | Possible values                                       | Recommended value                                   |
-| -------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------- | --------------------------------------------------- |
-| `postgresql_tag`     | PostgreSQL version from the [Docker image](https://hub.docker.com/r/pgvector/pgvector)          | `Any tag`                                             | `0.6.2-pg15`                                        |
-| `rethinkdb_tag`      | RethinkDB version from the [Docker image](https://hub.docker.com/_/rethinkdb)                   | `Any tag`                                             | `2.4.2`                                             |
-| `redis_tag`          | Redis version from the [Docker image](https://hub.docker.com/_/redis)                           | `Any tag`                                             | `7.0-alpine`                                        |
-| `_BUILD_ENV_PATH`    | File `.env` used by the application during the build process                                    | `Relative path from the root level of the repository` | `docker/parabol-ubi/environments/basic-env`         |
-| `_NODE_VERSION`      | Node version, used by Docker to use the Docker image node:\_NODE_VERSION as base image to build | `Same as in root package.json`                        |                                                     |
-| `_DOCKERFILE`        | Dockerfile used to build the image                                                              | `Relative path from the root level of the repository` | `./docker/parabol-ubi/dockerfiles/basic.dockerfile` |
-| `_DOCKER_REPOSITORY` | The destination repository                                                                      | `String`                                              | `parabol`                                           |
-| `_DOCKER_TAG`        | Tag for the produced image                                                                      | `String`                                              |                                                     |
-
-Example of variables:
-
-```commandLine
-export postgresql_tag=0.6.2-pg15; \
-export rethinkdb_tag=2.4.2; \
-export redis_tag=7.0-alpine; \
-export _BUILD_ENV_PATH=docker/parabol-ubi/environments/basic-env; \
-export _NODE_VERSION=$(jq -r -j '.engines.node|ltrimstr("^")' package.json); \
-export _DOCKERFILE=./docker/parabol-ubi/dockerfiles/basic.dockerfile; \
-export _DOCKER_REPOSITORY=parabol; \
-export _DOCKER_TAG=test-image
-```
-
 ## Building the image
 
-The application must be already built locally using the command `yarn build --no-deps` mode.
-
-To build the image, these commands must be executed from the **root level** of this repository:
-
-- **Set the environment variables** as explained in the precedent section.
-
-- **Copy the env file** for docker build:
-
-> :warning: **THIS WILL DELETE YOUR LOCAL .env file is you have one**. Back it up before proceeding.
-
-```commandLine
-cp $_BUILD_ENV_PATH ./.env
-```
-
-- **Start the databases:**
-
-> :warning: Stop all database containers you might have running before executing the following command. If other database containers are running, some ports might be already taken.
-
-```commandLine
-docker run --name temp-postgres -e POSTGRES_PASSWORD=temppassword -e POSTGRES_USER=tempuser -e POSTGRES_DB=tempdb -d -p 5432:5432 pgvector/pgvector:$postgresql_tag && \
-docker run --name temp-rethinkdb -d -p 28015:28015 -p 29015:29015 -p 8080:8080 rethinkdb:$rethinkdb_tag && \
-docker run --name temp-redis -d -p 6379:6379 redis:$redis_tag
-```
-
-- **Build the application:**
-
-```commandLine
-yarn && \
-yarn db:migrate && \
-yarn pg:migrate up && \
-yarn pg:build && \
-yarn build --no-deps
-```
-
-- **Build the docker image:**
-
-```commandLine
-docker build -t $_DOCKER_REPOSITORY:$_DOCKER_TAG -f $_DOCKERFILE --build-arg _NODE_VERSION=$_NODE_VERSION .
-```
-
-> Some build tips
->
-> - **Docker cache:** to avoid caching images and using cache, the flag `--no-cache` can be added to the `docker build` command. It will save some space in the workstation, but it might take longer to build.
-> - **Multi platform:** to build images for multiple platforms, you can use `docker builx build --platform linux/arm64 [the rest of the build command]`.
-> - **Debug:** if you want debug the commands executed during the docker build, add the flag `--progress=plain` to the docker build command.
-
-- **Stop and delete all database containers:**
-
-```commandLine
-docker stop temp-postgres temp-rethinkdb temp-redis && docker rm temp-postgres temp-rethinkdb temp-redis -f || docker stop temp-postgres temp-rethinkdb temp-redis && docker rm temp-postgres temp-rethinkdb temp-redis -f
-```
-
-- **Delete the `.env`:**
-
-```commandLine
-rm .env
-```
-
-It will produce a Docker image tagged as `${_DOCKER_REPOSITORY}:${_DOCKER_TAG}`. Ex: `parabol:test-image`.
-
-- **Show the new image:**
-
-```commandLine
-docker images $_DOCKER_REPOSITORY:$_DOCKER_TAG
-```
+See [build.yml](../../../.github/workflows/build.yml) to see how we build production images.
+To build an image ad-hoc, trigger the build workflow from GitHub Actions.
+To build it locally (unsupported), use [act](https://github.com/nektos/act) to run the GitHub Action locally.
 
 ## Run the application using a docker image
 
diff --git a/docker/images/parabol-ubi/cloudbuild.yaml b/docker/images/parabol-ubi/cloudbuild.yml
similarity index 100%
rename from docker/images/parabol-ubi/cloudbuild.yaml
rename to docker/images/parabol-ubi/cloudbuild.yml

From 15a54fbbb24ece533c8d20422950b0839969500b Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 10 Apr 2024 16:26:26 -0700
Subject: [PATCH 144/183] feat: related discussions refactor (#9557)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: Jordan Husney <jordan.husney@gmail.com>
---
 package.json                                  |   2 +-
 .../client/components/RetroDrawerRoot.tsx     |   4 +-
 packages/embedder/EMBEDDER_JOB_PRIORITY.ts    |   6 -
 packages/embedder/EmbedderJobType.ts          |  10 ++
 packages/embedder/EmbeddingsJobQueueStream.ts |  40 +++---
 packages/embedder/JobQueueError.ts            |  19 +++
 packages/embedder/WorkflowOrchestrator.ts     | 117 ++++++++++++++++++
 packages/embedder/addEmbeddingsMetadata.ts    |  16 ++-
 ...MetadataForRetrospectiveDiscussionTopic.ts |  78 ++----------
 .../ai_models/AbstractEmbeddingsModel.ts      |  62 ++++++----
 packages/embedder/ai_models/ModelManager.ts   |   5 +
 .../ai_models/TextEmbeddingsInference.ts      |  94 +++++++-------
 packages/embedder/custom.d.ts                 |  30 ++++-
 packages/embedder/debug.ts                    |  29 +++++
 packages/embedder/embedder.ts                 |  76 +++---------
 packages/embedder/getEmbedderPriority.ts      |  21 ++++
 .../indexing/createEmbeddingTextFrom.ts       |  11 +-
 packages/embedder/indexing/failJob.ts         |  17 ---
 .../indexing/retrospectiveDiscussionTopic.ts  |  59 ++++-----
 packages/embedder/inferLanguage.ts            |  11 ++
 .../insertDiscussionsIntoMetadataAndQueue.ts  |  56 +++++++++
 packages/embedder/logPerformance.ts           |  19 +++
 packages/embedder/package.json                |   1 +
 packages/embedder/processJob.ts               |  13 --
 packages/embedder/processJobEmbed.ts          | 101 ---------------
 packages/embedder/regex.ts                    |   2 +
 packages/embedder/workflows/embedMetadata.ts  |  96 ++++++++++++++
 .../workflows/getSimilarRetroTopics.ts        |  65 ++++++++++
 .../getRerankedEmbeddingsFromChunks.ts        | 115 +++++++++++++++++
 .../helpers/publishSimilarRetroTopics.ts      |  72 +++++++++++
 .../workflows/relatedDiscussionsStart.ts      |  54 ++++++++
 .../embedder/workflows/rerankRetroTopics.ts   |  53 ++++++++
 packages/server/dataloader/RootDataLoader.ts  |  13 +-
 .../dataloader/foreignKeyLoaderMakers.ts      |  19 +++
 .../dataloader/primaryKeyLoaderMakers.ts      |   5 +
 .../helpers/addAIGeneratedContentToThreads.ts |   8 +-
 .../mutations/helpers/handleCompletedStage.ts |  12 +-
 .../mutations/helpers/publishToEmbedder.ts    |  32 +++--
 .../mutations/helpers/safeEndRetrospective.ts |   2 -
 .../typeDefs/updateOrgFeatureFlag.graphql     |   1 +
 .../public/typeDefs/Organization.graphql      |   1 +
 .../public/types/OrganizationFeatureFlags.ts  |   3 +-
 .../migrations/1712074131388_priority.ts      |  32 +++++
 packages/server/utils/publish.ts              |   6 +-
 scripts/webpack/dev.servers.config.js         |   3 +-
 yarn.lock                                     |  37 +++---
 46 files changed, 1077 insertions(+), 451 deletions(-)
 delete mode 100644 packages/embedder/EMBEDDER_JOB_PRIORITY.ts
 create mode 100644 packages/embedder/EmbedderJobType.ts
 create mode 100644 packages/embedder/JobQueueError.ts
 create mode 100644 packages/embedder/WorkflowOrchestrator.ts
 create mode 100644 packages/embedder/debug.ts
 create mode 100644 packages/embedder/getEmbedderPriority.ts
 delete mode 100644 packages/embedder/indexing/failJob.ts
 create mode 100644 packages/embedder/inferLanguage.ts
 create mode 100644 packages/embedder/insertDiscussionsIntoMetadataAndQueue.ts
 create mode 100644 packages/embedder/logPerformance.ts
 delete mode 100644 packages/embedder/processJob.ts
 delete mode 100644 packages/embedder/processJobEmbed.ts
 create mode 100644 packages/embedder/regex.ts
 create mode 100644 packages/embedder/workflows/embedMetadata.ts
 create mode 100644 packages/embedder/workflows/getSimilarRetroTopics.ts
 create mode 100644 packages/embedder/workflows/helpers/getRerankedEmbeddingsFromChunks.ts
 create mode 100644 packages/embedder/workflows/helpers/publishSimilarRetroTopics.ts
 create mode 100644 packages/embedder/workflows/relatedDiscussionsStart.ts
 create mode 100644 packages/embedder/workflows/rerankRetroTopics.ts
 create mode 100644 packages/server/postgres/migrations/1712074131388_priority.ts

diff --git a/package.json b/package.json
index 4c634718ee7..277c5ee433b 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "minimist": "^1.2.5",
     "node-loader": "^2.0.0",
     "pg-promise": "^11.2.0",
-    "pm2": "^5.3.0",
+    "pm2": "^5.3.1",
     "postcss": "^8.4.21",
     "postcss-loader": "^7.0.2",
     "prettier": "^3.2.5",
diff --git a/packages/client/components/RetroDrawerRoot.tsx b/packages/client/components/RetroDrawerRoot.tsx
index 58bf63544ff..cb2698bbbe3 100644
--- a/packages/client/components/RetroDrawerRoot.tsx
+++ b/packages/client/components/RetroDrawerRoot.tsx
@@ -1,6 +1,6 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import retroDrawerQuery, {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import RetroDrawer from './RetroDrawer'
 
 type Props = {
@@ -12,7 +12,7 @@ type Props = {
 const RetroDrawerRoot = (props: Props) => {
   const {showDrawer, setShowDrawer, meetingId} = props
   const queryRef = useQueryLoaderNow<RetroDrawerQuery>(retroDrawerQuery, {
-    first: 200,
+    first: 2000,
     type: 'retrospective',
     meetingId
   })
diff --git a/packages/embedder/EMBEDDER_JOB_PRIORITY.ts b/packages/embedder/EMBEDDER_JOB_PRIORITY.ts
deleted file mode 100644
index a54e4b5c67d..00000000000
--- a/packages/embedder/EMBEDDER_JOB_PRIORITY.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const EMBEDDER_JOB_PRIORITY = {
-  MEETING: 40,
-  DEFAULT: 50,
-  TOPIC_HISTORY: 80,
-  NEW_MODEL: 90
-} as const
diff --git a/packages/embedder/EmbedderJobType.ts b/packages/embedder/EmbedderJobType.ts
new file mode 100644
index 00000000000..788731ff56f
--- /dev/null
+++ b/packages/embedder/EmbedderJobType.ts
@@ -0,0 +1,10 @@
+import {JobType} from './custom'
+
+type SplitJobType<T extends string> = T extends `${infer W}:${infer S}` ? [W, S] : never
+export const EmbedderJobType = {
+  join: (workflowName: string, stepName: string) => `${workflowName}:${stepName}` as JobType,
+  split: (jobType: JobType) => {
+    const [workflowName, stepName] = jobType.split(':') as SplitJobType<typeof jobType>
+    return {workflowName, stepName}
+  }
+}
diff --git a/packages/embedder/EmbeddingsJobQueueStream.ts b/packages/embedder/EmbeddingsJobQueueStream.ts
index 64f7de936dd..cb995821f4b 100644
--- a/packages/embedder/EmbeddingsJobQueueStream.ts
+++ b/packages/embedder/EmbeddingsJobQueueStream.ts
@@ -1,31 +1,22 @@
-import {Selectable, sql} from 'kysely'
+import {sql} from 'kysely'
 import ms from 'ms'
 import sleep from 'parabol-client/utils/sleep'
 import 'parabol-server/initSentry'
 import getKysely from 'parabol-server/postgres/getKysely'
-import {DB} from 'parabol-server/postgres/pg'
-import RootDataLoader from '../server/dataloader/RootDataLoader'
-import {processJob} from './processJob'
 import {Logger} from '../server/utils/Logger'
-import {EmbeddingsTableName} from './ai_models/AbstractEmbeddingsModel'
+import {WorkflowOrchestrator} from './WorkflowOrchestrator'
+import {DBJob} from './custom'
 
-export type DBJob = Selectable<DB['EmbeddingsJobQueue']>
-export type EmbedJob = DBJob & {
-  jobType: 'embed'
-  jobData: {
-    embeddingsMetadataId: number
-    model: EmbeddingsTableName
-  }
-}
-export type RerankJob = DBJob & {jobType: 'rerank'; jobData: {discussionIds: string[]}}
-export type Job = EmbedJob | RerankJob
-
-export class EmbeddingsJobQueueStream implements AsyncIterableIterator<Job> {
+export class EmbeddingsJobQueueStream implements AsyncIterableIterator<DBJob> {
   [Symbol.asyncIterator]() {
     return this
   }
-  dataLoader = new RootDataLoader({maxBatchSize: 1000})
-  async next(): Promise<IteratorResult<Job>> {
+
+  orchestrator: WorkflowOrchestrator
+  constructor(orchestrator: WorkflowOrchestrator) {
+    this.orchestrator = orchestrator
+  }
+  async next(): Promise<IteratorResult<DBJob>> {
     const pg = getKysely()
     const getJob = (isFailed: boolean) => {
       return pg
@@ -54,20 +45,17 @@ export class EmbeddingsJobQueueStream implements AsyncIterableIterator<Job> {
     if (!job) {
       Logger.log('JobQueueStream: no jobs found')
       // queue is empty, so sleep for a while
-      await sleep(ms('1m'))
+      await sleep(ms('10s'))
       return this.next()
     }
 
-    const isSuccessful = await processJob(job as Job, this.dataLoader)
-    if (isSuccessful) {
-      await pg.deleteFrom('EmbeddingsJobQueue').where('id', '=', job.id).executeTakeFirstOrThrow()
-    }
-    return {done: false, value: job as Job}
+    await this.orchestrator.runStep(job)
+    return {done: false, value: job}
   }
   return() {
     return Promise.resolve({done: true as const, value: undefined})
   }
   throw(error: any) {
-    return Promise.resolve({done: true, value: error})
+    return Promise.resolve({done: true as const, value: error})
   }
 }
diff --git a/packages/embedder/JobQueueError.ts b/packages/embedder/JobQueueError.ts
new file mode 100644
index 00000000000..9f88425f3e7
--- /dev/null
+++ b/packages/embedder/JobQueueError.ts
@@ -0,0 +1,19 @@
+export class JobQueueError extends Error {
+  name = 'JobQueueError' as const
+  retryDelay?: number
+  maxRetries?: number
+  jobData?: Record<string, any>
+
+  constructor(
+    message: string,
+    retryDelay?: number,
+    maxRetries?: number,
+    jobData?: Record<string, any>
+  ) {
+    super(message)
+    this.message = message
+    this.retryDelay = retryDelay
+    this.maxRetries = maxRetries
+    this.jobData = jobData
+  }
+}
diff --git a/packages/embedder/WorkflowOrchestrator.ts b/packages/embedder/WorkflowOrchestrator.ts
new file mode 100644
index 00000000000..704320542be
--- /dev/null
+++ b/packages/embedder/WorkflowOrchestrator.ts
@@ -0,0 +1,117 @@
+import {sql} from 'kysely'
+import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {Logger} from '../server/utils/Logger'
+import {EmbedderJobType} from './EmbedderJobType'
+import {JobQueueError} from './JobQueueError'
+import {DBJob, JobType, Workflow} from './custom'
+import {embedMetadata} from './workflows/embedMetadata'
+import {getSimilarRetroTopics} from './workflows/getSimilarRetroTopics'
+import {relatedDiscussionsStart} from './workflows/relatedDiscussionsStart'
+import {rerankRetroTopics} from './workflows/rerankRetroTopics'
+
+export class WorkflowOrchestrator {
+  workflows: Record<string, Workflow> = {
+    embed: {
+      start: {
+        run: embedMetadata
+      }
+    },
+    relatedDiscussions: {
+      start: {
+        run: relatedDiscussionsStart,
+        getNextStep: () => 'embed'
+      },
+      embed: {
+        run: embedMetadata,
+        getNextStep: () => 'getSimilarRetroTopics'
+      },
+      getSimilarRetroTopics: {
+        run: getSimilarRetroTopics,
+        getNextStep: () => 'rerank'
+      },
+      rerank: {
+        run: rerankRetroTopics
+      }
+    }
+  }
+
+  private failJob = async (jobId: number, retryCount: number, error: JobQueueError) => {
+    Logger.error(error)
+    const pg = getKysely()
+    const {message, retryDelay, jobData} = error
+    const maxRetries = error.maxRetries ?? 1e6
+    await pg
+      .updateTable('EmbeddingsJobQueue')
+      .set((eb) => ({
+        state: 'failed',
+        stateMessage: message,
+        retryCount: eb('retryCount', '+', 1),
+        retryAfter:
+          retryDelay && retryCount < maxRetries ? new Date(Date.now() + retryDelay) : null,
+        jobData: jobData ? sql`jsonb_concat("jobData", ${JSON.stringify({jobData})})` : undefined
+      }))
+      .where('id', '=', jobId)
+      .executeTakeFirstOrThrow()
+  }
+
+  private finishJob = async (jobId: number) => {
+    const pg = getKysely()
+    await pg.deleteFrom('EmbeddingsJobQueue').where('id', '=', jobId).executeTakeFirstOrThrow()
+  }
+
+  private addNextJob = async (
+    jobType: JobType,
+    priority: number,
+    data: Record<string, any> | Record<string, any>[]
+  ) => {
+    const pg = getKysely()
+    const getValues = (datum: any, idx = 0) => {
+      const {embeddingsMetadataId, model, ...jobData} = datum
+      return {
+        jobType,
+        // increment by idx so the first item goes first
+        priority: priority + idx,
+        embeddingsMetadataId,
+        model,
+        jobData: JSON.stringify(jobData)
+      }
+    }
+    const values = Array.isArray(data) ? data.map(getValues) : getValues(data)
+    await pg.insertInto('EmbeddingsJobQueue').values(values).execute()
+  }
+
+  runStep = async (job: DBJob) => {
+    const {id: jobId, jobData, jobType, priority, retryCount, embeddingsMetadataId, model} = job
+    const {workflowName, stepName} = EmbedderJobType.split(jobType)
+    const workflow = this.workflows[workflowName]
+    if (!workflow)
+      return this.failJob(
+        jobId,
+        retryCount,
+        new JobQueueError(`Workflow ${workflowName} not found`)
+      )
+    const step = workflow[stepName]
+    if (!step)
+      return this.failJob(jobId, retryCount, new JobQueueError(`Step ${stepName} not found`))
+    const {run, getNextStep} = step
+    const dataLoader = new RootDataLoader()
+    let result: Awaited<ReturnType<typeof run>> = false
+    const data = {...jobData, embeddingsMetadataId, model}
+    try {
+      result = await run({dataLoader, data})
+    } catch (e) {
+      if (e instanceof Error) {
+        result = new JobQueueError(`Uncaught error: ${e.message}`)
+        result.stack = e.stack
+      }
+    }
+    if (result instanceof JobQueueError) return this.failJob(jobId, retryCount, result)
+    await this.finishJob(jobId)
+    if (result === false) return
+    const nextStepName = await getNextStep?.({dataLoader, data: {...data, ...result}})
+    if (!nextStepName) return
+    const nextJobType = EmbedderJobType.join(workflowName, nextStepName)
+    await this.addNextJob(nextJobType, priority, result)
+  }
+}
diff --git a/packages/embedder/addEmbeddingsMetadata.ts b/packages/embedder/addEmbeddingsMetadata.ts
index 214fecc0409..86b7801b288 100644
--- a/packages/embedder/addEmbeddingsMetadata.ts
+++ b/packages/embedder/addEmbeddingsMetadata.ts
@@ -1,7 +1,19 @@
 import {addEmbeddingsMetadataForRetrospectiveDiscussionTopic} from './addEmbeddingsMetadataForRetrospectiveDiscussionTopic'
-import {MessageToEmbedder} from './custom'
+import {EmbeddingObjectType} from './custom'
 
-export const addEmbeddingsMetadata = async ({objectTypes, ...options}: MessageToEmbedder) => {
+export type AddEmbeddingsMetadataParams = {
+  startAt?: Date
+  endAt?: Date
+}
+
+type AddEmbeddingsMetadataOptions = AddEmbeddingsMetadataParams & {
+  objectTypes: EmbeddingObjectType[]
+}
+
+export const addEmbeddingsMetadata = async ({
+  objectTypes,
+  ...options
+}: AddEmbeddingsMetadataOptions) => {
   return Promise.all(
     objectTypes.map((type) => {
       switch (type) {
diff --git a/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts b/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
index cd4489e3942..72bd3519779 100644
--- a/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
+++ b/packages/embedder/addEmbeddingsMetadataForRetrospectiveDiscussionTopic.ts
@@ -1,14 +1,13 @@
 import {ExpressionOrFactory, SqlBool, sql} from 'kysely'
 import getRethink from 'parabol-server/database/rethinkDriver'
 import {RDatum} from 'parabol-server/database/stricterR'
-import getKysely from 'parabol-server/postgres/getKysely'
 import {DB} from 'parabol-server/postgres/pg'
 import {Logger} from 'parabol-server/utils/Logger'
-import {EMBEDDER_JOB_PRIORITY} from './EMBEDDER_JOB_PRIORITY'
-import getModelManager from './ai_models/ModelManager'
-import {EmbedderOptions} from './custom'
+import getKysely from '../server/postgres/getKysely'
+import {AddEmbeddingsMetadataParams} from './addEmbeddingsMetadata'
+import {insertDiscussionsIntoMetadataAndQueue} from './insertDiscussionsIntoMetadataAndQueue'
 
-interface DiscussionMeta {
+export interface DiscussionMeta {
   id: string
   teamId: string
   createdAt: Date
@@ -29,79 +28,18 @@ const validateDiscussions = async (discussions: (DiscussionMeta & {meetingId: st
   return discussions.filter(({meetingId}) => endedMeetingIdsSet.has(meetingId))
 }
 
-const insertDiscussionsIntoMetadata = async (discussions: DiscussionMeta[], priority: number) => {
-  const pg = getKysely()
-  const metadataRows = discussions.map(({id, teamId, createdAt}) => ({
-    refId: id,
-    objectType: 'retrospectiveDiscussionTopic' as const,
-    teamId,
-    // Not techincally updatedAt since discussions are be updated after they get created
-    refUpdatedAt: createdAt
-  }))
-  if (!metadataRows[0]) return
-
-  const modelManager = getModelManager()
-  const tableNames = [...modelManager.embeddingModels.keys()]
-  return (
-    pg
-      .with('Insert', (qc) =>
-        qc
-          .insertInto('EmbeddingsMetadata')
-          .values(metadataRows)
-          .onConflict((oc) => oc.doNothing())
-          .returning('id')
-      )
-      // create n*m rows for n models & m discussions
-      .with('Metadata', (qc) =>
-        qc
-          .selectFrom('Insert')
-          .fullJoin(
-            sql<{model: string}>`UNNEST(ARRAY[${sql.join(tableNames)}])`.as('model'),
-            (join) => join.onTrue()
-          )
-          .select(['id', 'model'])
-      )
-      .insertInto('EmbeddingsJobQueue')
-      .columns(['jobType', 'priority', 'jobData'])
-      .expression(({selectFrom}) =>
-        selectFrom('Metadata').select(({lit, fn, ref}) => [
-          sql.lit('embed').as('jobType'),
-          lit(priority).as('priority'),
-          fn('json_build_object', [
-            sql.lit('embeddingsMetadataId'),
-            ref('Metadata.id'),
-            sql.lit('model'),
-            ref('Metadata.model')
-          ]).as('jobData')
-        ])
-      )
-      .execute()
-  )
-}
-
 export const addEmbeddingsMetadataForRetrospectiveDiscussionTopic = async ({
   startAt,
-  endAt,
-  meetingId
-}: EmbedderOptions) => {
-  // load up the metadata table will all discussion topics that are a part of meetings ended within the given date range
+  endAt
+}: AddEmbeddingsMetadataParams) => {
   const pg = getKysely()
-  if (meetingId) {
-    const discussions = await pg
-      .selectFrom('Discussion')
-      .select(['id', 'teamId', 'createdAt'])
-      .where('meetingId', '=', meetingId)
-      .execute()
-    await insertDiscussionsIntoMetadata(discussions, EMBEDDER_JOB_PRIORITY.MEETING)
-    return
-  }
   // PG only accepts 65K parameters (inserted columns * number of rows + query params). Make the batches as big as possible
   const PG_MAX_PARAMS = 65535
   const QUERY_PARAMS = 10
   const METADATA_COLS_PER_ROW = 4
   const BATCH_SIZE = Math.floor((PG_MAX_PARAMS - QUERY_PARAMS) / METADATA_COLS_PER_ROW)
   const pgStartAt = startAt || new Date(0)
-  const pgEndAt = (endAt || new Date('4000-01-01')).getTime() / 1000
+  const pgEndAt = (endAt || new Date('4000')).getTime() / 1000
 
   let curEndAt = pgEndAt
   let curEndId = ''
@@ -135,7 +73,7 @@ export const addEmbeddingsMetadataForRetrospectiveDiscussionTopic = async ({
     curEndId = curEndAt === createdAtEpoch ? id : ''
     curEndAt = createdAtEpoch
     const validDiscussions = await validateDiscussions(discussions)
-    await insertDiscussionsIntoMetadata(validDiscussions, EMBEDDER_JOB_PRIORITY.TOPIC_HISTORY)
+    await insertDiscussionsIntoMetadataAndQueue(validDiscussions, 5)
     const jsTime = new Date(createdAtEpoch * 1000)
     Logger.log(
       `Inserted ${validDiscussions.length}/${discussions.length} discussions in metadata ending at ${jsTime}`
diff --git a/packages/embedder/ai_models/AbstractEmbeddingsModel.ts b/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
index f9fb669737d..daa19fad9aa 100644
--- a/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
+++ b/packages/embedder/ai_models/AbstractEmbeddingsModel.ts
@@ -3,8 +3,9 @@ import getKysely from 'parabol-server/postgres/getKysely'
 import {DB} from 'parabol-server/postgres/pg'
 import isValid from '../../server/graphql/isValid'
 import {Logger} from '../../server/utils/Logger'
-import {EMBEDDER_JOB_PRIORITY} from '../EMBEDDER_JOB_PRIORITY'
+import {getEmbedderPriority} from '../getEmbedderPriority'
 import {ISO6391} from '../iso6393To1'
+import {URLRegex} from '../regex'
 import {AbstractModel} from './AbstractModel'
 
 export interface EmbeddingModelParams {
@@ -19,7 +20,7 @@ export type EmbeddingsTable = Extract<keyof DB, EmbeddingsTableName>
 export abstract class AbstractEmbeddingsModel extends AbstractModel {
   readonly embeddingDimensions: number
   readonly maxInputTokens: number
-  readonly tableName: EmbeddingsTableName
+  readonly tableName: EmbeddingsTable
   readonly languages: ISO6391[]
   constructor(modelId: string, url: string) {
     super(url)
@@ -27,22 +28,30 @@ export abstract class AbstractEmbeddingsModel extends AbstractModel {
     this.embeddingDimensions = modelParams.embeddingDimensions
     this.languages = modelParams.languages
     this.maxInputTokens = modelParams.maxInputTokens
-    this.tableName = `Embeddings_${modelParams.tableSuffix}`
+    this.tableName = `Embeddings_${modelParams.tableSuffix}` as EmbeddingsTable
   }
   protected abstract constructModelParams(modelId: string): EmbeddingModelParams
   abstract getEmbedding(content: string, retries?: number): Promise<number[] | Error>
 
   abstract getTokens(content: string): Promise<number[] | Error>
 
+  private normalizeContent = (content: string, truncateUrls: boolean) => {
+    if (!truncateUrls) return content.trim()
+    // pathname & search can include a lot of garbage that doesn't help the meaning
+    return content.trim().replaceAll(URLRegex, (match) => new URL(match).origin)
+  }
+
   async chunkText(content: string) {
-    const tokens = await this.getTokens(content)
+    const AVG_CHARS_PER_TOKEN = 20
+    const maxContentLength = this.maxInputTokens * AVG_CHARS_PER_TOKEN
+    const tokens = content.length < maxContentLength ? await this.getTokens(content) : -1
     if (tokens instanceof Error) return tokens
-    const isFullTextTooBig = tokens.length > this.maxInputTokens
+    const isFullTextTooBig = tokens === -1 || tokens.length > this.maxInputTokens
     if (!isFullTextTooBig) return [content]
-
-    for (let i = 0; i < 3; i++) {
+    const normalizedContent = this.normalizeContent(content, true)
+    for (let i = 0; i < 5; i++) {
       const tokensPerWord = (4 + i) / 3
-      const chunks = this.splitText(content, tokensPerWord)
+      const chunks = this.splitText(normalizedContent, tokensPerWord)
       const chunkLengths = await Promise.all(
         chunks.map(async (chunk) => {
           const chunkTokens = await this.getTokens(chunk)
@@ -60,27 +69,30 @@ export abstract class AbstractEmbeddingsModel extends AbstractModel {
         return chunks
       }
     }
-    return new Error(`Text is too long and could not be split into chunks. Is it english?`)
+    return new Error(`Text could not be chunked. The tokenizer cannot support this content.`)
   }
   // private because result must still be too long to go into model. Must verify with getTokens
   private splitText(content: string, tokensPerWord = 4 / 3) {
-    // it's actually 4 / 3, but don't want to chance a failed split
     const WORD_LIMIT = Math.floor(this.maxInputTokens / tokensPerWord)
+    // account for junk data with excessively long words
+    const charLimit = WORD_LIMIT * 100
     const chunks: string[] = []
-    const delimiters = ['\n\n', '\n', '.', ' ']
+    const delimiters = ['\n\n', '\n', '.', ' '] as const
     const countWords = (text: string) => text.trim().split(/\s+/).length
-    const splitOnDelimiter = (text: string, delimiter: string) => {
+    const splitOnDelimiter = (text: string, delimiter: (typeof delimiters)[number]) => {
       const sections = text.split(delimiter)
       for (let i = 0; i < sections.length; i++) {
         const section = sections[i]!
+        // account for multiple delimiters in a row
+        if (section.length === 0) continue
         const sectionWordCount = countWords(section)
-        if (sectionWordCount < WORD_LIMIT) {
+        if (sectionWordCount < WORD_LIMIT && section.length < charLimit) {
           // try to merge this section with the last one
           const previousSection = chunks.at(-1)
           if (previousSection) {
             const combinedChunks = `${previousSection}${delimiter}${section}`
             const mergedWordCount = countWords(combinedChunks)
-            if (mergedWordCount < WORD_LIMIT) {
+            if (mergedWordCount < WORD_LIMIT && combinedChunks.length < charLimit) {
               chunks[chunks.length - 1] = combinedChunks
               continue
             }
@@ -92,26 +104,24 @@ export abstract class AbstractEmbeddingsModel extends AbstractModel {
         }
       }
     }
-    splitOnDelimiter(content.trim(), delimiters[0]!)
+    splitOnDelimiter(content, delimiters[0])
     return chunks
   }
 
   async createEmbeddingsForModel() {
     Logger.log(`Queueing EmbeddingsMetadata into EmbeddingsJobQueue for ${this.tableName}`)
     const pg = getKysely()
+    const priority = getEmbedderPriority(10)
     await pg
       .insertInto('EmbeddingsJobQueue')
-      .columns(['jobData', 'priority'])
+      .columns(['jobType', 'priority', 'embeddingsMetadataId', 'model'])
       .expression(({selectFrom}) =>
         selectFrom('EmbeddingsMetadata')
-          .select(({fn, lit}) => [
-            fn('json_build_object', [
-              sql.lit('model'),
-              sql.lit(this.tableName),
-              sql.lit('embeddingsMetadataId'),
-              'id'
-            ]).as('jobData'),
-            lit(EMBEDDER_JOB_PRIORITY.NEW_MODEL).as('priority')
+          .select(({lit, ref}) => [
+            sql.lit('embed:start').as('jobType'),
+            lit(priority).as('priority'),
+            ref('id').as('embeddingsMetadataId'),
+            sql.lit(this.tableName).as('model')
           ])
           .where('language', 'in', this.languages)
       )
@@ -136,9 +146,9 @@ export abstract class AbstractEmbeddingsModel extends AbstractModel {
           "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
           "embedText" TEXT,
           "embedding" vector(${sql.raw(vectorDimensions.toString())}),
-          "embeddingsMetadataId" INTEGER UNIQUE NOT NULL,
+          "embeddingsMetadataId" INTEGER NOT NULL,
           "chunkNumber" SMALLINT,
-          UNIQUE("embeddingsMetadataId", "chunkNumber"),
+          UNIQUE NULLS NOT DISTINCT("embeddingsMetadataId", "chunkNumber"),
           FOREIGN KEY ("embeddingsMetadataId")
             REFERENCES "EmbeddingsMetadata"("id")
             ON DELETE CASCADE
diff --git a/packages/embedder/ai_models/ModelManager.ts b/packages/embedder/ai_models/ModelManager.ts
index bbbfa4f6273..09091499121 100644
--- a/packages/embedder/ai_models/ModelManager.ts
+++ b/packages/embedder/ai_models/ModelManager.ts
@@ -15,6 +15,11 @@ export interface ModelConfig {
 export class ModelManager {
   embeddingModels: Map<EmbeddingsTableName, AbstractEmbeddingsModel>
   generationModels: Map<string, AbstractGenerationModel>
+  getEmbedder(tableName?: EmbeddingsTableName): AbstractEmbeddingsModel {
+    return tableName
+      ? this.embeddingModels.get(tableName)
+      : this.embeddingModels.values().next().value
+  }
 
   private parseModelEnvVars(envVar: 'AI_EMBEDDING_MODELS' | 'AI_GENERATION_MODELS'): ModelConfig[] {
     const envValue = process.env[envVar]
diff --git a/packages/embedder/ai_models/TextEmbeddingsInference.ts b/packages/embedder/ai_models/TextEmbeddingsInference.ts
index 1a2a02596b3..594f9dcf1ce 100644
--- a/packages/embedder/ai_models/TextEmbeddingsInference.ts
+++ b/packages/embedder/ai_models/TextEmbeddingsInference.ts
@@ -1,4 +1,4 @@
-import createClient from 'openapi-fetch'
+import createClient, {ClientMethod} from 'openapi-fetch'
 import sleep from 'parabol-client/utils/sleep'
 import type {paths} from '../textEmbeddingsnterface'
 import {AbstractEmbeddingsModel, EmbeddingModelParams} from './AbstractEmbeddingsModel'
@@ -19,62 +19,68 @@ const modelIdDefinitions: Record<ModelId, EmbeddingModelParams> = {
   }
 }
 
-export class TextEmbeddingsInference extends AbstractEmbeddingsModel {
-  client: ReturnType<typeof createClient<paths>>
-  constructor(modelId: string, url: string) {
-    super(modelId, url)
-    this.client = createClient<paths>({baseUrl: this.url})
-  }
-
-  async getTokens(content: string) {
+const openAPIWithTimeout =
+  (client: ClientMethod<any, any>, toError: (error: unknown) => any, timeout: number) =>
+  async (...args: Parameters<ClientMethod<any, any>>) => {
+    const controller = new AbortController()
+    const {signal} = controller
+    const timeoutId = setTimeout(() => {
+      controller.abort(new Error('Timeout'))
+    }, timeout)
+    const [route, requestInit] = args
+    let response: any
     try {
-      const {data, error} = await this.client.POST('/tokenize', {
-        body: {inputs: content, add_special_tokens: true},
+      response = await client(route, {
+        signal,
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json; charset=utf-8'
-        }
+        },
+        ...requestInit
       })
-      if (error) return new Error(error.error)
-      return data[0]!.map(({id}) => id)
+      clearTimeout(timeoutId)
+      return response
     } catch (e) {
-      return e instanceof Error ? e : new Error(e as string)
+      const error = toError(e)
+      return {error}
     }
   }
 
+export class TextEmbeddingsInference extends AbstractEmbeddingsModel {
+  client: ReturnType<typeof createClient<paths>>
+  constructor(modelId: string, url: string) {
+    super(modelId, url)
+    const client = createClient<paths>({baseUrl: this.url})
+    const toError = (e: unknown) => ({error: e instanceof Error ? e.message : e})
+    client.GET = openAPIWithTimeout(client.GET, toError, 10000)
+    client.POST = openAPIWithTimeout(client.POST, toError, 10000)
+    this.client = client
+  }
+  async getTokens(content: string) {
+    const {data, error} = await this.client.POST('/tokenize', {
+      body: {add_special_tokens: true, inputs: content}
+    })
+    if (error) return new Error(error.error)
+    return data[0]!.map(({id}) => id)
+  }
+
   async decodeTokens(inputIds: number[]) {
-    try {
-      const {data, error} = await this.client.POST('/decode', {
-        body: {ids: inputIds},
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json; charset=utf-8'
-        }
-      })
-      if (error) return new Error(error.error)
-      return data
-    } catch (e) {
-      return e instanceof Error ? e : new Error(e as string)
-    }
+    const {data, error} = await this.client.POST('/decode', {
+      body: {ids: inputIds}
+    })
+    if (error) return new Error(error.error)
+    return data
   }
   public async getEmbedding(content: string, retries = 5): Promise<number[] | Error> {
-    try {
-      const {data, error, response} = await this.client.POST('/embed', {
-        body: {inputs: content},
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json; charset=utf-8'
-        }
-      })
-      if (error) {
-        if (response.status !== 429 || retries < 1) return new Error(error.error)
-        await sleep(2000)
-        return this.getEmbedding(content, retries - 1)
-      }
-      return data[0]!
-    } catch (e) {
-      return e instanceof Error ? e : new Error(e as string)
+    const {data, error, response} = await this.client.POST('/embed', {
+      body: {inputs: content}
+    })
+    if (error) {
+      if (response.status !== 429 || retries < 1) return new Error(error.error)
+      await sleep(2000)
+      return this.getEmbedding(content, retries - 1)
     }
+    return data[0]!
   }
 
   protected constructModelParams(modelId: string): EmbeddingModelParams {
diff --git a/packages/embedder/custom.d.ts b/packages/embedder/custom.d.ts
index 6640974c6a9..b051eb3e4b3 100644
--- a/packages/embedder/custom.d.ts
+++ b/packages/embedder/custom.d.ts
@@ -1,11 +1,29 @@
+import {DataLoaderInstance} from '../server/dataloader/RootDataLoader'
 import type {DB} from '../server/postgres/pg'
+import {JobQueueError} from './JobQueueError'
 
 export type EmbeddingObjectType = DB['EmbeddingsMetadata']['objectType']
 
-export interface MessageToEmbedder {
-  objectTypes: EmbeddingObjectType[]
-  startAt?: Date
-  endAt?: Date
-  meetingId?: string
+type GetInputData<T> = T extends JobQueueStepRun<infer U> ? U : never
+export type ParentJob<T> = GetInputData<T> | GetInputData<T>[]
+
+interface StepContext<TData> {
+  dataLoader: DataLoaderInstance
+  data: TData
 }
-export type EmbedderOptions = Omit<MessageToEmbedder, 'objectTypes'>
+
+type StepResult = Record<string, unknown> | Record<string, unknown>[]
+export type JobQueueStepRun<TData, TResult = StepResult> = (
+  context: StepContext<TData>
+  // false if the job completed without error, but the flow should not continue
+  // e.g. could not create an embeddings because there wasn't enough text or it was in Russian
+) => Promise<TResult | JobQueueError | false>
+
+interface JobQueueStep<TData, TResult = StepResult> {
+  run: JobQueueStepRun<TData, TResult>
+  getNextStep?: (result: StepContext<TResult>) => string | Promise<string>
+}
+
+export type JobType = `${string}:${string}`
+export type Workflow = Record<string, JobQueueStep<any>>
+export type DBJob = Selectable<DB['EmbeddingsJobQueue']>
diff --git a/packages/embedder/debug.ts b/packages/embedder/debug.ts
new file mode 100644
index 00000000000..7edd0a011f6
--- /dev/null
+++ b/packages/embedder/debug.ts
@@ -0,0 +1,29 @@
+// call with yarn sucrase-node billing/debug.ts
+import '../../scripts/webpack/utils/dotenv'
+import getKysely from '../server/postgres/getKysely'
+import {WorkflowOrchestrator} from './WorkflowOrchestrator'
+
+const debugFailedJob = async () => {
+  const pg = getKysely()
+  const failedJob = await pg
+    .selectFrom('EmbeddingsJobQueue')
+    .selectAll()
+    .orderBy(['priority'])
+    .where('state', '=', 'failed')
+    .limit(1)
+    .executeTakeFirst()
+
+  if (!failedJob) {
+    console.log('No failed jobs found')
+    return
+  }
+
+  console.log('Debugging job:', failedJob.id)
+  const orch = new WorkflowOrchestrator()
+  await orch.runStep(failedJob as any)
+  // const man = getModelManager()
+  // const model = man.embeddingModels.get('Embeddings_ember_1')
+  // const res = await model?.chunkText('hey there')
+}
+
+debugFailedJob()
diff --git a/packages/embedder/embedder.ts b/packages/embedder/embedder.ts
index 7971ba4f717..e89a7b60a97 100644
--- a/packages/embedder/embedder.ts
+++ b/packages/embedder/embedder.ts
@@ -1,16 +1,14 @@
 import tracer from 'dd-trace'
-import EmbedderChannelId from 'parabol-client/shared/gqlIds/EmbedderChannelId'
 import 'parabol-server/initSentry'
 import {Logger} from 'parabol-server/utils/Logger'
 import RedisInstance from 'parabol-server/utils/RedisInstance'
 import {Tuple} from '../client/types/generics'
-import RedisStream from '../gql-executor/RedisStream'
 import {EmbeddingsJobQueueStream} from './EmbeddingsJobQueueStream'
-import {addEmbeddingsMetadata} from './addEmbeddingsMetadata'
+import {WorkflowOrchestrator} from './WorkflowOrchestrator'
 import getModelManager from './ai_models/ModelManager'
-import {MessageToEmbedder} from './custom'
 import {establishPrimaryEmbedder} from './establishPrimaryEmbedder'
 import {importHistoricalMetadata} from './importHistoricalMetadata'
+import {logPerformance} from './logPerformance'
 import {mergeAsyncIterators} from './mergeAsyncIterators'
 import {resetStalledJobs} from './resetStalledJobs'
 
@@ -22,19 +20,9 @@ tracer.init({
 })
 tracer.use('pg')
 
-const parseEmbedderMessage = (message: string): MessageToEmbedder => {
-  const {startAt, endAt, ...input} = JSON.parse(message)
-  return {
-    ...input,
-    startAt: startAt ? new Date(startAt) : undefined,
-    endAt: endAt ? new Date(endAt) : undefined
-  }
-}
-
 const run = async () => {
   const SERVER_ID = process.env.SERVER_ID
   if (!SERVER_ID) throw new Error('env.SERVER_ID is required')
-  const embedderChannel = EmbedderChannelId.join(SERVER_ID)
   const NUM_WORKERS = parseInt(process.env.AI_EMBEDDER_WORKERS!)
   if (!(NUM_WORKERS > 0)) {
     Logger.log('env.AI_EMBEDDER_WORKERS is < 0. Embedder will not run.')
@@ -44,14 +32,6 @@ const run = async () => {
   const redis = new RedisInstance(`embedder_${SERVER_ID}`)
   const primaryLock = await establishPrimaryEmbedder(redis)
   const modelManager = getModelManager()
-  let streams: AsyncIterableIterator<any> | undefined = undefined
-  const kill = () => {
-    primaryLock?.release()
-    streams?.return?.()
-    process.exit()
-  }
-  process.on('SIGTERM', kill)
-  process.on('SIGINT', kill)
   if (primaryLock) {
     // only 1 worker needs to perform these on startup
     await modelManager.maybeCreateTables()
@@ -59,48 +39,30 @@ const run = async () => {
     resetStalledJobs()
   }
 
-  const onMessage = async (_channel: string, message: string) => {
-    const parsedMessage = parseEmbedderMessage(message)
-    await addEmbeddingsMetadata(parsedMessage)
-  }
-
-  // subscribe to consumer group
-  try {
-    await redis.xgroup(
-      'CREATE',
-      'embedMetadataStream',
-      'embedMetadataConsumerGroup',
-      '$',
-      'MKSTREAM'
-    )
-  } catch (e) {
-    // stream already exists
-  }
-
-  const messageStream = new RedisStream(
-    'embedMetadataStream',
-    'embedMetadataConsumerGroup',
-    embedderChannel
-  )
-
+  const orchestrator = new WorkflowOrchestrator()
   // Assume 3 workers for type safety, but it doesn't really matter at runtime
   const jobQueueStreams = Array.from(
     {length: NUM_WORKERS},
-    () => new EmbeddingsJobQueueStream()
+    () => new EmbeddingsJobQueueStream(orchestrator)
   ) as Tuple<EmbeddingsJobQueueStream, 3>
+  const streams = mergeAsyncIterators(jobQueueStreams)
+
+  const kill: NodeJS.SignalsListener = (signal) => {
+    Logger.log(`Kill signal received: ${signal}`)
+    primaryLock?.release()
+    streams.return?.()
+    process.exit()
+  }
+  process.on('SIGTERM', kill)
+  process.on('SIGINT', kill)
 
   Logger.log(`\n⚡⚡⚡️️ Server ID: ${SERVER_ID}. Embedder is ready ⚡⚡⚡️️️`)
 
-  streams = mergeAsyncIterators([messageStream, ...jobQueueStreams])
-  for await (const [idx, message] of streams) {
-    switch (idx) {
-      case 0:
-        onMessage('', message)
-        continue
-      default:
-        Logger.log(`Worker ${idx} finished job ${message.id}`)
-        continue
-    }
+  const counter = logPerformance(10, 6)
+
+  for await (const _ of streams) {
+    // Logger.log(`Worker ${idx} finished job ${message.id}`)
+    counter.i++
   }
 
   // On graceful shutdown
diff --git a/packages/embedder/getEmbedderPriority.ts b/packages/embedder/getEmbedderPriority.ts
new file mode 100644
index 00000000000..ea0b0bad8e9
--- /dev/null
+++ b/packages/embedder/getEmbedderPriority.ts
@@ -0,0 +1,21 @@
+import ms from 'ms'
+/*
+The Job Queue has a first in first out (FIFO) strategy with a few exceptions:
+  - Realtime requests from the app should come before historal data processing
+  - Historical data processing should come before backfilling data for a new model
+Future use cases:
+  - Prioritize Enterprise/Pro users over free
+  - Deprioritize jobs for heavy users
+
+To achieve these goals we need some kind of clock, so we use a timestamp in Unix time (resolution in seconds)
+Postgres uses a signed 32-bit INT, so we subtract 2**31 to make use of the full range
+Otherwise, we could not schedule anything after 2**31-1, which is roughly the year 2038
+
+This allows us to provide a `maxDelayInDays` API, which is somewhat intuitive:
+e.g. Process realtime requests immediately, but start processing this historical data no later than 5 days from now.
+In 5 days, that historical data will be a higher priority than new realtime requests.
+*/
+export const getEmbedderPriority = (maxDelayInDays: number) => {
+  const maxDelayInSeconds = maxDelayInDays * ms('1d')
+  return -(2 ** 31) + ~~(Date.now() / 1000) + maxDelayInSeconds
+}
diff --git a/packages/embedder/indexing/createEmbeddingTextFrom.ts b/packages/embedder/indexing/createEmbeddingTextFrom.ts
index 9fb3cceda80..26083bd024c 100644
--- a/packages/embedder/indexing/createEmbeddingTextFrom.ts
+++ b/packages/embedder/indexing/createEmbeddingTextFrom.ts
@@ -1,16 +1,21 @@
 import {Selectable} from 'kysely'
 import {DB} from 'parabol-server/postgres/pg'
 
-import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
+import {DataLoaderInstance} from '../../server/dataloader/RootDataLoader'
 import {createTextFromRetrospectiveDiscussionTopic} from './retrospectiveDiscussionTopic'
 
 export const createEmbeddingTextFrom = async (
   embeddingsMetadata: Selectable<DB['EmbeddingsMetadata']>,
-  dataLoader: RootDataLoader
+  dataLoader: DataLoaderInstance,
+  isRerank?: boolean
 ) => {
   switch (embeddingsMetadata.objectType) {
     case 'retrospectiveDiscussionTopic':
-      return createTextFromRetrospectiveDiscussionTopic(embeddingsMetadata.refId, dataLoader)
+      return createTextFromRetrospectiveDiscussionTopic(
+        embeddingsMetadata.refId,
+        dataLoader,
+        isRerank
+      )
     default:
       throw new Error(`Unexcepted objectType: ${embeddingsMetadata.objectType}`)
   }
diff --git a/packages/embedder/indexing/failJob.ts b/packages/embedder/indexing/failJob.ts
deleted file mode 100644
index 17d293b49a9..00000000000
--- a/packages/embedder/indexing/failJob.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import getKysely from 'parabol-server/postgres/getKysely'
-import {Logger} from 'parabol-server/utils/Logger'
-
-export const failJob = async (jobId: number, stateMessage: string, retryAfter?: Date | null) => {
-  const pg = getKysely()
-  Logger.log(`embedder: failed job ${jobId}, ${stateMessage}`)
-  await pg
-    .updateTable('EmbeddingsJobQueue')
-    .set((eb) => ({
-      state: 'failed',
-      stateMessage,
-      retryCount: eb('retryCount', '+', 1),
-      retryAfter: retryAfter || null
-    }))
-    .where('id', '=', jobId)
-    .executeTakeFirstOrThrow()
-}
diff --git a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
index 5a9d1c423cc..0d6b8244e6a 100644
--- a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
+++ b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
@@ -1,8 +1,9 @@
-import {RethinkSchema} from 'parabol-server/database/rethinkDriver'
 import Comment from 'parabol-server/database/types/Comment'
 import {isMeetingRetrospective} from 'parabol-server/database/types/MeetingRetrospective'
-import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
+import {DataLoaderInstance} from 'parabol-server/dataloader/RootDataLoader'
 import prettier from 'prettier'
+import {inferLanguage} from '../inferLanguage'
+import {ISO6391} from '../iso6393To1'
 
 // Here's a generic reprentation of the text generated here:
 
@@ -20,15 +21,15 @@ import prettier from 'prettier'
 // </END IF DISCUSSION>
 
 const IGNORE_COMMENT_USER_IDS = ['parabolAIUser']
-
-async function getPreferredNameByUserId(userId: string, dataLoader: RootDataLoader) {
+const MAX_TEXT_LENGTH = 10000
+async function getPreferredNameByUserId(userId: string, dataLoader: DataLoaderInstance) {
   if (!userId) return 'Unknown'
   const user = await dataLoader.get('users').load(userId)
   return !user ? 'Unknown' : user.preferredName
 }
 
 async function formatThread(
-  dataLoader: RootDataLoader,
+  dataLoader: DataLoaderInstance,
   comments: Comment[],
   parentId: string | null = null,
   depth = 0
@@ -45,7 +46,7 @@ async function formatThread(
       ? 'Anonymous'
       : await getPreferredNameByUserId(comment.createdBy, dataLoader)
     const how = depth === 0 ? 'wrote' : 'replied'
-    const content = comment.plaintextContent
+    const content = comment.plaintextContent.slice(0, MAX_TEXT_LENGTH)
     const formattedPost = `${indent}- ${author} ${how}, "${content}"\n`
 
     // Recursively format child threads
@@ -60,7 +61,7 @@ async function formatThread(
 
 export const createTextFromRetrospectiveDiscussionTopic = async (
   discussionId: string,
-  dataLoader: RootDataLoader,
+  dataLoader: DataLoaderInstance,
   textForReranking: boolean = false
 ) => {
   const discussion = await dataLoader.get('discussions').load(discussionId)
@@ -72,23 +73,26 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
     dataLoader.get('retroReflectionsByGroupId').load(reflectionGroupId)
   ])
   if (!isMeetingRetrospective(newMeeting)) throw new Error('Meeting is not a retro')
-  const {templateId} = newMeeting
+  // It should never be undefined, but our data integrity in RethinkDB is bad
+  const templateId = newMeeting?.templateId ?? ''
 
   const promptIds = [...new Set(reflections.map((r) => r.promptId))]
   const [template, ...prompts] = await Promise.all([
-    dataLoader.get('meetingTemplates').loadNonNull(templateId),
+    dataLoader.get('meetingTemplates').load(templateId),
     ...promptIds.map((promptId) => dataLoader.get('reflectPrompts').load(promptId))
   ])
 
   let markdown = ''
+  const templateName = template?.name ?? 'Unknown'
   if (!textForReranking) {
     markdown =
       `A topic "${reflectionGroup?.title ?? ''}" was discussed during ` +
-      `the meeting "${newMeeting.name}" that followed the "${template.name}" template.\n` +
+      `the meeting "${newMeeting.name}" that followed the "${templateName}" template.\n` +
       `\n`
   }
 
   for (const prompt of prompts) {
+    if (!prompt) continue // RethinkDB bad data integrity
     if (!textForReranking) {
       markdown += `Participants were prompted with, "${prompt.question}`
       if (prompt.description) markdown += `: ${prompt.description}`
@@ -98,7 +102,10 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
       const author = newMeeting.disableAnonymity
         ? await getPreferredNameByUserId(reflection.creatorId, dataLoader)
         : 'Anonymous'
-      markdown += `   - ${author} wrote, "${reflection.plaintextContent}"\n`
+      markdown += `   - ${author} wrote, "${reflection.plaintextContent.slice(
+        0,
+        MAX_TEXT_LENGTH
+      )}"\n`
     }
     markdown += `\n`
   }
@@ -120,6 +127,7 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
    * objectType: 'retrospectiveDiscussionNoSummary' or something and do a bit of testing.
    */
 
+  let language: ISO6391 | undefined = undefined
   if (discussionSummary) {
     markdown += `Further discussion was made. ` + ` ${discussionSummary}`
   } else {
@@ -148,35 +156,20 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
       (c) => !IGNORE_COMMENT_USER_IDS.includes(c.createdBy)
     )
     if (filteredComments.length) {
-      markdown += `Futher discussion was made:\n`
+      markdown += `Further discussion was made:\n`
       markdown += await formatThread(dataLoader, filteredComments)
-      // TODO: if the discussion threads are too long, summarize them
+      const commentBlob = filteredComments.map((c) => c.plaintextContent).join(' ')
+      // it's common to reflect in english and comment in a native tongue
+      language = inferLanguage(commentBlob)
     }
   }
 
-  markdown = await prettier.format(markdown, {
+  const body = await prettier.format(markdown, {
     parser: 'markdown',
     proseWrap: 'always',
     printWidth: 72
   })
 
-  return markdown
-}
-
-export const newRetroDiscussionTopicsFromNewMeeting = async (
-  newMeeting: RethinkSchema['NewMeeting']['type'],
-  dataLoader: RootDataLoader
-) => {
-  const discussPhase = newMeeting.phases.find((phase) => phase.phaseType === 'discuss')
-  const orgId = (await dataLoader.get('teams').load(newMeeting.teamId))?.orgId
-  if (orgId && discussPhase && discussPhase.stages) {
-    return discussPhase.stages.map((stage) => ({
-      objectType: 'retrospectiveDiscussionTopic' as const,
-      teamId: newMeeting.teamId,
-      refId: `${newMeeting.id}:${stage.id}`,
-      refUpdatedAt: newMeeting.createdAt
-    }))
-  } else {
-    return []
-  }
+  language = language || inferLanguage(reflections.map((r) => r.plaintextContent).join(' '))
+  return {body, language}
 }
diff --git a/packages/embedder/inferLanguage.ts b/packages/embedder/inferLanguage.ts
new file mode 100644
index 00000000000..ffa94a4c532
--- /dev/null
+++ b/packages/embedder/inferLanguage.ts
@@ -0,0 +1,11 @@
+import franc from 'franc-min'
+import {ISO6391, iso6393To1} from './iso6393To1'
+import {URLRegex} from './regex'
+
+export const inferLanguage = (text: string, minLength = 100): ISO6391 | undefined => {
+  // URLs make foreign languages look English
+  const urlFreeText = text.replaceAll(URLRegex, '')
+  // if it's less than 100 chars, we probably don't care anyways
+  const iso6393 = franc(urlFreeText, {minLength})
+  return iso6393To1[iso6393 as keyof typeof iso6393To1]
+}
diff --git a/packages/embedder/insertDiscussionsIntoMetadataAndQueue.ts b/packages/embedder/insertDiscussionsIntoMetadataAndQueue.ts
new file mode 100644
index 00000000000..27f0b5db3d9
--- /dev/null
+++ b/packages/embedder/insertDiscussionsIntoMetadataAndQueue.ts
@@ -0,0 +1,56 @@
+import {sql} from 'kysely'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {DiscussionMeta} from './addEmbeddingsMetadataForRetrospectiveDiscussionTopic'
+import getModelManager from './ai_models/ModelManager'
+import {getEmbedderPriority} from './getEmbedderPriority'
+
+export const insertDiscussionsIntoMetadataAndQueue = async (
+  discussions: DiscussionMeta[],
+  maxDelayInDays: number
+) => {
+  const pg = getKysely()
+  const metadataRows = discussions.map(({id, teamId, createdAt}) => ({
+    refId: id,
+    objectType: 'retrospectiveDiscussionTopic' as const,
+    teamId,
+    // Not techincally updatedAt since discussions are updated after they get created
+    refUpdatedAt: createdAt
+  }))
+  if (!metadataRows[0]) return
+
+  const modelManager = getModelManager()
+  const tableNames = [...modelManager.embeddingModels.keys()]
+  const priority = getEmbedderPriority(maxDelayInDays)
+  // This is ugly but it runs fast, which is what we need for historical data
+  return (
+    pg
+      .with('Insert', (qc) =>
+        qc
+          .insertInto('EmbeddingsMetadata')
+          .values(metadataRows)
+          .onConflict((oc) => oc.doNothing())
+          .returning('id')
+      )
+      // create n*m rows for n models & m discussions
+      .with('Metadata', (qc) =>
+        qc
+          .selectFrom('Insert')
+          .fullJoin(
+            sql<{model: string}>`UNNEST(ARRAY[${sql.join(tableNames)}])`.as('model'),
+            (join) => join.onTrue()
+          )
+          .select(['id', 'model'])
+      )
+      .insertInto('EmbeddingsJobQueue')
+      .columns(['jobType', 'priority', 'embeddingsMetadataId', 'model'])
+      .expression(({selectFrom}) =>
+        selectFrom('Metadata').select(({lit, ref}) => [
+          sql.lit('embed:start').as('jobType'),
+          lit(priority).as('priority'),
+          ref('Metadata.id').as('embeddingsMetadataId'),
+          ref('Metadata.model').as('model')
+        ])
+      )
+      .execute()
+  )
+}
diff --git a/packages/embedder/logPerformance.ts b/packages/embedder/logPerformance.ts
new file mode 100644
index 00000000000..96742475db5
--- /dev/null
+++ b/packages/embedder/logPerformance.ts
@@ -0,0 +1,19 @@
+import {Logger} from '../server/utils/Logger'
+/*
+Every `logEvery` seconds log to the console the number of jobs completed per second for the last `resetEvery` logs
+*/
+export const logPerformance = (logEvery: number, resetEvery: number) => {
+  const counter = {i: 0}
+  let start = performance.now()
+  let logs = 0
+  setInterval(() => {
+    const duration = performance.now() - start
+    Logger.log(`Jobs per second: ${Math.round((counter.i / duration) * 1000)}`)
+    if (++logs >= resetEvery) {
+      counter.i = 0
+      logs = 0
+      start = performance.now()
+    }
+  }, logEvery * 1000)
+  return counter
+}
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 74bca7e11af..ca9ed2822a9 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -33,6 +33,7 @@
   "dependencies": {
     "dd-trace": "^4.2.0",
     "franc-min": "^5.0.0",
+    "ms": "^2.1.3",
     "redlock": "^5.0.0-beta.2"
   }
 }
diff --git a/packages/embedder/processJob.ts b/packages/embedder/processJob.ts
deleted file mode 100644
index 8723b75de6a..00000000000
--- a/packages/embedder/processJob.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
-import {Job} from './EmbeddingsJobQueueStream'
-import {processJobEmbed} from './processJobEmbed'
-
-export const processJob = async (job: Job, dataLoader: RootDataLoader) => {
-  const {jobType} = job
-  switch (jobType) {
-    case 'embed':
-      return processJobEmbed(job, dataLoader)
-    default:
-      throw new Error(`Invalid job type: ${jobType}`)
-  }
-}
diff --git a/packages/embedder/processJobEmbed.ts b/packages/embedder/processJobEmbed.ts
deleted file mode 100644
index d7fecf2aab0..00000000000
--- a/packages/embedder/processJobEmbed.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import franc from 'franc-min'
-import ms from 'ms'
-import RootDataLoader from 'parabol-server/dataloader/RootDataLoader'
-import getKysely from 'parabol-server/postgres/getKysely'
-import {EmbedJob} from './EmbeddingsJobQueueStream'
-import {EmbeddingsTable} from './ai_models/AbstractEmbeddingsModel'
-import getModelManager from './ai_models/ModelManager'
-import {createEmbeddingTextFrom} from './indexing/createEmbeddingTextFrom'
-import {failJob} from './indexing/failJob'
-import numberVectorToString from './indexing/numberVectorToString'
-import {iso6393To1} from './iso6393To1'
-
-export const processJobEmbed = async (job: EmbedJob, dataLoader: RootDataLoader) => {
-  const pg = getKysely()
-  const {id: jobId, retryCount, jobData} = job
-  const {embeddingsMetadataId, model} = jobData
-  const modelManager = getModelManager()
-
-  const metadata = await pg
-    .selectFrom('EmbeddingsMetadata')
-    .selectAll()
-    .where('id', '=', embeddingsMetadataId)
-    .executeTakeFirst()
-
-  if (!metadata) {
-    await failJob(jobId, `unable to fetch metadata by EmbeddingsJobQueue.id = ${jobId}`)
-    return
-  }
-
-  let {fullText, language} = metadata
-  try {
-    if (!fullText) {
-      fullText = await createEmbeddingTextFrom(metadata, dataLoader)
-      language = iso6393To1[franc(fullText) as keyof typeof iso6393To1]
-      await pg
-        .updateTable('EmbeddingsMetadata')
-        .set({fullText, language})
-        .where('id', '=', embeddingsMetadataId)
-        .execute()
-    }
-  } catch (e) {
-    // get the trace since the error message may be unobvious
-    console.trace(e)
-    await failJob(jobId, `unable to create embedding text: ${e}`)
-    return
-  }
-
-  const embeddingModel = modelManager.embeddingModels.get(model)
-  if (!embeddingModel) {
-    await failJob(jobId, `embedding model ${model} not available`)
-    return
-  }
-
-  // Exit successfully, we don't want to fail the job because the language is not supported
-  if (!embeddingModel.languages.includes(language!)) return true
-
-  const chunks = await embeddingModel.chunkText(fullText)
-  if (chunks instanceof Error) {
-    await failJob(
-      jobId,
-      `unable to get tokens: ${chunks.message}`,
-      retryCount < 10 ? new Date(Date.now() + ms('1m')) : null
-    )
-    return
-  }
-  // Cannot use summarization strategy if generation model has same context length as embedding model
-  // We must split the text & not tokens because BERT tokenizer is not trained for linebreaks e.g. \n\n
-  const isSuccessful = await Promise.all(
-    chunks.map(async (chunk, chunkNumber) => {
-      const embeddingVector = await embeddingModel.getEmbedding(chunk)
-      if (embeddingVector instanceof Error) {
-        await failJob(
-          jobId,
-          `unable to get embeddings: ${embeddingVector.message}`,
-          retryCount < 10 ? new Date(Date.now() + ms('1m')) : null
-        )
-        return false
-      }
-      await pg
-        // cast to any because these types won't be available in CI
-        .insertInto(embeddingModel.tableName as EmbeddingsTable)
-        .values({
-          // TODO is the extra space of a null embedText really worth it?!
-          embedText: chunks.length > 1 ? chunk : null,
-          embedding: numberVectorToString(embeddingVector),
-          embeddingsMetadataId,
-          chunkNumber: chunks.length > 1 ? chunkNumber : null
-        })
-        .onConflict((oc) =>
-          oc.column('embeddingsMetadataId').doUpdateSet((eb) => ({
-            embedText: eb.ref('excluded.embedText'),
-            embedding: eb.ref('excluded.embedding')
-          }))
-        )
-        .execute()
-      return true
-    })
-  )
-  // Logger.log(`Embedded ${embeddingsMetadataId} -> ${model}`)
-  return isSuccessful
-}
diff --git a/packages/embedder/regex.ts b/packages/embedder/regex.ts
new file mode 100644
index 00000000000..34a87e18344
--- /dev/null
+++ b/packages/embedder/regex.ts
@@ -0,0 +1,2 @@
+// grab the whole url, exclude <> for cases like <script src=https://bad.in></script>
+export const URLRegex = /https?:\/\/[^<>\s]*\b/g
diff --git a/packages/embedder/workflows/embedMetadata.ts b/packages/embedder/workflows/embedMetadata.ts
new file mode 100644
index 00000000000..4cba3ad6b90
--- /dev/null
+++ b/packages/embedder/workflows/embedMetadata.ts
@@ -0,0 +1,96 @@
+import ms from 'ms'
+import getKysely from 'parabol-server/postgres/getKysely'
+import {JobQueueError} from '../JobQueueError'
+import {EmbeddingsTableName} from '../ai_models/AbstractEmbeddingsModel'
+import getModelManager from '../ai_models/ModelManager'
+import {JobQueueStepRun, ParentJob} from '../custom'
+import {createEmbeddingTextFrom} from '../indexing/createEmbeddingTextFrom'
+import numberVectorToString from '../indexing/numberVectorToString'
+import {getSimilarRetroTopics} from './getSimilarRetroTopics'
+
+export const embedMetadata: JobQueueStepRun<
+  {
+    embeddingsMetadataId: number
+    model: EmbeddingsTableName
+    forceBuildText?: boolean
+  },
+  ParentJob<typeof getSimilarRetroTopics>
+> = async (context) => {
+  const {data, dataLoader} = context
+  const pg = getKysely()
+  const {embeddingsMetadataId, model, forceBuildText} = data
+  const modelManager = getModelManager()
+
+  const metadata = await dataLoader.get('embeddingsMetadata').load(embeddingsMetadataId)
+
+  if (!metadata) return new JobQueueError(`Invalid embeddingsMetadataId: ${embeddingsMetadataId}`)
+
+  if (!metadata.fullText || !metadata.language || forceBuildText) {
+    try {
+      const {body: fullText, language} = await createEmbeddingTextFrom(metadata, dataLoader)
+      metadata.fullText = fullText
+      metadata.language = language!
+      await pg
+        .updateTable('EmbeddingsMetadata')
+        .set({fullText, language})
+        .where('id', '=', embeddingsMetadataId)
+        .execute()
+    } catch (e) {
+      // get the trace since the error message may be unobvious
+      console.trace(e)
+      return new JobQueueError(`unable to create embedding text: ${e}`, undefined, 0, {
+        forceBuildText: true
+      })
+    }
+  }
+  const {fullText, language} = metadata
+
+  const embeddingModel = modelManager.getEmbedder(model)
+  if (!embeddingModel) {
+    return new JobQueueError(`embedding model ${model} not available`)
+  }
+  // Exit successfully, we don't want to fail the job because the language is not supported
+  if (!embeddingModel.languages.includes(language)) return false
+  const chunks = await embeddingModel.chunkText(fullText)
+  if (chunks instanceof Error) {
+    return new JobQueueError(`unable to get tokens: ${chunks.message}`, ms('1m'), 10, {
+      forceBuildText: true
+    })
+  }
+  // Cannot use summarization strategy if generation model has same context length as embedding model
+  // We must split the text & not tokens because BERT tokenizer is not trained for linebreaks e.g. \n\n
+  const errors = await Promise.all(
+    chunks.map(async (chunk, chunkNumber) => {
+      const embeddingVector = await embeddingModel.getEmbedding(chunk)
+      if (embeddingVector instanceof Error) {
+        return new JobQueueError(
+          `unable to get embeddings: ${embeddingVector.message}`,
+          ms('1m'),
+          10,
+          {forceBuildText: true}
+        )
+      }
+      await pg
+        // cast to any because these types won't be available in CI
+        .insertInto(embeddingModel.tableName)
+        .values({
+          // TODO is the extra space of a null embedText really worth it?!
+          embedText: chunks.length > 1 ? chunk : null,
+          embedding: numberVectorToString(embeddingVector),
+          embeddingsMetadataId,
+          chunkNumber: chunks.length > 1 ? chunkNumber : null
+        })
+        .onConflict((oc) =>
+          oc.columns(['embeddingsMetadataId', 'chunkNumber']).doUpdateSet((eb) => ({
+            embedText: eb.ref('excluded.embedText'),
+            embedding: eb.ref('excluded.embedding')
+          }))
+        )
+        .execute()
+      return undefined
+    })
+  )
+  const firstError = errors.find((error) => error instanceof JobQueueError)
+  // Logger.log(`Embedded ${embeddingsMetadataId} -> ${model}`)
+  return firstError || data
+}
diff --git a/packages/embedder/workflows/getSimilarRetroTopics.ts b/packages/embedder/workflows/getSimilarRetroTopics.ts
new file mode 100644
index 00000000000..d38f193af70
--- /dev/null
+++ b/packages/embedder/workflows/getSimilarRetroTopics.ts
@@ -0,0 +1,65 @@
+import getKysely from 'parabol-server/postgres/getKysely'
+import {EmbeddingsTable, EmbeddingsTableName} from '../ai_models/AbstractEmbeddingsModel'
+import {JobQueueStepRun, ParentJob} from '../custom'
+import {rerankRetroTopics} from './rerankRetroTopics'
+
+export const getSimilarRetroTopics: JobQueueStepRun<
+  {
+    embeddingsMetadataId: number
+    model: EmbeddingsTableName
+  },
+  ParentJob<typeof rerankRetroTopics>
+> = async (context) => {
+  const {data, dataLoader} = context
+  const {embeddingsMetadataId} = data
+  const model = data.model as EmbeddingsTable
+  const MAX_CANDIDATES = 10
+  const SIMILARITY_THRESHOLD = 0.67
+  const pg = getKysely()
+  const metadata = await dataLoader.get('embeddingsMetadata').loadNonNull(embeddingsMetadataId)
+  const {teamId} = metadata
+  const similarEmbeddings = await pg
+    .with('Vector', (qc) =>
+      qc
+        .selectFrom(model)
+        .select('embedding')
+        .where('embeddingsMetadataId', '=', embeddingsMetadataId)
+        .orderBy('chunkNumber')
+        // truncate strategy: only get discussions similar to the first chunk
+        .limit(1)
+    )
+    .with('Model', (qc) =>
+      qc
+        .selectFrom(model)
+        .select([`${model}.id`, 'embeddingsMetadataId', 'embedding'])
+        .innerJoin('EmbeddingsMetadata', 'EmbeddingsMetadata.id', `${model}.embeddingsMetadataId`)
+        .where('teamId', '=', teamId)
+        .where('objectType', '=', 'retrospectiveDiscussionTopic')
+        .where('embeddingsMetadataId', '!=', embeddingsMetadataId)
+    )
+    .with('CosineSimilarity', (pg) =>
+      pg
+        .selectFrom(['Model', 'Vector'])
+        .select(({eb, val, parens, ref}) => [
+          ref('Model.id').as('embeddingId'),
+          ref('Model.embeddingsMetadataId').as('embeddingsMetadataId'),
+          eb(
+            val(1),
+            '-',
+            parens('Model.embedding' as any, '<=>' as any, ref('Vector.embedding') as any)
+          ).as('similarity')
+        ])
+    )
+    .selectFrom('CosineSimilarity')
+    .select(['embeddingId', 'similarity', 'embeddingsMetadataId'])
+    .where('similarity', '>=', SIMILARITY_THRESHOLD)
+    .orderBy('similarity', 'desc')
+    .limit(MAX_CANDIDATES)
+    .execute()
+  if (similarEmbeddings.length === 0) return false
+  return {
+    embeddingsMetadataId,
+    model,
+    similarEmbeddings
+  }
+}
diff --git a/packages/embedder/workflows/helpers/getRerankedEmbeddingsFromChunks.ts b/packages/embedder/workflows/helpers/getRerankedEmbeddingsFromChunks.ts
new file mode 100644
index 00000000000..b7f2b5e8642
--- /dev/null
+++ b/packages/embedder/workflows/helpers/getRerankedEmbeddingsFromChunks.ts
@@ -0,0 +1,115 @@
+import ms from 'ms'
+import getKysely from '../../../server/postgres/getKysely'
+import {JobQueueError} from '../../JobQueueError'
+import {AbstractEmbeddingsModel} from '../../ai_models/AbstractEmbeddingsModel'
+import numberVectorToString from '../../indexing/numberVectorToString'
+
+/*
+ * Overview on how we find related discussions:
+ *
+ * A previous discussion could be fully related (similarity=1), not related
+ * (similarity=0), opposite (similarity=-1), or any place between 1..0..-1.
+ *
+ * We create an embeddingVector for the current retro discussion topic, then
+ * fetch up to MAX_CANDIDATES that are greater than or equal
+ * to SIMILARITY_THRESHOLD.
+ *
+ * We create a new embeddingVector that emphasizes only the reflections from the
+ * topic and use this to re-rank the initial results by:
+ *
+ * newSimilarity = initialSimilarity +
+ *   (rerankSimilarity - RERANK_THRESHOLD) * RERANK_MULTIPLE
+ *
+ * This amplifies the role reflection content plays in matches, making similar
+ * reflections boost matches and de-emphasize matches that otherwise might be
+ * based on similar template prompts, authorship, etc.
+ *
+ */
+
+export interface SimilarEmbedding {
+  similarity: number
+  embeddingId: number
+  embeddingsMetadataId: number
+}
+
+export const getRerankedEmbeddingsFromChunks = async (
+  embeddingsMetadataId: number,
+  chunks: string[],
+  similarEmbeddings: SimilarEmbedding[],
+  embeddingModel: AbstractEmbeddingsModel
+) => {
+  const pg = getKysely()
+  const RERANK_THRESHOLD = 0.7
+  const RERANK_MULTIPLE = 3
+  const similarEmbeddingIds = similarEmbeddings.map((e) => e.embeddingId)
+  const similarityScores = {} as Record<number, number[]>
+  const results = await Promise.all(
+    chunks.map(async (chunk) => {
+      const embeddingVector = await embeddingModel.getEmbedding(chunk)
+      if (embeddingVector instanceof Error) {
+        return new JobQueueError(
+          `unable to get embeddings: ${embeddingVector.message}`,
+          ms('1m'),
+          10
+        )
+      }
+      const embeddingVectorStr = numberVectorToString(embeddingVector)
+      const embeddingsWithSimilarities = await pg
+        .selectFrom(embeddingModel.tableName)
+        .select(({eb, val, parens}) => [
+          'id as embeddingId',
+          eb(val(1), '-', parens('embedding' as any, '<=>' as any, embeddingVectorStr)).as(
+            'rerankSimilarity'
+          )
+        ])
+        .where('id', 'in', similarEmbeddingIds)
+        .execute()
+      embeddingsWithSimilarities.forEach((e) => {
+        const {embeddingId, rerankSimilarity} = e
+        const similarDiscussion = similarEmbeddings.find((se) => se.embeddingId === embeddingId)!
+        const weightedSimilarity = Math.min(
+          // Limit the upper bound to 0.999..
+          0.999999999,
+          // Limit the lower bound to -0.999..
+          Math.max(
+            -0.999999999,
+            similarDiscussion.similarity + (rerankSimilarity - RERANK_THRESHOLD) * RERANK_MULTIPLE
+          )
+        )
+        similarityScores[embeddingId] = similarityScores[embeddingId] || []
+        similarityScores[embeddingId]!.push(weightedSimilarity)
+      })
+      return
+    })
+  )
+  const firstError = results.find((r) => r instanceof JobQueueError)
+  if (firstError) return firstError
+
+  const weightedSimilarities = Object.entries(similarityScores).map((entry) => {
+    const embeddingId = parseInt(entry[0], 10)
+    const similarities = entry[1]
+    const similarEmbedding = similarEmbeddings.find((se) => se.embeddingId === embeddingId)!
+    return {
+      embeddingsMetadataId: similarEmbedding.embeddingsMetadataId,
+      similarity: similarities.reduce((a, b) => a + b, 0) / similarities.length
+    }
+  })
+
+  if (weightedSimilarities.length === 0)
+    return new JobQueueError(`no similar embeddings found: ${embeddingsMetadataId}`)
+
+  const MAX_RESULTS = 3
+  const SIMILARITY_THRESHOLD = 0.67
+  const topResults = weightedSimilarities
+    // SIMILARITY THRESHOLD will be too high if chunks.length > 1
+    .filter((sd) => sd.similarity >= SIMILARITY_THRESHOLD)
+    .sort((a, b) => (a.similarity > b.similarity ? -1 : 1))
+    .slice(0, MAX_RESULTS)
+  if (!topResults.length) {
+    const similarities = weightedSimilarities.map((ws) => ws.similarity).join(',')
+    return new JobQueueError(
+      `no similar embeddings found. Decrease SIMILARITY_THRESHOLD: ${embeddingsMetadataId}, ${similarities}`
+    )
+  }
+  return topResults
+}
diff --git a/packages/embedder/workflows/helpers/publishSimilarRetroTopics.ts b/packages/embedder/workflows/helpers/publishSimilarRetroTopics.ts
new file mode 100644
index 00000000000..f8de026db74
--- /dev/null
+++ b/packages/embedder/workflows/helpers/publishSimilarRetroTopics.ts
@@ -0,0 +1,72 @@
+import {SubscriptionChannel} from '../../../client/types/constEnums'
+import makeAppURL from '../../../client/utils/makeAppURL'
+import appOrigin from '../../../server/appOrigin'
+import getRethink from '../../../server/database/rethinkDriver'
+import {DataLoaderInstance} from '../../../server/dataloader/RootDataLoader'
+import {isRetroMeeting} from '../../../server/graphql/meetingTypePredicates'
+import {
+  buildCommentContentBlock,
+  createAIComment
+} from '../../../server/graphql/mutations/helpers/addAIGeneratedContentToThreads'
+import getPhase from '../../../server/utils/getPhase'
+import publish from '../../../server/utils/publish'
+
+const makeSimilarDiscussionLink = async (
+  similarDiscussion: {embeddingsMetadataId: number; similarity: number},
+  dataLoader: DataLoaderInstance
+) => {
+  const {embeddingsMetadataId, similarity} = similarDiscussion
+  const metadata = await dataLoader.get('embeddingsMetadata').loadNonNull(embeddingsMetadataId)
+  const {refId: discussionId} = metadata
+  const discussion = await dataLoader.get('discussions').loadNonNull(discussionId)
+  const {meetingId, discussionTopicId: reflectionGroupId} = discussion
+  const [meeting, reflectionGroup] = await Promise.all([
+    dataLoader.get('newMeetings').load(meetingId),
+    dataLoader.get('retroReflectionGroups').load(reflectionGroupId)
+  ])
+
+  if (!meeting || !isRetroMeeting(meeting)) throw new Error('invalid meeting type')
+  const {phases, name: meetingName} = meeting
+  const {title: topic} = reflectionGroup
+  const discussPhase = getPhase(phases, 'discuss')
+  const {stages} = discussPhase
+  const stageIdx = stages
+    .sort((a, b) => (a.sortOrder < b.sortOrder ? -1 : 1))
+    .findIndex((stage) => stage.discussionId === discussionId)
+
+  const url = makeAppURL(appOrigin, `meet/${meetingId}/discuss/${stageIdx + 1}`)
+
+  return (
+    `<a href="${url}">` +
+    `${meetingName} – ${topic} (score: ${Math.trunc(100 * similarity)})` +
+    `</a>`
+  )
+}
+
+const publishComment = async (meetingId: string, commentId: string) => {
+  const data = {commentId, meetingId}
+  publish(SubscriptionChannel.MEETING, meetingId, 'AddCommentSuccess', data, {}, false)
+}
+
+export const publishSimilarRetroTopics = async (
+  embeddingsMetadataId: number,
+  similarEmbeddings: {embeddingsMetadataId: number; similarity: number}[],
+  dataLoader: DataLoaderInstance
+) => {
+  const r = await getRethink()
+  const links = await Promise.all(
+    similarEmbeddings.map((se) => makeSimilarDiscussionLink(se, dataLoader))
+  )
+  const listItems = links.map((link) => `<li>${link}</li>`).join('\n')
+  const metadata = await dataLoader.get('embeddingsMetadata').loadNonNull(embeddingsMetadataId)
+  const {refId: discussionId} = metadata
+  const discussion = await dataLoader.get('discussions').loadNonNull(discussionId)
+  const {meetingId} = discussion
+  const relatedDiscussionsComment = createAIComment(
+    discussionId,
+    buildCommentContentBlock('🤖 Related Discussions', `<ul>${listItems}</ul>`),
+    2
+  )
+  await r.table('Comment').insert(relatedDiscussionsComment).run()
+  publishComment(meetingId, relatedDiscussionsComment.id)
+}
diff --git a/packages/embedder/workflows/relatedDiscussionsStart.ts b/packages/embedder/workflows/relatedDiscussionsStart.ts
new file mode 100644
index 00000000000..e62a986a182
--- /dev/null
+++ b/packages/embedder/workflows/relatedDiscussionsStart.ts
@@ -0,0 +1,54 @@
+import isValid from 'parabol-server/graphql/isValid'
+import getKysely from 'parabol-server/postgres/getKysely'
+import getPhase from 'parabol-server/utils/getPhase'
+import {MessageToEmbedderRelatedDiscussions} from '../../server/graphql/mutations/helpers/publishToEmbedder'
+import getModelManager from '../ai_models/ModelManager'
+import {JobQueueStepRun, ParentJob} from '../custom'
+import {embedMetadata} from './embedMetadata'
+
+export const relatedDiscussionsStart: JobQueueStepRun<
+  MessageToEmbedderRelatedDiscussions['data'],
+  ParentJob<typeof embedMetadata>
+> = async (context) => {
+  const pg = getKysely()
+  const {data, dataLoader} = context
+  const {meetingId} = data
+  const [discussions, meeting] = await Promise.all([
+    dataLoader.get('discussionsByMeetingId').load(meetingId),
+    dataLoader.get('newMeetings').load(meetingId)
+  ])
+  const {phases} = meeting
+  const discussPhase = getPhase(phases, 'discuss')
+  const {stages} = discussPhase
+  const orderedDiscussions = stages
+    .map((stage) => discussions.find((d) => d.id === stage.discussionId))
+    .filter(isValid)
+
+  const metadataRows = orderedDiscussions.map(({id, teamId, createdAt}) => ({
+    refId: id,
+    objectType: 'retrospectiveDiscussionTopic' as const,
+    teamId,
+    // Not techincally updatedAt since discussions are updated after they get created
+    refUpdatedAt: createdAt
+  }))
+  const inserts = await pg
+    .insertInto('EmbeddingsMetadata')
+    .values(metadataRows)
+    .onConflict((oc) =>
+      // trigger an update in order to return the ID of the existing row
+      oc.columns(['refId', 'objectType']).doUpdateSet((eb) => ({
+        objectType: eb.ref('excluded.objectType')
+      }))
+    )
+    .returning('id')
+    .execute()
+
+  const modelManager = getModelManager()
+  // Only get 1 embedder since we only want to publish 1 message to the user
+  const {tableName} = modelManager.getEmbedder()
+
+  return inserts.map(({id}) => ({
+    embeddingsMetadataId: id,
+    model: tableName
+  }))
+}
diff --git a/packages/embedder/workflows/rerankRetroTopics.ts b/packages/embedder/workflows/rerankRetroTopics.ts
new file mode 100644
index 00000000000..fa6fec59333
--- /dev/null
+++ b/packages/embedder/workflows/rerankRetroTopics.ts
@@ -0,0 +1,53 @@
+import ms from 'ms'
+import {JobQueueError} from '../JobQueueError'
+import {EmbeddingsTableName} from '../ai_models/AbstractEmbeddingsModel'
+import getModelManager from '../ai_models/ModelManager'
+import {JobQueueStepRun} from '../custom'
+import {createEmbeddingTextFrom} from '../indexing/createEmbeddingTextFrom'
+import {
+  SimilarEmbedding,
+  getRerankedEmbeddingsFromChunks
+} from './helpers/getRerankedEmbeddingsFromChunks'
+import {publishSimilarRetroTopics} from './helpers/publishSimilarRetroTopics'
+
+export const rerankRetroTopics: JobQueueStepRun<{
+  similarEmbeddings: SimilarEmbedding[]
+  embeddingsMetadataId: number
+  model: EmbeddingsTableName
+}> = async ({data, dataLoader}) => {
+  const {similarEmbeddings, embeddingsMetadataId, model} = data
+  const metadata = await dataLoader.get('embeddingsMetadata').load(embeddingsMetadataId)
+  if (!metadata) return new JobQueueError(`Invalid embeddingsMetadataId: ${embeddingsMetadataId}`)
+
+  let rerankText: string = ''
+  try {
+    const {body} = await createEmbeddingTextFrom(metadata, dataLoader, true)
+    rerankText = body
+  } catch (e) {
+    // get the trace since the error message may be unobvious
+    console.trace(e)
+    return new JobQueueError(`unable to create embedding text: ${e}`)
+  }
+
+  const modelManager = getModelManager()
+  const embeddingModel = modelManager.embeddingModels.get(model)
+  if (!embeddingModel) {
+    return new JobQueueError(`embedding model ${model} not available`)
+  }
+
+  const chunks = await embeddingModel.chunkText(rerankText)
+  if (chunks instanceof Error) {
+    return new JobQueueError(`unable to get tokens: ${chunks.message}`, ms('1m'), 10)
+  }
+
+  const results = await getRerankedEmbeddingsFromChunks(
+    embeddingsMetadataId,
+    chunks,
+    similarEmbeddings,
+    embeddingModel
+  )
+  if (results instanceof JobQueueError) return results
+
+  await publishSimilarRetroTopics(embeddingsMetadataId, results, dataLoader)
+  return false
+}
diff --git a/packages/server/dataloader/RootDataLoader.ts b/packages/server/dataloader/RootDataLoader.ts
index 3bf5f7c3acd..1b2546ec1f8 100644
--- a/packages/server/dataloader/RootDataLoader.ts
+++ b/packages/server/dataloader/RootDataLoader.ts
@@ -1,5 +1,8 @@
 import DataLoader from 'dataloader'
 import {DBType} from '../database/rethinkDriver'
+import RethinkForeignKeyLoaderMaker from './RethinkForeignKeyLoaderMaker'
+import RethinkPrimaryKeyLoaderMaker from './RethinkPrimaryKeyLoaderMaker'
+import UpdatableCacheDataLoader from './UpdatableCacheDataLoader'
 import * as atlassianLoaders from './atlassianLoaders'
 import * as azureDevOpsLoaders from './azureDevOpsLoaders'
 import * as customLoaderMakers from './customLoaderMakers'
@@ -12,12 +15,9 @@ import * as jiraServerLoaders from './jiraServerLoaders'
 import * as pollLoaders from './pollsLoaders'
 import * as primaryKeyLoaderMakers from './primaryKeyLoaderMakers'
 import rethinkForeignKeyLoader from './rethinkForeignKeyLoader'
-import RethinkForeignKeyLoaderMaker from './RethinkForeignKeyLoaderMaker'
 import * as rethinkForeignKeyLoaderMakers from './rethinkForeignKeyLoaderMakers'
 import rethinkPrimaryKeyLoader from './rethinkPrimaryKeyLoader'
-import RethinkPrimaryKeyLoaderMaker from './RethinkPrimaryKeyLoaderMaker'
 import * as rethinkPrimaryKeyLoaderMakers from './rethinkPrimaryKeyLoaderMakers'
-import UpdatableCacheDataLoader from './UpdatableCacheDataLoader'
 
 interface LoaderDict {
   [loaderName: string]: DataLoader<any, any>
@@ -72,6 +72,11 @@ type CustomLoaders = keyof CustomLoaderMakers
 type Uncustom<T> = T extends (parent: RootDataLoader) => infer U ? U : never
 type TypeFromCustom<T extends CustomLoaders> = Uncustom<CustomLoaderMakers[T]>
 
+// Use this if you don't need the dataloader to be shareable
+export interface DataLoaderInstance {
+  get<LoaderName extends Loaders>(loaderName: LoaderName): TypedDataLoader<LoaderName>
+}
+
 export type TypedDataLoader<LoaderName> = LoaderName extends CustomLoaders
   ? TypeFromCustom<LoaderName>
   : UpdatableCacheDataLoader<
@@ -86,7 +91,7 @@ export type TypedDataLoader<LoaderName> = LoaderName extends CustomLoaders
 /**
  * This is the main dataloader
  */
-export default class RootDataLoader {
+export default class RootDataLoader implements DataLoaderInstance {
   dataLoaderOptions: DataLoader.Options<any, any>
   // casted to any because access to the loaders will results in a creation if needed
   loaders: LoaderDict = {} as any
diff --git a/packages/server/dataloader/foreignKeyLoaderMakers.ts b/packages/server/dataloader/foreignKeyLoaderMakers.ts
index 04d06ba3d2d..0c967c37b1a 100644
--- a/packages/server/dataloader/foreignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/foreignKeyLoaderMakers.ts
@@ -1,6 +1,25 @@
+import getKysely from '../postgres/getKysely'
 import getTeamsByOrgIds from '../postgres/queries/getTeamsByOrgIds'
 import {foreignKeyLoaderMaker} from './foreignKeyLoaderMaker'
 
 export const teamsByOrgIds = foreignKeyLoaderMaker('teams', 'orgId', (orgIds) =>
   getTeamsByOrgIds(orgIds, {isArchived: false})
 )
+
+export const discussionsByMeetingId = foreignKeyLoaderMaker(
+  'discussions',
+  'meetingId',
+  async (meetingIds) => {
+    const pg = getKysely()
+    return pg.selectFrom('Discussion').selectAll().where('meetingId', 'in', meetingIds).execute()
+  }
+)
+
+export const embeddingsMetadataByRefId = foreignKeyLoaderMaker(
+  'embeddingsMetadata',
+  'refId',
+  async (refId) => {
+    const pg = getKysely()
+    return pg.selectFrom('EmbeddingsMetadata').selectAll().where('refId', 'in', refId).execute()
+  }
+)
diff --git a/packages/server/dataloader/primaryKeyLoaderMakers.ts b/packages/server/dataloader/primaryKeyLoaderMakers.ts
index 4a87ea7bcef..06ebe30bd0f 100644
--- a/packages/server/dataloader/primaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/primaryKeyLoaderMakers.ts
@@ -9,6 +9,7 @@ import {getUsersByIds} from '../postgres/queries/getUsersByIds'
 import {getKudosesByIds} from '../postgres/queries/getKudosesByIds'
 import getMeetingTemplatesByIds from '../postgres/queries/getMeetingTemplatesByIds'
 import {primaryKeyLoaderMaker} from './primaryKeyLoaderMaker'
+import getKysely from '../postgres/getKysely'
 
 export const users = primaryKeyLoaderMaker(getUsersByIds)
 export const teams = primaryKeyLoaderMaker(getTeamsByIds)
@@ -20,3 +21,7 @@ export const meetingSeries = primaryKeyLoaderMaker(getMeetingSeriesByIds)
 export const meetingTemplates = primaryKeyLoaderMaker(getMeetingTemplatesByIds)
 export const domainJoinRequests = primaryKeyLoaderMaker(getDomainJoinRequestsByIds)
 export const kudoses = primaryKeyLoaderMaker(getKudosesByIds)
+
+export const embeddingsMetadata = primaryKeyLoaderMaker((ids: readonly number[]) => {
+  return getKysely().selectFrom('EmbeddingsMetadata').selectAll().where('id', 'in', ids).execute()
+})
diff --git a/packages/server/graphql/mutations/helpers/addAIGeneratedContentToThreads.ts b/packages/server/graphql/mutations/helpers/addAIGeneratedContentToThreads.ts
index 1254d4890b7..50b385c6a8f 100644
--- a/packages/server/graphql/mutations/helpers/addAIGeneratedContentToThreads.ts
+++ b/packages/server/graphql/mutations/helpers/addAIGeneratedContentToThreads.ts
@@ -7,13 +7,17 @@ import {convertHtmlToTaskContent} from '../../../utils/draftjs/convertHtmlToTask
 import {DataLoaderWorker} from '../../graphql'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
-const buildCommentContentBlock = (title: string, content: string, explainerText?: string) => {
+export const buildCommentContentBlock = (
+  title: string,
+  content: string,
+  explainerText?: string
+) => {
   const explainerBlock = explainerText ? `<i>${explainerText}</i><br>` : ''
   const html = `<html><body>${explainerBlock}<p><b>${title}</b></p><p>${content}</p></body></html>`
   return convertHtmlToTaskContent(html)
 }
 
-const createAIComment = (discussionId: string, content: string, order: number) =>
+export const createAIComment = (discussionId: string, content: string, order: number) =>
   new Comment({
     discussionId,
     content,
diff --git a/packages/server/graphql/mutations/helpers/handleCompletedStage.ts b/packages/server/graphql/mutations/helpers/handleCompletedStage.ts
index 3ef7ad154ec..785568a6396 100644
--- a/packages/server/graphql/mutations/helpers/handleCompletedStage.ts
+++ b/packages/server/graphql/mutations/helpers/handleCompletedStage.ts
@@ -10,13 +10,14 @@ import getKysely from '../../../postgres/getKysely'
 import insertDiscussions from '../../../postgres/queries/insertDiscussions'
 import {AnyMeeting} from '../../../postgres/types/Meeting'
 import {DataLoaderWorker} from '../../graphql'
-import addDiscussionTopics from './addDiscussionTopics'
 import addAIGeneratedContentToThreads from './addAIGeneratedContentToThreads'
+import addDiscussionTopics from './addDiscussionTopics'
+import addRecallBot from './addRecallBot'
 import generateDiscussionSummary from './generateDiscussionSummary'
-import generateGroups from './generateGroups'
 import generateGroupSummaries from './generateGroupSummaries'
+import generateGroups from './generateGroups'
+import {publishToEmbedder} from './publishToEmbedder'
 import removeEmptyReflections from './removeEmptyReflections'
-import addRecallBot from './addRecallBot'
 
 /*
  * handle side effects when a stage is completed
@@ -111,7 +112,8 @@ const handleCompletedRetrospectiveStage = async (
     }))
     await Promise.all([
       insertDiscussions(discussions),
-      addAIGeneratedContentToThreads(discussPhaseStages, meetingId, teamId, dataLoader)
+      addAIGeneratedContentToThreads(discussPhaseStages, meetingId, teamId, dataLoader),
+      publishToEmbedder({jobType: 'relatedDiscussions:start', data: {meetingId}, priority: 0})
     ])
     if (videoMeetingURL) {
       addRecallBot(meetingId, videoMeetingURL)
@@ -119,7 +121,7 @@ const handleCompletedRetrospectiveStage = async (
     return {[VOTE]: data}
   } else if (stage.phaseType === 'discuss') {
     const {discussionId} = stage as DiscussStage
-    // dont await for the OpenAI API response
+    // don't await for the OpenAI API response
     generateDiscussionSummary(discussionId, meeting, dataLoader)
   }
   return {}
diff --git a/packages/server/graphql/mutations/helpers/publishToEmbedder.ts b/packages/server/graphql/mutations/helpers/publishToEmbedder.ts
index c8a735f4ac9..0893dfaa286 100644
--- a/packages/server/graphql/mutations/helpers/publishToEmbedder.ts
+++ b/packages/server/graphql/mutations/helpers/publishToEmbedder.ts
@@ -1,14 +1,22 @@
-import type {MessageToEmbedder} from 'embedder/custom'
-import getRedis from '../../../utils/getRedis'
+import {getEmbedderPriority} from '../../../../embedder/getEmbedderPriority'
+import getKysely from '../../../postgres/getKysely'
 
-export const publishToEmbedder = (message: MessageToEmbedder) => {
-  return getRedis().xadd(
-    'embedMetadataStream',
-    'MAXLEN',
-    '~',
-    1000,
-    '*',
-    'msg',
-    JSON.stringify(message)
-  )
+export interface MessageToEmbedderRelatedDiscussions {
+  jobType: 'relatedDiscussions:start'
+  data: {meetingId: string}
+}
+
+export type MessageToEmbedder = {priority: number} & MessageToEmbedderRelatedDiscussions
+
+const IS_EMBEDDER_ENALBED = !!parseInt(process.env.AI_EMBEDDER_WORKERS!)
+export const publishToEmbedder = ({jobType, data, priority}: MessageToEmbedder) => {
+  if (!IS_EMBEDDER_ENALBED) return
+  return getKysely()
+    .insertInto('EmbeddingsJobQueue')
+    .values({
+      jobType,
+      priority: getEmbedderPriority(priority),
+      jobData: JSON.stringify(data)
+    })
+    .execute()
 }
diff --git a/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts b/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
index f5a69be4f22..9b47bbda356 100644
--- a/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
+++ b/packages/server/graphql/mutations/helpers/safeEndRetrospective.ts
@@ -27,7 +27,6 @@ import generateWholeMeetingSentimentScore from './generateWholeMeetingSentimentS
 import generateWholeMeetingSummary from './generateWholeMeetingSummary'
 import handleCompletedStage from './handleCompletedStage'
 import {IntegrationNotifier} from './notifications/IntegrationNotifier'
-import {publishToEmbedder} from './publishToEmbedder'
 import removeEmptyTasks from './removeEmptyTasks'
 import updateQualAIMeetingsCount from './updateQualAIMeetingsCount'
 import updateTeamInsights from './updateTeamInsights'
@@ -371,7 +370,6 @@ const safeEndRetrospective = async ({
     removedTaskIds,
     timelineEventId
   }
-  publishToEmbedder({objectTypes: ['retrospectiveDiscussionTopic'], meetingId})
   publish(SubscriptionChannel.TEAM, teamId, 'EndRetrospectiveSuccess', data, subOptions)
 
   return data
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
index 9d7fad91919..ef74a967ff1 100644
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
@@ -16,6 +16,7 @@ enum OrganizationFeatureFlagsEnum {
   aiIcebreakers
   aiTemplate
   recurringRetros
+  relatedDiscussions
 }
 
 extend type Mutation {
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index b7471c75dcf..49d3169c48f 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -191,4 +191,5 @@ type OrganizationFeatureFlags {
   aiIcebreakers: Boolean!
   aiTemplate: Boolean!
   recurringRetros: Boolean!
+  relatedDiscussions: Boolean!
 }
diff --git a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
index 8a0a0cec364..1f917215116 100644
--- a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
+++ b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
@@ -14,7 +14,8 @@ const OrganizationFeatureFlags: OrganizationFeatureFlagsResolvers = {
   kudos: ({kudos}) => !!kudos,
   aiIcebreakers: ({aiIcebreakers}) => !!aiIcebreakers,
   aiTemplate: ({aiTemplate}) => !!aiTemplate,
-  recurringRetros: ({recurringRetros}) => !!recurringRetros
+  recurringRetros: ({recurringRetros}) => !!recurringRetros,
+  relatedDiscussions: ({relatedDiscussions}) => !!relatedDiscussions
 }
 
 export default OrganizationFeatureFlags
diff --git a/packages/server/postgres/migrations/1712074131388_priority.ts b/packages/server/postgres/migrations/1712074131388_priority.ts
new file mode 100644
index 00000000000..e2f7afd06d9
--- /dev/null
+++ b/packages/server/postgres/migrations/1712074131388_priority.ts
@@ -0,0 +1,32 @@
+import {Client} from 'pg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    ALTER TABLE "EmbeddingsJobQueue"
+      ALTER COLUMN "priority" TYPE INTEGER;
+    ALTER TABLE "EmbeddingsJobQueue"
+      ADD COLUMN "model" VARCHAR(255),
+      ADD COLUMN "embeddingsMetadataId" INTEGER,
+      ADD CONSTRAINT "fk_embeddingsMetadataId"
+        FOREIGN KEY("embeddingsMetadataId")
+          REFERENCES "EmbeddingsMetadata"("id")
+          ON DELETE SET NULL;
+  `)
+  await client.end()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DELETE FROM "EmbeddingsJobQueue";
+    ALTER TABLE "EmbeddingsJobQueue"
+      ALTER COLUMN "priority" TYPE SMALLINT,
+      DROP COLUMN IF EXISTS "model",
+      DROP COLUMN IF EXISTS "embeddingsMetadataId";
+  ` /* Do undo magic */)
+  await client.end()
+}
diff --git a/packages/server/utils/publish.ts b/packages/server/utils/publish.ts
index b9c7defb2ff..80cfb0397fe 100644
--- a/packages/server/utils/publish.ts
+++ b/packages/server/utils/publish.ts
@@ -13,12 +13,14 @@ const publish = <T>(
   channel: string,
   type: string,
   payload: {[key: string]: any},
-  subOptions: SubOptions = {}
+  subOptions: SubOptions = {},
+  sendToSelf: boolean = true
 ) => {
   const subName = `${topic}Subscription`
   const rootValue = {[subName]: {fieldName: type, [type]: payload}}
+  const executorServerId = sendToSelf ? SERVER_ID! : undefined
   getPubSub()
-    .publish(`${topic}.${channel}`, {rootValue, executorServerId: SERVER_ID!, ...subOptions})
+    .publish(`${topic}.${channel}`, {rootValue, executorServerId, ...subOptions})
     .catch(Logger.error)
 }
 
diff --git a/scripts/webpack/dev.servers.config.js b/scripts/webpack/dev.servers.config.js
index 9632b40f66f..0d8e4db7e0e 100644
--- a/scripts/webpack/dev.servers.config.js
+++ b/scripts/webpack/dev.servers.config.js
@@ -29,7 +29,8 @@ module.exports = {
   entry: {
     web: [DOTENV, INIT_PUBLIC_PATH, path.join(SERVER_ROOT, 'server.ts')],
     embedder: [DOTENV, INIT_PUBLIC_PATH, path.join(EMBEDDER_ROOT, 'embedder.ts')],
-    gqlExecutor: [DOTENV, INIT_PUBLIC_PATH, path.join(GQL_ROOT, 'gqlExecutor.ts')]
+    gqlExecutor: [DOTENV, INIT_PUBLIC_PATH, path.join(GQL_ROOT, 'gqlExecutor.ts')],
+    debugEmbedder: [DOTENV, INIT_PUBLIC_PATH, path.join(EMBEDDER_ROOT, 'debug.ts')]
   },
   output: {
     filename: '[name].js',
diff --git a/yarn.lock b/yarn.lock
index c5316801eb3..c01d5591da9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5595,15 +5595,15 @@
     signal-exit "^3.0.3"
     tslib "1.9.3"
 
-"@pm2/js-api@~0.6.7":
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/@pm2/js-api/-/js-api-0.6.7.tgz#ed28c3b7b6d26f03f826318754fdc5468afa589f"
-  integrity sha512-jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw==
+"@pm2/js-api@~0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@pm2/js-api/-/js-api-0.8.0.tgz#d1b8aff562dd34befa3cb30fe28e08c9f9743abc"
+  integrity sha512-nmWzrA/BQZik3VBz+npRcNIu01kdBhWL0mxKmP1ciF/gTcujPTQqt027N9fc1pK9ERM8RipFhymw7RcmCyOEYA==
   dependencies:
     async "^2.6.3"
-    axios "^0.21.0"
     debug "~4.3.1"
     eventemitter2 "^6.3.1"
+    extrareqp2 "^1.0.0"
     ws "^7.0.0"
 
 "@pm2/pm2-version-check@latest":
@@ -9104,7 +9104,7 @@ axios-retry@3.2.0:
   dependencies:
     is-retry-allowed "^1.1.0"
 
-axios@0.21.4, axios@^0.21.0:
+axios@0.21.4:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
@@ -9742,9 +9742,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
-  version "1.0.30001603"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001603.tgz#605046a5bdc95ba4a92496d67e062522dce43381"
-  integrity sha512-iL2iSS0eDILMb9n5yKQoTBim9jMZ0Yrk8g0N9K7UzYyWnfIKzXBZD5ngpM37ZcL/cv0Mli8XtVMRYMQAfFpi5Q==
+  version "1.0.30001605"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz#ca12d7330dd8bcb784557eb9aa64f0037870d9d6"
+  integrity sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -12030,6 +12030,13 @@ extract-files@^11.0.0:
   resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a"
   integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==
 
+extrareqp2@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/extrareqp2/-/extrareqp2-1.0.0.tgz#aaf8ad1495d723f71276b0eab041c061aa21f035"
+  integrity sha512-Gum0g1QYb6wpPJCVypWP3bbIuaibcFiJcpuPM10YSXp/tzqi84x9PJageob+eN4xVRIOto4wjSGNLyMD54D2xA==
+  dependencies:
+    follow-redirects "^1.14.0"
+
 faker@^5.5.3:
   version "5.5.3"
   resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e"
@@ -16111,7 +16118,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -17610,14 +17617,14 @@ pm2-sysmonit@^1.2.8:
     systeminformation "^5.7"
     tx2 "~1.0.4"
 
-pm2@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/pm2/-/pm2-5.3.0.tgz#06850810f77cd98495ae1c66fbdd028a8fb5899e"
-  integrity sha512-xscmQiAAf6ArVmKhjKTeeN8+Td7ZKnuZFFPw1DGkdFPR/0Iyx+m+1+OpCdf9+HQopX3VPc9/wqPQHqVOfHum9w==
+pm2@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/pm2/-/pm2-5.3.1.tgz#f4c1b1199aac2988e9079ca4f127adaa1a5d18ce"
+  integrity sha512-DLVQHpSR1EegaTaRH3KbRXxpPVaqYwAp3uHSCtCsS++LSErvk07WSxuUnntFblBRqNU/w2KQyqs12mSq5wurkg==
   dependencies:
     "@pm2/agent" "~2.0.0"
     "@pm2/io" "~5.0.0"
-    "@pm2/js-api" "~0.6.7"
+    "@pm2/js-api" "~0.8.0"
     "@pm2/pm2-version-check" latest
     async "~3.2.0"
     blessed "0.1.81"

From 4cf395f04cb140c6184a850df1f8bedb41194e27 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 16:47:43 -0700
Subject: [PATCH 145/183] chore(release): release v7.26.0 (#9619)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 18 ++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index c7c1488dff8..ad981277836 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.25.4"
+  ".": "7.26.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e62ca7d5066..55aef702232 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,24 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.26.0](https://github.com/ParabolInc/parabol/compare/v7.25.4...v7.26.0) (2024-04-10)
+
+
+### Added
+
+* related discussions refactor ([#9557](https://github.com/ParabolInc/parabol/issues/9557)) ([15a54fb](https://github.com/ParabolInc/parabol/commit/15a54fbbb24ece533c8d20422950b0839969500b))
+
+
+### Fixed
+
+* bump prettier version ([#9618](https://github.com/ParabolInc/parabol/issues/9618)) ([82ac337](https://github.com/ParabolInc/parabol/commit/82ac337949e6767728a695a7c60f14b4257c5334))
+
+
+### Changed
+
+* disable change template ui if phase complete ([#9592](https://github.com/ParabolInc/parabol/issues/9592)) ([fc1b9e7](https://github.com/ParabolInc/parabol/commit/fc1b9e7e364c15fafa19d502b061c96cc1e07837))
+* remove build steps from readme and reference build.yml ([#9558](https://github.com/ParabolInc/parabol/issues/9558)) ([0e06d1f](https://github.com/ParabolInc/parabol/commit/0e06d1fcabaf563583a0c4776857ec1b0d07cf7b))
+
 ## [7.25.4](https://github.com/ParabolInc/parabol/compare/v7.25.3...v7.25.4) (2024-04-09)
 
 
diff --git a/package.json b/package.json
index 277c5ee433b..a683b9f7465 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 7305021cd2d..e5ad1b21ac0 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.25.4"
+    "parabol-server": "7.26.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index c03cbaeb9ce..00c363724b2 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index ca9ed2822a9..3c72eafe6ac 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 3628d2ab1af..f6e71d831f3 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.25.4",
-    "parabol-server": "7.25.4",
+    "parabol-client": "7.26.0",
+    "parabol-server": "7.26.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 0916770ef69..17c1f2c94d6 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 7dc40f74bbd..6099eb84dfb 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -120,7 +120,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.25.4",
+    "parabol-client": "7.26.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 92a1dbd18dc25c0046f573a3e46158f5cecdbf17 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Apr 2024 09:45:38 +0200
Subject: [PATCH 146/183] feat: Release activity library for everyone (#9617)

---
 .../ActivityLibrary/ActivityLibrary.tsx       |  9 +--
 .../components/Dashboard/DashSidebar.tsx      | 26 ++-------
 .../Dashboard/MobileDashSidebar.tsx           | 19 +++----
 packages/client/components/MeetingsDash.tsx   | 12 +---
 .../components/SideBarStartMeetingButton.tsx  | 12 +---
 .../client/components/StartMeetingFAB.tsx     | 13 +----
 .../components/TeamDashMain/TeamDashMain.tsx  |  5 +-
 .../userDashboard/components/UserDashMain.tsx | 37 ++++++++++++
 .../components/UserDashMain/UserDashMain.tsx  | 57 -------------------
 .../UserDashMain/UserDashMainRoot.tsx         | 14 -----
 .../UserDashboard/UserDashboard.tsx           |  4 +-
 .../mutations/helpers/bootstrapNewUser.ts     | 14 +----
 .../public/mutations/loginWithGoogle.ts       |  4 +-
 .../public/mutations/loginWithMicrosoft.ts    |  4 +-
 .../public/mutations/signUpWithPassword.ts    |  2 +-
 .../public/typeDefs/updateFeatureFlag.graphql |  2 -
 .../graphql/public/types/UserFeatureFlags.ts  |  1 -
 17 files changed, 63 insertions(+), 172 deletions(-)
 create mode 100644 packages/client/modules/userDashboard/components/UserDashMain.tsx
 delete mode 100644 packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx
 delete mode 100644 packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx

diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 2c84540e135..7cac76e9adc 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -85,9 +85,6 @@ const query = graphql`
           }
         }
       }
-      featureFlags {
-        retrosInDisguise
-      }
       organizations {
         featureFlags {
           aiTemplate
@@ -199,7 +196,7 @@ export const ActivityLibrary = (props: Props) => {
   const {queryRef} = props
   const data = usePreloadedQuery<ActivityLibraryQuery>(query, queryRef)
   const {viewer} = data
-  const {featureFlags, availableTemplates, organizations} = viewer
+  const {availableTemplates, organizations} = viewer
   const hasAITemplateFeatureFlag = !!organizations.find((org) => org.featureFlags.aiTemplate)
 
   const setSearch = (value: string) => {
@@ -272,10 +269,6 @@ export const ActivityLibrary = (props: Props) => {
     return undefined
   }, [categoryId, templatesToRender])
 
-  if (!featureFlags.retrosInDisguise) {
-    return <Redirect to='/404' />
-  }
-
   if (!categoryId || !availableCategoryIds.includes(categoryId)) {
     return <Redirect to={`/activity-library/category/${QUICK_START_CATEGORY_ID}`} />
   }
diff --git a/packages/client/components/Dashboard/DashSidebar.tsx b/packages/client/components/Dashboard/DashSidebar.tsx
index c9fbe1403eb..2f5c78f0cdb 100644
--- a/packages/client/components/Dashboard/DashSidebar.tsx
+++ b/packages/client/components/Dashboard/DashSidebar.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {useLocation, useRouteMatch} from 'react-router'
+import {useRouteMatch} from 'react-router'
 import {PALETTE} from '../../styles/paletteV3'
 import {NavSidebar} from '../../types/constEnums'
 import {
@@ -16,7 +16,6 @@ import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.gra
 import DashNavList from '../DashNavList/DashNavList'
 import SideBarStartMeetingButton from '../SideBarStartMeetingButton'
 import LeftDashNavItem from './LeftDashNavItem'
-import getTeamIdFromPathname from '../../utils/getTeamIdFromPathname'
 
 const Nav = styled('nav')<{isOpen: boolean}>(({isOpen}) => ({
   // 78px is total height of 'Add meeting' block
@@ -83,9 +82,6 @@ const DashSidebar = (props: Props) => {
     graphql`
       fragment DashSidebar_viewer on User {
         ...StandardHub_viewer
-        featureFlags {
-          retrosInDisguise
-        }
         organizations {
           ...DashNavList_organization
           id
@@ -97,10 +93,8 @@ const DashSidebar = (props: Props) => {
     viewerRef
   )
 
-  const location = useLocation()
-
   if (!viewer) return null
-  const {featureFlags, organizations} = viewer
+  const {organizations} = viewer
 
   if (match) {
     const {orgId: orgIdFromParams} = match.params
@@ -108,7 +102,7 @@ const DashSidebar = (props: Props) => {
     const {id: orgId, name, isBillingLeader} = currentOrg ?? {}
     return (
       <Wrapper>
-        <SideBarStartMeetingButton isOpen={isOpen} hasRid={featureFlags.retrosInDisguise} />
+        <SideBarStartMeetingButton isOpen={isOpen} />
         <Nav isOpen={isOpen}>
           <Contents>
             <NavItemsWrap>
@@ -153,11 +147,9 @@ const DashSidebar = (props: Props) => {
     )
   }
 
-  const teamId = getTeamIdFromPathname()
-
   return (
     <Wrapper>
-      <SideBarStartMeetingButton isOpen={isOpen} hasRid={featureFlags.retrosInDisguise} />
+      <SideBarStartMeetingButton isOpen={isOpen} />
       <Nav isOpen={isOpen}>
         <Contents>
           <NavItemsWrap>
@@ -174,16 +166,6 @@ const DashSidebar = (props: Props) => {
             <NavItem icon={'add'} href={'/newteam/1'} label={'Add a Team'} />
           </NavItemsWrap>
           <DashHR />
-          <NavItemsWrap>
-            {featureFlags.retrosInDisguise && (
-              <NavItem
-                icon={'magic'}
-                href={`/new-meeting/${teamId}`}
-                navState={{backgroundLocation: location}}
-                label={'Add meeting (legacy)'}
-              />
-            )}
-          </NavItemsWrap>
         </Contents>
       </Nav>
     </Wrapper>
diff --git a/packages/client/components/Dashboard/MobileDashSidebar.tsx b/packages/client/components/Dashboard/MobileDashSidebar.tsx
index fd53e154610..03666b91642 100644
--- a/packages/client/components/Dashboard/MobileDashSidebar.tsx
+++ b/packages/client/components/Dashboard/MobileDashSidebar.tsx
@@ -94,9 +94,6 @@ const MobileDashSidebar = (props: Props) => {
     graphql`
       fragment MobileDashSidebar_viewer on User {
         ...StandardHub_viewer
-        featureFlags {
-          retrosInDisguise
-        }
         organizations {
           ...DashNavList_organization
           id
@@ -108,7 +105,7 @@ const MobileDashSidebar = (props: Props) => {
     viewerRef
   )
   if (!viewer) return null
-  const {featureFlags, organizations} = viewer
+  const {organizations} = viewer
 
   if (match) {
     const {orgId: orgIdFromParams} = match.params
@@ -179,14 +176,12 @@ const MobileDashSidebar = (props: Props) => {
               href={'/meetings'}
               label={'Meetings'}
             />
-            {featureFlags.retrosInDisguise && (
-              <LeftDashNavItem
-                onClick={handleMenuClick}
-                icon={'magic'}
-                href={'/activity-library'}
-                label={'Activity Library'}
-              />
-            )}
+            <LeftDashNavItem
+              onClick={handleMenuClick}
+              icon={'magic'}
+              href={'/activity-library'}
+              label={'Activity Library'}
+            />
             <LeftDashNavItem
               onClick={handleMenuClick}
               icon={'timeline'}
diff --git a/packages/client/components/MeetingsDash.tsx b/packages/client/components/MeetingsDash.tsx
index 5cf2893cc01..e92e3c5db81 100644
--- a/packages/client/components/MeetingsDash.tsx
+++ b/packages/client/components/MeetingsDash.tsx
@@ -48,9 +48,6 @@ const MeetingsDash = (props: Props) => {
         id
         dashSearch
         preferredName
-        featureFlags {
-          retrosInDisguise
-        }
         teams {
           ...MeetingsDashActiveMeetings @relay(mask: false)
         }
@@ -61,12 +58,7 @@ const MeetingsDash = (props: Props) => {
   )
   const atmosphere = useAtmosphere()
   const {teamIds: teamFilterIds} = useQueryParameterParser(atmosphere.viewerId)
-  const {
-    teams = [],
-    preferredName = '',
-    dashSearch,
-    featureFlags = {retrosInDisguise: false}
-  } = viewer ?? {}
+  const {teams = [], preferredName = '', dashSearch} = viewer ?? {}
   const activeMeetings = useMemo(
     () =>
       teams
@@ -151,7 +143,7 @@ const MeetingsDash = (props: Props) => {
           ) : null}
         </EmptyContainer>
       )}
-      <StartMeetingFAB hasRid={featureFlags.retrosInDisguise} />
+      <StartMeetingFAB />
     </>
   )
 }
diff --git a/packages/client/components/SideBarStartMeetingButton.tsx b/packages/client/components/SideBarStartMeetingButton.tsx
index 1803351ce1a..ce67aa73bc8 100644
--- a/packages/client/components/SideBarStartMeetingButton.tsx
+++ b/packages/client/components/SideBarStartMeetingButton.tsx
@@ -1,9 +1,7 @@
 import styled from '@emotion/styled'
 import {Add} from '@mui/icons-material'
 import React from 'react'
-import {useLocation} from 'react-router'
 import useRouter from '~/hooks/useRouter'
-import getTeamIdFromPathname from '~/utils/getTeamIdFromPathname'
 import {BezierCurve} from '../types/constEnums'
 import FlatPrimaryButton from './FlatPrimaryButton'
 
@@ -30,17 +28,11 @@ const MeetingLabel = styled('div')<{isOpen: boolean}>(({isOpen}) => ({
   opacity: isOpen ? 1 : 0
 }))
 
-const SideBarStartMeetingButton = ({isOpen, hasRid}: {isOpen: boolean; hasRid: boolean}) => {
-  const location = useLocation()
-  const teamId = getTeamIdFromPathname()
+const SideBarStartMeetingButton = ({isOpen}: {isOpen: boolean}) => {
   const {history} = useRouter()
 
   const onClick = () => {
-    if (hasRid) {
-      history.push('/activity-library')
-    } else {
-      history.replace(`/new-meeting/${teamId}`, {backgroundLocation: location})
-    }
+    history.push('/activity-library')
   }
   return (
     <Button isOpen={isOpen} onClick={onClick}>
diff --git a/packages/client/components/StartMeetingFAB.tsx b/packages/client/components/StartMeetingFAB.tsx
index c9fdf1339ef..ebc0a3c1208 100644
--- a/packages/client/components/StartMeetingFAB.tsx
+++ b/packages/client/components/StartMeetingFAB.tsx
@@ -1,10 +1,8 @@
 import styled from '@emotion/styled'
 import {Add as AddIcon} from '@mui/icons-material'
 import React, {useEffect, useRef, useState} from 'react'
-import {useLocation} from 'react-router'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
-import getTeamIdFromPathname from '~/utils/getTeamIdFromPathname'
 import useBreakpoint from '../hooks/useBreakpoint'
 import {BezierCurve, Breakpoint, ElementWidth, ZIndex} from '../types/constEnums'
 import FloatingActionButton from './FloatingActionButton'
@@ -51,14 +49,11 @@ const MeetingLabel = styled('div')<{isExpanded: boolean}>(({isExpanded}) => ({
 
 interface Props {
   className?: string
-  hasRid: boolean
 }
 
 const StartMeetingFAB = (props: Props) => {
-  const location = useLocation()
-  const {className, hasRid} = props
+  const {className} = props
   const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
-  const teamId = getTeamIdFromPathname()
   const {history} = useRouter()
   const [isExpanded, setIsExpanded] = useState(true)
   const hoverTimerId = useRef<number | undefined>()
@@ -92,11 +87,7 @@ const StartMeetingFAB = (props: Props) => {
     }
   }
   const onClick = () => {
-    if (hasRid) {
-      history.push('/activity-library')
-    } else {
-      history.replace(`/new-meeting/${teamId}`, {backgroundLocation: location})
-    }
+    history.push('/activity-library')
   }
   // We use the SideBarStartMeetingButton in this case
   if (isDesktop) {
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
index 421f34296fd..9d1cb8125de 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
@@ -32,9 +32,6 @@ const TeamDashMain = (props: Props) => {
             ...TeamTasksHeaderContainer_team
             ...TeamDashActivityTab_team
           }
-          featureFlags {
-            retrosInDisguise
-          }
           ...TeamDashTasksTab_viewer
           ...TeamDrawer_viewer
         }
@@ -67,7 +64,7 @@ const TeamDashMain = (props: Props) => {
             <TeamDashActivityTab teamRef={team} />
           </Route>
         </Switch>
-        <AbsoluteFab hasRid={viewer.featureFlags.retrosInDisguise} />
+        <AbsoluteFab />
       </div>
       <TeamDrawer viewer={viewer} />
     </div>
diff --git a/packages/client/modules/userDashboard/components/UserDashMain.tsx b/packages/client/modules/userDashboard/components/UserDashMain.tsx
new file mode 100644
index 00000000000..2d933840e2a
--- /dev/null
+++ b/packages/client/modules/userDashboard/components/UserDashMain.tsx
@@ -0,0 +1,37 @@
+import React, {lazy, Suspense} from 'react'
+import {Route, RouteComponentProps, Switch} from 'react-router'
+import DashContent from '~/components/Dashboard/DashContent'
+import LoadingComponent from '~/components/LoadingComponent/LoadingComponent'
+import StartMeetingFAB from '~/components/StartMeetingFAB'
+import {LoaderSize} from '~/types/constEnums'
+
+interface Props extends RouteComponentProps {}
+
+const UserTaskViewRoot = lazy(
+  () =>
+    import(/* webpackChunkName: 'MyDashboardTasksRoot' */ '../../../components/UserTaskViewRoot')
+)
+const MyDashboardTimelineRoot = lazy(
+  () =>
+    import(
+      /* webpackChunkName: 'MyDashboardTimelineRoot' */ '../../../components/MyDashboardTimelineRoot'
+    )
+)
+
+const UserDashMain = (props: Props) => {
+  const {match} = props
+
+  return (
+    <DashContent>
+      <Suspense fallback={<LoadingComponent spinnerSize={LoaderSize.PANEL} />}>
+        <Switch>
+          <Route path={`${match.url}/tasks`} component={UserTaskViewRoot} />
+          <Route path={match.url} component={MyDashboardTimelineRoot} />
+        </Switch>
+      </Suspense>
+      <StartMeetingFAB />
+    </DashContent>
+  )
+}
+
+export default UserDashMain
diff --git a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx b/packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx
deleted file mode 100644
index 05de40f90c8..00000000000
--- a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMain.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, {lazy, Suspense} from 'react'
-import graphql from 'babel-plugin-relay/macro'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {UserDashMainQuery} from '~/__generated__/UserDashMainQuery.graphql'
-import {Route, RouteComponentProps, Switch} from 'react-router'
-import DashContent from '~/components/Dashboard/DashContent'
-import LoadingComponent from '../../../../components/LoadingComponent/LoadingComponent'
-import StartMeetingFAB from '../../../../components/StartMeetingFAB'
-import {LoaderSize} from '../../../../types/constEnums'
-
-interface Props extends RouteComponentProps {
-  queryRef: PreloadedQuery<UserDashMainQuery>
-}
-
-const UserTaskViewRoot = lazy(
-  () =>
-    import(/* webpackChunkName: 'MyDashboardTasksRoot' */ '../../../../components/UserTaskViewRoot')
-)
-const MyDashboardTimelineRoot = lazy(
-  () =>
-    import(
-      /* webpackChunkName: 'MyDashboardTimelineRoot' */ '../../../../components/MyDashboardTimelineRoot'
-    )
-)
-
-const UserDashMain = (props: Props) => {
-  const {match, queryRef} = props
-
-  const data = usePreloadedQuery<UserDashMainQuery>(
-    graphql`
-      query UserDashMainQuery {
-        viewer {
-          featureFlags {
-            retrosInDisguise
-          }
-        }
-      }
-    `,
-    queryRef
-  )
-
-  const {viewer} = data
-
-  return (
-    <DashContent>
-      <Suspense fallback={<LoadingComponent spinnerSize={LoaderSize.PANEL} />}>
-        <Switch>
-          <Route path={`${match.url}/tasks`} component={UserTaskViewRoot} />
-          <Route path={match.url} component={MyDashboardTimelineRoot} />
-        </Switch>
-      </Suspense>
-      <StartMeetingFAB hasRid={viewer.featureFlags.retrosInDisguise} />
-    </DashContent>
-  )
-}
-
-export default UserDashMain
diff --git a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx b/packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx
deleted file mode 100644
index e1681aee80f..00000000000
--- a/packages/client/modules/userDashboard/components/UserDashMain/UserDashMainRoot.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React, {Suspense} from 'react'
-import useQueryLoaderNow from '~/hooks/useQueryLoaderNow'
-import userDashMainQuery, {UserDashMainQuery} from '~/__generated__/UserDashMainQuery.graphql'
-import UserDashMain from './UserDashMain'
-import {RouteComponentProps} from 'react-router'
-
-const UserDashMainRoot = (props: RouteComponentProps) => {
-  const queryRef = useQueryLoaderNow<UserDashMainQuery>(userDashMainQuery)
-  return (
-    <Suspense fallback={''}>{queryRef && <UserDashMain queryRef={queryRef} {...props} />}</Suspense>
-  )
-}
-
-export default UserDashMainRoot
diff --git a/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx b/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
index 6b7c686cdf1..9b666042d9d 100644
--- a/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
+++ b/packages/client/modules/userDashboard/components/UserDashboard/UserDashboard.tsx
@@ -14,9 +14,7 @@ const Organization = lazy(
       /* webpackChunkName: 'OrganizationRoot' */ '../../containers/Organization/OrganizationRoot'
     )
 )
-const UserDashMain = lazy(
-  () => import(/* webpackChunkName: 'UserDashMain' */ '../UserDashMain/UserDashMainRoot')
-)
+const UserDashMain = lazy(() => import(/* webpackChunkName: 'UserDashMain' */ '../UserDashMain'))
 const UserProfile = lazy(
   () => import(/* webpackChunkName: 'UserProfileRoot' */ '../UserProfileRoot')
 )
diff --git a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
index cb4fc7095f6..278c71930b7 100644
--- a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
+++ b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
@@ -22,8 +22,7 @@ import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail'
 const bootstrapNewUser = async (
   newUser: User,
   isOrganic: boolean,
-  dataLoader: DataLoaderWorker,
-  searchParams?: string
+  dataLoader: DataLoaderWorker
 ) => {
   const r = await getRethink()
   const {
@@ -49,17 +48,6 @@ const bootstrapNewUser = async (
 
   const experimentalFlags = [...featureFlags]
 
-  // Retros in disguise
-  const domainUserHasRidFlag = usersWithDomain.some((user) =>
-    user.featureFlags.includes('retrosInDisguise')
-  )
-  const params = new URLSearchParams(searchParams)
-  if (Boolean(params.get('rid')) || domainUserHasRidFlag) {
-    experimentalFlags.push('retrosInDisguise')
-  } else if (usersWithDomain.length === 0) {
-    experimentalFlags.push('retrosInDisguise')
-  }
-
   // Add signUpDestinationTeam feature flag to 50% of new accounts
   if (Math.random() < 0.5) {
     experimentalFlags.push('signUpDestinationTeam')
diff --git a/packages/server/graphql/public/mutations/loginWithGoogle.ts b/packages/server/graphql/public/mutations/loginWithGoogle.ts
index bb039acac3b..b2d120c4e7f 100644
--- a/packages/server/graphql/public/mutations/loginWithGoogle.ts
+++ b/packages/server/graphql/public/mutations/loginWithGoogle.ts
@@ -15,7 +15,7 @@ import {MutationResolvers} from '../resolverTypes'
 
 const loginWithGoogle: MutationResolvers['loginWithGoogle'] = async (
   _source,
-  {code, invitationToken, pseudoId, params},
+  {code, invitationToken, pseudoId},
   context
 ) => {
   const {dataLoader} = context
@@ -98,7 +98,7 @@ const loginWithGoogle: MutationResolvers['loginWithGoogle'] = async (
     identities: [identity],
     pseudoId
   })
-  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader, params)
+  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader)
   return {
     userId,
     authToken: encodeAuthToken(context.authToken),
diff --git a/packages/server/graphql/public/mutations/loginWithMicrosoft.ts b/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
index 9737193a06d..e41022046d6 100644
--- a/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
+++ b/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
@@ -15,7 +15,7 @@ import {MutationResolvers} from '../resolverTypes'
 
 const loginWithMicrosoft: MutationResolvers['loginWithMicrosoft'] = async (
   _source,
-  {code, invitationToken, pseudoId, params},
+  {code, invitationToken, pseudoId},
   context
 ) => {
   const {dataLoader} = context
@@ -100,7 +100,7 @@ const loginWithMicrosoft: MutationResolvers['loginWithMicrosoft'] = async (
     identities: [identity],
     pseudoId
   })
-  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader, params)
+  context.authToken = await bootstrapNewUser(newUser, !invitationToken, dataLoader)
   return {
     userId,
     authToken: encodeAuthToken(context.authToken),
diff --git a/packages/server/graphql/public/mutations/signUpWithPassword.ts b/packages/server/graphql/public/mutations/signUpWithPassword.ts
index ea335848a77..0bb1ae2ddd6 100644
--- a/packages/server/graphql/public/mutations/signUpWithPassword.ts
+++ b/packages/server/graphql/public/mutations/signUpWithPassword.ts
@@ -65,7 +65,7 @@ const signUpWithPassword: MutationResolvers['signUpWithPassword'] = async (
   const hashedPassword = await bcrypt.hash(password, Security.SALT_ROUNDS)
   const newUser = createNewLocalUser({email, hashedPassword, isEmailVerified: false, pseudoId})
   // MUTATIVE
-  context.authToken = await bootstrapNewUser(newUser, isOrganic, dataLoader, params)
+  context.authToken = await bootstrapNewUser(newUser, isOrganic, dataLoader)
   return {
     userId: newUser.id,
     authToken: encodeAuthToken(context.authToken),
diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
index 411d2f484f6..8eefed7fef4 100644
--- 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
-  retrosInDisguise
   adHocTeams
   noTemplateLimit
   signUpDestinationTeam
@@ -22,7 +21,6 @@ type UserFeatureFlags {
   recurrence: Boolean!
   noAISummary: Boolean!
   noMeetingHistoryLimit: Boolean!
-  retrosInDisguise: Boolean!
   adHocTeams: Boolean!
   noTemplateLimit: Boolean!
   signUpDestinationTeam: Boolean!
diff --git a/packages/server/graphql/public/types/UserFeatureFlags.ts b/packages/server/graphql/public/types/UserFeatureFlags.ts
index f8c72854653..a96af981d89 100644
--- 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,
-  retrosInDisguise: ({retrosInDisguise}) => !!retrosInDisguise,
   adHocTeams: ({adHocTeams}) => !!adHocTeams,
   noTemplateLimit: ({noTemplateLimit}) => !!noTemplateLimit,
   signUpDestinationTeam: ({signUpDestinationTeam}) => !!signUpDestinationTeam

From b337d17ff41c4ab4179073ed2eb59a1244998180 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Apr 2024 09:56:28 +0200
Subject: [PATCH 147/183] chore: remove old new meeting dialog (#9621)

---
 .../ActivityLibrary/ActivityCard.tsx          |   2 +-
 .../components/ActivityLibrary/Categories.ts  |   2 +-
 packages/client/components/Dashboard.tsx      |   2 +-
 .../MeetingHelp/CheckInHelpMenu.tsx           |   2 +-
 packages/client/components/NewMeeting.tsx     | 234 ------------------
 .../client/components/NewMeetingCarousel.tsx  | 172 -------------
 .../NewMeetingRecurrenceSettings.tsx          |  70 ------
 packages/client/components/NewMeetingRoot.tsx |  52 ----
 .../client/components/NewMeetingSettings.tsx  |   2 +-
 packages/client/components/PrivateRoutes.tsx  |  12 +-
 .../Recurrence/EndRecurringMeetingModal.tsx   |   2 +-
 .../components/SelectMeetingDropdown.tsx      |  30 ---
 .../SuggestedActionTryActionMeeting.tsx       |   4 +-
 .../SuggestedActionTryRetroMeeting.tsx        |   4 +-
 packages/client/components/Tag/TierTag.tsx    |   2 +-
 packages/client/hooks/useActiveTopTemplate.ts |   2 +-
 packages/client/hooks/useEndMeetingHotkey.ts  |   2 +-
 .../components/ReflectTemplateItem.tsx        |   2 +-
 .../meeting/components/RemoveTemplate.tsx     |   2 +-
 .../components/OrgBilling/OrgPlan.tsx         |   2 +-
 .../components/OrgBilling/OrgPlans.tsx        |   2 +-
 packages/client/utils/getContentGroup.ts      |   2 +-
 .../client/utils/relay/setActiveTemplate.ts   |   2 +-
 .../client/utils/useTemplateDescription.ts    |   2 +-
 24 files changed, 23 insertions(+), 587 deletions(-)
 delete mode 100644 packages/client/components/NewMeeting.tsx
 delete mode 100644 packages/client/components/NewMeetingCarousel.tsx
 delete mode 100644 packages/client/components/NewMeetingRecurrenceSettings.tsx
 delete mode 100644 packages/client/components/NewMeetingRoot.tsx

diff --git a/packages/client/components/ActivityLibrary/ActivityCard.tsx b/packages/client/components/ActivityLibrary/ActivityCard.tsx
index 59a955d6249..e0ccdbdf51d 100644
--- a/packages/client/components/ActivityLibrary/ActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityCard.tsx
@@ -4,7 +4,7 @@ import React, {PropsWithChildren, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {twMerge} from 'tailwind-merge'
 import {ActivityCard_template$key} from '../../__generated__/ActivityCard_template.graphql'
-import {MeetingTypeEnum} from '../../__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql'
 import {Tooltip} from '../../ui/Tooltip/Tooltip'
 import {TooltipContent} from '../../ui/Tooltip/TooltipContent'
 import {TooltipTrigger} from '../../ui/Tooltip/TooltipTrigger'
diff --git a/packages/client/components/ActivityLibrary/Categories.ts b/packages/client/components/ActivityLibrary/Categories.ts
index e50a16131e6..57b66dbd474 100644
--- a/packages/client/components/ActivityLibrary/Categories.ts
+++ b/packages/client/components/ActivityLibrary/Categories.ts
@@ -1,4 +1,4 @@
-import {MeetingTypeEnum} from '../../__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql'
 import {CardTheme} from './ActivityCard'
 
 export const MAIN_CATEGORIES = [
diff --git a/packages/client/components/Dashboard.tsx b/packages/client/components/Dashboard.tsx
index 53d3c842532..6dbc7c535e2 100644
--- a/packages/client/components/Dashboard.tsx
+++ b/packages/client/components/Dashboard.tsx
@@ -150,7 +150,7 @@ const Dashboard = (props: Props) => {
         <DashMain id='main' ref={meetingsDashRef}>
           <Switch>
             <Route
-              path='(/meetings|/new-meeting)'
+              path='(/meetings)'
               render={(routeProps) => (
                 <MeetingsDash {...routeProps} meetingsDashRef={meetingsDashRef} viewer={viewer} />
               )}
diff --git a/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx b/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx
index ab710768f5a..2a14d40c109 100644
--- a/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/CheckInHelpMenu.tsx
@@ -1,5 +1,5 @@
 import React, {forwardRef} from 'react'
-import {MeetingTypeEnum} from '~/__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {ExternalLinks} from '../../types/constEnums'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
diff --git a/packages/client/components/NewMeeting.tsx b/packages/client/components/NewMeeting.tsx
deleted file mode 100644
index 084389fe6db..00000000000
--- a/packages/client/components/NewMeeting.tsx
+++ /dev/null
@@ -1,234 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef, useState} from 'react'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import useAtmosphere from '~/hooks/useAtmosphere'
-import useMutationProps from '~/hooks/useMutationProps'
-import useUsageSnackNag from '~/hooks/useUsageSnackNag'
-import StartCheckInMutation from '~/mutations/StartCheckInMutation'
-import StartRetrospectiveMutation from '~/mutations/StartRetrospectiveMutation'
-import StartSprintPokerMutation from '~/mutations/StartSprintPokerMutation'
-import StartTeamPromptMutation from '~/mutations/StartTeamPromptMutation'
-import {PALETTE} from '~/styles/paletteV3'
-import {MeetingTypeEnum, NewMeetingQuery} from '~/__generated__/NewMeetingQuery.graphql'
-import useRouter from '../hooks/useRouter'
-import {Breakpoint, Radius} from '../types/constEnums'
-import sortByTier from '../utils/sortByTier'
-import DialogContainer from './DialogContainer'
-import DialogTitle from './DialogTitle'
-import FlatButton from './FlatButton'
-import IconLabel from './IconLabel'
-import NewMeetingActions from './NewMeetingActions'
-import NewMeetingCarousel from './NewMeetingCarousel'
-import {NewMeetingRecurrenceSettings} from './NewMeetingRecurrenceSettings'
-import NewMeetingSettings from './NewMeetingSettings'
-import NewMeetingTeamPicker from './NewMeetingTeamPicker'
-import {RecurrenceSettings} from './Recurrence/RecurrenceSettings'
-
-interface Props {
-  teamId?: string | null
-  queryRef: PreloadedQuery<NewMeetingQuery>
-  onClose: () => void
-}
-
-const MEDIA_QUERY_FUZZY_TABLET = `@media screen and (max-width: ${Breakpoint.FUZZY_TABLET}px)`
-
-const TeamAndSettings = styled('div')({
-  marginTop: 16,
-  minHeight: 166,
-  padding: '0px 24px'
-})
-
-const SettingsFirstRow = styled('div')({
-  paddingBottom: 16
-})
-
-const SettingsRow = styled('div')({
-  display: 'flex',
-  flexDirection: 'row',
-  gap: 16,
-  '> div, button': {
-    width: '50%'
-  },
-  [MEDIA_QUERY_FUZZY_TABLET]: {
-    flexDirection: 'column',
-    '> div, button': {
-      width: '100%'
-    }
-  }
-})
-
-const NewMeetingDialog = styled(DialogContainer)({
-  width: '865px',
-  borderRadius: Radius.FIELD,
-
-  [MEDIA_QUERY_FUZZY_TABLET]: {
-    minWidth: '100vw',
-    maxHeight: '100vh',
-    minHeight: '100vh',
-    borderRadius: 0
-  }
-})
-
-const Title = styled(DialogTitle)({
-  fontSize: 24,
-  display: 'flex',
-  flexDirection: 'row',
-  alignItems: 'center',
-  justifyContent: 'space-between',
-  padding: '16px 16px 16px 24px',
-  [MEDIA_QUERY_FUZZY_TABLET]: {
-    padding: '8px 8px 8px 16px'
-  }
-})
-
-const CloseButton = styled(FlatButton)({
-  padding: 8,
-  color: PALETTE.SLATE_600
-})
-
-const NewMeetingInner = styled('div')({
-  height: '100%',
-  maxHeight: 640,
-  maxWidth: 1400,
-  padding: 0,
-
-  [MEDIA_QUERY_FUZZY_TABLET]: {
-    display: 'block',
-    padding: 0
-  }
-})
-
-const query = graphql`
-  query NewMeetingQuery {
-    viewer {
-      featureFlags {
-        insights
-      }
-      teams {
-        ...NewMeetingTeamPicker_selectedTeam
-        ...NewMeetingSettings_selectedTeam
-        ...NewMeetingTeamPicker_teams
-        ...NewMeetingActions_team
-        id
-        lastMeetingType
-        name
-        tier
-      }
-    }
-  }
-`
-
-const NewMeeting = (props: Props) => {
-  const {teamId, queryRef, onClose} = props
-  const data = usePreloadedQuery<NewMeetingQuery>(query, queryRef)
-  const {viewer} = data
-  const {teams, featureFlags} = viewer
-  const {insights} = featureFlags
-  const [meetingOrder, setMeetingOrder] = useState<MeetingTypeEnum[]>([
-    'retrospective',
-    'teamPrompt',
-    'poker',
-    'action'
-  ])
-  const [recurrenceSettings, setRecurrenceSettings] = useState<RecurrenceSettings>({
-    name: '',
-    rrule: null
-  })
-
-  const {history, location} = useRouter()
-  const [idx, setIdx] = useState(0)
-  useUsageSnackNag(insights)
-  const meetingType = meetingOrder[idx] as MeetingTypeEnum
-  const sendToMeRef = useRef(false)
-  useEffect(() => {
-    if (!teamId) {
-      sendToMeRef.current = true
-      const [firstTeam] = sortByTier(teams)
-      const nextPath = firstTeam ? `/new-meeting/${firstTeam.id}` : '/newteam'
-      history.replace(nextPath, location.state)
-    }
-  }, [])
-  const selectedTeam = teams.find((team) => team.id === teamId)
-  useEffect(() => {
-    if (!selectedTeam) return
-    const {lastMeetingType} = selectedTeam
-    const meetingIdx = meetingOrder.indexOf(lastMeetingType)
-    const newMeetingOrder = [...meetingOrder]
-    const firstMeeting = newMeetingOrder.splice(meetingIdx, 1)[0] as MeetingTypeEnum
-    newMeetingOrder.unshift(firstMeeting)
-    setMeetingOrder(newMeetingOrder)
-  }, [])
-  const {submitMutation, error, submitting, onError, onCompleted} = useMutationProps()
-  const atmosphere = useAtmosphere()
-  const onStartMeetingClick = () => {
-    if (submitting || !selectedTeam) return
-    submitMutation()
-    const {id: teamId} = selectedTeam
-    if (meetingType === 'poker') {
-      StartSprintPokerMutation(atmosphere, {teamId}, {history, onError, onCompleted})
-    } else if (meetingType === 'action') {
-      StartCheckInMutation(atmosphere, {teamId}, {history, onError, onCompleted})
-    } else if (meetingType === 'retrospective') {
-      StartRetrospectiveMutation(atmosphere, {teamId}, {history, onError, onCompleted})
-    } else if (meetingType === 'teamPrompt') {
-      StartTeamPromptMutation(
-        atmosphere,
-        {
-          teamId,
-          recurrenceSettings: {
-            rrule: recurrenceSettings.rrule?.toString(),
-            name: recurrenceSettings.name
-          }
-        },
-        {history, onError, onCompleted}
-      )
-    }
-  }
-  if (!teamId || !selectedTeam) return null
-  return (
-    <NewMeetingDialog>
-      <Title>
-        New meeting
-        <CloseButton onClick={onClose}>
-          <IconLabel icon='close' iconLarge />
-        </CloseButton>
-      </Title>
-      <NewMeetingInner>
-        <NewMeetingCarousel
-          idx={idx}
-          setIdx={setIdx}
-          meetingOrder={meetingOrder}
-          onStartMeetingClick={onStartMeetingClick}
-        />
-        <TeamAndSettings>
-          <SettingsFirstRow>
-            <NewMeetingTeamPicker
-              onSelectTeam={(teamId) => history.replace(`/new-meeting/${teamId}`)}
-              selectedTeamRef={selectedTeam}
-              teamsRef={teams}
-            />
-          </SettingsFirstRow>
-          <SettingsRow>
-            <NewMeetingSettings selectedTeamRef={selectedTeam} meetingType={meetingType} />
-            {meetingType === 'teamPrompt' && (
-              <NewMeetingRecurrenceSettings
-                onRecurrenceSettingsUpdated={setRecurrenceSettings}
-                recurrenceSettings={recurrenceSettings}
-                placeholder='Standup'
-              />
-            )}
-          </SettingsRow>
-        </TeamAndSettings>
-      </NewMeetingInner>
-      <NewMeetingActions
-        teamRef={selectedTeam}
-        onStartMeetingClick={onStartMeetingClick}
-        submitting={submitting}
-        error={error}
-      />
-    </NewMeetingDialog>
-  )
-}
-
-export default NewMeeting
diff --git a/packages/client/components/NewMeetingCarousel.tsx b/packages/client/components/NewMeetingCarousel.tsx
deleted file mode 100644
index d3d78343bf2..00000000000
--- a/packages/client/components/NewMeetingCarousel.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import styled from '@emotion/styled'
-import React, {useEffect, useRef} from 'react'
-import {FreeMode, Keyboard, Mousewheel} from 'swiper'
-import 'swiper/css'
-import 'swiper/css/free-mode'
-import 'swiper/css/mousewheel'
-import {Swiper, SwiperSlide} from 'swiper/react'
-import action from '../../../static/images/illustrations/action.png'
-import retrospective from '../../../static/images/illustrations/retrospective.png'
-import poker from '../../../static/images/illustrations/sprintPoker.png'
-import teamPrompt from '../../../static/images/illustrations/teamPrompt.png'
-import {PALETTE} from '../styles/paletteV3'
-import {BezierCurve, Breakpoint} from '../types/constEnums'
-import {MeetingTypeEnum} from '../__generated__/NewMeetingQuery.graphql'
-
-const Container = styled('div')({
-  '.swiper-wrapper': {
-    alignItems: 'center',
-    padding: '20px 0'
-  }
-})
-
-const Title = styled('div')<{isActive: boolean}>(({isActive}) => ({
-  color: isActive ? PALETTE.WHITE : PALETTE.SLATE_900,
-  fontSize: 20,
-  fontWeight: 600
-}))
-
-const Description = styled('div')<{isActive: boolean}>(({isActive}) => ({
-  display: isActive ? 'block' : 'none',
-  overflow: 'hidden',
-  color: PALETTE.WHITE,
-  fontSize: 12,
-  whiteSpace: 'nowrap',
-  textOverflow: 'ellipsis'
-}))
-
-const MeetingImage = styled('img')({
-  objectFit: 'contain',
-  height: 108
-})
-
-const BACKGROUND_COLORS = {
-  retrospective: PALETTE.GRAPE_500,
-  action: PALETTE.AQUA_400,
-  poker: PALETTE.TOMATO_400,
-  teamPrompt: PALETTE.JADE_400
-}
-
-const Card = styled('div')<{isActive: boolean; meetingType: keyof typeof BACKGROUND_COLORS}>(
-  ({isActive, meetingType}) => ({
-    background: isActive ? BACKGROUND_COLORS[meetingType] : PALETTE.SLATE_200,
-    cursor: 'pointer',
-    borderRadius: 4,
-    padding: 16,
-    transition: `all 200ms ${BezierCurve.DECELERATE}`,
-    transform: isActive ? `scale(1.1)` : 'scale(1)',
-    display: 'flex',
-    flexDirection: 'column',
-    outline: 'none',
-    position: 'relative'
-  })
-)
-
-const ILLUSTRATIONS = {
-  retrospective,
-  action,
-  poker,
-  teamPrompt
-} as Record<MeetingTypeEnum, string>
-
-const TITLES = {
-  retrospective: 'Retrospective',
-  action: 'Team Check-in',
-  poker: 'Sprint Poker',
-  teamPrompt: 'Standup'
-} as Record<MeetingTypeEnum, string>
-
-const DESCRIPTIONS = {
-  retrospective: 'Improve how you work',
-  action: 'Sync up, unblock each other',
-  poker: 'Estimate effort, de-risk execution',
-  teamPrompt: 'Share updates, on your time'
-} as Record<MeetingTypeEnum, string>
-
-interface Props {
-  idx: number
-  setIdx: (idx: number) => void
-  meetingOrder: MeetingTypeEnum[]
-  onStartMeetingClick: () => void
-}
-
-const NewMeetingCarousel = (props: Props) => {
-  const {idx, setIdx, meetingOrder, onStartMeetingClick} = props
-  const cardRef = useRef<HTMLDivElement | null>(null)
-
-  useEffect(() => {
-    if (cardRef.current) {
-      cardRef.current.focus()
-    }
-  }, [cardRef.current])
-
-  const onKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
-    const {key} = e
-    if (key === 'ArrowLeft') {
-      if (idx !== 0) {
-        const newIdx = idx - 1
-        setIdx(newIdx)
-      }
-    } else if (key === 'ArrowRight') {
-      if (idx !== meetingOrder.length - 1) {
-        const newIdx = idx + 1
-        setIdx(newIdx)
-      }
-    } else if (key === 'Enter') {
-      onStartMeetingClick()
-    }
-  }
-
-  return (
-    <Container>
-      <Swiper
-        modules={[Mousewheel, FreeMode, Keyboard]}
-        mousewheel={true}
-        slidesOffsetAfter={24}
-        centeredSlides
-        slideToClickedSlide={true}
-        spaceBetween={26}
-        threshold={10}
-        keyboard={true}
-        slidesPerView={1.5}
-        breakpoints={{
-          [Breakpoint.FUZZY_TABLET]: {
-            slidesOffsetBefore: 24,
-            slidesPerView: 3.5,
-            slideToClickedSlide: true,
-            centeredSlides: false,
-            centeredSlidesBounds: false
-          }
-        }}
-        freeMode={{
-          enabled: true
-        }}
-      >
-        {meetingOrder.map((meetingType, index) => {
-          const src = ILLUSTRATIONS[meetingType]
-          const title = TITLES[meetingType]
-          const description = DESCRIPTIONS[meetingType]
-          const isActive = idx === index
-          return (
-            <SwiperSlide key={meetingType}>
-              <Card
-                isActive={isActive}
-                meetingType={meetingType}
-                tabIndex={0}
-                onClick={() => setIdx(index)}
-                ref={isActive ? cardRef : null}
-                onKeyDown={onKeyDown}
-              >
-                <MeetingImage src={src} key={meetingType} />
-                <Title isActive={isActive}>{title}</Title>
-                <Description isActive={isActive}>{description}</Description>
-              </Card>
-            </SwiperSlide>
-          )
-        })}
-      </Swiper>
-    </Container>
-  )
-}
-
-export default NewMeetingCarousel
diff --git a/packages/client/components/NewMeetingRecurrenceSettings.tsx b/packages/client/components/NewMeetingRecurrenceSettings.tsx
deleted file mode 100644
index 51206d0f3d0..00000000000
--- a/packages/client/components/NewMeetingRecurrenceSettings.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React, {ChangeEvent} from 'react'
-import {RRule} from 'rrule'
-import {MenuPosition} from '../hooks/useCoords'
-import useMenu from '../hooks/useMenu'
-import {PortalStatus} from '../hooks/usePortal'
-import NewMeetingDropdown from './NewMeetingDropdown'
-import {toHumanReadable} from './Recurrence/HumanReadableRecurrenceRule'
-import {RecurrenceSettings} from './Recurrence/RecurrenceSettings'
-
-interface Props {
-  onRecurrenceSettingsUpdated: (recurrenceSettings: RecurrenceSettings) => void
-  recurrenceSettings: RecurrenceSettings
-  placeholder: string
-}
-
-export const NewMeetingRecurrenceSettings = (props: Props) => {
-  const {onRecurrenceSettingsUpdated, recurrenceSettings, placeholder} = props
-  const {rrule, name} = recurrenceSettings
-
-  const onNameChange = (e: ChangeEvent<HTMLInputElement>) => {
-    const title = e.target.value || placeholder
-    onRecurrenceSettingsUpdated({...recurrenceSettings, name: title})
-  }
-
-  const onRruleChange = (rrule: RRule | null) => {
-    onRecurrenceSettingsUpdated({...recurrenceSettings, rrule})
-  }
-
-  const {togglePortal, menuPortal, originRef, portalStatus} = useMenu<HTMLDivElement>(
-    MenuPosition.LOWER_RIGHT,
-    {
-      id: 'newMeetingRecurrenceSettings',
-      isDropdown: true
-    }
-  )
-  const handleClick = () => {
-    togglePortal()
-  }
-
-  return (
-    <>
-      <NewMeetingDropdown
-        label={
-          recurrenceSettings.rrule
-            ? toHumanReadable(recurrenceSettings.rrule, {useShortNames: true, shortDayNameAfter: 1})
-            : 'Does not restart'
-        }
-        title={'Recurrence'}
-        onClick={handleClick}
-        opened={[PortalStatus.Entering, PortalStatus.Entered].includes(portalStatus)}
-        ref={originRef}
-      />
-      {menuPortal(
-        <div className='flex flex-col'>
-          <input
-            className='form-input m-2 rounded border border-solid border-slate-500 p-2 font-sans text-base hover:border-slate-600 focus:border-slate-600 focus:outline-none focus:ring-1 focus:ring-slate-600'
-            type='text'
-            name='title'
-            placeholder={placeholder}
-            value={name}
-            onChange={onNameChange}
-            min={1}
-            max={50}
-          />
-          <RecurrenceSettings title={name} rrule={rrule} onRruleUpdated={onRruleChange} />
-        </div>
-      )}
-    </>
-  )
-}
diff --git a/packages/client/components/NewMeetingRoot.tsx b/packages/client/components/NewMeetingRoot.tsx
deleted file mode 100644
index a89bf8025aa..00000000000
--- a/packages/client/components/NewMeetingRoot.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, {Suspense, useCallback, useEffect} from 'react'
-import {useHistory, useLocation} from 'react-router'
-import newMeetingQuery, {NewMeetingQuery} from '~/__generated__/NewMeetingQuery.graphql'
-import useModal from '../hooks/useModal'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
-import useRouter from '../hooks/useRouter'
-import useSubscription from '../hooks/useSubscription'
-import NotificationSubscription from '../subscriptions/NotificationSubscription'
-import OrganizationSubscription from '../subscriptions/OrganizationSubscription'
-import TaskSubscription from '../subscriptions/TaskSubscription'
-import TeamSubscription from '../subscriptions/TeamSubscription'
-import {Loader} from '../utils/relay/renderLoader'
-import NewMeeting from './NewMeeting'
-
-const NewMeetingRoot = () => {
-  const {match} = useRouter<{teamId: string}>()
-  const {params} = match
-  const {teamId} = params
-  useSubscription('NewMeetingRoot', NotificationSubscription)
-  useSubscription('NewMeetingRoot', OrganizationSubscription)
-  useSubscription('NewMeetingRoot', TaskSubscription)
-  useSubscription('NewMeetingRoot', TeamSubscription)
-  const queryRef = useQueryLoaderNow<NewMeetingQuery>(newMeetingQuery, {teamId})
-
-  const location = useLocation<{backgroundLocation?: Location}>()
-  const history = useHistory()
-
-  const onClose = useCallback(() => {
-    const state = location.state
-    history.replace(state?.backgroundLocation ?? '/meetings')
-  }, [location])
-
-  const {openPortal, closePortal, modalPortal} = useModal({
-    id: 'newMeetingRoot',
-    onClose
-  })
-
-  useEffect(() => {
-    openPortal()
-    return () => {
-      closePortal()
-    }
-  }, [])
-
-  return modalPortal(
-    <Suspense fallback={<Loader />}>
-      {queryRef && <NewMeeting teamId={teamId} queryRef={queryRef} onClose={closePortal} />}
-    </Suspense>
-  )
-}
-
-export default NewMeetingRoot
diff --git a/packages/client/components/NewMeetingSettings.tsx b/packages/client/components/NewMeetingSettings.tsx
index 5ea12f25bd2..26993d5e365 100644
--- a/packages/client/components/NewMeetingSettings.tsx
+++ b/packages/client/components/NewMeetingSettings.tsx
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {MeetingTypeEnum} from '~/__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import {NewMeetingSettings_selectedTeam$key} from '~/__generated__/NewMeetingSettings_selectedTeam.graphql'
 import NewMeetingSettingsAction from './NewMeetingSettingsAction'
 import NewMeetingSettingsPoker from './NewMeetingSettingsPoker'
diff --git a/packages/client/components/PrivateRoutes.tsx b/packages/client/components/PrivateRoutes.tsx
index b6545a0a437..5c5e81a8a97 100644
--- a/packages/client/components/PrivateRoutes.tsx
+++ b/packages/client/components/PrivateRoutes.tsx
@@ -1,6 +1,6 @@
 import React, {lazy} from 'react'
 import {Location} from 'history'
-import {Route, Switch, useLocation} from 'react-router'
+import {Redirect, Route, Switch, useLocation} from 'react-router'
 import useAuthRoute from '../hooks/useAuthRoute'
 import useNoIndex from '../hooks/useNoIndex'
 
@@ -53,10 +53,6 @@ const ShareTopicRouterRoot = lazy(
   () => import(/* webpackChunkName: 'ShareTopicRouterRoot' */ './ShareTopicRouterRoot')
 )
 
-const NewMeetingRoot = lazy(
-  () => import(/* webpackChunkName: 'NewMeetingRoot' */ './NewMeetingRoot')
-)
-
 const PrivateRoutes = () => {
   useAuthRoute()
   useNoIndex()
@@ -67,9 +63,12 @@ const PrivateRoutes = () => {
       <Switch location={state?.backgroundLocation || location}>
         <Route path='/activity-library' component={ActivityLibraryRoutes} />
         <Route
-          path='(/meetings|/me|/newteam|/team|/usage|/new-meeting|/organization-join-request)'
+          path='(/meetings|/me|/newteam|/team|/usage|/organization-join-request)'
           component={DashboardRoot}
         />
+        <Route path='/new-meeting'>
+          <Redirect to='/activity-library' />
+        </Route>
         <Route path='/meet/:meetingId' component={MeetingRoot} />
         <Route path='/meeting-series/:meetingId' component={MeetingSeriesRoot} />
         <Route path='/invoice/:invoiceId' component={Invoice} />
@@ -86,7 +85,6 @@ const PrivateRoutes = () => {
           component={ReviewRequestToJoinOrgRoot}
         />
         <Route path='/new-summary/:meetingId/share/:stageId' component={ShareTopicRouterRoot} />
-        <Route path='/new-meeting/:teamId?' component={NewMeetingRoot} />
       </Switch>
     </>
   )
diff --git a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
index 864e85c79c8..161709a6de8 100644
--- a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
+++ b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
@@ -18,7 +18,7 @@ import {
   StandardMutation
 } from '../../types/relayMutations'
 import {humanReadableCountdown} from '../../utils/date/relativeDate'
-import {MeetingTypeEnum} from '../../__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql'
 import DialogContainer from '../DialogContainer'
 
 export const EndMeetingMutationLookup = {
diff --git a/packages/client/components/SelectMeetingDropdown.tsx b/packages/client/components/SelectMeetingDropdown.tsx
index 779fe2397a0..0f992d2b09b 100644
--- a/packages/client/components/SelectMeetingDropdown.tsx
+++ b/packages/client/components/SelectMeetingDropdown.tsx
@@ -1,11 +1,9 @@
 import styled from '@emotion/styled'
-import {Forum} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
-import getTeamIdFromPathname from '~/utils/getTeamIdFromPathname'
 import plural from '~/utils/plural'
 import {SelectMeetingDropdown_meetings$key} from '~/__generated__/SelectMeetingDropdown_meetings.graphql'
 import {MenuProps} from '../hooks/useMenu'
@@ -27,29 +25,6 @@ const HeaderLabel = styled('div')({
   userSelect: 'none'
 })
 
-const NoMeetings = styled('div')({
-  alignItems: 'center',
-  display: 'flex',
-  fontSize: 16,
-  fontWeight: 600,
-  height: 56,
-  justifyContent: 'center',
-  padding: '0 16px',
-  width: '100%'
-})
-
-const StyledIcon = styled(Forum)({
-  color: PALETTE.SLATE_600,
-  marginRight: 16
-})
-
-const NoMeetingItem = () => (
-  <NoMeetings>
-    <StyledIcon />
-    {'Start a New Meeting'}
-  </NoMeetings>
-)
-
 const SelectMeetingDropdown = (props: Props) => {
   const {meetings: meetingsRef, menuProps} = props
   const meetings = useFragment(
@@ -64,14 +39,9 @@ const SelectMeetingDropdown = (props: Props) => {
   const {history} = useRouter()
   const meetingCount = meetings.length
   const label = `${meetingCount} Active ${plural(meetingCount, 'Meeting')}`
-  const startMeeting = () => {
-    const teamId = getTeamIdFromPathname()
-    history.push(`/new-meeting/${teamId}`)
-  }
   return (
     <Menu ariaLabel={'Select the Meeting to enter'} {...menuProps}>
       <HeaderLabel>{label}</HeaderLabel>
-      {meetingCount === 0 && <MenuItem onClick={startMeeting} label={<NoMeetingItem />} />}
       {meetings.map((meeting) => {
         const handleClick = () => {
           history.push(`/meet/${meeting.id}`)
diff --git a/packages/client/components/SuggestedActionTryActionMeeting.tsx b/packages/client/components/SuggestedActionTryActionMeeting.tsx
index 864a62e6f3e..ac26fe9ec9d 100644
--- a/packages/client/components/SuggestedActionTryActionMeeting.tsx
+++ b/packages/client/components/SuggestedActionTryActionMeeting.tsx
@@ -31,9 +31,7 @@ const SuggestedActionTryActionMeeting = (props: Props) => {
 
   const onClick = () => {
     const {history} = props
-    const {team} = suggestedAction
-    const {id: teamId} = team
-    history.push(`/new-meeting/${teamId}`)
+    history.push(`/activity-library/category/standup`)
   }
 
   return (
diff --git a/packages/client/components/SuggestedActionTryRetroMeeting.tsx b/packages/client/components/SuggestedActionTryRetroMeeting.tsx
index 9e8dd3c3b1e..e9f9c1e5072 100644
--- a/packages/client/components/SuggestedActionTryRetroMeeting.tsx
+++ b/packages/client/components/SuggestedActionTryRetroMeeting.tsx
@@ -31,9 +31,7 @@ const SuggestedActionTryRetroMeeting = (props: Props) => {
 
   const onClick = () => {
     const {history} = props
-    const {team} = suggestedAction
-    const {id: teamId} = team
-    history.push(`/new-meeting/${teamId}`)
+    history.push(`/activity-library/category/retrospective`)
   }
 
   return (
diff --git a/packages/client/components/Tag/TierTag.tsx b/packages/client/components/Tag/TierTag.tsx
index 53332df10e7..89dff6ea7e6 100644
--- a/packages/client/components/Tag/TierTag.tsx
+++ b/packages/client/components/Tag/TierTag.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled'
 import React from 'react'
 import {PALETTE} from '../../styles/paletteV3'
 import {TierLabel} from '../../types/constEnums'
-import {TierEnum} from '../../__generated__/NewMeetingQuery.graphql'
+import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql'
 import BaseTag from './BaseTag'
 
 interface Props {
diff --git a/packages/client/hooks/useActiveTopTemplate.ts b/packages/client/hooks/useActiveTopTemplate.ts
index 3a15da68c07..1cfd4d8db2a 100644
--- a/packages/client/hooks/useActiveTopTemplate.ts
+++ b/packages/client/hooks/useActiveTopTemplate.ts
@@ -1,6 +1,6 @@
 import {useEffect, useRef} from 'react'
 import {commitLocalUpdate} from 'react-relay'
-import {MeetingTypeEnum} from '~/__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import isTempId from '../utils/relay/isTempId'
 import {setActiveTemplate} from '../utils/relay/setActiveTemplate'
 import useAtmosphere from './useAtmosphere'
diff --git a/packages/client/hooks/useEndMeetingHotkey.ts b/packages/client/hooks/useEndMeetingHotkey.ts
index 0f3934dd4c3..6122816cf2e 100644
--- a/packages/client/hooks/useEndMeetingHotkey.ts
+++ b/packages/client/hooks/useEndMeetingHotkey.ts
@@ -1,7 +1,7 @@
 import EndCheckInMutation from '~/mutations/EndCheckInMutation'
 import EndRetrospectiveMutation from '~/mutations/EndRetrospectiveMutation'
 import EndSprintPokerMutation from '~/mutations/EndSprintPokerMutation'
-import {MeetingTypeEnum} from '~/__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import handleHotkey from '../utils/meetings/handleHotkey'
 import useAtmosphere from './useAtmosphere'
 import useHotkey from './useHotkey'
diff --git a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx b/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
index 10524e02f8d..1be0bb114a8 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
@@ -12,7 +12,7 @@ import {PALETTE} from '../../../styles/paletteV3'
 import useTemplateDescription from '../../../utils/useTemplateDescription'
 import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
 import {ReflectTemplateItem_template$key} from '../../../__generated__/ReflectTemplateItem_template.graphql'
-import {TierEnum} from '../../../__generated__/NewMeetingQuery.graphql'
+import {TierEnum} from '../../../__generated__/OrganizationSubscription.graphql'
 
 const TemplateItem = styled('li')<{isActive: boolean}>(({isActive}) => ({
   backgroundColor: isActive ? PALETTE.SLATE_200 : undefined,
diff --git a/packages/client/modules/meeting/components/RemoveTemplate.tsx b/packages/client/modules/meeting/components/RemoveTemplate.tsx
index 0cfed46afc8..5d8c9ab0c1e 100644
--- a/packages/client/modules/meeting/components/RemoveTemplate.tsx
+++ b/packages/client/modules/meeting/components/RemoveTemplate.tsx
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {MeetingTypeEnum} from '~/__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import DetailAction from '../../../components/DetailAction'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
index f7df386a5b6..aa6101a8847 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
@@ -4,7 +4,7 @@ import {Elevation} from '../../../../styles/elevation'
 import BaseButton from '../../../../components/BaseButton'
 import {Radius} from '../../../../types/constEnums'
 import {PALETTE} from '../../../../styles/paletteV3'
-import {TierEnum} from '../../../../__generated__/NewMeetingQuery.graphql'
+import {TierEnum} from '../../../../__generated__/OrganizationSubscription.graphql'
 import styled from '@emotion/styled'
 import useTooltip from '../../../../hooks/useTooltip'
 import {MenuPosition} from '../../../../hooks/useCoords'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
index 0e31205312a..2b419f3ea4d 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
@@ -6,7 +6,7 @@ import Panel from '../../../../components/Panel/Panel'
 import Row from '../../../../components/Row/Row'
 import {OrgPlans_organization$key} from '../../../../__generated__/OrgPlans_organization.graphql'
 import {ElementWidth} from '../../../../types/constEnums'
-import {TierEnum} from '../../../../__generated__/NewMeetingQuery.graphql'
+import {TierEnum} from '../../../../__generated__/OrganizationSubscription.graphql'
 import OrgStats from './OrgStats'
 import useModal from '../../../../hooks/useModal'
 import DowngradeModal from './DowngradeModal'
diff --git a/packages/client/utils/getContentGroup.ts b/packages/client/utils/getContentGroup.ts
index ae83f04df0c..aae1ef1fd40 100644
--- a/packages/client/utils/getContentGroup.ts
+++ b/packages/client/utils/getContentGroup.ts
@@ -2,7 +2,7 @@ const CONTENT_GROUP_PREFIX = `App |`
 export default function getContentGroup(pathname: string) {
   let contentGroup
   // ^action\.parabol\.co/(meet|new-meeting|retro)(/|$|\?)
-  if (pathname.match(/^\/(meet|meetings|new-meeting|retro)(\/|$\?)/)) {
+  if (pathname.match(/^\/(meet|meetings|retro)(\/|$\?)/)) {
     contentGroup = 'Meetings'
   } else if (pathname.match(/^\/(team|new-summary)(\/|$|\?)/)) {
     contentGroup = 'Team'
diff --git a/packages/client/utils/relay/setActiveTemplate.ts b/packages/client/utils/relay/setActiveTemplate.ts
index 1fc5cb4e617..8fd4231d171 100644
--- a/packages/client/utils/relay/setActiveTemplate.ts
+++ b/packages/client/utils/relay/setActiveTemplate.ts
@@ -1,6 +1,6 @@
 import {commitLocalUpdate} from 'react-relay'
 import {RecordSourceProxy} from 'relay-runtime'
-import {MeetingTypeEnum} from '~/__generated__/NewMeetingQuery.graphql'
+import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import Atmosphere from '../../Atmosphere'
 
 const setActiveTemplateInRelayStore = (
diff --git a/packages/client/utils/useTemplateDescription.ts b/packages/client/utils/useTemplateDescription.ts
index ffb16050082..302dfaaabfe 100644
--- a/packages/client/utils/useTemplateDescription.ts
+++ b/packages/client/utils/useTemplateDescription.ts
@@ -2,7 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import {readInlineData} from 'react-relay'
 import {useTemplateDescription_template$key} from '../__generated__/useTemplateDescription_template.graphql'
 import {useTemplateDescription_viewer$key} from '../__generated__/useTemplateDescription_viewer.graphql'
-import {TierEnum} from '../__generated__/NewMeetingQuery.graphql'
+import {TierEnum} from '../__generated__/OrganizationSubscription.graphql'
 import relativeDate from './date/relativeDate'
 
 const useTemplateDescription = (

From a4f10d193bb38990d8400183c6d320522d2db71e Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Apr 2024 12:34:59 +0200
Subject: [PATCH 148/183] feat: release recurring retros (#9625)

---
 .../components/ActivityLibrary/ActivityDetailsSidebar.tsx  | 7 +------
 .../graphql/private/typeDefs/updateOrgFeatureFlag.graphql  | 1 -
 .../server/graphql/public/typeDefs/Organization.graphql    | 1 -
 .../graphql/public/types/OrganizationFeatureFlags.ts       | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index 1d335f21a90..0fbe9cfab1a 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -89,9 +89,6 @@ const ActivityDetailsSidebar = (props: Props) => {
         orgId
         organization {
           name
-          featureFlags {
-            recurringRetros
-          }
         }
         retroSettings: meetingSettings(meetingType: retrospective) {
           ...NewMeetingSettingsToggleCheckIn_settings
@@ -252,9 +249,7 @@ const ActivityDetailsSidebar = (props: Props) => {
           : type === 'action'
             ? 'Check-in'
             : 'Meeting'
-  const withRecurrence =
-    type === 'teamPrompt' ||
-    (selectedTeam.organization.featureFlags.recurringRetros && type === 'retrospective')
+  const withRecurrence = type === 'teamPrompt' || type === 'retrospective'
 
   return (
     <>
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
index ef74a967ff1..ab0497ff8b3 100644
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
@@ -15,7 +15,6 @@ enum OrganizationFeatureFlagsEnum {
   kudos
   aiIcebreakers
   aiTemplate
-  recurringRetros
   relatedDiscussions
 }
 
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index 49d3169c48f..349a943c5b6 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -190,6 +190,5 @@ type OrganizationFeatureFlags {
   kudos: Boolean!
   aiIcebreakers: Boolean!
   aiTemplate: Boolean!
-  recurringRetros: Boolean!
   relatedDiscussions: Boolean!
 }
diff --git a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
index 1f917215116..dac0884752c 100644
--- a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
+++ b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
@@ -14,7 +14,6 @@ const OrganizationFeatureFlags: OrganizationFeatureFlagsResolvers = {
   kudos: ({kudos}) => !!kudos,
   aiIcebreakers: ({aiIcebreakers}) => !!aiIcebreakers,
   aiTemplate: ({aiTemplate}) => !!aiTemplate,
-  recurringRetros: ({recurringRetros}) => !!recurringRetros,
   relatedDiscussions: ({relatedDiscussions}) => !!relatedDiscussions
 }
 

From fba3b80bfdbdb5ab368117a4f3f6bbe4742d1607 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Apr 2024 15:18:17 +0200
Subject: [PATCH 149/183] fix: Only list available categories in edit template
 (#9628)

---
 .../ActivityDetails/ActivityDetailsCategoryBadge.tsx          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
index 21edb932c09..194c0b882f4 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
@@ -7,7 +7,7 @@ import {useFragment} from 'react-relay'
 import {ActivityDetailsCategoryBadge_template$key} from '~/__generated__/ActivityDetailsCategoryBadge_template.graphql'
 import PlainButton from '../../PlainButton/PlainButton'
 import ActivityDetailsBadge from './ActivityDetailsBadge'
-import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID} from '../Categories'
+import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, MAIN_CATEGORIES} from '../Categories'
 import useTemplateCategoryMutation from '../../../mutations/UpdateTemplateCategoryMutation'
 
 interface Props {
@@ -49,7 +49,7 @@ const ActivityDetailsCategoryBadge = (props: Props) => {
       <DropdownMenu.Portal>
         <DropdownMenu.Content className='border-rad rounded bg-white shadow-lg' sideOffset={5}>
           <DropdownMenu.RadioGroup value={category} onValueChange={updateTemplateCategory}>
-            {Object.keys(CATEGORY_THEMES).map((c) => {
+            {MAIN_CATEGORIES.map((c) => {
               const categoryId = c as CategoryID
               return (
                 <DropdownMenu.RadioItem

From 65f311920432416f547e83831cfcdfef2dc570af Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Apr 2024 15:40:33 +0200
Subject: [PATCH 150/183] chore: Add absolute date tooltip in history (#9629)

---
 packages/client/components/SimpleTooltip.tsx  | 31 +++++++++++++++++++
 .../client/components/TimelineEventDate.tsx   |  8 ++++-
 .../TeamDashInsights/MostUsedEmojisCard.tsx   |  6 ++--
 .../TeamDashInsights/TeamInsightsCard.tsx     |  6 ++--
 .../TopRetroTemplatesCard.tsx                 |  6 ++--
 5 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 packages/client/components/SimpleTooltip.tsx

diff --git a/packages/client/components/SimpleTooltip.tsx b/packages/client/components/SimpleTooltip.tsx
new file mode 100644
index 00000000000..a38ebd8bacb
--- /dev/null
+++ b/packages/client/components/SimpleTooltip.tsx
@@ -0,0 +1,31 @@
+import clsx from 'clsx'
+import React, {ReactNode} from 'react'
+import {MenuPosition} from '../hooks/useCoords'
+import useTooltip from '../hooks/useTooltip'
+
+interface Props {
+  text: ReactNode
+  children: ReactNode
+  className?: string
+}
+
+const SimpleTooltip = (props: Props) => {
+  const {text, children, className} = props
+  const {openTooltip, closeTooltip, tooltipPortal, originRef} = useTooltip<HTMLDivElement>(
+    MenuPosition.UPPER_CENTER
+  )
+
+  return (
+    <div
+      onMouseEnter={openTooltip}
+      onMouseLeave={closeTooltip}
+      className={clsx('cursor-pointer', className)}
+      ref={originRef}
+    >
+      {children}
+      {tooltipPortal(text)}
+    </div>
+  )
+}
+
+export default SimpleTooltip
diff --git a/packages/client/components/TimelineEventDate.tsx b/packages/client/components/TimelineEventDate.tsx
index eae6dc65acd..fa309d87165 100644
--- a/packages/client/components/TimelineEventDate.tsx
+++ b/packages/client/components/TimelineEventDate.tsx
@@ -2,7 +2,9 @@ import styled from '@emotion/styled'
 import ms from 'ms'
 import React, {Component} from 'react'
 import {PALETTE} from '../styles/paletteV3'
+import absoluteDate from '../utils/date/absoluteDate'
 import relativeDate from '../utils/date/relativeDate'
+import SimpleTooltip from './SimpleTooltip'
 
 const StyledSpan = styled('span')({
   color: PALETTE.SLATE_600,
@@ -41,7 +43,11 @@ class TimelineEventDate extends Component<Props, State> {
 
   render() {
     const {fromNow} = this.state
-    return <StyledSpan>{fromNow}</StyledSpan>
+    return (
+      <StyledSpan>
+        <SimpleTooltip text={absoluteDate(this.props.createdAt)}>{fromNow}</SimpleTooltip>
+      </StyledSpan>
+    )
   }
 }
 
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx
index 4fe97897bc2..aabb832be1b 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/MostUsedEmojisCard.tsx
@@ -2,7 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {MostUsedEmojisCard_insights$key} from '~/__generated__/MostUsedEmojisCard_insights.graphql'
-import Tooltip from '../../../../components/Tooltip'
+import SimpleTooltip from '../../../../components/SimpleTooltip'
 import getReactji from '../../../../utils/getReactji'
 import TeamInsightsCard from './TeamInsightsCard'
 
@@ -41,9 +41,9 @@ const MostUsedEmojisCard = (props: Props) => {
           const {unicode, shortName} = getReactji(emoji.id)
           return (
             <div key={emoji.id} className='flex h-24 w-1/4 flex-col items-center justify-center'>
-              <Tooltip text={`:${shortName}:`}>
+              <SimpleTooltip text={`:${shortName}:`}>
                 <div className='text-2xl'>{unicode}</div>
-              </Tooltip>
+              </SimpleTooltip>
               <div className='p-2 font-semibold'>{emoji.count}</div>
             </div>
           )
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx
index c4ffa985305..6e9922db025 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {ReactNode, useState} from 'react'
 import {useFragment} from 'react-relay'
-import Tooltip from '../../../../components/Tooltip'
+import SimpleTooltip from '../../../../components/SimpleTooltip'
 import {Info as InfoIcon} from '@mui/icons-material'
 import {ThumbUp, ThumbDown} from '@mui/icons-material'
 import FlatButton from '../../../../components/FlatButton'
@@ -51,9 +51,9 @@ const TeamInsightsCard = (props: Props) => {
     <div className='relative m-2 flex w-[320px] flex-col overflow-hidden rounded bg-white drop-shadow'>
       <div className='flex items-center justify-between'>
         <div className='p-4 text-sm font-semibold text-slate-600'>{title}</div>
-        <Tooltip text={tooltip} className='pr-3 text-slate-600'>
+        <SimpleTooltip text={tooltip} className='pr-3 text-slate-600'>
           <InfoIcon />
-        </Tooltip>
+        </SimpleTooltip>
       </div>
       <div className='flex flex-grow flex-col justify-center p-4 pt-0'>{children}</div>
       <div className='flex items-center justify-center bg-slate-100 px-4 py-2 text-sm font-semibold text-slate-600'>
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
index aaf9bbd3e64..d62c822e707 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
@@ -2,7 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {TopRetroTemplatesCard_insights$key} from '~/__generated__/TopRetroTemplatesCard_insights.graphql'
-import Tooltip from '../../../../components/Tooltip'
+import SimpleTooltip from '../../../../components/SimpleTooltip'
 import TeamInsightsCard from './TeamInsightsCard'
 import plural from '../../../../utils/plural'
 
@@ -46,14 +46,14 @@ const TopRetroTemplatesCard = (props: Props) => {
           const {reflectTemplate, count} = template
           const {name, illustrationUrl} = reflectTemplate
           return (
-            <Tooltip
+            <SimpleTooltip
               text={`Used ${plural(count, 'once', `${count} times`)} in the last 12 months`}
               className='my-2 flex items-center rounded border-2 border-grape-500 bg-fuscia-100 text-sm font-semibold text-slate-700'
               key={index}
             >
               <img className='m-1 h-10 w-10' src={illustrationUrl} />
               {name}
-            </Tooltip>
+            </SimpleTooltip>
           )
         })}
         {topRetroTemplates.length === 1 && (

From e4f8d49c544be1d37388596b1afa086d9eb30a5c Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 11 Apr 2024 16:17:14 +0200
Subject: [PATCH 151/183] feat: Make top team templates clickable (#9630)

---
 .../TopRetroTemplatesCard.tsx                 | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
index d62c822e707..68aff4dab59 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
@@ -5,6 +5,7 @@ import {TopRetroTemplatesCard_insights$key} from '~/__generated__/TopRetroTempla
 import SimpleTooltip from '../../../../components/SimpleTooltip'
 import TeamInsightsCard from './TeamInsightsCard'
 import plural from '../../../../utils/plural'
+import {useHistory} from 'react-router'
 
 interface Props {
   teamInsightsRef: TopRetroTemplatesCard_insights$key
@@ -12,6 +13,7 @@ interface Props {
 
 const TopRetroTemplatesCard = (props: Props) => {
   const {teamInsightsRef} = props
+  const history = useHistory()
   const insights = useFragment(
     graphql`
       fragment TopRetroTemplatesCard_insights on TeamInsights {
@@ -35,6 +37,10 @@ const TopRetroTemplatesCard = (props: Props) => {
     return null
   }
 
+  const onClick = (templateId: string) => {
+    history.push(`/activity-library/details/${templateId}`)
+  }
+
   return (
     <TeamInsightsCard
       teamInsightsRef={insights}
@@ -42,18 +48,19 @@ const TopRetroTemplatesCard = (props: Props) => {
       tooltip='The most used retro templates on your team in the last 12 months'
     >
       <div className='flex w-full flex-col'>
-        {topRetroTemplates.map((template, index) => {
+        {topRetroTemplates.map((template) => {
           const {reflectTemplate, count} = template
-          const {name, illustrationUrl} = reflectTemplate
+          const {id, name, illustrationUrl} = reflectTemplate
           return (
-            <SimpleTooltip
-              text={`Used ${plural(count, 'once', `${count} times`)} in the last 12 months`}
-              className='my-2 flex items-center rounded border-2 border-grape-500 bg-fuscia-100 text-sm font-semibold text-slate-700'
-              key={index}
-            >
-              <img className='m-1 h-10 w-10' src={illustrationUrl} />
-              {name}
-            </SimpleTooltip>
+            <div key={id} onClick={() => onClick(id)}>
+              <SimpleTooltip
+                text={`Used ${plural(count, 'once', `${count} times`)} in the last 12 months`}
+                className='my-2 flex items-center rounded border-2 border-grape-500 bg-fuscia-100 text-sm font-semibold text-slate-700'
+              >
+                <img className='m-1 h-10 w-10' src={illustrationUrl} />
+                {name}
+              </SimpleTooltip>
+            </div>
           )
         })}
         {topRetroTemplates.length === 1 && (

From 38c8e61bcc6a199abf0165f49bb0dd7d693962e3 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 11 Apr 2024 13:56:46 -0700
Subject: [PATCH 152/183] fix: use radix-ui for avatars (#9633)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .prettierrc                                   |  3 +-
 .vscode/settings.json                         | 26 +----
 .../components/ActionMeetingAgendaItems.tsx   |  2 +-
 .../components/ActionMeetingUpdatesPrompt.tsx |  5 +-
 packages/client/components/Avatar/Avatar.tsx  | 94 ++++---------------
 packages/client/components/AvatarList.tsx     |  4 +-
 packages/client/components/AvatarListUser.tsx | 40 ++------
 .../DashboardAvatars/DashboardAvatar.tsx      | 26 +----
 .../client/components/DeckActivityAvatars.tsx | 16 +---
 .../components/DiscussionThreadInput.tsx      | 11 +--
 .../EditableAvatar/EditableAvatar.tsx         | 83 +++-------------
 .../MeetingSidebarTeamMemberStageItems.tsx    |  4 +-
 .../components/MentionUser/MentionUser.tsx    |  2 +-
 .../NewMeetingTeamPickerAvatars.tsx           | 13 +--
 packages/client/components/OrgAvatarInput.tsx |  9 +-
 .../components/StandardHub/StandardHub.tsx    |  8 +-
 .../client/components/TeamHealthVotingRow.tsx |  4 +-
 .../TeamPrompt/TeamPromptDiscussionDrawer.tsx |  6 +-
 .../TeamPromptRepliesAvatarList.tsx           |  6 +-
 .../TeamPrompt/TeamPromptResponseCard.tsx     | 18 ++--
 .../components/ThreadedAvatarColumn.tsx       |  5 +-
 packages/client/components/TopBarAvatar.tsx   |  7 +-
 .../client/components/UserAvatarInput.tsx     |  4 +-
 .../NewMeetingCheckInPrompt.tsx               |  9 +-
 .../components/AgendaItem/AgendaItem.tsx      |  8 +-
 .../ManageTeam/ManageTeamMember.tsx           |  2 +-
 .../components/OrgBilling/BillingLeader.tsx   | 25 +++--
 .../OrgBilling/NewBillingLeaderMenu.tsx       | 18 ++--
 .../components/OrgBilling/OrgDetails.tsx      | 20 ++--
 .../OrgTeamMembers/OrgTeamMembersRow.tsx      | 21 ++---
 .../components/OrgUserRow/OrgMemberRow.tsx    | 20 ++--
 .../OrganizationRow/OrganizationRow.tsx       |  2 +-
 .../UserSettingsForm/UserSettingsForm.tsx     |  4 +-
 packages/client/ui/Avatar/Avatar.tsx          |  8 +-
 34 files changed, 159 insertions(+), 374 deletions(-)

diff --git a/.prettierrc b/.prettierrc
index 0422e517d93..fd7689d2027 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -13,5 +13,6 @@
         "singleQuote": false
       }
     }
-  ]
+  ],
+  "plugins": ["prettier-plugin-tailwindcss"]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index fb50e7e36a0..ae71b536906 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,30 +1,7 @@
 {
   "git.ignoreLimitWarning": true,
-  "eslint.packageManager": "yarn",
   "typescript.tsdk": "node_modules/typescript/lib",
   "editor.tabSize": 2,
-  "eslint.workingDirectories": [
-    {
-      "directory": "./packages/server",
-      "changeProcessCWD": true
-    },
-    {
-      "directory": "./packages/client",
-      "changeProcessCWD": true
-    }
-  ],
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    {
-      "language": "typescript",
-      "autoFix": true
-    },
-    {
-      "language": "typescriptreact",
-      "autoFix": true
-    }
-  ],
   "npm.packageManager": "yarn",
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
@@ -53,5 +30,6 @@
     "**/graphql/private/schema.graphql": true,
     "**/graphql/public/schema.graphql": true,
     "**/resolverTypes.ts": true
-  }
+  },
+  "tailwindCSS.experimental.classRegex": [["clsx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]]
 }
diff --git a/packages/client/components/ActionMeetingAgendaItems.tsx b/packages/client/components/ActionMeetingAgendaItems.tsx
index 54476d115a7..36c16750fd3 100644
--- a/packages/client/components/ActionMeetingAgendaItems.tsx
+++ b/packages/client/components/ActionMeetingAgendaItems.tsx
@@ -93,7 +93,7 @@ const ActionMeetingAgendaItems = (props: Props) => {
         </MeetingTopBar>
         <PhaseWrapper>
           <AgendaVerbatim>
-            <Avatar picture={picture} size={64} />
+            <Avatar picture={picture} className={'h-16 w-16'} />
             <StyledHeading>{content}</StyledHeading>
           </AgendaVerbatim>
           <StyledCopy>{`${preferredName}, what do you need?`}</StyledCopy>
diff --git a/packages/client/components/ActionMeetingUpdatesPrompt.tsx b/packages/client/components/ActionMeetingUpdatesPrompt.tsx
index 0c5545a898a..ea41e45abb8 100644
--- a/packages/client/components/ActionMeetingUpdatesPrompt.tsx
+++ b/packages/client/components/ActionMeetingUpdatesPrompt.tsx
@@ -2,9 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import ActionMeetingUpdatesPromptTeamHelpText from '../modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText'
-import defaultUserAvatar from '../styles/theme/images/avatar-user.svg'
 import {ActionMeetingUpdatesPrompt_meeting$key} from '../__generated__/ActionMeetingUpdatesPrompt_meeting.graphql'
+import ActionMeetingUpdatesPromptTeamHelpText from '../modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText'
 import Avatar from './Avatar/Avatar'
 import PhaseHeaderDescription from './PhaseHeaderDescription'
 import PhaseHeaderTitle from './PhaseHeaderTitle'
@@ -89,7 +88,7 @@ const ActionMeetingUpdatesPrompt = (props: Props) => {
   const taskCount = tasks.edges.length
   return (
     <StyledPrompt>
-      <Avatar picture={picture || defaultUserAvatar} size={64} />
+      <Avatar picture={picture} className={'h-16 w-16'} />
       <PromptText>
         <StyledHeader className='max-w-full'>
           {prefix}
diff --git a/packages/client/components/Avatar/Avatar.tsx b/packages/client/components/Avatar/Avatar.tsx
index 8b1329a6253..ef086097822 100644
--- a/packages/client/components/Avatar/Avatar.tsx
+++ b/packages/client/components/Avatar/Avatar.tsx
@@ -1,92 +1,34 @@
-import styled from '@emotion/styled'
-import React, {forwardRef, useState} from 'react'
+import clsx from 'clsx'
+import React, {forwardRef} from 'react'
 import defaultUserAvatar from '../../styles/theme/images/avatar-user.svg'
-import AvatarBadge from '../AvatarBadge/AvatarBadge'
-
-type ImageBlockProps = Pick<Props, 'sansRadius' | 'sansShadow' | 'picture' | 'size' | 'onClick'>
-
-const ImageBlock = styled('div')<ImageBlockProps>(
-  ({sansRadius, sansShadow, picture, size, onClick}) => ({
-    backgroundImage: `url(${picture})`,
-    backgroundPosition: 'center center',
-    backgroundRepeat: 'no-repeat',
-    backgroundSize: 'cover',
-    borderRadius: sansRadius ? 0 : '100%',
-    boxShadow: sansShadow ? 'none' : undefined,
-    cursor: onClick ? 'pointer' : 'default',
-    display: 'block',
-    flexShrink: 0,
-    width: size,
-    height: size
-  })
-)
-
-const BadgeBlock = styled('div')({
-  alignItems: 'center',
-  display: 'flex',
-  height: '25%',
-  justifyContent: 'center',
-  position: 'absolute',
-  right: 0,
-  top: 0,
-  width: '25%'
-})
-
-const BadgeBlockInner = styled('div')({
-  flexShrink: 0
-})
+import {Avatar as AvatarRoot} from '../../ui/Avatar/Avatar'
+import {AvatarFallback} from '../../ui/Avatar/AvatarFallback'
+import {AvatarImage} from '../../ui/Avatar/AvatarImage'
 
 interface Props {
+  alt?: string
   className?: string
-  hasBadge?: boolean
-  isConnected?: boolean
   onClick?: (e?: React.MouseEvent) => void
   onMouseEnter?: () => void
   onTransitionEnd?: () => void
-  picture: string
-  sansRadius?: boolean
-  sansShadow?: boolean
-  size: number
+  picture?: string | null
 }
 
-const Avatar = forwardRef((props: Props, ref: any) => {
-  const {
-    className,
-    hasBadge,
-    isConnected,
-    onClick,
-    onMouseEnter,
-    onTransitionEnd,
-    picture,
-    sansRadius,
-    sansShadow,
-    size
-  } = props
-  const [imageUrl, setImageUrl] = useState(picture || defaultUserAvatar)
-  const onError = () => {
-    setImageUrl(defaultUserAvatar)
-  }
+const Avatar = forwardRef<HTMLDivElement, Props>((props, ref) => {
+  const {alt, className, onClick, onTransitionEnd, onMouseEnter, picture} = props
   return (
-    <ImageBlock
-      onTransitionEnd={onTransitionEnd}
-      className={className}
-      ref={ref}
+    <AvatarRoot
       onClick={onClick}
+      onTransitionEnd={onTransitionEnd}
       onMouseEnter={onMouseEnter}
-      sansRadius={sansRadius}
-      sansShadow={sansShadow}
-      picture={imageUrl}
-      size={size}
+      ref={ref}
+      className={clsx(`${onClick && 'cursor-pointer'}`, className)}
     >
-      <img src={imageUrl} className='hidden' onError={onError} />
-      {hasBadge && (
-        <BadgeBlock>
-          <BadgeBlockInner>
-            <AvatarBadge isConnected={isConnected || false} />
-          </BadgeBlockInner>
-        </BadgeBlock>
-      )}
-    </ImageBlock>
+      <AvatarImage src={picture || defaultUserAvatar} alt={alt || 'Avatar'} />
+      <AvatarFallback>
+        <img src={defaultUserAvatar} alt={alt || 'Avatar not found'} />
+      </AvatarFallback>
+    </AvatarRoot>
   )
 })
 
diff --git a/packages/client/components/AvatarList.tsx b/packages/client/components/AvatarList.tsx
index ddb51583f51..f90b9e14d11 100644
--- a/packages/client/components/AvatarList.tsx
+++ b/packages/client/components/AvatarList.tsx
@@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {ReactElement, useLayoutEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useResizeObserver from '~/hooks/useResizeObserver'
+import {AvatarList_users$key} from '../__generated__/AvatarList_users.graphql'
 import useOverflowAvatars from '../hooks/useOverflowAvatars'
 import {TransitionStatus} from '../hooks/useTransition'
 import {BezierCurve} from '../types/constEnums'
-import {AvatarList_users$key} from '../__generated__/AvatarList_users.graphql'
 import AvatarListUser from './AvatarListUser'
 import OverflowAvatar from './OverflowAvatar'
 
@@ -117,7 +117,7 @@ const AvatarList = (props: Props) => {
             onTransitionEnd={onTransitionEnd}
             status={status}
             offset={offsetSize * displayIdx}
-            width={size}
+            className={`${size === 28 ? 'h-7 w-7' : size === 46 ? 'h-[46px] w-[46px]' : ''}`}
             borderColor={borderColor}
           />
         )
diff --git a/packages/client/components/AvatarListUser.tsx b/packages/client/components/AvatarListUser.tsx
index e3f6a7d14a3..668fcde44b0 100644
--- a/packages/client/components/AvatarListUser.tsx
+++ b/packages/client/components/AvatarListUser.tsx
@@ -1,12 +1,13 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {TransitionStatus} from '~/hooks/useTransition'
+import {AvatarListUser_user$key} from '../__generated__/AvatarListUser_user.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
 import {BezierCurve} from '../types/constEnums'
-import {AvatarListUser_user$key} from '../__generated__/AvatarListUser_user.graphql'
 import Avatar from './Avatar/Avatar'
 
 const Wrapper = styled('div')<{offset: number; isColumn?: boolean}>(({offset, isColumn}) => ({
@@ -15,26 +16,6 @@ const Wrapper = styled('div')<{offset: number; isColumn?: boolean}>(({offset, is
   transition: `all 300ms ${BezierCurve.DECELERATE}`
 }))
 
-const StyledAvatar = styled(Avatar)<{
-  status?: TransitionStatus
-  isAnimated: boolean
-  borderColor?: string
-  width: number
-}>(({status, isAnimated, borderColor = '#fff', width}) => ({
-  border: `${width >= 40 ? '3px' : '2px'} solid ${borderColor}`,
-  opacity: !isAnimated
-    ? undefined
-    : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-      ? 0
-      : 1,
-  transform: !isAnimated
-    ? undefined
-    : status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED
-      ? 'scale(0)'
-      : 'scale(1)',
-  transition: `all 300ms ${BezierCurve.DECELERATE}`
-}))
-
 interface Props {
   className?: string
   offset: number
@@ -43,7 +24,6 @@ interface Props {
   onTransitionEnd?: () => void
   status?: TransitionStatus
   user: AvatarListUser_user$key
-  width: number
   onClick?: () => void
   borderColor?: string
 }
@@ -57,7 +37,6 @@ const AvatarListUser = (props: Props) => {
     status,
     offset,
     isAnimated,
-    width,
     onClick,
     borderColor
   } = props
@@ -74,6 +53,9 @@ const AvatarListUser = (props: Props) => {
   const {tooltipPortal, openTooltip, closeTooltip, originRef} = useTooltip<HTMLDivElement>(
     MenuPosition.UPPER_CENTER
   )
+  const isAnimating =
+    isAnimated && (status === TransitionStatus.EXITING || status === TransitionStatus.MOUNTED)
+
   return (
     <Wrapper
       ref={originRef}
@@ -83,15 +65,13 @@ const AvatarListUser = (props: Props) => {
       onMouseOver={openTooltip}
       onMouseLeave={closeTooltip}
     >
-      <StyledAvatar
-        className={className}
-        status={status}
+      <Avatar
+        className={clsx(
+          `border-solid border-[${borderColor || '#fff'}] duration-300 ease-out ${isAnimating ? 'scale-0 opacity-0' : 'scale-100 opacity-100'}`,
+          className
+        )}
         onTransitionEnd={onTransitionEnd}
         picture={picture}
-        size={width}
-        isAnimated={isAnimated}
-        borderColor={borderColor}
-        width={width}
       />
       {tooltipPortal(preferredName)}
     </Wrapper>
diff --git a/packages/client/components/DashboardAvatars/DashboardAvatar.tsx b/packages/client/components/DashboardAvatars/DashboardAvatar.tsx
index b23e528c5e2..8046f0ce813 100644
--- a/packages/client/components/DashboardAvatars/DashboardAvatar.tsx
+++ b/packages/client/components/DashboardAvatars/DashboardAvatar.tsx
@@ -2,15 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {DashboardAvatar_teamMember$key} from '../../__generated__/DashboardAvatar_teamMember.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMutationProps from '../../hooks/useMutationProps'
 import useTooltip from '../../hooks/useTooltip'
 import ToggleTeamDrawerMutation from '../../mutations/ToggleTeamDrawerMutation'
-import {PALETTE} from '../../styles/paletteV3'
-import defaultUserAvatar from '../../styles/theme/images/avatar-user.svg'
 import {ElementWidth} from '../../types/constEnums'
-import {DashboardAvatar_teamMember$key} from '../../__generated__/DashboardAvatar_teamMember.graphql'
 import Avatar from '../Avatar/Avatar'
 
 interface Props {
@@ -21,20 +19,6 @@ const AvatarWrapper = styled('div')({
   width: ElementWidth.DASHBOARD_AVATAR_OVERLAPPED
 })
 
-const StyledAvatar = styled(Avatar)<{isConnected: boolean; picture: string}>(
-  ({isConnected, picture}) => ({
-    // opacity causes transparency making overlap look bad. use img instead
-    backgroundImage: `${
-      isConnected ? '' : 'linear-gradient(rgba(255,255,255,.65), rgba(255,255,255,.65)),'
-    } url(${picture}), url(${defaultUserAvatar})`,
-    border: `2px solid ${PALETTE.SLATE_200}`,
-    ':hover': {
-      backgroundImage: `linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.5)),
-    url(${picture}), url(${defaultUserAvatar})`
-    }
-  })
-)
-
 const DashboardAvatar = (props: Props) => {
   const {teamMember: teamMemberRef} = props
   const teamMember = useFragment(
@@ -86,13 +70,11 @@ const DashboardAvatar = (props: Props) => {
 
   return (
     <AvatarWrapper onMouseEnter={openTooltip} onMouseLeave={closeTooltip}>
-      <StyledAvatar
-        {...teamMember}
-        isConnected={!!isConnected}
+      <Avatar
         onClick={handleClick}
-        picture={picture || defaultUserAvatar}
+        picture={picture}
         ref={originRef}
-        size={ElementWidth.DASHBOARD_AVATAR}
+        className={`h-7 w-7 border-2 border-solid border-slate-200 after:absolute after:h-full after:w-full after:content-[""] hover:after:bg-white/30 ${!isConnected && 'after:bg-white/60'}`}
       />
       {tooltipPortal(preferredName)}
     </AvatarWrapper>
diff --git a/packages/client/components/DeckActivityAvatars.tsx b/packages/client/components/DeckActivityAvatars.tsx
index dbe21bd9462..3f1c104a3db 100644
--- a/packages/client/components/DeckActivityAvatars.tsx
+++ b/packages/client/components/DeckActivityAvatars.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {DeckActivityAvatars_stage$key} from '../__generated__/DeckActivityAvatars_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useTransition, {TransitionStatus} from '../hooks/useTransition'
 import {PokerCards} from '../types/constEnums'
-import {DeckActivityAvatars_stage$key} from '../__generated__/DeckActivityAvatars_stage.graphql'
 import AvatarListUser from './AvatarListUser'
 
 const DeckActivityPanel = styled('div')({
@@ -19,16 +19,6 @@ const DeckActivityPanel = styled('div')({
   zIndex: 100 // show above dimension column
 })
 
-const PeekingAvatar = styled(AvatarListUser)<{status?: TransitionStatus}>(({status}) => ({
-  opacity: status === TransitionStatus.EXITING ? 0 : 1,
-  transform:
-    status === TransitionStatus.MOUNTED
-      ? `translate(64px)`
-      : status === TransitionStatus.EXITING
-        ? 'scale(0)'
-        : undefined
-}))
-
 interface Props {
   stage: DeckActivityAvatars_stage$key
 }
@@ -78,7 +68,7 @@ const DeckActivityAvatars = (props: Props) => {
         const visibleScoreIdx = peekingUsers.findIndex((user) => user.id === userId)
         const displayIdx = visibleScoreIdx === -1 ? idx : visibleScoreIdx
         return (
-          <PeekingAvatar
+          <AvatarListUser
             key={userId}
             status={status}
             onTransitionEnd={onTransitionEnd}
@@ -86,7 +76,7 @@ const DeckActivityAvatars = (props: Props) => {
             offset={(PokerCards.AVATAR_WIDTH - 10) * displayIdx}
             isColumn
             isAnimated
-            width={PokerCards.AVATAR_WIDTH as number}
+            className={`h-[46px] w-[46px] border-[3px] opacity-100 ${status === TransitionStatus.EXITING ? 'scale-0 opacity-0' : status === TransitionStatus.MOUNTED ? 'translate-x-64' : ''}`}
           />
         )
       })}
diff --git a/packages/client/components/DiscussionThreadInput.tsx b/packages/client/components/DiscussionThreadInput.tsx
index ba7cd2f3778..5d2e1f0373a 100644
--- a/packages/client/components/DiscussionThreadInput.tsx
+++ b/packages/client/components/DiscussionThreadInput.tsx
@@ -3,6 +3,8 @@ import graphql from 'babel-plugin-relay/macro'
 import {ContentState, convertToRaw, EditorState} from 'draft-js'
 import React, {forwardRef, RefObject, useEffect, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {DiscussionThreadInput_discussion$key} from '~/__generated__/DiscussionThreadInput_discussion.graphql'
+import {DiscussionThreadInput_viewer$key} from '~/__generated__/DiscussionThreadInput_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import useReplyEditorState from '~/hooks/useReplyEditorState'
@@ -13,8 +15,6 @@ import {SORT_STEP} from '~/utils/constants'
 import dndNoise from '~/utils/dndNoise'
 import {convertStateToRaw} from '~/utils/draftjs/convertToTaskContent'
 import isAndroid from '~/utils/draftjs/isAndroid'
-import {DiscussionThreadInput_discussion$key} from '~/__generated__/DiscussionThreadInput_discussion.graphql'
-import {DiscussionThreadInput_viewer$key} from '~/__generated__/DiscussionThreadInput_viewer.graphql'
 import {useBeforeUnload} from '../hooks/useBeforeUnload'
 import useInitialLocalState from '../hooks/useInitialLocalState'
 import CreateTaskMutation from '../mutations/CreateTaskMutation'
@@ -49,11 +49,6 @@ const CommentContainer = styled('div')({
   padding: 4
 })
 
-const CommentAvatar = styled(Avatar)({
-  margin: 8,
-  transition: 'all 150ms'
-})
-
 const EditorWrap = styled('div')({
   flex: 1,
   margin: '14px 0',
@@ -300,7 +295,7 @@ const DiscussionThreadInput = forwardRef((props: Props, ref: any) => {
   return (
     <Wrapper data-cy={`${dataCy}-wrapper`} ref={ref} isReply={isReply} isDisabled={isDisabled}>
       <CommentContainer>
-        <CommentAvatar size={32} picture={avatar} onClick={toggleAnonymous} />
+        <Avatar picture={avatar} onClick={toggleAnonymous} className='m-2 h-8 w-8 transition-all' />
         <EditorWrap>
           <CommentEditor
             dataCy={`${dataCy}`}
diff --git a/packages/client/components/EditableAvatar/EditableAvatar.tsx b/packages/client/components/EditableAvatar/EditableAvatar.tsx
index 862e0e8904b..fb840c110ed 100644
--- a/packages/client/components/EditableAvatar/EditableAvatar.tsx
+++ b/packages/client/components/EditableAvatar/EditableAvatar.tsx
@@ -1,91 +1,32 @@
-import styled from '@emotion/styled'
 import {Edit as EditIcon} from '@mui/icons-material'
+import clsx from 'clsx'
 import React from 'react'
-import {panelShadow} from '../../styles/elevation'
-import {PALETTE} from '../../styles/paletteV3'
 import Avatar from '../Avatar/Avatar'
 
-const borderRadius = '50%'
-const borderRadiusPanel = 4
-const panelPadding = 8
-const panelPaddingHorizontal = panelPadding * 2
-
-const EditableAvatarRoot = styled('button')<Pick<Props, 'hasPanel'>>(({hasPanel}) => ({
-  backgroundColor: hasPanel ? '#FFFFFF' : undefined,
-  boxShadow: hasPanel ? panelShadow : undefined,
-  borderRadius: hasPanel ? borderRadiusPanel : borderRadius,
-  display: 'block',
-  padding: hasPanel ? panelPadding : '0',
-  position: 'relative'
-}))
-
-const EditableAvatarEditOverlay = styled('div')<Pick<Props, 'hasPanel' | 'size'>>(({hasPanel}) => ({
-  alignItems: 'center',
-  backgroundColor: PALETTE.SLATE_400,
-  borderRadius: hasPanel ? borderRadiusPanel : borderRadius,
-  color: PALETTE.SLATE_800,
-  cursor: 'pointer',
-  display: 'flex',
-  flexDirection: 'column',
-  fontSize: 14,
-  fontWeight: 600,
-  height: '100%',
-  justifyContent: 'center',
-  left: 0,
-  opacity: 0,
-  padding: 4,
-  position: 'absolute',
-  top: 0,
-  transition: 'all .3s ease-in-out',
-  width: '100%',
-  zIndex: 2,
-
-  '&:hover': {
-    opacity: 0.75
-  }
-}))
-
-const EditableAvatarImgBlock = styled('div')<Pick<Props, 'hasPanel' | 'size'>>(
-  ({hasPanel, size}) => ({
-    height: hasPanel ? size - panelPaddingHorizontal : size,
-    position: 'relative',
-    width: hasPanel ? size - panelPaddingHorizontal : size,
-    zIndex: 1
-  })
-)
-
 interface Props {
-  hasPanel?: boolean
   onClick?: () => void
   picture: string
-  size: number
-  unstyled?: boolean
+  className?: string
 }
 
 const EditableAvatar = (props: Props) => {
-  const {hasPanel, onClick, picture, size, unstyled} = props
-  const avatarSize = hasPanel ? size - panelPaddingHorizontal : size
+  const {onClick, picture, className} = props
   return (
-    <EditableAvatarRoot
-      className='flex items-center justify-center rounded-full border-4 border-slate-200 outline-none duration-300 ease-in-out hover:cursor-pointer hover:border-slate-400 focus:border-sky-500'
-      hasPanel={hasPanel}
-      onClick={onClick}
-      aria-label='click to update photo'
-      tabIndex={0}
-    >
+    <div className='relative cursor-pointer' onClick={onClick} aria-label='click to update photo'>
+      <Avatar
+        picture={picture}
+        className={clsx(`h-16 w-16 border-4 border-solid border-slate-200`, className)}
+      />
+      <div className='absolute top-0 left-0 flex h-full w-full items-center justify-center rounded-full bg-slate-400 text-sm font-semibold text-slate-800 opacity-0 transition-opacity  duration-300 hover:opacity-75'>
+        EDIT
+      </div>
       <div
         aria-hidden
         className='icon-wrapper absolute top-0 right-0 z-10 rounded-full bg-slate-200 px-1.5 hover:bg-slate-200'
       >
         <EditIcon className='mb-[-2px] w-3.5 pt-0.5' />
       </div>
-      <EditableAvatarEditOverlay hasPanel={hasPanel} onClick={onClick} size={size}>
-        <span>{'EDIT'}</span>
-      </EditableAvatarEditOverlay>
-      <EditableAvatarImgBlock hasPanel={hasPanel} size={size}>
-        <Avatar picture={picture} size={avatarSize} sansRadius={unstyled} sansShadow={unstyled} />
-      </EditableAvatarImgBlock>
-    </EditableAvatarRoot>
+    </div>
   )
 }
 
diff --git a/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx b/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx
index c594f2b16cd..651e3739281 100644
--- a/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx
+++ b/packages/client/components/MeetingSidebarTeamMemberStageItems.tsx
@@ -3,12 +3,12 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingSidebarTeamMemberStageItems_meeting$key} from '~/__generated__/MeetingSidebarTeamMemberStageItems_meeting.graphql'
+import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
 import Avatar from '../components/Avatar/Avatar'
 import MeetingSubnavItem from '../components/MeetingSubnavItem'
 import useAnimatedPhaseListChildren from '../hooks/useAnimatedPhaseListChildren'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useGotoStageId from '../hooks/useGotoStageId'
-import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
 import MeetingSidebarPhaseItemChild from './MeetingSidebarPhaseItemChild'
 
 const AvatarBlock = styled('div')({
@@ -94,7 +94,7 @@ const MeetingSidebarTeamMemberStageItems = (props: Props) => {
               key={stageId}
               metaContent={
                 <AvatarBlock>
-                  <Avatar hasBadge={false} picture={picture} size={24} />
+                  <Avatar picture={picture} className='h-6 w-6' />
                 </AvatarBlock>
               }
               isDisabled={isViewerFacilitator ? !isNavigableByFacilitator : !isNavigable}
diff --git a/packages/client/components/MentionUser/MentionUser.tsx b/packages/client/components/MentionUser/MentionUser.tsx
index 8c33208a7c8..4f2429855ab 100644
--- a/packages/client/components/MentionUser/MentionUser.tsx
+++ b/packages/client/components/MentionUser/MentionUser.tsx
@@ -13,7 +13,7 @@ const MentionUser = (props: MentionUserProps) => {
   const {active, preferredName, picture} = props
   return (
     <DraftMentionRow active={active}>
-      <Avatar picture={picture} size={24} />
+      <Avatar picture={picture} className='h-6 w-6' />
       <DraftMentionDescription>{preferredName}</DraftMentionDescription>
     </DraftMentionRow>
   )
diff --git a/packages/client/components/NewMeetingTeamPickerAvatars.tsx b/packages/client/components/NewMeetingTeamPickerAvatars.tsx
index 954f0539a8a..73a4ee1c187 100644
--- a/packages/client/components/NewMeetingTeamPickerAvatars.tsx
+++ b/packages/client/components/NewMeetingTeamPickerAvatars.tsx
@@ -2,10 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '../styles/paletteV3'
-import defaultUserAvatar from '../styles/theme/images/avatar-user.svg'
-import getShuffledArr from '../utils/getShuffledArr'
 import {NewMeetingTeamPickerAvatars_team$key} from '../__generated__/NewMeetingTeamPickerAvatars_team.graphql'
+import getShuffledArr from '../utils/getShuffledArr'
 import Avatar from './Avatar/Avatar'
 import ErrorBoundary from './ErrorBoundary'
 
@@ -23,10 +21,6 @@ const AvatarWrapper = styled('div')<{count: number}>(({count}) => ({
   height: count > 2 ? 20 : 'auto'
 }))
 
-const StyledAvatar = styled(Avatar)({
-  border: `2px solid ${PALETTE.SLATE_200}`
-})
-
 interface Props {
   teamRef: NewMeetingTeamPickerAvatars_team$key
 }
@@ -73,7 +67,10 @@ const NewMeetingTeamPickerAvatars = (props: Props) => {
         return (
           <ErrorBoundary key={`pickerAvatar${teamMember.id}`}>
             <AvatarWrapper count={randomAvatars.length}>
-              <StyledAvatar {...teamMember} picture={picture || defaultUserAvatar} size={28} />
+              <Avatar
+                picture={picture}
+                className={`h-7 w-7 border-2 border-solid border-slate-200`}
+              />
             </AvatarWrapper>
           </ErrorBoundary>
         )
diff --git a/packages/client/components/OrgAvatarInput.tsx b/packages/client/components/OrgAvatarInput.tsx
index 386b1a947e6..56abd163dea 100644
--- a/packages/client/components/OrgAvatarInput.tsx
+++ b/packages/client/components/OrgAvatarInput.tsx
@@ -34,10 +34,6 @@ const StyledDialogTitle = styled(DialogTitle)({
   textAlign: 'center'
 })
 
-const AvatarWithShadow = styled(Avatar)({
-  boxShadow: `0px 4px 5px 0px #DADADA`
-})
-
 interface Props {
   picture: string
   orgId: string
@@ -76,7 +72,10 @@ const OrgAvatarInput = (props: Props) => {
     <ModalBoundary>
       <StyledDialogTitle>{'Upload a New Photo'}</StyledDialogTitle>
       <AvatarBlock>
-        <AvatarWithShadow picture={picture} size={96} />
+        <Avatar
+          picture={picture}
+          className='h-24 w-24 shadow-[0_4px_5px_0px_rgba(218,218,218,1)]'
+        />
       </AvatarBlock>
       <AvatarInput error={error?.message} onSubmit={onSubmit} />
     </ModalBoundary>
diff --git a/packages/client/components/StandardHub/StandardHub.tsx b/packages/client/components/StandardHub/StandardHub.tsx
index 5180979e4d0..d275019c553 100644
--- a/packages/client/components/StandardHub/StandardHub.tsx
+++ b/packages/client/components/StandardHub/StandardHub.tsx
@@ -7,9 +7,9 @@ import WaveWhiteSVG from 'static/images/waveWhite.svg'
 import PlainButton from '~/components/PlainButton/PlainButton'
 import TierTag from '~/components/Tag/TierTag'
 import useRouter from '~/hooks/useRouter'
+import {StandardHub_viewer$key, TierEnum} from '../../__generated__/StandardHub_viewer.graphql'
 import {PALETTE} from '../../styles/paletteV3'
 import defaultUserAvatar from '../../styles/theme/images/avatar-user.svg'
-import {StandardHub_viewer$key, TierEnum} from '../../__generated__/StandardHub_viewer.graphql'
 import Avatar from '../Avatar/Avatar'
 
 const StandardHubRoot = styled('div')({
@@ -32,10 +32,6 @@ const User = styled('div')({
   position: 'relative'
 })
 
-const StyledAvatar = styled(Avatar)({
-  cursor: 'pointer'
-})
-
 const NameAndEmail = styled('div')({
   display: 'flex',
   flexDirection: 'column',
@@ -120,7 +116,7 @@ const StandardHub = (props: Props) => {
   return (
     <StandardHubRoot>
       <User onClick={gotoUserSettings}>
-        <StyledAvatar hasBadge={false} picture={userAvatar} size={48} />
+        <Avatar picture={userAvatar} className='h-12 w-12' />
         <NameAndEmail>
           <PreferredName>{preferredName}</PreferredName>
           <Email>{email}</Email>
diff --git a/packages/client/components/TeamHealthVotingRow.tsx b/packages/client/components/TeamHealthVotingRow.tsx
index e706ef3b60d..c5c98030620 100644
--- a/packages/client/components/TeamHealthVotingRow.tsx
+++ b/packages/client/components/TeamHealthVotingRow.tsx
@@ -1,11 +1,11 @@
+import {Check as CheckIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamHealthVotingRow_stage$key} from '../__generated__/TeamHealthVotingRow_stage.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import {PokerCards} from '../types/constEnums'
-import {TeamHealthVotingRow_stage$key} from '../__generated__/TeamHealthVotingRow_stage.graphql'
 import AvatarList from './AvatarList'
-import {Check as CheckIcon} from '@mui/icons-material'
 import MiniPokerCard from './MiniPokerCard'
 import PokerVotingNoVotes from './PokerVotingNoVotes'
 
diff --git a/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx
index 1104253543a..71186f123b8 100644
--- a/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptDiscussionDrawer.tsx
@@ -4,18 +4,18 @@ import {JSONContent} from '@tiptap/react'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamPromptDiscussionDrawer_meeting$key} from '~/__generated__/TeamPromptDiscussionDrawer_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import AddReactjiToReactableMutation from '~/mutations/AddReactjiToReactableMutation'
 import ReactjiId from '~/shared/gqlIds/ReactjiId'
 import findStageById from '~/utils/meetings/findStageById'
-import {TeamPromptDiscussionDrawer_meeting$key} from '~/__generated__/TeamPromptDiscussionDrawer_meeting.graphql'
 import {PALETTE} from '../../styles/paletteV3'
 import Avatar from '../Avatar/Avatar'
 import DiscussionThreadRoot from '../DiscussionThreadRoot'
 import PlainButton from '../PlainButton/PlainButton'
-import PromptResponseEditor from '../promptResponse/PromptResponseEditor'
 import ReactjiSection from '../ReflectionCard/ReactjiSection'
+import PromptResponseEditor from '../promptResponse/PromptResponseEditor'
 import TeamPromptLastUpdatedTime from './TeamPromptLastUpdatedTime'
 
 const ThreadColumn = styled('div')({
@@ -157,7 +157,7 @@ const TeamPromptDiscussionDrawer = ({meetingRef, onToggleDrawer}: Props) => {
       <DiscussionResponseCard>
         <Header>
           <div className='flex items-center'>
-            <Avatar picture={teamMember.picture} size={48} />
+            <Avatar picture={teamMember.picture} className={'h-12 w-12'} />
             <TeamMemberName>
               {teamMember.preferredName}
               {response && (
diff --git a/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx b/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx
index a97ee933707..41d794ee484 100644
--- a/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptRepliesAvatarList.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamPromptRepliesAvatarList_edges$key} from '~/__generated__/TeamPromptRepliesAvatarList_edges.graphql'
 import useOverflowAvatars from '~/hooks/useOverflowAvatars'
 import {TransitionStatus} from '~/hooks/useTransition'
-import {TeamPromptRepliesAvatarList_edges$key} from '~/__generated__/TeamPromptRepliesAvatarList_edges.graphql'
 import AvatarListUser from '../AvatarListUser'
 import TeamPromptOverflowAvatar from './TeamPromptOverflowAvatar'
 
@@ -70,7 +70,7 @@ const TeamPromptRepliesAvatarList = (props: Props) => {
                 onTransitionEnd={onTransitionEnd}
                 status={status}
                 offset={offsetSize * displayIdx}
-                width={AVATAR_SIZE}
+                className='h-6 w-6'
               />
               <TeamPromptOverflowAvatar
                 key={`${userId}:overflowCount`}
@@ -92,7 +92,7 @@ const TeamPromptRepliesAvatarList = (props: Props) => {
             onTransitionEnd={onTransitionEnd}
             status={status}
             offset={offsetSize * displayIdx}
-            width={AVATAR_SIZE}
+            className='h-6 w-6'
           />
         )
       })}
diff --git a/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx b/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx
index 9bd86c9eb8e..7c3107b977e 100644
--- a/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptResponseCard.tsx
@@ -1,10 +1,12 @@
 import styled from '@emotion/styled'
+import {Link} from '@mui/icons-material'
 import {Editor as EditorState} from '@tiptap/core'
 import {JSONContent} from '@tiptap/react'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
-import {commitLocalUpdate, useFragment} from 'react-relay'
 import CopyToClipboard from 'react-copy-to-clipboard'
+import {commitLocalUpdate, useFragment} from 'react-relay'
+import {TeamPromptResponseCard_stage$key} from '~/__generated__/TeamPromptResponseCard_stage.graphql'
 import useAnimatedCard from '~/hooks/useAnimatedCard'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useEventCallback from '~/hooks/useEventCallback'
@@ -13,9 +15,13 @@ import {Elevation} from '~/styles/elevation'
 import {PALETTE} from '~/styles/paletteV3'
 import {BezierCurve, Card} from '~/types/constEnums'
 import plural from '~/utils/plural'
-import {TeamPromptResponseCard_stage$key} from '~/__generated__/TeamPromptResponseCard_stage.graphql'
+import {MenuPosition} from '../../hooks/useCoords'
 import useMutationProps from '../../hooks/useMutationProps'
+import useTooltip from '../../hooks/useTooltip'
 import UpsertTeamPromptResponseMutation from '../../mutations/UpsertTeamPromptResponseMutation'
+import SendClientSideEvent from '../../utils/SendClientSideEvent'
+import makeAppURL from '../../utils/makeAppURL'
+import {mergeRefs} from '../../utils/react/mergeRefs'
 import Avatar from '../Avatar/Avatar'
 import PlainButton from '../PlainButton/PlainButton'
 import PromptResponseEditor from '../promptResponse/PromptResponseEditor'
@@ -23,12 +29,6 @@ import {ResponseCardDimensions, ResponsesGridBreakpoints} from './TeamPromptGrid
 import TeamPromptLastUpdatedTime from './TeamPromptLastUpdatedTime'
 import TeamPromptRepliesAvatarList from './TeamPromptRepliesAvatarList'
 import {TeamPromptResponseEmojis} from './TeamPromptResponseEmojis'
-import makeAppURL from '../../utils/makeAppURL'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
-import {mergeRefs} from '../../utils/react/mergeRefs'
-import useTooltip from '../../hooks/useTooltip'
-import {MenuPosition} from '../../hooks/useCoords'
-import {Link} from '@mui/icons-material'
 
 const twoColumnResponseMediaQuery = `@media screen and (min-width: ${ResponsesGridBreakpoints.TWO_RESPONSE_COLUMN}px)`
 const threeColumnResponseMediaQuery = `@media screen and (min-width: ${ResponsesGridBreakpoints.THREE_RESPONSE_COLUMNS}px)`
@@ -254,7 +254,7 @@ const TeamPromptResponseCard = (props: Props) => {
       isSingleColumn={isSingleColumn}
     >
       <ResponseHeader>
-        <Avatar picture={picture} size={48} />
+        <Avatar picture={picture} className='h-12 w-12' />
         <TeamMemberName>
           {preferredName}
           {response && (
diff --git a/packages/client/components/ThreadedAvatarColumn.tsx b/packages/client/components/ThreadedAvatarColumn.tsx
index ad0c633f55c..b81bcaac427 100644
--- a/packages/client/components/ThreadedAvatarColumn.tsx
+++ b/packages/client/components/ThreadedAvatarColumn.tsx
@@ -1,6 +1,5 @@
 import styled from '@emotion/styled'
 import React from 'react'
-import defaultUserAvatar from '../styles/theme/images/avatar-user.svg'
 import Avatar from './Avatar/Avatar'
 
 const AvatarCol = styled('div')<{isReply: boolean | undefined}>(({isReply}) => ({
@@ -9,8 +8,6 @@ const AvatarCol = styled('div')<{isReply: boolean | undefined}>(({isReply}) => (
   paddingLeft: isReply ? undefined : 8
 }))
 
-const ColumnAvatar = styled(Avatar)({})
-
 interface Props {
   isReply: boolean | undefined
   picture: string | null
@@ -20,7 +17,7 @@ const ThreadedAvatarColumn = (props: Props) => {
   const {picture, isReply} = props
   return (
     <AvatarCol isReply={isReply}>
-      <ColumnAvatar size={32} picture={picture || defaultUserAvatar} />
+      <Avatar picture={picture} className='h-8 w-8' />
     </AvatarCol>
   )
 }
diff --git a/packages/client/components/TopBarAvatar.tsx b/packages/client/components/TopBarAvatar.tsx
index a026687f2a2..247e9d757a8 100644
--- a/packages/client/components/TopBarAvatar.tsx
+++ b/packages/client/components/TopBarAvatar.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TopBarAvatar_viewer$key} from '~/__generated__/TopBarAvatar_viewer.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import lazyPreload from '~/utils/lazyPreload'
-import {TopBarAvatar_viewer$key} from '~/__generated__/TopBarAvatar_viewer.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import defaultUserAvatar from '../styles/theme/images/avatar-user.svg'
 import Avatar from './Avatar/Avatar'
@@ -16,7 +16,7 @@ const AvatarWrapper = styled('button')({
   borderRadius: 100,
   marginLeft: 8,
   padding: 4,
-  ':focus': {
+  ':focus-visible': {
     boxShadow: `0 0 0 2px ${PALETTE.SKY_400}`,
     cursor: 'pointer',
     outline: 'none'
@@ -55,9 +55,8 @@ const TopBarAvatar = (props: Props) => {
         <Avatar
           onMouseEnter={StandardHubUserMenu.preload}
           ref={originRef}
-          hasBadge={false}
           picture={userAvatar}
-          size={40}
+          className='h-10 w-10 cursor-pointer'
         />
         {viewer && menuPortal(<StandardHubUserMenu menuProps={menuProps} viewerRef={viewer} />)}
       </AvatarWrapper>
diff --git a/packages/client/components/UserAvatarInput.tsx b/packages/client/components/UserAvatarInput.tsx
index 01cc3475543..72905142f6c 100644
--- a/packages/client/components/UserAvatarInput.tsx
+++ b/packages/client/components/UserAvatarInput.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
 import sanitizeSVG from '@mattkrick/sanitize-svg'
+import {Close} from '@mui/icons-material'
 import React from 'react'
 import jpgWithoutEXIF from '~/utils/jpgWithoutEXIF'
 import useAtmosphere from '../hooks/useAtmosphere'
@@ -9,7 +10,6 @@ import svgToPng from '../utils/svgToPng'
 import Avatar from './Avatar/Avatar'
 import AvatarInput from './AvatarInput'
 import DialogTitle from './DialogTitle'
-import {Close} from '@mui/icons-material'
 import FlatButton from './FlatButton'
 
 const AvatarBlock = styled('div')({
@@ -75,7 +75,7 @@ const UserAvatarInput = (props: Props) => {
       <div>
         {/* upload */}
         <AvatarBlock>
-          <Avatar picture={picture} size={96} />
+          <Avatar picture={picture} className='h-24 w-24' />
         </AvatarBlock>
         <AvatarInput error={error?.message} onSubmit={onSubmit} />
       </div>
diff --git a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx
index 814c477dfc2..5333987bfe5 100644
--- a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx
+++ b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt.tsx
@@ -3,11 +3,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingCheckInPrompt_meeting$key} from '~/__generated__/NewMeetingCheckInPrompt_meeting.graphql'
-import Avatar from '../../../../components/Avatar/Avatar'
-import useBreakpoint from '../../../../hooks/useBreakpoint'
-import defaultUserAvatar from '../../../../styles/theme/images/avatar-user.svg'
-import {Breakpoint} from '../../../../types/constEnums'
 import {NewMeetingCheckInPrompt_teamMember$key} from '../../../../__generated__/NewMeetingCheckInPrompt_teamMember.graphql'
+import Avatar from '../../../../components/Avatar/Avatar'
 import NewMeetingCheckInGreeting from '../NewMeetingCheckInGreeting'
 import NewCheckInQuestion from './NewCheckInQuestion'
 
@@ -73,15 +70,13 @@ const NewMeetingCheckinPrompt = (props: Props) => {
     `,
     teamMemberRef
   )
-  const isLargeViewport = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
   const {picture} = teamMember
   const {localPhase} = meeting
   const {checkInGreeting} = localPhase
-  const size = isLargeViewport ? 160 : 128
   return (
     <PromptBlock>
       <AvatarBlock>
-        <Avatar picture={picture || defaultUserAvatar} size={size} />
+        <Avatar picture={picture} className={`h-32 w-32 sidebar-left:h-40 sidebar-left:w-40`} />
       </AvatarBlock>
       <CheckInBlock>
         <NewMeetingCheckInGreeting checkInGreeting={checkInGreeting!} teamMember={teamMember} />
diff --git a/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx b/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx
index 864961f92d0..579ad32697b 100644
--- a/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaItem/AgendaItem.tsx
@@ -3,9 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {
-  AgendaItem_meeting$key,
-  AgendaItem_meeting$data
+  AgendaItem_meeting$data,
+  AgendaItem_meeting$key
 } from '~/__generated__/AgendaItem_meeting.graphql'
+import {AgendaItem_agendaItem$key} from '../../../../__generated__/AgendaItem_agendaItem.graphql'
 import Avatar from '../../../../components/Avatar/Avatar'
 import IconButton from '../../../../components/IconButton'
 import MeetingSubnavItem from '../../../../components/MeetingSubnavItem'
@@ -20,7 +21,6 @@ import pinIcon from '../../../../styles/theme/images/icons/pin.svg'
 import unpinIcon from '../../../../styles/theme/images/icons/unpin.svg'
 import {ICON_SIZE} from '../../../../styles/typographyV2'
 import findStageAfterId from '../../../../utils/meetings/findStageAfterId'
-import {AgendaItem_agendaItem$key} from '../../../../__generated__/AgendaItem_agendaItem.graphql'
 
 const AgendaItemStyles = styled('div')({
   position: 'relative',
@@ -199,7 +199,7 @@ const AgendaItem = (props: Props) => {
 
   const getIcon = () => {
     if (pinned && isHovering) return <SvgIcon alt='unpinIcon' src={unpinIcon} />
-    else if (!pinned && !isHovering) return <Avatar hasBadge={false} picture={picture} size={24} />
+    else if (!pinned && !isHovering) return <Avatar picture={picture} className='h-6 w-6' />
     else return <SvgIcon alt='pinnedIcon' src={pinIcon} />
   }
 
diff --git a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx
index 5156af771c3..a3f48da65d6 100644
--- a/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx
+++ b/packages/client/modules/teamDashboard/components/ManageTeam/ManageTeamMember.tsx
@@ -134,7 +134,7 @@ const ManageTeamMember = (props: Props) => {
 
   return (
     <StyledRow ref={ref}>
-      <Avatar size={24} picture={picture} />
+      <Avatar className='h-6 w-6' picture={picture} />
       <Content>
         <Name>{preferredName}</Name>
         <TeamLeadLabel isLead={isLead || isOrgAdmin}>
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx
index 79b5c4d6d86..49f7753dde2 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeader.tsx
@@ -1,27 +1,26 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import Avatar from '../../../../components/Avatar/Avatar'
 import React from 'react'
+import {useFragment} from 'react-relay'
 import {BillingLeader_orgUser$key} from '../../../../__generated__/BillingLeader_orgUser.graphql'
 import {BillingLeader_organization$key} from '../../../../__generated__/BillingLeader_organization.graphql'
+import Avatar from '../../../../components/Avatar/Avatar'
+import BillingLeaderMenu from '../../../../components/BillingLeaderMenu'
+import FlatButton from '../../../../components/FlatButton'
+import IconLabel from '../../../../components/IconLabel'
 import Row from '../../../../components/Row/Row'
-import {ElementWidth} from '../../../../types/constEnums'
-import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
-import RowInfoHeader from '../../../../components/Row/RowInfoHeader'
 import RowActions from '../../../../components/Row/RowActions'
-import FlatButton from '../../../../components/FlatButton'
 import RowInfo from '../../../../components/Row/RowInfo'
-import {useFragment} from 'react-relay'
-import IconLabel from '../../../../components/IconLabel'
-import lazyPreload from '../../../../utils/lazyPreload'
-import useMenu from '../../../../hooks/useMenu'
-import BillingLeaderMenu from '../../../../components/BillingLeaderMenu'
+import RowInfoHeader from '../../../../components/Row/RowInfoHeader'
+import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
+import BaseTag from '../../../../components/Tag/BaseTag'
 import {MenuPosition} from '../../../../hooks/useCoords'
+import useMenu from '../../../../hooks/useMenu'
+import useModal from '../../../../hooks/useModal'
 import useTooltip from '../../../../hooks/useTooltip'
+import lazyPreload from '../../../../utils/lazyPreload'
 import LeaveOrgModal from '../LeaveOrgModal/LeaveOrgModal'
-import useModal from '../../../../hooks/useModal'
 import RemoveFromOrgModal from '../RemoveFromOrgModal/RemoveFromOrgModal'
-import BaseTag from '../../../../components/Tag/BaseTag'
 
 const StyledRow = styled(Row)<{isFirstRow: boolean}>(({isFirstRow}) => ({
   padding: '12px 16px',
@@ -112,7 +111,7 @@ const BillingLeader = (props: Props) => {
 
   return (
     <StyledRow isFirstRow={isFirstRow}>
-      <Avatar hasBadge={false} picture={picture} size={ElementWidth.BILLING_AVATAR} />
+      <Avatar picture={picture} className='h-11 w-11' />
       <RowInfo>
         <RowInfoHeader>
           <RowInfoHeading>{preferredName}</RowInfoHeading>
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx
index db19ca6093e..afc5e19e565 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderMenu.tsx
@@ -1,21 +1,21 @@
+import graphql from 'babel-plugin-relay/macro'
 import React, {forwardRef, useMemo} from 'react'
-import Menu from '../../../../components/Menu'
-import MenuItem from '../../../../components/MenuItem'
-import MenuItemLabel from '../../../../components/MenuItemLabel'
-import {MenuProps} from '../../../../hooks/useMenu'
 import {useFragment} from 'react-relay'
-import graphql from 'babel-plugin-relay/macro'
 import {
   NewBillingLeaderMenu_organization$data,
   NewBillingLeaderMenu_organization$key
 } from '~/__generated__/NewBillingLeaderMenu_organization.graphql'
 import Avatar from '../../../../components/Avatar/Avatar'
-import TypeAheadLabel from '../../../../components/TypeAheadLabel'
-import useFilteredItems from '../../../../hooks/useFilteredItems'
 import {EmptyDropdownMenuItemLabel} from '../../../../components/EmptyDropdownMenuItemLabel'
-import SetOrgUserRoleMutation from '../../../../mutations/SetOrgUserRoleMutation'
+import Menu from '../../../../components/Menu'
+import MenuItem from '../../../../components/MenuItem'
+import MenuItemLabel from '../../../../components/MenuItemLabel'
+import TypeAheadLabel from '../../../../components/TypeAheadLabel'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
+import useFilteredItems from '../../../../hooks/useFilteredItems'
+import {MenuProps} from '../../../../hooks/useMenu'
 import useMutationProps from '../../../../hooks/useMutationProps'
+import SetOrgUserRoleMutation from '../../../../mutations/SetOrgUserRoleMutation'
 
 interface Props {
   menuProps: MenuProps
@@ -96,7 +96,7 @@ const NewBillingLeaderMenu = forwardRef((props: Props, ref: any) => {
             label={
               <MenuItemLabel>
                 <div className='pr-8'>
-                  <Avatar picture={picture} size={32} />
+                  <Avatar picture={picture} className='h-8 w-8' />
                 </div>
                 <TypeAheadLabel query={newLeaderSearchQuery} label={preferredName} />
               </MenuItemLabel>
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
index 6fea1869a96..012b9f7247f 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
@@ -1,15 +1,15 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
+import {OrgDetails_organization$key} from '../../../../__generated__/OrgDetails_organization.graphql'
+import Avatar from '../../../../components/Avatar/Avatar'
+import EditableAvatar from '../../../../components/EditableAvatar/EditableAvatar'
+import EditableOrgName from '../../../../components/EditableOrgName'
 import OrgAvatarInput from '../../../../components/OrgAvatarInput'
 import useModal from '../../../../hooks/useModal'
-import {OrgDetails_organization$key} from '../../../../__generated__/OrgDetails_organization.graphql'
-import OrgBillingDangerZone from './OrgBillingDangerZone'
 import defaultOrgAvatar from '../../../../styles/theme/images/avatar-organization.svg'
-import EditableOrgName from '../../../../components/EditableOrgName'
 import OrganizationDetails from '../Organization/OrganizationDetails'
-import Avatar from '../../../../components/Avatar/Avatar'
-import EditableAvatar from '../../../../components/EditableAvatar/EditableAvatar'
+import OrgBillingDangerZone from './OrgBillingDangerZone'
 
 type Props = {
   organizationRef: OrgDetails_organization$key
@@ -51,12 +51,14 @@ const OrgDetails = (props: Props) => {
       <div className='mb-4 flex w-full items-center'>
         {modalPortal(<OrgAvatarInput picture={pictureOrDefault} orgId={orgId} />)}
         {isBillingLeader ? (
-          <div onClick={togglePortal} className='mr-2'>
-            <EditableAvatar hasPanel picture={pictureOrDefault} size={64} unstyled />
-          </div>
+          <EditableAvatar
+            onClick={togglePortal}
+            picture={pictureOrDefault}
+            className='mr-4 h-16 w-16'
+          />
         ) : (
           <div className='mr-4 w-16'>
-            <Avatar picture={pictureOrDefault} size={64} sansRadius sansShadow />
+            <Avatar picture={pictureOrDefault} />
           </div>
         )}
         <div className='text-gray-600 ml-2 flex flex-grow flex-col items-start'>
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
index 02b643f744f..3bc1c8a6836 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRow.tsx
@@ -1,19 +1,17 @@
-import React from 'react'
+import {MoreVert} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {useFragment} from 'react-relay'
 import {OrgTeamMembersRow_teamMember$key} from '../../../../__generated__/OrgTeamMembersRow_teamMember.graphql'
-import {Avatar} from '../../../../ui/Avatar/Avatar'
-import {AvatarFallback} from '../../../../ui/Avatar/AvatarFallback'
-import {AvatarImage} from '../../../../ui/Avatar/AvatarImage'
-import {Button} from '../../../../ui/Button/Button'
-import {MoreVert} from '@mui/icons-material'
-import {OrgTeamMemberMenu} from './OrgTeamMemberMenu'
+import Avatar from '../../../../components/Avatar/Avatar'
+import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
+import useModal from '../../../../hooks/useModal'
+import {Button} from '../../../../ui/Button/Button'
 import PromoteTeamMemberModal from '../../../teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal'
 import RemoveTeamMemberModal from '../../../teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal'
-import useModal from '../../../../hooks/useModal'
-import useAtmosphere from '../../../../hooks/useAtmosphere'
+import {OrgTeamMemberMenu} from './OrgTeamMemberMenu'
 
 type Props = {
   teamMemberRef: OrgTeamMembersRow_teamMember$key
@@ -65,10 +63,7 @@ export const OrgTeamMembersRow = (props: Props) => {
   return (
     <div className='flex w-full items-center justify-center gap-4 p-4'>
       <div>
-        <Avatar className='h-8 w-8'>
-          <AvatarImage src={teamMember.picture} alt={teamMember.preferredName} />
-          <AvatarFallback>{teamMember.preferredName.substring(0, 2)}</AvatarFallback>
-        </Avatar>
+        <Avatar className='h-8 w-8' picture={teamMember.picture} alt={teamMember.preferredName} />
       </div>
       <div className='flex w-full flex-col gap-y-1 py-1'>
         <div className='text-gray-700 inline-flex items-center gap-x-2 text-lg font-bold'>
diff --git a/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx b/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
index 8a15e046096..7087976fa84 100644
--- a/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgUserRow/OrgMemberRow.tsx
@@ -3,6 +3,14 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {forwardRef, Ref} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {
+  OrgMemberRow_organization$data,
+  OrgMemberRow_organization$key
+} from '../../../../__generated__/OrgMemberRow_organization.graphql'
+import {
+  OrgMemberRow_organizationUser$data,
+  OrgMemberRow_organizationUser$key
+} from '../../../../__generated__/OrgMemberRow_organizationUser.graphql'
 import Avatar from '../../../../components/Avatar/Avatar'
 import FlatButton, {FlatButtonProps} from '../../../../components/FlatButton'
 import IconLabel from '../../../../components/IconLabel'
@@ -12,6 +20,7 @@ import RowInfo from '../../../../components/Row/RowInfo'
 import RowInfoHeader from '../../../../components/Row/RowInfoHeader'
 import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
 import RowInfoLink from '../../../../components/Row/RowInfoLink'
+import BaseTag from '../../../../components/Tag/BaseTag'
 import EmphasisTag from '../../../../components/Tag/EmphasisTag'
 import InactiveTag from '../../../../components/Tag/InactiveTag'
 import RoleTag from '../../../../components/Tag/RoleTag'
@@ -22,15 +31,6 @@ import defaultUserAvatar from '../../../../styles/theme/images/avatar-user.svg'
 import {Breakpoint} from '../../../../types/constEnums'
 import lazyPreload from '../../../../utils/lazyPreload'
 import withMutationProps, {WithMutationProps} from '../../../../utils/relay/withMutationProps'
-import {
-  OrgMemberRow_organization$key,
-  OrgMemberRow_organization$data
-} from '../../../../__generated__/OrgMemberRow_organization.graphql'
-import {
-  OrgMemberRow_organizationUser$key,
-  OrgMemberRow_organizationUser$data
-} from '../../../../__generated__/OrgMemberRow_organizationUser.graphql'
-import BaseTag from '../../../../components/Tag/BaseTag'
 
 const AvatarBlock = styled('div')({
   display: 'none',
@@ -113,7 +113,7 @@ interface UserAvatarProps {
 const UserAvatar: React.FC<UserAvatarProps> = ({picture}) => (
   <AvatarBlock>
     {picture ? (
-      <Avatar hasBadge={false} picture={picture} size={44} />
+      <Avatar picture={picture} className='h-11 w-11' />
     ) : (
       <img alt='default avatar' src={defaultUserAvatar} />
     )}
diff --git a/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx b/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx
index b3c6d77de41..2032ba8a87c 100644
--- a/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrganizationRow/OrganizationRow.tsx
@@ -127,7 +127,7 @@ const OrganizationRow = (props: Props) => {
   return (
     <Row>
       <OrgAvatar onClick={onRowClick}>
-        <Avatar size={44} picture={orgAvatar} />
+        <Avatar className='h-11 w-11' picture={orgAvatar} />
       </OrgAvatar>
       <RowInner>
         <StyledRowInfo>
diff --git a/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx b/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx
index 639240d0a41..93bb10e792d 100644
--- a/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx
+++ b/packages/client/modules/userDashboard/components/UserSettingsForm/UserSettingsForm.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled'
 import React, {lazy} from 'react'
+import {UserProfileQuery} from '../../../../__generated__/UserProfileQuery.graphql'
 import EditableAvatar from '../../../../components/EditableAvatar/EditableAvatar'
 import FieldLabel from '../../../../components/FieldLabel/FieldLabel'
 import BasicInput from '../../../../components/InputField/BasicInput'
@@ -13,7 +14,6 @@ import defaultUserAvatar from '../../../../styles/theme/images/avatar-user.svg'
 import {Breakpoint, Layout} from '../../../../types/constEnums'
 import withForm, {WithFormProps} from '../../../../utils/relay/withForm'
 import Legitity from '../../../../validation/Legitity'
-import {UserProfileQuery} from '../../../../__generated__/UserProfileQuery.graphql'
 import NotificationErrorMessage from '../../../notifications/components/NotificationErrorMessage'
 
 const SettingsForm = styled('form')({
@@ -84,7 +84,7 @@ function UserSettings(props: UserSettingsProps) {
   return (
     <SettingsForm onSubmit={onSubmit}>
       <div onClick={togglePortal}>
-        <EditableAvatar picture={pictureOrDefault} size={96} />
+        <EditableAvatar picture={pictureOrDefault} className='h-24 w-24' />
       </div>
       {modalPortal(<UserAvatarInput closeModal={togglePortal} picture={pictureOrDefault} />)}
       <InfoBlock>
diff --git a/packages/client/ui/Avatar/Avatar.tsx b/packages/client/ui/Avatar/Avatar.tsx
index 23bbecd22a6..73506f3d62e 100644
--- a/packages/client/ui/Avatar/Avatar.tsx
+++ b/packages/client/ui/Avatar/Avatar.tsx
@@ -1,11 +1,9 @@
-import React from 'react'
 import * as AvatarPrimitive from '@radix-ui/react-avatar'
 import clsx from 'clsx'
+import React from 'react'
+import {forwardRadix} from '../forwardRadix'
 
-export const Avatar = React.forwardRef<
-  HTMLSpanElement,
-  React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root>
->(({className, ...props}, ref) => (
+export const Avatar = forwardRadix<typeof AvatarPrimitive.Root>(({className, ...props}, ref) => (
   <AvatarPrimitive.Root
     ref={ref}
     className={clsx('relative flex shrink-0 overflow-hidden rounded-full', className)}

From c5a8edab6cd3da6590c8962cabacdbaebc048828 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 14:05:09 -0700
Subject: [PATCH 153/183] chore(release): release v7.27.0 (#9624)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 21 +++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index ad981277836..bb6937b0fd0 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.26.0"
+  ".": "7.27.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55aef702232..cdd40c2dd68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.27.0](https://github.com/ParabolInc/parabol/compare/v7.26.0...v7.27.0) (2024-04-11)
+
+
+### Added
+
+* Make top team templates clickable ([#9630](https://github.com/ParabolInc/parabol/issues/9630)) ([e4f8d49](https://github.com/ParabolInc/parabol/commit/e4f8d49c544be1d37388596b1afa086d9eb30a5c))
+* Release activity library for everyone ([#9617](https://github.com/ParabolInc/parabol/issues/9617)) ([92a1dbd](https://github.com/ParabolInc/parabol/commit/92a1dbd18dc25c0046f573a3e46158f5cecdbf17))
+* release recurring retros ([#9625](https://github.com/ParabolInc/parabol/issues/9625)) ([a4f10d1](https://github.com/ParabolInc/parabol/commit/a4f10d193bb38990d8400183c6d320522d2db71e))
+
+
+### Fixed
+
+* Only list available categories in edit template ([#9628](https://github.com/ParabolInc/parabol/issues/9628)) ([fba3b80](https://github.com/ParabolInc/parabol/commit/fba3b80bfdbdb5ab368117a4f3f6bbe4742d1607))
+* use radix-ui for avatars ([#9633](https://github.com/ParabolInc/parabol/issues/9633)) ([38c8e61](https://github.com/ParabolInc/parabol/commit/38c8e61bcc6a199abf0165f49bb0dd7d693962e3))
+
+
+### Changed
+
+* Add absolute date tooltip in history ([#9629](https://github.com/ParabolInc/parabol/issues/9629)) ([65f3119](https://github.com/ParabolInc/parabol/commit/65f311920432416f547e83831cfcdfef2dc570af))
+* remove old new meeting dialog ([#9621](https://github.com/ParabolInc/parabol/issues/9621)) ([b337d17](https://github.com/ParabolInc/parabol/commit/b337d17ff41c4ab4179073ed2eb59a1244998180))
+
 ## [7.26.0](https://github.com/ParabolInc/parabol/compare/v7.25.4...v7.26.0) (2024-04-10)
 
 
diff --git a/package.json b/package.json
index a683b9f7465..37d92af280a 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.26.0",
+  "version": "7.27.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index e5ad1b21ac0..436bf0a45d2 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.26.0",
+  "version": "7.27.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.26.0"
+    "parabol-server": "7.27.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 00c363724b2..226c62bc03d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.26.0",
+  "version": "7.27.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 3c72eafe6ac..44b40e97562 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.26.0",
+  "version": "7.27.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index f6e71d831f3..518c0231736 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.26.0",
+  "version": "7.27.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.26.0",
-    "parabol-server": "7.26.0",
+    "parabol-client": "7.27.0",
+    "parabol-server": "7.27.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 17c1f2c94d6..4813aec47b6 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.26.0",
+  "version": "7.27.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 6099eb84dfb..381576fe390 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.26.0",
+  "version": "7.27.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -120,7 +120,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.26.0",
+    "parabol-client": "7.27.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 4f25cba7393f28bb2f0269db1b1916e9792df4a7 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 11 Apr 2024 14:28:01 -0700
Subject: [PATCH 154/183] fix: margin spacing on hover (#9635)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .../userDashboard/components/OrgBilling/OrgDetails.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
index 012b9f7247f..6784b5bb14b 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgDetails.tsx
@@ -51,17 +51,13 @@ const OrgDetails = (props: Props) => {
       <div className='mb-4 flex w-full items-center'>
         {modalPortal(<OrgAvatarInput picture={pictureOrDefault} orgId={orgId} />)}
         {isBillingLeader ? (
-          <EditableAvatar
-            onClick={togglePortal}
-            picture={pictureOrDefault}
-            className='mr-4 h-16 w-16'
-          />
+          <EditableAvatar onClick={togglePortal} picture={pictureOrDefault} className='h-16 w-16' />
         ) : (
-          <div className='mr-4 w-16'>
+          <div className='w-16'>
             <Avatar picture={pictureOrDefault} />
           </div>
         )}
-        <div className='text-gray-600 ml-2 flex flex-grow flex-col items-start'>
+        <div className='text-gray-600 ml-6 flex flex-grow flex-col items-start'>
           {isBillingLeader ? (
             <EditableOrgName organization={organization} />
           ) : (

From 7d1086d4c1e5b0466617b007bb96c6642b4d5015 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 11 Apr 2024 14:49:58 -0700
Subject: [PATCH 155/183] fix: add prettier-plugin-organize-imports (#9637)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .prettierrc                                   |  2 +-
 packages/client/components/ActionMeeting.tsx  |  2 +-
 .../components/ActionMeetingAgendaItems.tsx   |  2 +-
 .../components/ActionMeetingFirstCall.tsx     |  2 +-
 .../components/ActionMeetingLastCall.tsx      |  2 +-
 .../components/ActionMeetingSidebar.tsx       |  8 ++--
 .../components/ActionMeetingUpdates.tsx       |  2 +-
 .../ActionSidebarAgendaItemsSection.tsx       |  2 +-
 .../ActionSidebarPhaseListItemChildren.tsx    |  2 +-
 .../components/ActivityLibrary/AISearch.tsx   |  2 +-
 .../ActivityDetails/ActivityDetails.tsx       |  6 +--
 .../ActivityDetailsCategoryBadge.tsx          |  4 +-
 .../components/DetailsBadge.tsx               |  2 +-
 .../components/IntegrationsTip.tsx            |  6 +--
 .../ActivityDetailsSidebar.tsx                | 36 +++++++--------
 .../ActivityLibrary/ActivityGrid.tsx          |  4 +-
 .../ActivityLibrary/ActivityLibrary.tsx       | 12 ++---
 .../ActivityLibraryCardDescription.tsx        |  6 +--
 .../ActivityLibrary/ActivityLibraryRoutes.tsx |  6 +--
 .../ActivityLibrary/CreateActivityCard.tsx    |  8 ++--
 .../CreateNewActivity/CreateNewActivity.tsx   | 32 +++++++-------
 .../ActivityLibrary/ScheduleMeetingButton.tsx | 12 ++---
 .../components/ActivityLibrary/SearchBar.tsx  |  2 +-
 .../ActivityLibrary/TeamPickerModal.tsx       |  2 +-
 packages/client/components/AddTeamDialog.tsx  | 32 +++++++-------
 .../client/components/AddTeamDialogRoot.tsx   |  6 +--
 .../components/AddTeamMemberAvatarButton.tsx  |  2 +-
 .../client/components/AddToAzureMenuItem.tsx  |  2 +-
 .../client/components/AddToGitLabMenuItem.tsx |  2 +-
 .../AdhocTeamMultiSelect.tsx                  |  6 +--
 packages/client/components/AnalyticsPage.tsx  |  4 +-
 .../client/components/ArchiveTaskRoot.tsx     |  2 +-
 .../client/components/ArchiveTaskUserRoot.tsx |  2 +-
 .../AzureDevOpsFieldDimensionDropdown.tsx     |  2 +-
 .../components/AzureDevOpsFieldMenu.tsx       |  2 +-
 .../AzureDevOpsScopingSearchBar.tsx           |  2 +-
 .../AzureDevOpsScopingSearchFilterMenu.tsx    |  2 +-
 .../AzureDevOpsScopingSearchInput.tsx         |  2 +-
 .../AzureDevOpsScopingSearchResultsRoot.tsx   |  2 +-
 .../components/BillingLeaderActionMenu.tsx    |  4 +-
 .../client/components/BillingLeaderMenu.tsx   |  2 +-
 .../components/BottomControlBarReady.tsx      |  6 +--
 .../components/BottomControlBarTips.tsx       |  4 +-
 .../client/components/BottomNavIconLabel.tsx  |  2 +-
 packages/client/components/Checkbox.tsx       |  2 +-
 .../DashFilterToggle/DashFilterToggle.tsx     |  2 +-
 .../components/DashNavList/DashNavList.tsx    |  6 +--
 packages/client/components/DashTopBar.tsx     |  2 +-
 packages/client/components/Dashboard.tsx      |  8 ++--
 .../components/Dashboard/DashSidebar.tsx      |  2 +-
 .../Dashboard/MobileDashSidebar.tsx           |  2 +-
 .../DashboardAvatars/DashboardAvatars.tsx     |  8 ++--
 .../DashboardAvatars/TeamMemberAvatarMenu.tsx |  2 +-
 packages/client/components/DashboardRoot.tsx  |  2 +-
 .../client/components/DeleteTeamDialog.tsx    | 14 +++---
 .../client/components/DemoMeetingCard.tsx     |  2 +-
 .../client/components/DemoMeetingRoot.tsx     |  2 +-
 .../components/DiscussPhaseReflectionGrid.tsx |  2 +-
 .../client/components/DiscussionMentioned.tsx |  4 +-
 .../client/components/DiscussionThread.tsx    |  4 +-
 .../components/DiscussionThreadList.tsx       |  4 +-
 ...scussionThreadListEmptyTranscriptState.tsx |  2 +-
 .../components/DiscussionThreadRoot.tsx       |  2 +-
 .../client/components/DropdownToggleV2.tsx    |  2 +-
 packages/client/components/DueDatePicker.tsx  |  2 +-
 packages/client/components/DueDateToggle.tsx  |  2 +-
 .../client/components/EditableOrgName.tsx     |  2 +-
 .../EditingStatus/EditingStatus.tsx           |  2 +-
 .../client/components/EditorInputWrapper.tsx  |  2 +-
 .../client/components/EmailNotifications.tsx  |  2 +-
 .../components/EstimateDimensionColumn.tsx    |  4 +-
 .../client/components/EstimatePhaseArea.tsx   |  2 +-
 .../EstimatePhaseDiscussionDrawer.tsx         |  2 +-
 .../EventTypeFilterMenuItemLabel.tsx          |  8 ++--
 .../client/components/FacilitatorMenu.tsx     |  2 +-
 .../GitHubFieldDimensionDropdown.tsx          |  2 +-
 .../client/components/GitHubFieldMenu.tsx     |  2 +-
 .../components/GitHubRepoSearchFilterMenu.tsx |  6 +--
 .../components/GitHubScopingSearchBar.tsx     |  2 +-
 .../GitHubScopingSearchFilterMenu.tsx         |  2 +-
 .../GitHubScopingSearchFilterMenuRoot.tsx     |  4 +-
 .../GitHubScopingSearchFilterToggle.tsx       |  2 +-
 .../GitHubScopingSearchHistoryToggle.tsx      |  2 +-
 .../components/GitHubScopingSearchResults.tsx |  8 ++--
 .../GitHubScopingSearchResultsRoot.tsx        |  2 +-
 .../GitHubScopingSelectAllIssues.tsx          |  2 +-
 .../GitLabFieldDimensionDropdown.tsx          |  2 +-
 .../client/components/GitLabFieldMenu.tsx     |  2 +-
 .../GitLabScopingSearchFilterMenu.tsx         |  4 +-
 .../GitLabScopingSearchFilterMenuRoot.tsx     |  4 +-
 .../GitLabScopingSearchFilterToggle.tsx       |  2 +-
 .../components/GitLabScopingSearchResults.tsx |  6 +--
 .../GitLabScopingSearchResultsRoot.tsx        |  2 +-
 .../GitLabScopingSelectAllIssues.tsx          |  2 +-
 .../components/GoogleMeetProviderLogo.tsx     |  2 +-
 packages/client/components/GroupingKanban.tsx |  4 +-
 .../components/GroupingKanbanColumn.tsx       |  6 +--
 packages/client/components/IconLabel.tsx      |  2 +-
 packages/client/components/Insights.tsx       |  2 +-
 packages/client/components/InsightsCharts.tsx | 12 ++---
 .../client/components/InsightsDomainNudge.tsx |  4 +-
 .../client/components/InsightsDomainPanel.tsx |  2 +-
 packages/client/components/InsightsRoot.tsx   |  2 +-
 .../components/InvitationLinkDialog.tsx       |  2 +-
 .../components/InvitationLinkErrorExpired.tsx |  2 +-
 .../components/InviteTeamMemberAvatar.tsx     |  2 +-
 .../components/JiraFieldDimensionDropdown.tsx |  2 +-
 packages/client/components/JiraFieldMenu.tsx  |  4 +-
 .../JiraScopingSearchCurrentFilters.tsx       |  2 +-
 .../JiraScopingSearchFilterMenuRoot.tsx       |  2 +-
 .../JiraScopingSearchFilterToggle.tsx         |  2 +-
 .../components/JiraScopingSearchResults.tsx   |  6 +--
 .../JiraScopingSearchResultsRoot.tsx          |  2 +-
 .../components/JiraScopingSelectAllIssues.tsx |  2 +-
 .../JiraServerFieldDimensionDropdown.tsx      |  2 +-
 .../client/components/JiraServerFieldMenu.tsx |  2 +-
 .../JiraServerScopingSearchFilterMenuRoot.tsx |  2 +-
 .../JiraServerScopingSearchFilterToggle.tsx   |  2 +-
 .../JiraServerScopingSearchResults.tsx        |  6 +--
 .../JiraServerScopingSearchResultsRoot.tsx    |  2 +-
 .../components/KudosReceivedNotification.tsx  |  6 +--
 .../components/LimitExceededWarning.tsx       |  2 +-
 .../components/MassInvitationTokenLink.tsx    |  4 +-
 .../MassInvitationTokenLinkRoot.tsx           |  2 +-
 packages/client/components/MeetingCard.tsx    |  6 +--
 .../components/MeetingCardOptionsMenu.tsx     |  4 +-
 .../components/MeetingCardOptionsMenuRoot.tsx |  4 +-
 .../client/components/MeetingControlBar.tsx   |  4 +-
 .../MeetingHelp/TeamHealthHelpMenu.tsx        |  4 +-
 .../components/MeetingLockedOverlay.tsx       |  2 +-
 packages/client/components/MeetingOptions.tsx |  8 ++--
 packages/client/components/MeetingRoot.tsx    |  4 +-
 .../client/components/MeetingSelector.tsx     |  4 +-
 .../client/components/MeetingSeriesRoot.tsx   |  4 +-
 .../components/MeetingStageTimeLimitEnd.tsx   |  2 +-
 packages/client/components/MeetingTopBar.tsx  |  2 +-
 packages/client/components/MeetingsDash.tsx   |  4 +-
 .../client/components/MeetingsDashEmpty.tsx   |  2 +-
 .../client/components/MeetingsDashHeader.tsx  |  8 ++--
 packages/client/components/Mentioned.tsx      | 10 ++---
 .../components/MicrosoftOAuthButtonBlock.tsx  |  6 +--
 .../components/MyDashboardTasksAndHeader.tsx  |  2 +-
 .../components/MyDashboardTasksRoot.tsx       |  6 +--
 .../client/components/MyDashboardTimeline.tsx |  4 +-
 .../components/MyDashboardTimelineRoot.tsx    |  6 +--
 .../client/components/NewAzureIssueInput.tsx  |  4 +-
 .../client/components/NewGitHubIssueInput.tsx |  6 +--
 .../client/components/NewGitLabIssueInput.tsx |  4 +-
 .../client/components/NewJiraIssueInput.tsx   |  4 +-
 .../client/components/NewMeetingActions.tsx   |  2 +-
 .../NewMeetingActionsCurrentMeetings.tsx      |  2 +-
 .../client/components/NewMeetingCheckIn.tsx   |  2 +-
 ...ewMeetingSettingsRetrospectiveSettings.tsx |  4 +-
 .../NewMeetingSettingsToggleTeamHealth.tsx    |  4 +-
 .../NewMeetingSettingsToggleTranscription.tsx |  2 +-
 ...NewMeetingSettingsUpgradeForTeamHealth.tsx |  8 ++--
 .../client/components/NewMeetingSidebar.tsx   |  2 +-
 .../NewMeetingSidebarPhaseListItem.tsx        |  2 +-
 .../NewMeetingSidebarUpgradeBlock.tsx         |  2 +-
 .../components/NewMeetingTeamPicker.tsx       |  8 ++--
 .../client/components/NewTeamOrgDropdown.tsx  |  2 +-
 .../components/NotificationDropdown.tsx       | 10 ++---
 .../client/components/NotificationPicker.tsx  |  2 +-
 .../client/components/NotificationRow.tsx     |  2 +-
 .../components/NotificationTemplate.tsx       |  2 +-
 .../components/NullableTask/NullableTask.tsx  |  2 +-
 .../client/components/OrgAdminActionMenu.tsx  |  6 +--
 .../PalettePicker/PalettePicker.tsx           |  2 +-
 .../ParabolScopingSearchFilterMenu.tsx        |  2 +-
 .../ParabolScopingSearchResultItem.tsx        |  2 +-
 .../ParabolScopingSearchResults.tsx           |  4 +-
 .../ParabolScopingSearchResultsRoot.tsx       |  4 +-
 .../ParabolScopingSelectAllTasks.tsx          |  2 +-
 .../client/components/PasswordResetLink.tsx   |  2 +-
 .../client/components/PaymentRejected.tsx     |  2 +-
 .../PinnedSnackbarNotifications.tsx           |  6 +--
 packages/client/components/PokerCard.tsx      |  2 +-
 packages/client/components/PokerCardDeck.tsx  |  2 +-
 .../PokerDimensionFinalScorePicker.tsx        |  2 +-
 .../components/PokerDimensionValueControl.tsx |  2 +-
 .../client/components/PokerDiscussVoting.tsx  | 10 ++---
 .../PokerEstimateHeaderCardParabol.tsx        |  2 +-
 .../client/components/PokerEstimatePhase.tsx  |  2 +-
 .../client/components/PokerMeetingSidebar.tsx |  2 +-
 .../PokerSidebarEstimateSection.tsx           |  2 +-
 .../PokerSidebarPhaseListItemChildren.tsx     |  2 +-
 packages/client/components/PokerVotingRow.tsx |  4 +-
 .../components/Poll/EditablePollOption.tsx    |  2 +-
 .../components/Poll/EditablePollTitle.tsx     |  2 +-
 packages/client/components/Poll/Poll.tsx      |  2 +-
 packages/client/components/PrivateRoutes.tsx  |  2 +-
 .../components/PromoteToBillingLeader.tsx     |  2 +-
 .../PromptToJoinOrgNotification.tsx           |  6 +--
 .../Recurrence/EndRecurringMeetingModal.tsx   |  6 +--
 .../Recurrence/RecurrenceSettings.tsx         |  2 +-
 .../UpdateRecurrenceSettingsModal.tsx         |  4 +-
 .../components/ReflectionCard/ColorBadge.tsx  |  4 +-
 .../ReflectionCard/ReactjiCount.tsx           |  4 +-
 .../ReflectionCard/ReactjiSection.tsx         |  2 +-
 .../ReflectionCard/ReflectionCard.tsx         |  6 +--
 .../components/ReflectionEditorWrapper.tsx    |  4 +-
 .../DraggableReflectionCard.tsx               |  2 +-
 .../ReflectionGroup/ReflectionGroup.tsx       |  4 +-
 .../ReflectionGroupTitleEditor.tsx            |  4 +-
 .../ReflectionGroup/RemoteReflection.tsx      | 10 ++---
 .../useSpotlightReflectionGroup.ts            |  2 +-
 .../components/ReflectionGroupHeader.tsx      |  4 +-
 .../components/ReflectionGroupVoting.tsx      |  4 +-
 .../RequestToJoinOrgNotification.tsx          |  4 +-
 .../client/components/ResponseMentioned.tsx   |  6 +--
 .../client/components/ResponseReplied.tsx     |  4 +-
 .../client/components/RetroDiscussPhase.tsx   |  8 ++--
 .../RetroDiscussionThreadHeader.tsx           | 12 ++---
 packages/client/components/RetroDrawer.tsx    |  6 +--
 .../components/RetroDrawerTemplateCard.tsx    | 14 +++---
 .../client/components/RetroGroupPhase.tsx     | 22 +++++-----
 .../client/components/RetroMeetingSidebar.tsx |  4 +-
 .../RetroReflectPhase/PhaseItemColumn.tsx     |  2 +-
 .../RetroReflectPhase/PhaseItemEditor.tsx     | 10 ++---
 .../RetroReflectPhase/ReflectionStack.tsx     |  2 +-
 .../RetroReflectPhase/RetroReflectPhase.tsx   |  4 +-
 .../components/RetroSidebarDiscussSection.tsx |  8 ++--
 .../RetroSidebarPhaseListItemChildren.tsx     |  2 +-
 .../client/components/RetroVoteMetaHeader.tsx |  2 +-
 .../ReviewRequestToJoinOrgModal.tsx           | 12 ++---
 .../components/ReviewRequestToJoinOrgRoot.tsx |  6 +--
 packages/client/components/ScheduleDialog.tsx | 44 +++++++++----------
 packages/client/components/ScopePhase.tsx     |  2 +-
 packages/client/components/ScopePhaseArea.tsx |  4 +-
 .../ScopePhaseAreaAddAzureDevOps.tsx          |  2 +-
 .../components/ScopePhaseAreaAddGitHub.tsx    |  2 +-
 .../components/ScopePhaseAreaAddGitLab.tsx    |  2 +-
 .../components/ScopePhaseAreaAddJira.tsx      |  6 +--
 .../ScopePhaseAreaAddJiraServer.tsx           |  2 +-
 .../components/ScopePhaseAreaGitHub.tsx       |  2 +-
 .../client/components/ScopingSearchInput.tsx  |  4 +-
 .../components/ScopingSearchResultItem.tsx    |  2 +-
 .../components/SelectMeetingDropdown.tsx      |  2 +-
 .../components/SelectMeetingDropdownItem.tsx  |  2 +-
 .../components/SelectSharingScopeDropdown.tsx |  2 +-
 .../client/components/ShareTopicModal.tsx     | 28 ++++++------
 packages/client/components/ShareTopicRoot.tsx |  4 +-
 .../components/ShareTopicRouterRoot.tsx       |  6 +--
 packages/client/components/SpotlightModal.tsx |  2 +-
 .../client/components/SpotlightResults.tsx    |  2 +-
 .../client/components/SpotlightSearchBar.tsx  |  2 +-
 .../components/SpotlightSourceGroup.tsx       |  2 +-
 .../client/components/StageTimerControl.tsx   |  2 +-
 .../client/components/StageTimerDisplay.tsx   |  2 +-
 .../client/components/StageTimerModal.tsx     |  4 +-
 .../components/StageTimerModalEditTimeEnd.tsx |  4 +-
 .../StageTimerModalEditTimeLimit.tsx          |  2 +-
 .../components/StageTimerModalEndTime.tsx     |  4 +-
 .../StageTimerModalEndTimeSlackToggle.tsx     |  4 +-
 .../components/StageTimerModalTimeLimit.tsx   |  2 +-
 .../client/components/StandardHubUserMenu.tsx |  2 +-
 .../SubmittedForgotPasswordPage.tsx           |  2 +-
 .../components/SuggestMentionableUsers.tsx    |  2 +-
 .../SuggestMentionableUsersRoot.tsx           |  4 +-
 .../SuggestedActionCreateNewTeam.tsx          |  2 +-
 .../SuggestedActionInviteYourTeam.tsx         |  2 +-
 .../SuggestedActionTryActionMeeting.tsx       |  2 +-
 .../SuggestedActionTryRetroMeeting.tsx        |  2 +-
 .../components/SuggestedActionTryTheDemo.tsx  |  2 +-
 packages/client/components/Tag/TierTag.tsx    |  2 +-
 .../components/TaskColumns/TaskColumns.tsx    |  8 ++--
 .../components/TaskEditor/CommentEditor.tsx   |  2 +-
 .../components/TaskEditor/TaskEditor.tsx      |  2 +-
 .../components/TaskEditor/useSuggestions.tsx  |  2 +-
 .../components/TaskFooterIntegrateMenu.tsx    | 12 ++---
 .../TaskFooterIntegrateMenuList.tsx           |  4 +-
 .../TaskFooterIntegrateMenuRoot.tsx           |  8 ++--
 .../TaskFooterIntegrateMenuSignup.tsx         |  2 +-
 .../client/components/TaskIntegrationLink.tsx |  2 +-
 .../components/TaskIntegrationMenuItem.tsx    |  2 +-
 packages/client/components/TaskInvolves.tsx   |  2 +-
 packages/client/components/TaskWatermark.tsx  |  2 +-
 .../components/TeamDashTeamMemberMenu.tsx     |  2 +-
 packages/client/components/TeamFilterMenu.tsx |  8 ++--
 packages/client/components/TeamHealth.tsx     | 18 ++++----
 .../components/TeamInvitationDialog.tsx       |  2 +-
 .../components/TeamInvitationEmailSignin.tsx  |  4 +-
 .../TeamInvitationErrorAccepted.tsx           |  2 +-
 .../components/TeamInvitationErrorExpired.tsx |  2 +-
 .../TeamInvitationGoogleCreateAccount.tsx     |  4 +-
 .../components/TeamInvitationGoogleSignin.tsx |  2 +-
 .../components/TeamInvitationNotification.tsx |  2 +-
 .../client/components/TeamInvitationRoot.tsx  |  2 +-
 .../TeamPrompt/TeamPromptDrawer.tsx           |  8 ++--
 .../TeamPrompt/TeamPromptEditablePrompt.tsx   |  2 +-
 .../TeamPrompt/TeamPromptOptions.tsx          |  2 +-
 .../TeamPrompt/TeamPromptOptionsMenu.tsx      |  6 +--
 .../TeamPrompt/TeamPromptResponseEmojis.tsx   |  2 +-
 .../TeamPrompt/TeamPromptTopBar.tsx           | 12 ++---
 .../TeamPrompt/TeamPromptWorkDrawer.tsx       | 18 ++++----
 .../TeamPrompt/WorkDrawer/GCalEventCard.tsx   | 16 +++----
 .../WorkDrawer/GCalIntegrationPanel.tsx       |  8 ++--
 .../WorkDrawer/GCalIntegrationResults.tsx     |  8 ++--
 .../WorkDrawer/GCalIntegrationResultsRoot.tsx |  6 +--
 .../WorkDrawer/GitHubIntegrationPanel.tsx     | 10 ++---
 .../WorkDrawer/GitHubIntegrationResults.tsx   |  8 ++--
 .../GitHubIntegrationResultsRoot.tsx          |  4 +-
 .../WorkDrawer/GitHubObjectCard.tsx           | 22 +++++-----
 .../WorkDrawer/GitHubRepoFilterBar.tsx        | 13 +++---
 .../WorkDrawer/JiraIntegrationPanel.tsx       |  6 +--
 .../WorkDrawer/JiraIntegrationResults.tsx     |  8 ++--
 .../WorkDrawer/JiraIntegrationResultsRoot.tsx |  4 +-
 .../TeamPrompt/WorkDrawer/JiraObjectCard.tsx  | 14 +++---
 .../WorkDrawer/ParabolTasksPanel.tsx          | 14 +++---
 .../WorkDrawer/ParabolTasksResults.tsx        |  8 ++--
 .../WorkDrawer/ParabolTasksResultsRoot.tsx    |  6 +--
 .../client/components/TeamPromptMeeting.tsx   |  2 +-
 .../TeamsLimitExceededNotification.tsx        |  4 +-
 .../TeamsLimitReminderNotification.tsx        |  4 +-
 .../client/components/ThreadedCommentBase.tsx |  8 ++--
 .../components/ThreadedCommentFooter.tsx      |  2 +-
 .../components/ThreadedCommentHeader.tsx      |  8 ++--
 .../client/components/ThreadedItemReply.tsx   |  6 +--
 .../client/components/ThreadedPollBase.tsx    |  2 +-
 .../client/components/ThreadedTaskBase.tsx    |  4 +-
 packages/client/components/TimelineEvent.tsx  |  2 +-
 .../client/components/TimelineEventCard.tsx   |  2 +-
 .../TimelineEventCompletedActionMeeting.tsx   |  4 +-
 .../TimelineEventCompletedRetroMeeting.tsx    |  4 +-
 .../components/TimelineEventJoinedParabol.tsx |  2 +-
 .../components/TimelineEventPokerComplete.tsx |  6 +--
 .../components/TimelineEventTeamCreated.tsx   |  2 +-
 .../TimelineEventTeamPromptComplete.tsx       |  4 +-
 .../components/TimelineEventTypeIcon.tsx      |  2 +-
 .../components/TimelineEventTypeMenu.tsx      |  4 +-
 .../client/components/TimelineFeedList.tsx    |  2 +-
 packages/client/components/TimelineHeader.tsx | 12 ++---
 .../components/TimelineHistoryLockedCard.tsx  |  4 +-
 .../components/TimelinePriorityTasks.tsx      |  2 +-
 .../client/components/TimelineRightDrawer.tsx |  2 +-
 .../components/TimelineSuggestedAction.tsx    |  2 +-
 .../client/components/TopBarNotifications.tsx |  2 +-
 packages/client/components/TopBarSearch.tsx   |  4 +-
 .../components/UserDashTeamMemberMenu.tsx     |  6 +--
 .../client/components/ViewerNotOnTeam.tsx     |  2 +-
 .../client/components/ViewerNotOnTeamRoot.tsx |  6 +--
 .../client/components/VoteSettingsMenu.tsx    |  2 +-
 .../promptResponse/PromptResponseEditor.tsx   |  2 +-
 .../client/components/useSetTaskEstimate.ts   |  8 ++--
 packages/client/containers/Signout/signout.ts |  2 +-
 .../containers/TaskCard/DraggableTask.tsx     |  2 +-
 .../hooks/useAnimatedSpotlightSource.ts       |  2 +-
 packages/client/hooks/useClientSideTrack.ts   |  2 +-
 .../hooks/useDraggableReflectionCard.tsx      |  4 +-
 packages/client/hooks/useEndMeetingHotkey.ts  |  2 +-
 packages/client/hooks/useGotoStageId.ts       |  2 +-
 packages/client/hooks/useInitialSafeRoute.ts  |  2 +-
 packages/client/hooks/useIsIntegrated.ts      |  2 +-
 packages/client/hooks/useMeeting.ts           |  2 +-
 .../client/hooks/useNewFeatureSnackbar.ts     |  2 +-
 packages/client/hooks/useQueryLoaderNow.tsx   |  4 +-
 .../client/hooks/useSnacksForNewMeetings.ts   |  2 +-
 .../hooks/useSpotlightSimulatedDrag.tsx       |  4 +-
 packages/client/hooks/useSubColumns.ts        |  2 +-
 .../modules/demo/ClientGraphQLServer.ts       | 12 ++---
 .../modules/demo/DemoGenericMeetingStage.ts   |  2 +-
 .../modules/demo/handleCompletedDemoStage.ts  |  2 +-
 packages/client/modules/demo/initBotScript.ts |  2 +-
 packages/client/modules/demo/initDB.ts        |  2 +-
 .../EmailNotificationPicker.tsx               |  2 +-
 .../EmailNotifications/EmailTaskInvolves.tsx  |  2 +-
 .../components/NotificationSummaryEmail.tsx   |  2 +-
 .../components/SummaryEmail/ExportToCSV.tsx   |  2 +-
 .../EmailReflectionCard.tsx                   |  2 +-
 .../MeetingSummaryEmail/EmailTaskCard.tsx     |  4 +-
 .../MeetingSummaryEmail/ExportAllTasks.tsx    | 22 +++++-----
 .../ExportAllTasksMenu.tsx                    |  8 ++--
 .../ExportAllTasksMenuRoot.tsx                |  8 ++--
 .../MeetingMemberTaskSummaryList.tsx          |  2 +-
 .../MeetingMembersWithoutTasks.tsx            |  6 +--
 .../MeetingSummaryEmail/QuickStats.tsx        |  2 +-
 .../MeetingSummaryEmail/RetroTopic.tsx        |  4 +-
 .../MeetingSummaryEmail/RetroTopics.tsx       |  2 +-
 .../MeetingSummaryEmail/ShareTopic.tsx        |  6 +--
 .../SummaryAvatarHeader.tsx                   |  2 +-
 .../MeetingSummaryEmail/SummaryHeader.tsx     |  2 +-
 .../SummaryPokerStories.tsx                   |  2 +-
 .../MeetingSummaryEmail/SummarySheet.tsx      | 22 +++++-----
 .../TaskSummarySection.tsx                    |  2 +-
 .../MeetingSummaryEmail/TeamHealthSummary.tsx |  4 +-
 .../WholeMeetingSummaryResult.tsx             |  4 +-
 .../MeetingSummaryEmail/makePokerStats.ts     |  2 +-
 .../makeTeamPromptStats.ts                    |  2 +-
 .../invoice/components/Invoice/Invoice.tsx    |  2 +-
 .../InvoiceLineItemDetails.tsx                |  4 +-
 .../invoice/containers/InvoiceRoot.tsx        |  2 +-
 ...ActionMeetingUpdatesPromptTeamHelpText.tsx |  2 +-
 .../components/AddNewPokerTemplate.tsx        |  4 +-
 .../components/AddNewReflectTemplate.tsx      |  4 +-
 .../components/AddPokerTemplateDimension.tsx  |  2 +-
 .../meeting/components/AddTemplatePrompt.tsx  |  2 +-
 .../components/CustomTemplateUpgradeMsg.tsx   |  4 +-
 .../components/EditableTemplateDimension.tsx  |  2 +-
 .../components/EditableTemplatePrompt.tsx     |  2 +-
 .../EditableTemplatePromptColor.tsx           |  4 +-
 .../components/EditableTemplateScaleName.tsx  |  2 +-
 .../EditableTemplateScaleValueColor.tsx       |  2 +-
 .../EditableTemplateScaleValueLabel.tsx       |  6 +--
 .../MeetingAvatarGroup/NewMeetingAvatar.tsx   |  2 +-
 .../NewMeetingAvatarGroup.tsx                 |  2 +-
 .../NewCheckInQuestion.tsx                    | 16 +++----
 .../components/NewMeetingCheckInGreeting.tsx  |  4 +-
 .../NewTemplateScaleValueLabelInput.tsx       | 10 ++---
 .../components/PokerTemplateDetails.tsx       |  2 +-
 .../meeting/components/PokerTemplateItem.tsx  |  6 +--
 .../meeting/components/PokerTemplateList.tsx  |  2 +-
 .../components/PokerTemplateListOrg.tsx       |  4 +-
 .../components/PokerTemplateListOrgRoot.tsx   |  2 +-
 .../components/PokerTemplateListPublic.tsx    |  2 +-
 .../PokerTemplateListPublicRoot.tsx           |  2 +-
 .../components/PokerTemplateListTeam.tsx      |  6 +--
 .../meeting/components/PokerTemplateModal.tsx |  2 +-
 .../components/PokerTemplatePicker.tsx        |  2 +-
 .../components/PokerTemplateScaleDetails.tsx  |  4 +-
 .../components/PokerTemplateScalePicker.tsx   |  2 +-
 .../components/ReflectTemplateDetails.tsx     |  2 +-
 .../components/ReflectTemplateItem.tsx        |  8 ++--
 .../components/ReflectTemplateList.tsx        |  4 +-
 .../components/ReflectTemplateListOrg.tsx     |  4 +-
 .../components/ReflectTemplateListOrgRoot.tsx |  2 +-
 .../components/ReflectTemplateListPublic.tsx  |  2 +-
 .../ReflectTemplateListPublicRoot.tsx         |  2 +-
 .../components/ReflectTemplateListTeam.tsx    | 12 ++---
 .../components/ReflectTemplateModal.tsx       |  2 +-
 .../meeting/components/RemoveTemplate.tsx     |  2 +-
 .../components/RetroTemplatePicker.tsx        |  2 +-
 .../meeting/components/ScaleActions.tsx       |  2 +-
 .../components/ScaleDropdownMenuItem.tsx      |  4 +-
 .../components/ScaleValuePalettePicker.tsx    |  2 +-
 .../components/SelectScaleDropdown.tsx        |  2 +-
 .../meeting/components/SelectTemplate.tsx     |  6 +--
 .../components/TemplateDimensionItem.tsx      |  4 +-
 .../components/TemplateDimensionList.tsx      |  2 +-
 .../meeting/components/TemplatePromptItem.tsx |  4 +-
 .../meeting/components/TemplatePromptList.tsx |  2 +-
 .../components/TemplateScaleValueItem.tsx     |  4 +-
 .../meeting/components/TemplateSharing.tsx    |  2 +-
 packages/client/modules/newTeam/NewTeam.tsx   |  2 +-
 .../components/NewTeamForm/NewTeamForm.tsx    |  4 +-
 .../containers/NewTeamForm/NewTeamRoot.tsx    |  2 +-
 .../components/OutcomeCard/OutcomeCard.tsx    |  6 +--
 .../TaskFooterTeamAssigneeMenu.tsx            |  6 +--
 .../TaskFooterUserAssigneeMenu.tsx            |  8 ++--
 .../OutcomeCardFooter/TaskFooter.tsx          |  2 +-
 .../TaskFooterTagMenuToggle.tsx               |  2 +-
 .../TaskFooterTeamAssignee.tsx                |  2 +-
 .../TaskFooterUserAssignee.tsx                |  2 +-
 .../TaskFooterTagMenu.tsx                     |  2 +-
 .../TaskFooterTagMenuStatusItem.tsx           |  2 +-
 .../TaskFooterUserAssigneeMenuRoot.tsx        |  8 ++--
 .../OutcomeCard/OutcomeCardContainer.tsx      |  4 +-
 .../summary/components/NewMeetingSummary.tsx  |  4 +-
 .../components/NewMeetingSummaryRoot.tsx      |  6 +--
 .../team/components/NewTeamOrgPicker.tsx      |  2 +-
 .../components/AgendaInput/AgendaInput.tsx    |  2 +-
 .../AgendaListAndInput/AgendaListAndInput.tsx |  6 +--
 .../ArchiveTeam/ArchiveOrganizationForm.tsx   |  2 +-
 .../ArchiveTeam/ArchiveTeamForm.tsx           |  2 +-
 .../EditTeamName/EditableTeamName.tsx         |  2 +-
 .../LeaveTeamModal/LeaveTeamModal.tsx         |  2 +-
 .../PromoteTeamMemberModal.tsx                |  2 +-
 .../components/ProviderList/ProviderList.tsx  |  6 +--
 .../ProviderRow/AtlassianProviderRow.tsx      |  2 +-
 .../ProviderRow/AzureDevOpsProviderRow.tsx    |  2 +-
 .../ProviderRow/GcalProviderRow.tsx           | 12 ++---
 .../ProviderRow/GitHubProviderRow.tsx         |  2 +-
 .../ProviderRow/GitLabProviderRow.tsx         |  2 +-
 .../ProviderRow/JiraServerProviderRow.tsx     |  2 +-
 .../components/ProviderRow/MSTeamsPanel.tsx   |  4 +-
 .../ProviderRow/MattermostPanel.tsx           |  4 +-
 .../ProviderRow/SlackChannelPicker.tsx        |  2 +-
 .../ProviderRow/SlackNotificationList.tsx     |  8 ++--
 .../ProviderRow/SlackNotificationRow.tsx      |  8 ++--
 .../ProviderRow/SlackProviderRow.tsx          |  2 +-
 .../RemoveTeamMemberModal.tsx                 |  2 +-
 .../TaskColumn/ArchiveAllDoneTasksModal.tsx   |  6 +--
 .../components/TaskColumn/TaskColumn.tsx      |  6 +--
 .../TaskColumn/TaskColumnAddTask.tsx          |  2 +-
 .../teamDashboard/components/Team/Team.tsx    |  2 +-
 .../components/TeamArchive/TeamArchive.tsx    |  8 ++--
 .../TeamDashActivityTab.tsx                   |  4 +-
 .../TeamDashHeader/TeamDashHeader.tsx         |  2 +-
 .../TeamDashInsights/TeamDashInsights.tsx     |  2 +-
 .../TeamDashInsights/TeamInsightsCard.tsx     | 11 +++--
 .../TopRetroTemplatesCard.tsx                 |  4 +-
 .../components/TeamDashMain/TeamDashMain.tsx  |  8 ++--
 .../components/TeamDashMain/TeamDrawer.tsx    |  2 +-
 .../components/TeamDashMainRoot.tsx           |  8 ++--
 .../TeamDashTasksTab/TeamDashTasksTab.tsx     |  8 ++--
 .../teamDashboard/components/TeamRoot.tsx     |  4 +-
 .../components/TeamSettings/TeamSettings.tsx  |  2 +-
 .../components/TeamSettingsRoot.tsx           |  6 +--
 .../UnpaidTeamModal/UnpaidTeamModal.tsx       |  6 +--
 .../containers/Team/TeamContainer.tsx         |  2 +-
 .../TeamColumns/TeamColumnsContainer.tsx      |  2 +-
 .../TeamIntegrationsRoot.tsx                  |  2 +-
 .../TeamTasksHeaderContainer.tsx              |  2 +-
 .../UnpaidTeamModal/UnpaidTeamModalRoot.tsx   |  4 +-
 .../CreditCardModal/CreditCardForm.tsx        |  2 +-
 .../components/GcalModal/DateTimePickers.tsx  |  8 ++--
 .../components/GcalModal/GcalModal.tsx        | 28 ++++++------
 .../components/GcalModal/GcalSettings.tsx     | 10 ++---
 .../GcalModal/VideoConferencing.tsx           | 12 ++---
 .../GcalModal/VideoConferencingMenu.tsx       |  6 +--
 .../OrgAuthentication/OrgAuthentication.tsx   |  4 +-
 .../components/OrgBilling/BillingForm.tsx     | 22 +++++-----
 .../components/OrgBilling/BillingLeaders.tsx  | 16 +++----
 .../components/OrgBilling/DowngradeModal.tsx  | 21 +++++----
 .../OrgBilling/NewBillingLeaderInput.tsx      |  4 +-
 .../OrgBilling/OrgBillingDangerZone.tsx       |  2 +-
 .../OrgBilling/OrgBillingInvoices.tsx         |  2 +-
 .../components/OrgBilling/OrgPlan.tsx         | 14 +++---
 .../components/OrgBilling/OrgPlanDrawer.tsx   | 16 +++----
 .../OrgBilling/OrgPlanDrawerContent.tsx       |  4 +-
 .../components/OrgBilling/OrgPlans.tsx        | 20 ++++-----
 .../OrgBilling/OrgPlansAndBilling.tsx         | 14 +++---
 .../OrgBilling/OrgPlansAndBillingHeading.tsx  |  2 +-
 .../OrgBilling/OrgPlansAndBillingRoot.tsx     |  2 +-
 .../components/OrgBilling/OrgStats.tsx        |  2 +-
 .../components/OrgBilling/Organization.tsx    |  4 +-
 .../components/OrgBilling/PaymentDetails.tsx  | 10 ++---
 .../components/OrgBilling/UpdatePayment.tsx   | 10 ++---
 .../OrgTeamMembers/OrgTeamMemberMenu.tsx      |  8 ++--
 .../OrgTeamMembers/OrgTeamMembers.tsx         | 16 +++----
 .../OrgTeamMembers/OrgTeamMembersMenu.tsx     |  2 +-
 .../OrgTeamMembers/OrgTeamMembersRoot.tsx     |  2 +-
 .../components/OrgTeams/OrgTeams.tsx          |  4 +-
 .../components/OrgTeams/OrgTeamsRow.tsx       |  8 ++--
 .../components/Organization/OrgNav.tsx        |  2 +-
 .../Organizations/Organizations.tsx           |  2 +-
 .../userDashboard/components/UserProfile.tsx  |  2 +-
 .../components/UserProfileRoot.tsx            |  2 +-
 .../UserTasksHeader/UserTasksHeader.tsx       | 10 ++---
 .../containers/OrgBilling/OrgBillingRoot.tsx  |  2 +-
 .../Organization/OrganizationRoot.tsx         |  4 +-
 .../Organizations/OrganizationsRoot.tsx       |  6 +--
 .../UserColumns/UserColumnsContainer.tsx      |  2 +-
 .../mutations/AcceptTeamInvitationMutation.ts |  6 +--
 .../client/mutations/AddAgendaItemMutation.ts |  4 +-
 .../mutations/AddAtlassianAuthMutation.ts     |  2 +-
 .../client/mutations/AddCommentMutation.ts    |  4 +-
 .../client/mutations/AddGitHubAuthMutation.ts |  2 +-
 .../AddIntegrationProviderMutation.ts         |  2 +-
 packages/client/mutations/AddOrgMutation.ts   |  6 +--
 .../AddPokerTemplateDimensionMutation.ts      |  4 +-
 .../mutations/AddPokerTemplateMutation.ts     |  4 +-
 .../AddPokerTemplateScaleMutation.ts          |  4 +-
 .../AddPokerTemplateScaleValueMutation.ts     |  2 +-
 .../AddReactjiToReactableMutation.ts          |  2 +-
 .../mutations/AddReflectTemplateMutation.ts   |  4 +-
 .../AddReflectTemplatePromptMutation.ts       |  4 +-
 .../client/mutations/AddSlackAuthMutation.ts  |  2 +-
 .../AddTeamMemberIntegrationAuthMutation.ts   |  2 +-
 packages/client/mutations/AddTeamMutation.ts  |  6 +--
 .../mutations/AddTranscriptionBotMutation.ts  |  2 +-
 .../mutations/ArchiveOrganizationMutation.ts  |  4 +-
 .../client/mutations/ArchiveTeamMutation.ts   |  6 +--
 .../mutations/ArchiveTimelineEventMutation.ts |  4 +-
 .../client/mutations/AutogroupMutation.ts     |  2 +-
 .../mutations/BatchArchiveTasksMutation.ts    |  6 +--
 .../mutations/ChangeTaskTeamMutation.ts       |  2 +-
 .../mutations/CreateImposterTokenMutation.ts  |  2 +-
 .../mutations/CreateMassInvitationMutation.ts |  2 +-
 .../CreateOAuth1AuthorizeUrlMutation.ts       |  2 +-
 .../client/mutations/CreatePollMutation.ts    |  2 +-
 .../mutations/CreateReflectionMutation.ts     |  4 +-
 .../CreateStripeSubscriptionMutation.ts       |  2 +-
 .../CreateTaskIntegrationMutation.ts          |  4 +-
 .../client/mutations/CreateTaskMutation.ts    |  6 +--
 .../client/mutations/DeleteCommentMutation.ts |  4 +-
 .../client/mutations/DeleteUserMutation.ts    |  2 +-
 .../mutations/DenyPushInvitationMutation.ts   |  2 +-
 .../mutations/DismissNewFeatureMutation.ts    |  2 +-
 .../DismissSuggestedActionMutation.ts         |  2 +-
 .../mutations/DowngradeToStarterMutation.ts   |  2 +-
 .../mutations/DragDiscussionTopicMutation.ts  |  2 +-
 .../mutations/DragEstimatingTaskMutation.ts   |  2 +-
 .../mutations/EditCommentingMutation.ts       |  2 +-
 .../mutations/EditReflectionMutation.ts       |  2 +-
 packages/client/mutations/EditTaskMutation.ts |  4 +-
 .../mutations/EmailPasswordResetMutation.ts   |  2 +-
 .../client/mutations/EndCheckInMutation.ts    |  4 +-
 .../mutations/EndRetrospectiveMutation.ts     |  4 +-
 .../mutations/EndSprintPokerMutation.ts       |  4 +-
 .../client/mutations/EndTeamPromptMutation.ts |  4 +-
 .../mutations/FlagReadyToAdvanceMutation.ts   |  2 +-
 .../GetTemplateSuggestionMutation.ts          |  2 +-
 .../mutations/InvalidateSessionsMutation.ts   |  2 +-
 .../client/mutations/InviteToTeamMutation.ts  |  4 +-
 .../client/mutations/JoinMeetingMutation.ts   |  2 +-
 .../mutations/LoginWithGoogleMutation.ts      |  2 +-
 .../mutations/LoginWithMicrosoftMutation.ts   |  2 +-
 .../mutations/LoginWithPasswordMutation.ts    |  2 +-
 .../MovePokerTemplateDimensionMutation.ts     |  2 +-
 .../MovePokerTemplateScaleValueMutation.ts    |  2 +-
 .../MoveReflectTemplatePromptMutation.ts      |  2 +-
 .../mutations/NavigateMeetingMutation.ts      |  2 +-
 .../mutations/OldUpdateCreditCardMutation.ts  |  2 +-
 .../mutations/OldUpgradeToTeamTierMutation.ts |  2 +-
 packages/client/mutations/PayLaterMutation.ts |  2 +-
 .../PersistGitHubSearchQueryMutation.ts       |  2 +-
 .../PersistJiraSearchQueryMutation.ts         |  2 +-
 .../PersistJiraServerSearchQueryMutation.ts   |  2 +-
 .../PokerAnnounceDeckHoverMutation.ts         |  4 +-
 .../mutations/PokerResetDimensionMutation.ts  |  2 +-
 .../PromoteNewMeetingFacilitatorMutation.ts   |  2 +-
 .../mutations/PromoteToTeamLeadMutation.ts    |  2 +-
 .../mutations/PushInvitationMutation.ts       |  2 +-
 ...TemplatePromptUpdateDescriptionMutation.ts |  2 +-
 ...tTemplatePromptUpdateGroupColorMutation.ts |  2 +-
 .../mutations/RemoveAgendaItemMutation.ts     |  2 +-
 .../mutations/RemoveAtlassianAuthMutation.ts  |  2 +-
 .../mutations/RemoveGitHubAuthMutation.ts     |  2 +-
 .../RemoveIntegrationProviderMutation.ts      |  2 +-
 .../RemoveJiraServerSearchQueryMutation.ts    |  2 +-
 .../client/mutations/RemoveOrgUserMutation.ts |  8 ++--
 .../RemovePokerTemplateDimensionMutation.ts   |  2 +-
 .../mutations/RemovePokerTemplateMutation.ts  |  2 +-
 .../RemovePokerTemplateScaleMutation.ts       |  2 +-
 .../RemovePokerTemplateScaleValueMutation.ts  |  2 +-
 .../RemoveReflectTemplateMutation.ts          |  2 +-
 .../RemoveReflectTemplatePromptMutation.ts    |  2 +-
 .../mutations/RemoveReflectionMutation.ts     |  2 +-
 .../mutations/RemoveSlackAuthMutation.ts      |  2 +-
 ...RemoveTeamMemberIntegrationAuthMutation.ts |  2 +-
 .../mutations/RemoveTeamMemberMutation.ts     |  8 ++--
 .../client/mutations/RenameMeetingMutation.ts |  2 +-
 .../mutations/RequestToJoinDomainMutation.ts  |  2 +-
 .../client/mutations/ResetPasswordMutation.ts |  2 +-
 .../ResetReflectionGroupsMutation.ts          |  2 +-
 .../ResetRetroMeetingToGroupStageMutation.ts  |  2 +-
 .../RevealTeamHealthVotesMutation.ts          |  2 +-
 .../mutations/SelectTemplateMutation.ts       |  2 +-
 .../SetDefaultSlackChannelMutation.ts         |  2 +-
 .../mutations/SetMeetingSettingsMutation.ts   |  2 +-
 .../mutations/SetOrgUserRoleMutation.ts       |  4 +-
 .../client/mutations/SetPhaseFocusMutation.ts |  2 +-
 .../mutations/SetPokerSpectateMutation.ts     |  2 +-
 .../mutations/SetSlackNotificationMutation.ts |  2 +-
 .../client/mutations/SetStageTimerMutation.ts |  2 +-
 .../mutations/SetTaskEstimateMutation.ts      |  2 +-
 .../mutations/SetTaskHighlightMutation.ts     |  2 +-
 .../mutations/SetTeamHealthVoteMutation.ts    |  2 +-
 .../mutations/SignUpWithPasswordMutation.ts   |  2 +-
 .../client/mutations/StartCheckInMutation.ts  |  2 +-
 .../StartDraggingReflectionMutation.ts        |  2 +-
 .../mutations/StartSprintPokerMutation.ts     |  2 +-
 .../mutations/StartTeamPromptMutation.ts      |  2 +-
 .../mutations/ToggleSummaryEmailMutation.ts   |  2 +-
 .../mutations/ToggleTeamDrawerMutation.ts     |  2 +-
 .../mutations/UpdateAgendaItemMutation.ts     |  2 +-
 .../mutations/UpdateAutoJoinMutation.ts       |  2 +-
 ...UpdateAzureDevOpsDimensionFieldMutation.ts |  6 +--
 .../mutations/UpdateCommentContentMutation.ts |  2 +-
 .../mutations/UpdateCreditCardMutation.ts     |  2 +-
 .../mutations/UpdateFeatureFlagMutation.ts    |  2 +-
 .../UpdateGitHubDimensionFieldMutation.ts     |  4 +-
 .../UpdateGitLabDimensionFieldMutation.ts     |  4 +-
 .../UpdateIntegrationProviderMutation.ts      |  2 +-
 .../UpdateJiraDimensionFieldMutation.ts       |  6 +--
 .../UpdateJiraServerDimensionFieldMutation.ts |  2 +-
 .../mutations/UpdateMeetingPromptMutation.ts  |  2 +-
 .../UpdateMeetingTemplateMutation.ts          |  2 +-
 .../UpdateNewCheckInQuestionMutation.ts       |  2 +-
 .../client/mutations/UpdateOrgMutation.ts     |  2 +-
 .../mutations/UpdatePokerScopeMutation.ts     |  4 +-
 ...datePokerTemplateDimensionScaleMutation.ts |  2 +-
 .../UpdatePokerTemplateScaleValueMutation.ts  |  2 +-
 .../UpdatePokerTemplateScopeMutation.ts       | 10 ++---
 .../UpdateRecurrenceSettingsMutation.ts       |  2 +-
 .../UpdateReflectTemplateScopeMutation.ts     | 10 ++---
 .../UpdateReflectionContentMutation.ts        |  2 +-
 .../UpdateReflectionGroupTitleMutation.ts     |  2 +-
 .../mutations/UpdateRetroMaxVotesMutation.ts  |  2 +-
 .../mutations/UpdateTaskDueDateMutation.ts    |  2 +-
 .../client/mutations/UpdateTaskMutation.ts    |  4 +-
 .../mutations/UpdateTeamNameMutation.ts       |  2 +-
 .../UpdateTemplateCategoryMutation.ts         |  2 +-
 .../mutations/UpdateUserProfileMutation.ts    |  2 +-
 .../mutations/UploadOrgImageMutation.ts       |  2 +-
 .../mutations/UploadUserImageMutation.ts      |  2 +-
 .../UpsertTeamPromptResponseMutation.ts       |  4 +-
 .../client/mutations/VerifyEmailMutation.ts   |  2 +-
 .../mutations/VoteForPokerStoryMutation.ts    |  2 +-
 .../VoteForReflectionGroupMutation.ts         |  2 +-
 .../handlers/handleAuthenticationRedirect.ts  |  2 +-
 .../handlers/handleAzureCreateIssue.ts        |  2 +-
 .../handlers/handleGitHubCreateIssue.ts       |  2 +-
 .../handlers/handleGitLabCreateIssue.ts       |  2 +-
 .../mutations/handlers/handleRemoveTasks.ts   |  2 +-
 .../toasts/mapDiscussionMentionedToToast.ts   |  6 +--
 .../toasts/mapKudosReceivedToToast.ts         |  4 +-
 .../mutations/toasts/mapMentionedToToast.ts   |  2 +-
 .../toasts/mapPromptToJoinOrgToToast.ts       |  4 +-
 .../toasts/mapRequestToJoinOrgToToast.ts      |  4 +-
 .../toasts/mapResponseMentionedToToast.ts     |  4 +-
 .../toasts/mapResponseRepliedToToast.ts       |  2 +-
 .../toasts/mapTeamsLimitExceededToToast.ts    |  4 +-
 .../toasts/mapTeamsLimitReminderToToast.ts    |  4 +-
 .../mutations/toasts/popInvolvementToast.ts   |  2 +-
 .../mutations/toasts/popNotificationToast.ts  | 12 ++---
 .../toasts/updateNotificationToast.ts         |  2 +-
 .../useAcceptRequestToJoinDomainMutation.ts   |  2 +-
 .../client/mutations/useShareTopicMutation.ts |  2 +-
 .../subscriptions/MeetingSubscription.ts      |  8 ++--
 .../subscriptions/OrganizationSubscription.ts | 10 ++---
 .../client/subscriptions/TeamSubscription.ts  |  6 +--
 .../ui/AlertDialog/AlertDialogAction.tsx      |  2 +-
 .../ui/AlertDialog/AlertDialogCancel.tsx      |  2 +-
 .../ui/AlertDialog/AlertDialogDescription.tsx |  2 +-
 .../ui/AlertDialog/AlertDialogFooter.tsx      |  2 +-
 .../ui/AlertDialog/AlertDialogHeader.tsx      |  2 +-
 .../ui/AlertDialog/AlertDialogOverlay.tsx     |  2 +-
 .../ui/AlertDialog/AlertDialogTitle.tsx       |  2 +-
 packages/client/ui/Avatar/AvatarFallback.tsx  |  2 +-
 packages/client/ui/Avatar/AvatarImage.tsx     |  2 +-
 packages/client/ui/Button/Button.tsx          |  2 +-
 packages/client/ui/Chip/Chip.tsx              |  2 +-
 packages/client/ui/Dialog/Dialog.tsx          |  2 +-
 packages/client/ui/Dialog/DialogClose.tsx     |  2 +-
 packages/client/ui/Dialog/DialogContent.tsx   |  4 +-
 .../client/ui/Dialog/DialogDescription.tsx    |  2 +-
 packages/client/ui/Dialog/DialogOverlay.tsx   |  2 +-
 packages/client/ui/Dialog/DialogTitle.tsx     |  2 +-
 packages/client/ui/Select/SelectContent.tsx   |  2 +-
 packages/client/ui/Select/SelectItem.tsx      |  4 +-
 packages/client/ui/Select/SelectTrigger.tsx   |  4 +-
 packages/client/utils/GcalClientManager.ts    |  2 +-
 packages/client/utils/SendClientSideEvent.ts  |  2 +-
 packages/client/utils/date/relativeDate.ts    |  2 +-
 .../client/utils/getTeamHealthVoteColor.ts    |  2 +-
 .../client/utils/handleSuccessfulLogin.ts     |  4 +-
 .../client/utils/relay/setActiveTemplate.ts   |  2 +-
 .../client/utils/useTemplateDescription.ts    |  2 +-
 packages/server/__tests__/setup.ts            |  2 +-
 .../server/billing/helpers/adjustUserCount.ts |  6 +--
 .../server/billing/helpers/generateInvoice.ts |  2 +-
 .../helpers/removeTeamsLimitObjects.ts        |  2 +-
 .../helpers/updateSubscriptionQuantity.ts     |  4 +-
 .../20220602164119-fixRetroTemplates.ts       |  4 +-
 packages/server/database/rethinkDriver.ts     |  6 +--
 .../server/database/types/TeamHealthPhase.ts  |  2 +-
 .../database/types/scheduleTeamLimitsJobs.ts  |  2 +-
 packages/server/dataloader/RedisCache.ts      |  2 +-
 .../server/dataloader/atlassianLoaders.ts     |  8 ++--
 .../server/dataloader/azureDevOpsLoaders.ts   |  2 +-
 .../dataloader/foreignKeyLoaderMaker.ts       |  2 +-
 .../dataloader/primaryKeyLoaderMakers.ts      |  6 +--
 .../dataloader/rethinkPrimaryKeyLoader.ts     |  2 +-
 packages/server/email/MailManagerDebug.ts     |  2 +-
 .../email/newMeetingSummaryEmailCreator.tsx   |  2 +-
 .../email/notificationSummaryCreator.tsx      |  2 +-
 .../server/fileStorage/getFileStoreManager.ts |  2 +-
 packages/server/graphql/ResponseStream.ts     |  2 +-
 .../server/graphql/mutations/addAgendaItem.ts |  2 +-
 .../graphql/mutations/addAtlassianAuth.ts     |  2 +-
 .../server/graphql/mutations/addGitHubAuth.ts |  2 +-
 packages/server/graphql/mutations/addOrg.ts   |  2 +-
 .../mutations/addPokerTemplateScale.ts        |  2 +-
 .../server/graphql/mutations/addSlackAuth.ts  |  2 +-
 packages/server/graphql/mutations/addTeam.ts  |  4 +-
 .../mutations/addTeamMemberIntegrationAuth.ts |  4 +-
 .../graphql/mutations/archiveOrganization.ts  |  2 +-
 .../server/graphql/mutations/archiveTeam.ts   |  2 +-
 .../server/graphql/mutations/createPoll.ts    |  2 +-
 .../graphql/mutations/createReflection.ts     |  6 +--
 .../graphql/mutations/downgradeToStarter.ts   |  2 +-
 .../server/graphql/mutations/endCheckIn.ts    |  2 +-
 .../graphql/mutations/endSprintPoker.ts       |  4 +-
 .../helpers/activatePrevSlackAuth.ts          |  2 +-
 .../graphql/mutations/helpers/attemptLogin.ts |  2 +-
 .../mutations/helpers/bootstrapNewUser.ts     | 12 ++---
 .../mutations/helpers/createGcalEvent.ts      |  6 +--
 .../helpers/createNewMeetingPhases.ts         |  2 +-
 .../mutations/helpers/gatherInsights.ts       |  2 +-
 .../mutations/helpers/generateGroups.ts       | 10 ++---
 .../helpers/generateStandupMeetingSummary.ts  |  4 +-
 .../mutations/helpers/getCCFromCustomer.ts    |  2 +-
 .../helpers/getReflectionEntities.ts          |  2 +-
 .../mutations/helpers/inviteToTeamHelper.ts   | 20 ++++-----
 .../helpers/notifications/MSTeamsNotifier.ts  |  6 +--
 .../notifications/MattermostNotifier.ts       | 10 ++---
 .../helpers/notifications/SlackNotifier.ts    | 20 ++++-----
 .../helpers/notifications/getSummaryText.ts   |  2 +-
 .../mutations/helpers/removeFromOrg.ts        |  4 +-
 .../mutations/helpers/removeScheduledJobs.ts  |  2 +-
 .../mutations/helpers/removeTeamMember.ts     |  2 +-
 .../mutations/helpers/safeEndTeamPrompt.ts    |  8 ++--
 .../mutations/helpers/validateScaleValue.ts   |  2 +-
 .../server/graphql/mutations/joinMeeting.ts   |  2 +-
 .../server/graphql/mutations/moveTeamToOrg.ts |  4 +-
 .../graphql/mutations/navigateMeeting.ts      |  2 +-
 packages/server/graphql/mutations/payLater.ts |  2 +-
 .../server/graphql/mutations/resetPassword.ts |  2 +-
 .../graphql/mutations/selectTemplate.ts       |  2 +-
 .../mutations/setDefaultSlackChannel.ts       |  2 +-
 .../server/graphql/mutations/setStageTimer.ts |  4 +-
 .../graphql/mutations/setTaskEstimate.ts      |  4 +-
 .../updateAzureDevOpsDimensionField.ts        |  2 +-
 .../mutations/updateGitHubDimensionField.ts   |  2 +-
 .../mutations/updateIntegrationProvider.ts    |  2 +-
 .../graphql/mutations/updatePokerScope.ts     |  2 +-
 .../mutations/updateReflectionContent.ts      |  2 +-
 .../mutations/updateReflectionGroupTitle.ts   |  2 +-
 .../graphql/mutations/updateTaskDueDate.ts    |  2 +-
 .../graphql/mutations/updateTeamName.ts       |  2 +-
 .../graphql/mutations/updateTemplateScope.ts  |  2 +-
 .../nestedSchema/nestGitLabEndpoint.ts        |  4 +-
 .../private/mutations/autopauseUsers.ts       |  2 +-
 .../private/mutations/connectSocket.ts        |  2 +-
 .../mutations/draftEnterpriseInvoice.ts       |  4 +-
 .../private/mutations/processRecurrence.ts    | 16 +++----
 .../private/mutations/runScheduledJobs.ts     |  8 ++--
 .../mutations/sendBatchNotificationEmails.ts  |  2 +-
 .../mutations/sendUpcomingInvoiceEmails.ts    |  2 +-
 .../private/mutations/stripeFailPayment.ts    |  2 +-
 .../private/mutations/upgradeToTeamTier.ts    |  2 +-
 .../mutations/acceptRequestToJoinDomain.ts    | 26 +++++------
 .../public/mutations/acceptTeamInvitation.ts  |  2 +-
 .../public/mutations/addPokerTemplate.ts      |  4 +-
 .../public/mutations/addReflectTemplate.ts    | 12 ++---
 .../public/mutations/batchArchiveTasks.ts     |  6 +--
 .../__tests__/getKudosUserIdsFromJson.test.ts |  2 +-
 .../public/mutations/loginWithPassword.ts     |  2 +-
 .../public/mutations/modifyCheckInQuestion.ts |  4 +-
 .../public/mutations/requestToJoinDomain.ts   | 12 ++---
 .../public/mutations/revealTeamHealthVotes.ts |  6 +--
 .../public/mutations/setOrgUserRole.ts        |  4 +-
 .../public/mutations/setTeamHealthVote.ts     | 12 ++---
 .../graphql/public/mutations/shareTopic.ts    |  4 +-
 .../public/mutations/signUpWithPassword.ts    |  2 +-
 .../public/mutations/startRetrospective.ts    |  8 ++--
 .../public/mutations/startTeamPrompt.ts       |  6 +--
 .../mutations/updateGitLabDimensionField.ts   |  2 +-
 .../mutations/updateRecurrenceSettings.ts     |  6 +--
 .../mutations/updateTemplateCategory.ts       |  2 +-
 .../mutations/upsertTeamPromptResponse.ts     |  6 +--
 .../types/AddReactjiToReactableSuccess.ts     |  2 +-
 .../public/types/CreateGcalEventInput.ts      |  6 +--
 .../graphql/public/types/DomainJoinRequest.ts |  6 +--
 .../graphql/public/types/GcalIntegration.ts   |  2 +-
 .../public/types/NotifyRequestToJoinOrg.ts    |  2 +-
 .../graphql/public/types/Organization.ts      |  2 +-
 .../types/ResetReflectionGroupsSuccess.ts     |  2 +-
 .../public/types/RetrospectiveMeeting.ts      |  2 +-
 .../public/types/SetOrgUserRoleSuccess.ts     |  2 +-
 packages/server/graphql/public/types/Team.ts  |  2 +-
 .../graphql/public/types/TeamHealthPhase.ts   |  2 +-
 .../graphql/public/types/TeamHealthStage.ts   |  6 +--
 .../graphql/public/types/TeamPromptMeeting.ts |  4 +-
 .../graphql/public/types/TopRetroTemplate.ts  |  2 +-
 .../types/UpsertTeamPromptResponseSuccess.ts  |  2 +-
 packages/server/graphql/public/types/User.ts  |  4 +-
 .../helpers/getActiveTeamCountByTeamIds.ts    |  2 +-
 .../queries/helpers/fetchGitHubRepos.ts       |  2 +-
 .../queries/helpers/fetchGitLabProjects.ts    |  2 +-
 .../queries/helpers/makeUpcomingInvoice.ts    |  4 +-
 .../helpers/resolveSelectedTemplate.ts        |  2 +-
 packages/server/graphql/rootMutation.ts       |  2 +-
 packages/server/graphql/rootTypes.ts          |  2 +-
 packages/server/graphql/traceGraphQL.ts       |  6 +--
 .../types/AddIntegrationProviderPayload.ts    |  2 +-
 .../types/AddReactjiToReflectionPayload.ts    |  2 +-
 .../AddTeamMemberIntegrationAuthPayload.ts    |  2 +-
 .../types/ArchiveTimelineEventPayload.ts      |  2 +-
 packages/server/graphql/types/AuthIdentity.ts |  2 +-
 .../types/CreateMassInvitationPayload.ts      |  2 +-
 packages/server/graphql/types/Discussion.ts   |  2 +-
 .../types/DragEstimatingTaskPayload.ts        |  2 +-
 .../server/graphql/types/EndCheckInPayload.ts |  2 +-
 .../graphql/types/EndRetrospectivePayload.ts  |  2 +-
 .../graphql/types/EndSprintPokerPayload.ts    |  2 +-
 .../graphql/types/EndTeamPromptPayload.ts     |  2 +-
 .../types/FlagReadyToAdvancePayload.ts        |  2 +-
 .../server/graphql/types/JiraRemoteProject.ts |  2 +-
 .../graphql/types/JoinMeetingPayload.ts       |  2 +-
 .../MovePokerTemplateScaleValuePayload.ts     |  2 +-
 .../server/graphql/types/NewMeetingStage.ts   |  2 +-
 packages/server/graphql/types/Organization.ts |  2 +-
 .../server/graphql/types/OrganizationUser.ts  |  2 +-
 .../types/PokerAnnounceDeckHoverPayload.ts    |  2 +-
 packages/server/graphql/types/PokerMeeting.ts |  2 +-
 .../graphql/types/PokerMeetingSettings.ts     |  2 +-
 packages/server/graphql/types/Reactable.ts    |  2 +-
 .../types/RemoveIntegrationProviderPayload.ts |  2 +-
 .../RemoveTeamMemberIntegrationAuthPayload.ts |  2 +-
 .../graphql/types/RenameMeetingPayload.ts     |  2 +-
 .../types/RetrospectiveMeetingSettings.ts     |  2 +-
 .../graphql/types/SetAppLocationPayload.ts    |  2 +-
 .../types/SetDefaultSlackChannelPayload.ts    |  2 +-
 .../graphql/types/SetPokerSpectatePayload.ts  |  2 +-
 .../graphql/types/SetTaskEstimatePayload.ts   |  2 +-
 .../graphql/types/SetTaskHighlightPayload.ts  |  2 +-
 .../graphql/types/StartSprintPokerPayload.ts  |  2 +-
 .../graphql/types/TeamMeetingSettings.ts      |  6 +--
 .../graphql/types/TeamMemberIntegrations.ts   |  2 +-
 .../graphql/types/ToggleTeamDrawerPayload.ts  |  2 +-
 .../UpdateAzureDevOpsDimensionFieldPayload.ts |  2 +-
 .../UpdateGitHubDimensionFieldPayload.ts      |  2 +-
 .../types/UpdateIntegrationProviderPayload.ts |  2 +-
 .../graphql/types/UpdatePokerScopePayload.ts  |  2 +-
 .../types/UpdateRetroMaxVotesPayload.ts       |  2 +-
 .../types/UpdateTemplateScopePayload.ts       |  2 +-
 packages/server/graphql/types/User.ts         |  4 +-
 .../1614030642692_refs-for-meetings.ts        |  2 +-
 .../migrations/1614361628531_github-auth.ts   |  2 +-
 .../migrations/1623102903842_discuss.ts       |  2 +-
 .../1625576993065_addAtlassianAuthTable.ts    |  2 +-
 .../1631553388387_add-template-teams-users.ts |  2 +-
 ...29261909_mattermostToIntegrationsTables.ts |  2 +-
 .../1654861495450_migrateSecureDomain.ts      |  2 +-
 .../1677272969994_meetingTemplatesMove.ts     |  2 +-
 .../migrations/1694191002164_migrateSAML.ts   |  2 +-
 .../1695293482618_addFreemailDomain.ts        |  2 +-
 .../1709927835000_moveScheduledJob.ts         |  2 +-
 .../postgres/queries/updateUserTiers.ts       |  2 +-
 .../socketHelpers/sendEncodedMessage.ts       |  2 +-
 .../server/utils/AtlassianServerManager.ts    |  8 ++--
 .../server/utils/AzureDevOpsServerManager.ts  |  2 +-
 packages/server/utils/OpenAIServerManager.ts  |  4 +-
 packages/server/utils/PubSubPromise.ts        |  2 +-
 .../server/utils/RecallAIServerManager.ts     |  2 +-
 packages/server/utils/StaticServer.ts         |  2 +-
 .../utils/__tests__/RedisLockQueue.test.ts    |  4 +-
 packages/server/utils/authorization.ts        |  5 +--
 packages/server/utils/getGraphQLExecutor.ts   |  2 +-
 packages/server/utils/getPhase.ts             |  2 +-
 packages/server/utils/isPhaseAvailable.ts     |  4 +-
 .../utils/isRequestToJoinDomainAllowed.ts     |  6 +--
 packages/server/utils/sendPromptToJoinOrg.ts  |  4 +-
 packages/server/utils/serverHealthChecker.ts  |  2 +-
 packages/server/utils/updateGQLSchema.ts      |  2 +-
 937 files changed, 1844 insertions(+), 1848 deletions(-)

diff --git a/.prettierrc b/.prettierrc
index fd7689d2027..da740c62717 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -14,5 +14,5 @@
       }
     }
   ],
-  "plugins": ["prettier-plugin-tailwindcss"]
+  "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"]
 }
diff --git a/packages/client/components/ActionMeeting.tsx b/packages/client/components/ActionMeeting.tsx
index 35452b1556c..9ec5ad872ca 100644
--- a/packages/client/components/ActionMeeting.tsx
+++ b/packages/client/components/ActionMeeting.tsx
@@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {ReactElement, Suspense, useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {ActionMeeting_meeting$key} from '~/__generated__/ActionMeeting_meeting.graphql'
+import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
 import useMeeting from '../hooks/useMeeting'
 import NewMeetingAvatarGroup from '../modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup'
 import lazyPreload, {LazyExoticPreload} from '../utils/lazyPreload'
-import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
 import ActionMeetingSidebar from './ActionMeetingSidebar'
 import MeetingArea from './MeetingArea'
 import MeetingControlBar from './MeetingControlBar'
diff --git a/packages/client/components/ActionMeetingAgendaItems.tsx b/packages/client/components/ActionMeetingAgendaItems.tsx
index 36c16750fd3..0650fd1c732 100644
--- a/packages/client/components/ActionMeetingAgendaItems.tsx
+++ b/packages/client/components/ActionMeetingAgendaItems.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
-import useBreakpoint from '~/hooks/useBreakpoint'
 import {ActionMeetingAgendaItems_meeting$key} from '~/__generated__/ActionMeetingAgendaItems_meeting.graphql'
+import useBreakpoint from '~/hooks/useBreakpoint'
 import EditorHelpModalContainer from '../containers/EditorHelpModalContainer/EditorHelpModalContainer'
 import MeetingCopy from '../modules/meeting/components/MeetingCopy/MeetingCopy'
 import MeetingPhaseHeading from '../modules/meeting/components/MeetingPhaseHeading/MeetingPhaseHeading'
diff --git a/packages/client/components/ActionMeetingFirstCall.tsx b/packages/client/components/ActionMeetingFirstCall.tsx
index e13f6310b52..0b52fd29098 100644
--- a/packages/client/components/ActionMeetingFirstCall.tsx
+++ b/packages/client/components/ActionMeetingFirstCall.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ActionMeetingFirstCall_meeting$key} from '../__generated__/ActionMeetingFirstCall_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import AgendaShortcutHint from '../modules/meeting/components/AgendaShortcutHint/AgendaShortcutHint'
 import MeetingCopy from '../modules/meeting/components/MeetingCopy/MeetingCopy'
@@ -9,7 +10,6 @@ import MeetingFacilitationHint from '../modules/meeting/components/MeetingFacili
 import MeetingPhaseHeading from '../modules/meeting/components/MeetingPhaseHeading/MeetingPhaseHeading'
 import {AGENDA_ITEMS, AGENDA_ITEM_LABEL} from '../utils/constants'
 import {phaseLabelLookup} from '../utils/meetings/lookups'
-import {ActionMeetingFirstCall_meeting$key} from '../__generated__/ActionMeetingFirstCall_meeting.graphql'
 import {ActionMeetingPhaseProps} from './ActionMeeting'
 import MeetingContent from './MeetingContent'
 import MeetingHeaderAndPhase from './MeetingHeaderAndPhase'
diff --git a/packages/client/components/ActionMeetingLastCall.tsx b/packages/client/components/ActionMeetingLastCall.tsx
index 34526fe2a6f..787adec1056 100644
--- a/packages/client/components/ActionMeetingLastCall.tsx
+++ b/packages/client/components/ActionMeetingLastCall.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import EndCheckInMutation from '~/mutations/EndCheckInMutation'
+import {ActionMeetingLastCall_meeting$key} from '../__generated__/ActionMeetingLastCall_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
@@ -13,7 +14,6 @@ import MeetingPhaseHeading from '../modules/meeting/components/MeetingPhaseHeadi
 import {AGENDA_ITEM_LABEL} from '../utils/constants'
 import {phaseLabelLookup} from '../utils/meetings/lookups'
 import plural from '../utils/plural'
-import {ActionMeetingLastCall_meeting$key} from '../__generated__/ActionMeetingLastCall_meeting.graphql'
 import {ActionMeetingPhaseProps} from './ActionMeeting'
 import ErrorBoundary from './ErrorBoundary'
 import MeetingContent from './MeetingContent'
diff --git a/packages/client/components/ActionMeetingSidebar.tsx b/packages/client/components/ActionMeetingSidebar.tsx
index a2f5328e77e..c91e69301c0 100644
--- a/packages/client/components/ActionMeetingSidebar.tsx
+++ b/packages/client/components/ActionMeetingSidebar.tsx
@@ -1,14 +1,14 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Fragment} from 'react'
 import {useFragment} from 'react-relay'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useGotoStageId from '../hooks/useGotoStageId'
-import getSidebarItemStage from '../utils/getSidebarItemStage'
-import findStageById from '../utils/meetings/findStageById'
 import {
   ActionMeetingSidebar_meeting$key,
   NewMeetingPhaseTypeEnum
 } from '../__generated__/ActionMeetingSidebar_meeting.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useGotoStageId from '../hooks/useGotoStageId'
+import getSidebarItemStage from '../utils/getSidebarItemStage'
+import findStageById from '../utils/meetings/findStageById'
 import ActionSidebarPhaseListItemChildren from './ActionSidebarPhaseListItemChildren'
 import MeetingNavList from './MeetingNavList'
 import NewMeetingSidebar from './NewMeetingSidebar'
diff --git a/packages/client/components/ActionMeetingUpdates.tsx b/packages/client/components/ActionMeetingUpdates.tsx
index 40270c6e178..1e980031ff2 100644
--- a/packages/client/components/ActionMeetingUpdates.tsx
+++ b/packages/client/components/ActionMeetingUpdates.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {ActionMeetingUpdates_meeting$key} from '../__generated__/ActionMeetingUpdates_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import isTaskPrivate from '../utils/isTaskPrivate'
 import toTeamMemberId from '../utils/relay/toTeamMemberId'
-import {ActionMeetingUpdates_meeting$key} from '../__generated__/ActionMeetingUpdates_meeting.graphql'
 import {ActionMeetingPhaseProps} from './ActionMeeting'
 import ActionMeetingUpdatesPrompt from './ActionMeetingUpdatesPrompt'
 import MeetingContent from './MeetingContent'
diff --git a/packages/client/components/ActionSidebarAgendaItemsSection.tsx b/packages/client/components/ActionSidebarAgendaItemsSection.tsx
index 1115b32f8cb..b8507dc7eab 100644
--- a/packages/client/components/ActionSidebarAgendaItemsSection.tsx
+++ b/packages/client/components/ActionSidebarAgendaItemsSection.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ActionSidebarAgendaItemsSection_meeting$key} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql'
 import useGotoStageId from '../hooks/useGotoStageId'
 import AgendaListAndInput from '../modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput'
-import {ActionSidebarAgendaItemsSection_meeting$key} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql'
 import MeetingSidebarPhaseItemChild from './MeetingSidebarPhaseItemChild'
 
 const StyledRoot = styled(MeetingSidebarPhaseItemChild)({
diff --git a/packages/client/components/ActionSidebarPhaseListItemChildren.tsx b/packages/client/components/ActionSidebarPhaseListItemChildren.tsx
index f43e9afff43..5e516423f30 100644
--- a/packages/client/components/ActionSidebarPhaseListItemChildren.tsx
+++ b/packages/client/components/ActionSidebarPhaseListItemChildren.tsx
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActionSidebarPhaseListItemChildren_meeting$key} from '~/__generated__/ActionSidebarPhaseListItemChildren_meeting.graphql'
-import useGotoStageId from '../hooks/useGotoStageId'
 import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionSidebarAgendaItemsSection_meeting.graphql'
+import useGotoStageId from '../hooks/useGotoStageId'
 import ActionSidebarAgendaItemsSection from './ActionSidebarAgendaItemsSection'
 import MeetingSidebarTeamMemberStageItems from './MeetingSidebarTeamMemberStageItems'
 
diff --git a/packages/client/components/ActivityLibrary/AISearch.tsx b/packages/client/components/ActivityLibrary/AISearch.tsx
index 34584ce67cc..46dd650ede4 100644
--- a/packages/client/components/ActivityLibrary/AISearch.tsx
+++ b/packages/client/components/ActivityLibrary/AISearch.tsx
@@ -1,8 +1,8 @@
 import React, {useState} from 'react'
+import {GetTemplateSuggestionMutation$data} from '../../__generated__/GetTemplateSuggestionMutation.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useMutationProps from '../../hooks/useMutationProps'
 import GetTemplateSuggestionMutation from '../../mutations/GetTemplateSuggestionMutation'
-import {GetTemplateSuggestionMutation$data} from '../../__generated__/GetTemplateSuggestionMutation.graphql'
 import LoadingComponent from '../LoadingComponent/LoadingComponent'
 import StyledError from '../StyledError'
 import ActivityGrid from './ActivityGrid'
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
index 7f1706645c2..9428b641bcc 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -5,14 +5,14 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Redirect, useHistory} from 'react-router'
 import {Link} from 'react-router-dom'
 import {ActivityDetailsQuery} from '~/__generated__/ActivityDetailsQuery.graphql'
+import useAtmosphere from '../../../hooks/useAtmosphere'
 import EditableTemplateName from '../../../modules/meeting/components/EditableTemplateName'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import IconLabel from '../../IconLabel'
 import {ActivityCard, ActivityCardImage} from '../ActivityCard'
 import ActivityDetailsSidebar from '../ActivityDetailsSidebar'
-import {CategoryID, CATEGORY_THEMES, QUICK_START_CATEGORY_ID} from '../Categories'
+import {CATEGORY_THEMES, CategoryID, QUICK_START_CATEGORY_ID} from '../Categories'
 import {TemplateDetails} from './TemplateDetails'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import useAtmosphere from '../../../hooks/useAtmosphere'
 
 graphql`
   fragment ActivityDetails_template on MeetingTemplate {
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
index 194c0b882f4..e593c4c79b5 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetailsCategoryBadge.tsx
@@ -5,10 +5,10 @@ import clsx from 'clsx'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {ActivityDetailsCategoryBadge_template$key} from '~/__generated__/ActivityDetailsCategoryBadge_template.graphql'
+import useTemplateCategoryMutation from '../../../mutations/UpdateTemplateCategoryMutation'
 import PlainButton from '../../PlainButton/PlainButton'
-import ActivityDetailsBadge from './ActivityDetailsBadge'
 import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, MAIN_CATEGORIES} from '../Categories'
-import useTemplateCategoryMutation from '../../../mutations/UpdateTemplateCategoryMutation'
+import ActivityDetailsBadge from './ActivityDetailsBadge'
 
 interface Props {
   isEditing: boolean
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx
index 140cbf0ccbf..48509a1bb24 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/components/DetailsBadge.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
 import clsx from 'clsx'
+import React from 'react'
 
 interface DetailsBadgeProps {
   className?: string
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
index 8846fa39b19..e0cec9c4116 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
@@ -1,10 +1,10 @@
+import clsx from 'clsx'
 import React from 'react'
+import AzureDevOpsSVG from '../../../AzureDevOpsSVG'
 import GitHubSVG from '../../../GitHubSVG'
-import JiraSVG from '../../../JiraSVG'
 import GitLabSVG from '../../../GitLabSVG'
-import AzureDevOpsSVG from '../../../AzureDevOpsSVG'
+import JiraSVG from '../../../JiraSVG'
 import JiraServerSVG from '../../../JiraServerSVG'
-import clsx from 'clsx'
 
 interface Props {
   className?: string
diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index 0fbe9cfab1a..880b12f59c0 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -1,40 +1,40 @@
 import {LockOpen} from '@mui/icons-material'
+import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
+import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp'
-import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
-import React, {useState, useEffect, useRef} from 'react'
+import React, {useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
-import StartSprintPokerMutation from '~/mutations/StartSprintPokerMutation'
 import {useHistory} from 'react-router'
-import StartRetrospectiveMutation from '~/mutations/StartRetrospectiveMutation'
-import UpdateReflectTemplateScopeMutation from '~/mutations/UpdateReflectTemplateScopeMutation'
+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 {ActivityDetailsSidebar_teams$key} from '~/__generated__/ActivityDetailsSidebar_teams.graphql'
+import StartRetrospectiveMutation from '~/mutations/StartRetrospectiveMutation'
+import StartSprintPokerMutation from '~/mutations/StartSprintPokerMutation'
+import UpdateReflectTemplateScopeMutation from '~/mutations/UpdateReflectTemplateScopeMutation'
+import {MeetingTypeEnum} from '../../__generated__/ActivityDetailsQuery.graphql'
+import {
+  CreateGcalEventInput,
+  RecurrenceSettingsInput
+} from '../../__generated__/StartRetrospectiveMutation.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
+import useBreakpoint from '../../hooks/useBreakpoint'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMutationProps from '../../hooks/useMutationProps'
 import SelectTemplateMutation from '../../mutations/SelectTemplateMutation'
 import StartCheckInMutation from '../../mutations/StartCheckInMutation'
 import StartTeamPromptMutation from '../../mutations/StartTeamPromptMutation'
 import {PALETTE} from '../../styles/paletteV3'
-import {
-  CreateGcalEventInput,
-  RecurrenceSettingsInput
-} from '../../__generated__/StartRetrospectiveMutation.graphql'
+import {Breakpoint} from '../../types/constEnums'
 import sortByTier from '../../utils/sortByTier'
-import {MeetingTypeEnum} from '../../__generated__/ActivityDetailsQuery.graphql'
-import NewMeetingSettingsToggleAnonymity from '../NewMeetingSettingsToggleAnonymity'
-import NewMeetingSettingsToggleTeamHealth from '../NewMeetingSettingsToggleTeamHealth'
-import NewMeetingSettingsToggleCheckIn from '../NewMeetingSettingsToggleCheckIn'
-import StyledError from '../StyledError'
 import FlatPrimaryButton from '../FlatPrimaryButton'
 import NewMeetingActionsCurrentMeetings from '../NewMeetingActionsCurrentMeetings'
+import NewMeetingSettingsToggleAnonymity from '../NewMeetingSettingsToggleAnonymity'
+import NewMeetingSettingsToggleCheckIn from '../NewMeetingSettingsToggleCheckIn'
+import NewMeetingSettingsToggleTeamHealth from '../NewMeetingSettingsToggleTeamHealth'
 import NewMeetingTeamPicker from '../NewMeetingTeamPicker'
+import StyledError from '../StyledError'
 import ScheduleMeetingButton from './ScheduleMeetingButton'
-import useBreakpoint from '../../hooks/useBreakpoint'
-import {Breakpoint} from '../../types/constEnums'
 
 interface Props {
   selectedTemplateRef: ActivityDetailsSidebar_template$key
diff --git a/packages/client/components/ActivityLibrary/ActivityGrid.tsx b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
index fca5f6c3524..f9db6c34480 100644
--- a/packages/client/components/ActivityLibrary/ActivityGrid.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
@@ -1,11 +1,11 @@
 import React from 'react'
+import {Link} from 'react-router-dom'
 import {ActivityBadge} from './ActivityBadge'
 import {ActivityCardImage} from './ActivityCard'
 import {Template} from './ActivityLibrary'
 import {ActivityLibraryCard} from './ActivityLibraryCard'
-import {Link} from 'react-router-dom'
-import {CategoryID, CATEGORY_THEMES} from './Categories'
 import {ActivityLibraryCardDescription} from './ActivityLibraryCardDescription'
+import {CATEGORY_THEMES, CategoryID} from './Categories'
 
 interface ActivityGridProps {
   templates: Template[]
diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 7cac76e9adc..5ee39ff1bd7 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -5,28 +5,28 @@ import React, {Fragment, useEffect, useMemo} from 'react'
 import {PreloadedQuery, commitLocalUpdate, usePreloadedQuery} from 'react-relay'
 import {Redirect} from 'react-router'
 import {Link} from 'react-router-dom'
+import {useDebounce} from 'use-debounce'
 import {ActivityLibraryQuery} from '~/__generated__/ActivityLibraryQuery.graphql'
 import {ActivityLibrary_template$data} from '~/__generated__/ActivityLibrary_template.graphql'
 import {ActivityLibrary_templateSearchDocument$data} from '~/__generated__/ActivityLibrary_templateSearchDocument.graphql'
 import halloweenRetrospectiveTemplate from '../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
+import useAtmosphere from '../../hooks/useAtmosphere'
 import useRouter from '../../hooks/useRouter'
 import useSearchFilter from '../../hooks/useSearchFilter'
 import logoMarkPurple from '../../styles/theme/images/brand/mark-color.svg'
+import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import IconLabel from '../IconLabel'
+import AISearch from './AISearch'
+import ActivityGrid from './ActivityGrid'
 import {
-  CategoryID,
   CATEGORY_ID_TO_NAME,
   CATEGORY_THEMES,
   CUSTOM_CATEGORY_ID,
+  CategoryID,
   QUICK_START_CATEGORY_ID
 } from './Categories'
 import CreateActivityCard from './CreateActivityCard'
 import SearchBar from './SearchBar'
-import useAtmosphere from '../../hooks/useAtmosphere'
-import AISearch from './AISearch'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
-import {useDebounce} from 'use-debounce'
-import ActivityGrid from './ActivityGrid'
 
 graphql`
   fragment ActivityLibrary_templateSearchDocument on MeetingTemplate {
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx
index e9927587efe..412d8543c1b 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibraryCardDescription.tsx
@@ -1,10 +1,10 @@
+import * as ScrollArea from '@radix-ui/react-scroll-area'
 import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
-import * as ScrollArea from '@radix-ui/react-scroll-area'
 import React from 'react'
 import {
-  ActivityLibraryCardDescription_template$key,
-  ActivityLibraryCardDescription_template$data
+  ActivityLibraryCardDescription_template$data,
+  ActivityLibraryCardDescription_template$key
 } from '~/__generated__/ActivityLibraryCardDescription_template.graphql'
 
 import {Comment, LinearScale, Update} from '@mui/icons-material'
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx
index 41b2cb290e5..e191e20929d 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibraryRoutes.tsx
@@ -1,10 +1,10 @@
 import React, {lazy} from 'react'
-import TeamSubscription from '../../subscriptions/TeamSubscription'
+import {Route, Switch, useRouteMatch} from 'react-router'
 import useSubscription from '../../hooks/useSubscription'
-import TaskSubscription from '../../subscriptions/TaskSubscription'
 import NotificationSubscription from '../../subscriptions/NotificationSubscription'
 import OrganizationSubscription from '../../subscriptions/OrganizationSubscription'
-import {Route, Switch, useRouteMatch} from 'react-router'
+import TaskSubscription from '../../subscriptions/TaskSubscription'
+import TeamSubscription from '../../subscriptions/TeamSubscription'
 
 const ActivityDetailsRoute = lazy(
   () => import(/* webpackChunkName: 'ActivityDetails' */ './ActivityDetails/ActivityDetailsRoute')
diff --git a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
index ea574d4cf1c..38a2b7b9744 100644
--- a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
-import {ActivityLibraryCard} from './ActivityLibraryCard'
-import {ActivityBadge} from './ActivityBadge'
 import {Add as AddIcon} from '@mui/icons-material'
 import clsx from 'clsx'
+import React from 'react'
 import {Link} from 'react-router-dom'
-import {CATEGORY_THEMES, CATEGORY_ID_TO_NAME, AllCategoryID} from './Categories'
+import {ActivityBadge} from './ActivityBadge'
+import {ActivityLibraryCard} from './ActivityLibraryCard'
+import {AllCategoryID, CATEGORY_ID_TO_NAME, CATEGORY_THEMES} from './Categories'
 
 interface Props {
   className?: string
diff --git a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
index f105e0e1aab..2207adf83b2 100644
--- a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
+++ b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
@@ -1,29 +1,29 @@
-import React, {ComponentPropsWithoutRef, useState} from 'react'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import graphql from 'babel-plugin-relay/macro'
 import * as RadioGroup from '@radix-ui/react-radio-group'
+import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
+import React, {ComponentPropsWithoutRef, useState} from 'react'
+import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {useHistory} from 'react-router'
 import {Link} from 'react-router-dom'
-import newTemplate from '../../../../../static/images/illustrations/newTemplate.png'
-import estimatedEffortTemplate from '../../../../../static/images/illustrations/estimatedEffortTemplate.png'
 import {CreateNewActivityQuery} from '~/__generated__/CreateNewActivityQuery.graphql'
-import {ActivityCard, ActivityCardImage} from '../ActivityCard'
-import {ActivityBadge} from '../ActivityBadge'
-import IconLabel from '../../IconLabel'
-import NewMeetingTeamPicker from '../../NewMeetingTeamPicker'
-import sortByTier from '../../../utils/sortByTier'
-import {useHistory} from 'react-router'
+import estimatedEffortTemplate from '../../../../../static/images/illustrations/estimatedEffortTemplate.png'
+import newTemplate from '../../../../../static/images/illustrations/newTemplate.png'
+import {AddPokerTemplateMutation$data} from '../../../__generated__/AddPokerTemplateMutation.graphql'
 import {AddReflectTemplateMutation$data} from '../../../__generated__/AddReflectTemplateMutation.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
-import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
 import useRouter from '../../../hooks/useRouter'
-import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, DEFAULT_CARD_THEME} from '../Categories'
-import BaseButton from '../../BaseButton'
 import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation'
-import {AddPokerTemplateMutation$data} from '../../../__generated__/AddPokerTemplateMutation.graphql'
-import RaisedButton from '../../RaisedButton'
+import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
 import SendClientSideEvent from '../../../utils/SendClientSideEvent'
+import sortByTier from '../../../utils/sortByTier'
+import BaseButton from '../../BaseButton'
+import IconLabel from '../../IconLabel'
+import NewMeetingTeamPicker from '../../NewMeetingTeamPicker'
+import RaisedButton from '../../RaisedButton'
+import {ActivityBadge} from '../ActivityBadge'
+import {ActivityCard, ActivityCardImage} from '../ActivityCard'
+import {CATEGORY_ID_TO_NAME, CATEGORY_THEMES, CategoryID, DEFAULT_CARD_THEME} from '../Categories'
 
 const Bold = (props: ComponentPropsWithoutRef<'span'>) => {
   const {children, className, ...rest} = props
diff --git a/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx b/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
index 319187dd742..8f2017c7d27 100644
--- a/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
+++ b/packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx
@@ -1,16 +1,16 @@
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
-import SecondaryButton from '../SecondaryButton'
+import React from 'react'
+import {useFragment} from 'react-relay'
+import {ScheduleMeetingButton_team$key} from '~/__generated__/ScheduleMeetingButton_team.graphql'
 import {
   CreateGcalEventInput,
   RecurrenceSettingsInput
 } from '../../__generated__/StartRetrospectiveMutation.graphql'
-import {useFragment} from 'react-relay'
-import {ScheduleMeetingButton_team$key} from '~/__generated__/ScheduleMeetingButton_team.graphql'
-import {MenuMutationProps} from '../../hooks/useMutationProps'
 import useModal from '../../hooks/useModal'
-import {ScheduleDialog} from '../ScheduleDialog'
+import {MenuMutationProps} from '../../hooks/useMutationProps'
 import DialogContainer from '../DialogContainer'
+import {ScheduleDialog} from '../ScheduleDialog'
+import SecondaryButton from '../SecondaryButton'
 
 type Props = {
   mutationProps: MenuMutationProps
diff --git a/packages/client/components/ActivityLibrary/SearchBar.tsx b/packages/client/components/ActivityLibrary/SearchBar.tsx
index eed043eb5bf..1af0307f978 100644
--- a/packages/client/components/ActivityLibrary/SearchBar.tsx
+++ b/packages/client/components/ActivityLibrary/SearchBar.tsx
@@ -1,5 +1,5 @@
-import React, {ChangeEvent} from 'react'
 import {Search as SearchIcon} from '@mui/icons-material'
+import React, {ChangeEvent} from 'react'
 
 interface Props {
   searchQuery: string
diff --git a/packages/client/components/ActivityLibrary/TeamPickerModal.tsx b/packages/client/components/ActivityLibrary/TeamPickerModal.tsx
index 0da704b6df2..07ab1ba8d2c 100644
--- a/packages/client/components/ActivityLibrary/TeamPickerModal.tsx
+++ b/packages/client/components/ActivityLibrary/TeamPickerModal.tsx
@@ -7,6 +7,7 @@ import {useHistory} from 'react-router'
 import {AddReflectTemplateMutation$data} from '~/__generated__/AddReflectTemplateMutation.graphql'
 import {TeamPickerModal_teams$key} from '~/__generated__/TeamPickerModal_teams.graphql'
 import {MeetingTypeEnum} from '~/__generated__/TemplateDetails_activity.graphql'
+import {AddPokerTemplateMutation$data} from '../../__generated__/AddPokerTemplateMutation.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMutationProps from '../../hooks/useMutationProps'
@@ -14,7 +15,6 @@ import AddPokerTemplateMutation from '../../mutations/AddPokerTemplateMutation'
 import AddReflectTemplateMutation from '../../mutations/AddReflectTemplateMutation'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import sortByTier from '../../utils/sortByTier'
-import {AddPokerTemplateMutation$data} from '../../__generated__/AddPokerTemplateMutation.graphql'
 import NewMeetingTeamPicker from '../NewMeetingTeamPicker'
 
 const ACTION_BUTTON_CLASSES =
diff --git a/packages/client/components/AddTeamDialog.tsx b/packages/client/components/AddTeamDialog.tsx
index 18de4e59bbf..0ce695761fe 100644
--- a/packages/client/components/AddTeamDialog.tsx
+++ b/packages/client/components/AddTeamDialog.tsx
@@ -1,27 +1,27 @@
+import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
-import {PreloadedQuery, usePreloadedQuery, useFragment} from 'react-relay'
-import FlatPrimaryButton from './FlatPrimaryButton'
+import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
+import useRouter from '~/hooks/useRouter'
+import AddTeamMutation from '~/mutations/AddTeamMutation'
+import SendClientSideEvent from '~/utils/SendClientSideEvent'
+import getGraphQLError from '~/utils/relay/getGraphQLError'
+import {AddTeamDialogQuery} from '../__generated__/AddTeamDialogQuery.graphql'
+import {AddTeamDialog_viewer$key} from '../__generated__/AddTeamDialog_viewer.graphql'
+import {AdhocTeamMultiSelect, Option} from '../components/AdhocTeamMultiSelect/AdhocTeamMultiSelect'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useMutationProps from '../hooks/useMutationProps'
 import {Dialog} from '../ui/Dialog/Dialog'
+import {DialogActions} from '../ui/Dialog/DialogActions'
 import {DialogContent} from '../ui/Dialog/DialogContent'
 import {DialogTitle} from '../ui/Dialog/DialogTitle'
-import {DialogActions} from '../ui/Dialog/DialogActions'
+import {Input} from '../ui/Input/Input'
 import {Select} from '../ui/Select/Select'
+import {SelectContent} from '../ui/Select/SelectContent'
+import {SelectGroup} from '../ui/Select/SelectGroup'
 import {SelectItem} from '../ui/Select/SelectItem'
 import {SelectTrigger} from '../ui/Select/SelectTrigger'
-import {SelectGroup} from '../ui/Select/SelectGroup'
 import {SelectValue} from '../ui/Select/SelectValue'
-import {SelectContent} from '../ui/Select/SelectContent'
-import graphql from 'babel-plugin-relay/macro'
-import {AddTeamDialogQuery} from '../__generated__/AddTeamDialogQuery.graphql'
-import {AddTeamDialog_viewer$key} from '../__generated__/AddTeamDialog_viewer.graphql'
-import useMutationProps from '../hooks/useMutationProps'
-import useAtmosphere from '../hooks/useAtmosphere'
-import {AdhocTeamMultiSelect, Option} from '../components/AdhocTeamMultiSelect/AdhocTeamMultiSelect'
-import {Input} from '../ui/Input/Input'
-import AddTeamMutation from '~/mutations/AddTeamMutation'
-import useRouter from '~/hooks/useRouter'
-import getGraphQLError from '~/utils/relay/getGraphQLError'
-import SendClientSideEvent from '~/utils/SendClientSideEvent'
+import FlatPrimaryButton from './FlatPrimaryButton'
 
 interface Props {
   isOpen: boolean
diff --git a/packages/client/components/AddTeamDialogRoot.tsx b/packages/client/components/AddTeamDialogRoot.tsx
index a314e933876..cd5be060bef 100644
--- a/packages/client/components/AddTeamDialogRoot.tsx
+++ b/packages/client/components/AddTeamDialogRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
-import AddTeamDialog from './AddTeamDialog'
-import {Loader} from '../utils/relay/renderLoader'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import addTeamDialogQuery, {AddTeamDialogQuery} from '../__generated__/AddTeamDialogQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import {Loader} from '../utils/relay/renderLoader'
+import AddTeamDialog from './AddTeamDialog'
 
 interface Props {
   onClose: () => void
diff --git a/packages/client/components/AddTeamMemberAvatarButton.tsx b/packages/client/components/AddTeamMemberAvatarButton.tsx
index 2f3a95a24cf..8aeacbd0fa4 100644
--- a/packages/client/components/AddTeamMemberAvatarButton.tsx
+++ b/packages/client/components/AddTeamMemberAvatarButton.tsx
@@ -4,13 +4,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
+import {AddTeamMemberAvatarButton_teamMembers$key} from '../__generated__/AddTeamMemberAvatarButton_teamMembers.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useModal from '../hooks/useModal'
 import useTooltip from '../hooks/useTooltip'
 import {meetingAvatarMediaQueries} from '../styles/meeting'
 import isDemoRoute from '../utils/isDemoRoute'
 import lazyPreload from '../utils/lazyPreload'
-import {AddTeamMemberAvatarButton_teamMembers$key} from '../__generated__/AddTeamMemberAvatarButton_teamMembers.graphql'
 import OutlinedButton from './OutlinedButton'
 
 interface Props {
diff --git a/packages/client/components/AddToAzureMenuItem.tsx b/packages/client/components/AddToAzureMenuItem.tsx
index 1bffc1f650c..76fe597cac9 100644
--- a/packages/client/components/AddToAzureMenuItem.tsx
+++ b/packages/client/components/AddToAzureMenuItem.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
+import {AddToAzureMenuItem_AzureIntegration$key} from '../__generated__/AddToAzureMenuItem_AzureIntegration.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import {ICON_SIZE} from '../styles/typographyV2'
 import AzureDevOpsClientManager from '../utils/AzureDevOpsClientManager'
-import {AddToAzureMenuItem_AzureIntegration$key} from '../__generated__/AddToAzureMenuItem_AzureIntegration.graphql'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import MenuItem from './MenuItem'
 import MenuItemComponentAvatar from './MenuItemComponentAvatar'
diff --git a/packages/client/components/AddToGitLabMenuItem.tsx b/packages/client/components/AddToGitLabMenuItem.tsx
index 7b06b07addb..2cc793f704a 100644
--- a/packages/client/components/AddToGitLabMenuItem.tsx
+++ b/packages/client/components/AddToGitLabMenuItem.tsx
@@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
 import GitLabClientManager from '~/utils/GitLabClientManager'
+import {AddToGitLabMenuItem_GitLabIntegration$key} from '../__generated__/AddToGitLabMenuItem_GitLabIntegration.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps, {MenuMutationProps} from '../hooks/useMutationProps'
 import {ICON_SIZE} from '../styles/typographyV2'
-import {AddToGitLabMenuItem_GitLabIntegration$key} from '../__generated__/AddToGitLabMenuItem_GitLabIntegration.graphql'
 import GitLabSVG from './GitLabSVG'
 import MenuItem from './MenuItem'
 import MenuItemComponentAvatar from './MenuItemComponentAvatar'
diff --git a/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx b/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx
index 2f1a92fb107..ffb6e8585cd 100644
--- a/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx
+++ b/packages/client/components/AdhocTeamMultiSelect/AdhocTeamMultiSelect.tsx
@@ -1,11 +1,11 @@
+import {useAutocomplete} from '@mui/base/AutocompleteUnstyled'
+import CheckIcon from '@mui/icons-material/Check'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {useAutocomplete} from '@mui/base/AutocompleteUnstyled'
-import CheckIcon from '@mui/icons-material/Check'
 
-import {AdhocTeamMultiSelect_viewer$key} from '../../__generated__/AdhocTeamMultiSelect_viewer.graphql'
 import {Send as SendIcon} from '@mui/icons-material'
+import {AdhocTeamMultiSelect_viewer$key} from '../../__generated__/AdhocTeamMultiSelect_viewer.graphql'
 import {Chip} from '../../ui/Chip/Chip'
 import {emailRegex} from '../../validation/regex'
 
diff --git a/packages/client/components/AnalyticsPage.tsx b/packages/client/components/AnalyticsPage.tsx
index dee92c85291..9a6478fed22 100644
--- a/packages/client/components/AnalyticsPage.tsx
+++ b/packages/client/components/AnalyticsPage.tsx
@@ -1,14 +1,14 @@
+import * as amplitude from '@amplitude/analytics-browser'
 import {datadogRum} from '@datadog/browser-rum'
 import * as Sentry from '@sentry/browser'
 import graphql from 'babel-plugin-relay/macro'
 import {useEffect} from 'react'
 import ReactGA from 'react-ga4'
+import {AnalyticsPageQuery} from '~/__generated__/AnalyticsPageQuery.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {LocalStorageKey} from '~/types/constEnums'
 import safeIdentify from '~/utils/safeIdentify'
-import {AnalyticsPageQuery} from '~/__generated__/AnalyticsPageQuery.graphql'
 import getContentGroup from '../utils/getContentGroup'
-import * as amplitude from '@amplitude/analytics-browser'
 
 const query = graphql`
   query AnalyticsPageQuery {
diff --git a/packages/client/components/ArchiveTaskRoot.tsx b/packages/client/components/ArchiveTaskRoot.tsx
index c52b373461f..6a2fcd6ef5a 100644
--- a/packages/client/components/ArchiveTaskRoot.tsx
+++ b/packages/client/components/ArchiveTaskRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
 import useDocumentTitle from '~/hooks/useDocumentTitle'
 import TeamArchive from '~/modules/teamDashboard/components/TeamArchive/TeamArchive'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import teamArchiveQuery, {TeamArchiveQuery} from '../__generated__/TeamArchiveQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 
 interface Props {
   teamIds?: string[] | null
diff --git a/packages/client/components/ArchiveTaskUserRoot.tsx b/packages/client/components/ArchiveTaskUserRoot.tsx
index ed64cf7bdd0..9707ac9f96e 100644
--- a/packages/client/components/ArchiveTaskUserRoot.tsx
+++ b/packages/client/components/ArchiveTaskUserRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
 import TeamArchive from '~/modules/teamDashboard/components/TeamArchive/TeamArchive'
 import UserTasksHeader from '~/modules/userDashboard/components/UserTasksHeader/UserTasksHeader'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import teamArchiveQuery, {TeamArchiveQuery} from '../__generated__/TeamArchiveQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 
 interface Props {
   teamIds?: string[] | null
diff --git a/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx b/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx
index f9e44bc9d8a..2ffa721ed59 100644
--- a/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx
+++ b/packages/client/components/AzureDevOpsFieldDimensionDropdown.tsx
@@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
+import {AzureDevOpsFieldDimensionDropdown_stage$key} from '../__generated__/AzureDevOpsFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {SprintPokerDefaults} from '../types/constEnums'
@@ -13,7 +14,6 @@ import {
   azureDevOpsRemainingWorkWorkItems,
   azureDevOpsStoryPointWorkItems
 } from '../utils/AzureDevOpsWorkItemFields'
-import {AzureDevOpsFieldDimensionDropdown_stage$key} from '../__generated__/AzureDevOpsFieldDimensionDropdown_stage.graphql'
 import AzureDevOpsFieldMenu from './AzureDevOpsFieldMenu'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/AzureDevOpsFieldMenu.tsx b/packages/client/components/AzureDevOpsFieldMenu.tsx
index 9b1bd6689bf..dd399c6eb8f 100644
--- a/packages/client/components/AzureDevOpsFieldMenu.tsx
+++ b/packages/client/components/AzureDevOpsFieldMenu.tsx
@@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {AzureDevOpsFieldMenu_stage$key} from '../__generated__/AzureDevOpsFieldMenu_stage.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import UpdateAzureDevOpsDimensionFieldMutation from '../mutations/UpdateAzureDevOpsDimensionFieldMutation'
 import {SprintPokerDefaults} from '../types/constEnums'
@@ -12,7 +13,6 @@ import {
   azureDevOpsRemainingWorkWorkItems,
   azureDevOpsStoryPointWorkItems
 } from '../utils/AzureDevOpsWorkItemFields'
-import {AzureDevOpsFieldMenu_stage$key} from '../__generated__/AzureDevOpsFieldMenu_stage.graphql'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 import MenuItemHR from './MenuItemHR'
diff --git a/packages/client/components/AzureDevOpsScopingSearchBar.tsx b/packages/client/components/AzureDevOpsScopingSearchBar.tsx
index 4d8a7b79659..57ae76f6966 100644
--- a/packages/client/components/AzureDevOpsScopingSearchBar.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchBar.tsx
@@ -3,8 +3,8 @@ import {Search} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '../styles/paletteV3'
 import {AzureDevOpsScopingSearchBar_meeting$key} from '../__generated__/AzureDevOpsScopingSearchBar_meeting.graphql'
+import {PALETTE} from '../styles/paletteV3'
 import AzureDevOpsScopingSearchFilterToggle from './AzureDevOpsScopingSearchFilterToggle'
 import AzureDevOpsScopingSearchInput from './AzureDevOpsScopingSearchInput'
 
diff --git a/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx b/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx
index e15d1080661..395c4f67930 100644
--- a/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchFilterMenu.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
-import {MenuProps} from '../hooks/useMenu'
 import {
   AzureDevOpsScopingSearchFilterMenu_meeting$data,
   AzureDevOpsScopingSearchFilterMenu_meeting$key
 } from '../__generated__/AzureDevOpsScopingSearchFilterMenu_meeting.graphql'
+import {MenuProps} from '../hooks/useMenu'
 import Checkbox from './Checkbox'
 import DropdownMenuLabel from './DropdownMenuLabel'
 import Menu from './Menu'
diff --git a/packages/client/components/AzureDevOpsScopingSearchInput.tsx b/packages/client/components/AzureDevOpsScopingSearchInput.tsx
index e5aa030bc2f..d2e6864b596 100644
--- a/packages/client/components/AzureDevOpsScopingSearchInput.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchInput.tsx
@@ -5,8 +5,8 @@ import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import Atmosphere from '../Atmosphere'
-import useAtmosphere from '../hooks/useAtmosphere'
 import {AzureDevOpsScopingSearchInput_meeting$key} from '../__generated__/AzureDevOpsScopingSearchInput_meeting.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
 
 const Wrapper = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx b/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx
index 259cf7f0faf..52637c5e284 100644
--- a/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx
+++ b/packages/client/components/AzureDevOpsScopingSearchResultsRoot.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import azureDevOpsScopingSearchResultsQuery, {
   AzureDevOpsScopingSearchResultsQuery
 } from '../__generated__/AzureDevOpsScopingSearchResultsQuery.graphql'
 import {AzureDevOpsScopingSearchResultsRoot_meeting$key} from '../__generated__/AzureDevOpsScopingSearchResultsRoot_meeting.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import AzureDevOpsScopingSearchResults from './AzureDevOpsScopingSearchResults'
 
 interface Props {
diff --git a/packages/client/components/BillingLeaderActionMenu.tsx b/packages/client/components/BillingLeaderActionMenu.tsx
index d8ee60cf36a..9f6e1e7604c 100644
--- a/packages/client/components/BillingLeaderActionMenu.tsx
+++ b/packages/client/components/BillingLeaderActionMenu.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {BillingLeaderActionMenu_organization$key} from '../__generated__/BillingLeaderActionMenu_organization.graphql'
+import {BillingLeaderActionMenu_organizationUser$key} from '../__generated__/BillingLeaderActionMenu_organizationUser.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation'
 import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps'
-import {BillingLeaderActionMenu_organization$key} from '../__generated__/BillingLeaderActionMenu_organization.graphql'
-import {BillingLeaderActionMenu_organizationUser$key} from '../__generated__/BillingLeaderActionMenu_organizationUser.graphql'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 
diff --git a/packages/client/components/BillingLeaderMenu.tsx b/packages/client/components/BillingLeaderMenu.tsx
index 033cdeb64db..3082a87b4d1 100644
--- a/packages/client/components/BillingLeaderMenu.tsx
+++ b/packages/client/components/BillingLeaderMenu.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
+import useMutationProps from '../hooks/useMutationProps'
 import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
-import useMutationProps from '../hooks/useMutationProps'
 
 type Props = {
   menuProps: MenuProps
diff --git a/packages/client/components/BottomControlBarReady.tsx b/packages/client/components/BottomControlBarReady.tsx
index b212c7cbb5d..a1291de032e 100644
--- a/packages/client/components/BottomControlBarReady.tsx
+++ b/packages/client/components/BottomControlBarReady.tsx
@@ -1,8 +1,9 @@
 import styled from '@emotion/styled'
-import {ArrowForward, CheckCircleOutline, CheckCircle} from '@mui/icons-material'
+import {ArrowForward, CheckCircle, CheckCircleOutline} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {BottomControlBarReady_meeting$key} from '~/__generated__/BottomControlBarReady_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useGotoNext from '~/hooks/useGotoNext'
 import {TransitionStatus} from '~/hooks/useTransition'
@@ -10,10 +11,9 @@ import FlagReadyToAdvanceMutation from '~/mutations/FlagReadyToAdvanceMutation'
 import {PALETTE} from '~/styles/paletteV3'
 import {BezierCurve, Times} from '~/types/constEnums'
 import handleRightArrow from '~/utils/handleRightArrow'
-import {BottomControlBarReady_meeting$key} from '~/__generated__/BottomControlBarReady_meeting.graphql'
+import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarReady_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
-import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarReady_meeting.graphql'
 import BottomControlBarProgress from './BottomControlBarProgress'
 import BottomNavControl from './BottomNavControl'
 import BottomNavIconLabel from './BottomNavIconLabel'
diff --git a/packages/client/components/BottomControlBarTips.tsx b/packages/client/components/BottomControlBarTips.tsx
index 6aa0b6086af..fa8873ae2ae 100644
--- a/packages/client/components/BottomControlBarTips.tsx
+++ b/packages/client/components/BottomControlBarTips.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
+import {BottomControlBarTips_meeting$key} from '~/__generated__/BottomControlBarTips_meeting.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import useTimeout from '~/hooks/useTimeout'
 import {TransitionStatus} from '~/hooks/useTransition'
 import LocalAtmosphere from '~/modules/demo/LocalAtmosphere'
 import lazyPreload, {LazyExoticPreload} from '~/utils/lazyPreload'
-import {BottomControlBarTips_meeting$key} from '~/__generated__/BottomControlBarTips_meeting.graphql'
+import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarTips_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import isDemoRoute from '../utils/isDemoRoute'
-import {NewMeetingPhaseTypeEnum} from '../__generated__/BottomControlBarTips_meeting.graphql'
 import BottomNavControl from './BottomNavControl'
 import BottomNavIconLabel from './BottomNavIconLabel'
 import Menu from './Menu'
diff --git a/packages/client/components/BottomNavIconLabel.tsx b/packages/client/components/BottomNavIconLabel.tsx
index e24975b915a..97d0d5498f4 100644
--- a/packages/client/components/BottomNavIconLabel.tsx
+++ b/packages/client/components/BottomNavIconLabel.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {Event, HelpOutline, PersonPinCircleOutlined, TimerOutlined} from '@mui/icons-material'
-import React, {forwardRef, ReactNode, Ref} from 'react'
+import React, {ReactNode, Ref, forwardRef} from 'react'
 import {PALETTE} from '../styles/paletteV3'
 
 const paletteColors = {
diff --git a/packages/client/components/Checkbox.tsx b/packages/client/components/Checkbox.tsx
index 9915fd83b2d..a319fa4a5b2 100644
--- a/packages/client/components/Checkbox.tsx
+++ b/packages/client/components/Checkbox.tsx
@@ -1,6 +1,6 @@
 import {CheckBox, CheckBoxOutlineBlank, IndeterminateCheckBox} from '@mui/icons-material'
-import React from 'react'
 import clsx from 'clsx'
+import React from 'react'
 
 interface Props {
   active: boolean | null
diff --git a/packages/client/components/DashFilterToggle/DashFilterToggle.tsx b/packages/client/components/DashFilterToggle/DashFilterToggle.tsx
index ccb11d7e89c..155621b2ebc 100644
--- a/packages/client/components/DashFilterToggle/DashFilterToggle.tsx
+++ b/packages/client/components/DashFilterToggle/DashFilterToggle.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {FilterList, Group, Person} from '@mui/icons-material'
-import React, {forwardRef, Ref} from 'react'
+import React, {Ref, forwardRef} from 'react'
 import {PALETTE} from '~/styles/paletteV3'
 import LinkButton from '../LinkButton'
 
diff --git a/packages/client/components/DashNavList/DashNavList.tsx b/packages/client/components/DashNavList/DashNavList.tsx
index 137497d813b..2c5890bc643 100644
--- a/packages/client/components/DashNavList/DashNavList.tsx
+++ b/packages/client/components/DashNavList/DashNavList.tsx
@@ -5,11 +5,11 @@ import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {Breakpoint} from '~/types/constEnums'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
-import LeftDashNavItem from '../Dashboard/LeftDashNavItem'
 import {
-  DashNavList_organization$key,
-  DashNavList_organization$data
+  DashNavList_organization$data,
+  DashNavList_organization$key
 } from '../../__generated__/DashNavList_organization.graphql'
+import LeftDashNavItem from '../Dashboard/LeftDashNavItem'
 
 const DashNavListStyles = styled('div')({
   paddingRight: 8,
diff --git a/packages/client/components/DashTopBar.tsx b/packages/client/components/DashTopBar.tsx
index 2b9c9ead0a3..691afb835db 100644
--- a/packages/client/components/DashTopBar.tsx
+++ b/packages/client/components/DashTopBar.tsx
@@ -3,12 +3,12 @@ import {Menu} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {DashTopBar_query$key} from '~/__generated__/DashTopBar_query.graphql'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
 import {ICON_SIZE} from '~/styles/typographyV2'
 import {AppBar, Breakpoint, Layout, NavSidebar} from '~/types/constEnums'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
-import {DashTopBar_query$key} from '~/__generated__/DashTopBar_query.graphql'
 import parabolLogo from '../styles/theme/images/brand/lockup_color_mark_white_type.svg'
 import PinnedSnackbarNotifications from './PinnedSnackbarNotifications'
 import PlainButton from './PlainButton/PlainButton'
diff --git a/packages/client/components/Dashboard.tsx b/packages/client/components/Dashboard.tsx
index 6dbc7c535e2..e636a27285f 100644
--- a/packages/client/components/Dashboard.tsx
+++ b/packages/client/components/Dashboard.tsx
@@ -4,20 +4,20 @@ import React, {lazy, useRef} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Route, Switch} from 'react-router'
 import useBreakpoint from '~/hooks/useBreakpoint'
+import useNewFeatureSnackbar from '~/hooks/useNewFeatureSnackbar'
 import useSnackNag from '~/hooks/useSnackNag'
 import useSnacksForNewMeetings from '~/hooks/useSnacksForNewMeetings'
-import useNewFeatureSnackbar from '~/hooks/useNewFeatureSnackbar'
 import {PALETTE} from '~/styles/paletteV3'
 import {Breakpoint} from '~/types/constEnums'
+import {DashboardQuery} from '../__generated__/DashboardQuery.graphql'
 import useSidebar from '../hooks/useSidebar'
 import useUsageSnackNag from '../hooks/useUsageSnackNag'
-import {DashboardQuery} from '../__generated__/DashboardQuery.graphql'
+import DashTopBar from './DashTopBar'
 import DashSidebar from './Dashboard/DashSidebar'
 import MobileDashSidebar from './Dashboard/MobileDashSidebar'
-import DashTopBar from './DashTopBar'
 import MobileDashTopBar from './MobileDashTopBar'
-import SwipeableDashSidebar from './SwipeableDashSidebar'
 import RequestToJoinComponent from './RequestToJoin'
+import SwipeableDashSidebar from './SwipeableDashSidebar'
 
 const InsightsRoot = lazy(
   () => import(/* webpackChunkName: 'Insights' */ '../components/InsightsRoot')
diff --git a/packages/client/components/Dashboard/DashSidebar.tsx b/packages/client/components/Dashboard/DashSidebar.tsx
index 2f5c78f0cdb..f95a6d38675 100644
--- a/packages/client/components/Dashboard/DashSidebar.tsx
+++ b/packages/client/components/Dashboard/DashSidebar.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {useRouteMatch} from 'react-router'
+import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql'
 import {PALETTE} from '../../styles/paletteV3'
 import {NavSidebar} from '../../types/constEnums'
 import {
@@ -12,7 +13,6 @@ import {
   ORG_SETTINGS_PAGE,
   TEAMS_PAGE
 } from '../../utils/constants'
-import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql'
 import DashNavList from '../DashNavList/DashNavList'
 import SideBarStartMeetingButton from '../SideBarStartMeetingButton'
 import LeftDashNavItem from './LeftDashNavItem'
diff --git a/packages/client/components/Dashboard/MobileDashSidebar.tsx b/packages/client/components/Dashboard/MobileDashSidebar.tsx
index 03666b91642..033556c85bc 100644
--- a/packages/client/components/Dashboard/MobileDashSidebar.tsx
+++ b/packages/client/components/Dashboard/MobileDashSidebar.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {useRouteMatch} from 'react-router'
+import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql'
 import {PALETTE} from '../../styles/paletteV3'
 import {NavSidebar} from '../../types/constEnums'
 import {
@@ -12,7 +13,6 @@ import {
   ORG_SETTINGS_PAGE,
   TEAMS_PAGE
 } from '../../utils/constants'
-import {DashSidebar_viewer$key} from '../../__generated__/DashSidebar_viewer.graphql'
 import DashNavList from '../DashNavList/DashNavList'
 import StandardHub from '../StandardHub/StandardHub'
 import LeftDashNavItem from './LeftDashNavItem'
diff --git a/packages/client/components/DashboardAvatars/DashboardAvatars.tsx b/packages/client/components/DashboardAvatars/DashboardAvatars.tsx
index 5827f1edb8c..acfe2337256 100644
--- a/packages/client/components/DashboardAvatars/DashboardAvatars.tsx
+++ b/packages/client/components/DashboardAvatars/DashboardAvatars.tsx
@@ -4,15 +4,15 @@ import React, {useMemo} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {Breakpoint, ElementHeight, ElementWidth} from '~/types/constEnums'
 import fromTeamMemberId from '~/utils/relay/fromTeamMemberId'
+import {
+  DashboardAvatars_team$data,
+  DashboardAvatars_team$key
+} from '../../__generated__/DashboardAvatars_team.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useBreakpoint from '../../hooks/useBreakpoint'
 import useMutationProps from '../../hooks/useMutationProps'
 import ToggleTeamDrawerMutation from '../../mutations/ToggleTeamDrawerMutation'
 import {PALETTE} from '../../styles/paletteV3'
-import {
-  DashboardAvatars_team$key,
-  DashboardAvatars_team$data
-} from '../../__generated__/DashboardAvatars_team.graphql'
 import ErrorBoundary from '../ErrorBoundary'
 import PlainButton from '../PlainButton/PlainButton'
 import DashboardAvatar from './DashboardAvatar'
diff --git a/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx b/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx
index 9bf47a5b7b8..5433494085e 100644
--- a/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx
+++ b/packages/client/components/DashboardAvatars/TeamMemberAvatarMenu.tsx
@@ -3,8 +3,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
-import {MenuProps} from '../../hooks/useMenu'
 import {TeamMemberAvatarMenu_teamMember$key} from '../../__generated__/TeamMemberAvatarMenu_teamMember.graphql'
+import {MenuProps} from '../../hooks/useMenu'
 import Menu from '../Menu'
 import MenuItem from '../MenuItem'
 import MenuItemLabel from '../MenuItemLabel'
diff --git a/packages/client/components/DashboardRoot.tsx b/packages/client/components/DashboardRoot.tsx
index f97e879fce5..e2366c7d517 100644
--- a/packages/client/components/DashboardRoot.tsx
+++ b/packages/client/components/DashboardRoot.tsx
@@ -1,12 +1,12 @@
 import React, {Suspense} from 'react'
 import {withRouter} from 'react-router-dom'
+import dashboardQuery, {DashboardQuery} from '../__generated__/DashboardQuery.graphql'
 import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import useSubscription from '../hooks/useSubscription'
 import NotificationSubscription from '../subscriptions/NotificationSubscription'
 import OrganizationSubscription from '../subscriptions/OrganizationSubscription'
 import TaskSubscription from '../subscriptions/TaskSubscription'
 import TeamSubscription from '../subscriptions/TeamSubscription'
-import dashboardQuery, {DashboardQuery} from '../__generated__/DashboardQuery.graphql'
 import Dashboard from './Dashboard'
 
 const DashboardRoot = () => {
diff --git a/packages/client/components/DeleteTeamDialog.tsx b/packages/client/components/DeleteTeamDialog.tsx
index d6bb993bbde..d940674c070 100644
--- a/packages/client/components/DeleteTeamDialog.tsx
+++ b/packages/client/components/DeleteTeamDialog.tsx
@@ -1,15 +1,15 @@
 import React, {useState} from 'react'
-import FlatPrimaryButton from './FlatPrimaryButton'
-import {Input} from '../ui/Input/Input'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useMutationProps from '../hooks/useMutationProps'
+import useRouter from '../hooks/useRouter'
+import ArchiveTeamMutation from '../mutations/ArchiveTeamMutation'
 import {Dialog} from '../ui/Dialog/Dialog'
+import {DialogActions} from '../ui/Dialog/DialogActions'
 import {DialogContent} from '../ui/Dialog/DialogContent'
 import {DialogTitle} from '../ui/Dialog/DialogTitle'
-import {DialogActions} from '../ui/Dialog/DialogActions'
-import useMutationProps from '../hooks/useMutationProps'
+import {Input} from '../ui/Input/Input'
+import FlatPrimaryButton from './FlatPrimaryButton'
 import SecondaryButton from './SecondaryButton'
-import ArchiveTeamMutation from '../mutations/ArchiveTeamMutation'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useRouter from '../hooks/useRouter'
 
 interface Props {
   isOpen: boolean
diff --git a/packages/client/components/DemoMeetingCard.tsx b/packages/client/components/DemoMeetingCard.tsx
index 1409d57911d..36892c5c372 100644
--- a/packages/client/components/DemoMeetingCard.tsx
+++ b/packages/client/components/DemoMeetingCard.tsx
@@ -4,10 +4,10 @@ import {Link} from 'react-router-dom'
 import retrospective from '../../../static/images/illustrations/retrospective.png'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useBreakpoint from '../hooks/useBreakpoint'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {Elevation} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
 import {BezierCurve, Breakpoint, Card, ElementWidth} from '../types/constEnums'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 const CardWrapper = styled('div')<{
   maybeTabletPlus: boolean
diff --git a/packages/client/components/DemoMeetingRoot.tsx b/packages/client/components/DemoMeetingRoot.tsx
index 53e3f595b73..932301106e5 100644
--- a/packages/client/components/DemoMeetingRoot.tsx
+++ b/packages/client/components/DemoMeetingRoot.tsx
@@ -2,13 +2,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import MeetingSubscription from '~/subscriptions/MeetingSubscription'
+import {DemoMeetingRootQuery} from '../__generated__/DemoMeetingRootQuery.graphql'
 import useSubscription from '../hooks/useSubscription'
 import NotificationSubscription from '../subscriptions/NotificationSubscription'
 import OrganizationSubscription from '../subscriptions/OrganizationSubscription'
 import TaskSubscription from '../subscriptions/TaskSubscription'
 import TeamSubscription from '../subscriptions/TeamSubscription'
 import {RetroDemo} from '../types/constEnums'
-import {DemoMeetingRootQuery} from '../__generated__/DemoMeetingRootQuery.graphql'
 import RetroMeeting from './RetroMeeting'
 
 const query = graphql`
diff --git a/packages/client/components/DiscussPhaseReflectionGrid.tsx b/packages/client/components/DiscussPhaseReflectionGrid.tsx
index 514cc27fc68..0189bc882ee 100644
--- a/packages/client/components/DiscussPhaseReflectionGrid.tsx
+++ b/packages/client/components/DiscussPhaseReflectionGrid.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {DiscussPhaseReflectionGrid_meeting$key} from '~/__generated__/DiscussPhaseReflectionGrid_meeting.graphql'
 import {useCoverable} from '~/hooks/useControlBarCovers'
 import {MeetingControlBarEnum} from '~/types/constEnums'
-import {DiscussPhaseReflectionGrid_meeting$key} from '~/__generated__/DiscussPhaseReflectionGrid_meeting.graphql'
 import {meetingGridMinWidth} from '../styles/meeting'
 import MasonryCSSGrid from './MasonryCSSGrid'
 import ReflectionCard from './ReflectionCard/ReflectionCard'
diff --git a/packages/client/components/DiscussionMentioned.tsx b/packages/client/components/DiscussionMentioned.tsx
index 25b494e3b91..1fd1cab6386 100644
--- a/packages/client/components/DiscussionMentioned.tsx
+++ b/packages/client/components/DiscussionMentioned.tsx
@@ -4,13 +4,13 @@ import {Editor} from 'draft-js'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
+import {DiscussionMentioned_notification$key} from '../__generated__/DiscussionMentioned_notification.graphql'
 import useEditorState from '../hooks/useEditorState'
 import useRouter from '../hooks/useRouter'
 import {cardShadow} from '../styles/elevation'
+import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg'
 import fromStageIdToUrl from '../utils/meetings/fromStageIdToUrl'
-import {DiscussionMentioned_notification$key} from '../__generated__/DiscussionMentioned_notification.graphql'
 import NotificationTemplate from './NotificationTemplate'
-import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg'
 
 const EditorWrapper = styled('div')({
   backgroundColor: '#fff',
diff --git a/packages/client/components/DiscussionThread.tsx b/packages/client/components/DiscussionThread.tsx
index 40a7c534904..35b400a19e5 100644
--- a/packages/client/components/DiscussionThread.tsx
+++ b/packages/client/components/DiscussionThread.tsx
@@ -5,10 +5,10 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {useCoverable} from '~/hooks/useControlBarCovers'
 import {Breakpoint, DiscussionThreadEnum, MeetingControlBarEnum} from '~/types/constEnums'
-import {Elevation} from '../styles/elevation'
-import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery'
 import {DiscussionThreadQuery} from '../__generated__/DiscussionThreadQuery.graphql'
 import {RetroDiscussPhase_meeting$data} from '../__generated__/RetroDiscussPhase_meeting.graphql'
+import {Elevation} from '../styles/elevation'
+import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery'
 import DiscussionThreadInput from './DiscussionThreadInput'
 import DiscussionThreadList, {DiscussionThreadables} from './DiscussionThreadList'
 import {isLocalPoll} from './Poll/local/newPoll'
diff --git a/packages/client/components/DiscussionThreadList.tsx b/packages/client/components/DiscussionThreadList.tsx
index 76c11100693..e13fa04e9df 100644
--- a/packages/client/components/DiscussionThreadList.tsx
+++ b/packages/client/components/DiscussionThreadList.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {forwardRef, ReactNode, RefObject} from 'react'
 import {useFragment} from 'react-relay'
-import useScrollThreadList from '~/hooks/useScrollThreadList'
 import {DiscussionThreadList_discussion$key} from '~/__generated__/DiscussionThreadList_discussion.graphql'
 import {DiscussionThreadList_threadables$key} from '~/__generated__/DiscussionThreadList_threadables.graphql'
 import {DiscussionThreadList_viewer$key} from '~/__generated__/DiscussionThreadList_viewer.graphql'
-import {PALETTE} from '../styles/paletteV3'
+import useScrollThreadList from '~/hooks/useScrollThreadList'
 import {RetroDiscussPhase_meeting$data} from '../__generated__/RetroDiscussPhase_meeting.graphql'
+import {PALETTE} from '../styles/paletteV3'
 import CommentingStatusText from './CommentingStatusText'
 import LabelHeading from './LabelHeading/LabelHeading'
 import ThreadedItem from './ThreadedItem'
diff --git a/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx b/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx
index 0ab2cd51288..c9b7a53a874 100644
--- a/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx
+++ b/packages/client/components/DiscussionThreadListEmptyTranscriptState.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {DiscussionThreadListEmptyTranscriptState_meeting$key} from '~/__generated__/DiscussionThreadListEmptyTranscriptState_meeting.graphql'
 import {PALETTE} from '~/styles/paletteV3'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
 import useAtmosphere from '../hooks/useAtmosphere'
@@ -12,7 +13,6 @@ import linkify from '../utils/linkify'
 import Legitity from '../validation/Legitity'
 import FlatButton from './FlatButton'
 import StyledError from './StyledError'
-import {DiscussionThreadListEmptyTranscriptState_meeting$key} from '~/__generated__/DiscussionThreadListEmptyTranscriptState_meeting.graphql'
 import {ZoomSVG} from './ZoomSVG'
 
 const mobileBreakpoint = makeMinWidthMediaQuery(380)
diff --git a/packages/client/components/DiscussionThreadRoot.tsx b/packages/client/components/DiscussionThreadRoot.tsx
index c6a590f0703..d7d7d0d011d 100644
--- a/packages/client/components/DiscussionThreadRoot.tsx
+++ b/packages/client/components/DiscussionThreadRoot.tsx
@@ -1,9 +1,9 @@
 import React, {ReactNode, RefObject, Suspense} from 'react'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import discussionThreadQuery, {
   DiscussionThreadQuery
 } from '../__generated__/DiscussionThreadQuery.graphql'
 import {RetroDiscussPhase_meeting$data} from '../__generated__/RetroDiscussPhase_meeting.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import DiscussionThread from './DiscussionThread'
 import {DiscussionThreadables} from './DiscussionThreadList'
 
diff --git a/packages/client/components/DropdownToggleV2.tsx b/packages/client/components/DropdownToggleV2.tsx
index f5fd1c31f9c..b7111cd7384 100644
--- a/packages/client/components/DropdownToggleV2.tsx
+++ b/packages/client/components/DropdownToggleV2.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import {ExpandMore as ExpandMoreIcon, KeyboardArrowRight} from '@mui/icons-material'
-import React, {forwardRef, ReactNode, Ref} from 'react'
+import React, {ReactNode, Ref, forwardRef} from 'react'
 import useMenu from '../hooks/useMenu'
 import {PALETTE} from '../styles/paletteV3'
 
diff --git a/packages/client/components/DueDatePicker.tsx b/packages/client/components/DueDatePicker.tsx
index 459be442401..62544916bbe 100644
--- a/packages/client/components/DueDatePicker.tsx
+++ b/packages/client/components/DueDatePicker.tsx
@@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {DayModifiers, DayPicker} from 'react-day-picker'
 import {useFragment} from 'react-relay'
+import {DueDatePicker_task$key} from '../__generated__/DueDatePicker_task.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import useMutationProps from '../hooks/useMutationProps'
 import {UseTaskChild} from '../hooks/useTaskChildFocus'
 import UpdateTaskDueDateMutation from '../mutations/UpdateTaskDueDateMutation'
 import {PALETTE} from '../styles/paletteV3'
-import {DueDatePicker_task$key} from '../__generated__/DueDatePicker_task.graphql'
 import Menu from './Menu'
 
 interface Props {
diff --git a/packages/client/components/DueDateToggle.tsx b/packages/client/components/DueDateToggle.tsx
index f8c11acb133..3feb5e60c3b 100644
--- a/packages/client/components/DueDateToggle.tsx
+++ b/packages/client/components/DueDateToggle.tsx
@@ -5,13 +5,13 @@ import ms from 'ms'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useTooltip from '~/hooks/useTooltip'
+import {DueDateToggle_task$key} from '../__generated__/DueDateToggle_task.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {UseTaskChild} from '../hooks/useTaskChildFocus'
 import {PALETTE} from '../styles/paletteV3'
 import lazyPreload from '../utils/lazyPreload'
 import {shortMonths} from '../utils/makeDateString'
-import {DueDateToggle_task$key} from '../__generated__/DueDateToggle_task.graphql'
 import CardButton from './CardButton'
 
 interface StyleProps {
diff --git a/packages/client/components/EditableOrgName.tsx b/packages/client/components/EditableOrgName.tsx
index ec119c837b8..2bcde367f44 100644
--- a/packages/client/components/EditableOrgName.tsx
+++ b/packages/client/components/EditableOrgName.tsx
@@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {EditableOrgName_organization$key} from '../__generated__/EditableOrgName_organization.graphql'
 import UpdateOrgMutation from '../mutations/UpdateOrgMutation'
 import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps'
 import Legitity from '../validation/Legitity'
-import {EditableOrgName_organization$key} from '../__generated__/EditableOrgName_organization.graphql'
 import EditableText from './EditableText'
 
 interface Props extends WithMutationProps {
diff --git a/packages/client/components/EditingStatus/EditingStatus.tsx b/packages/client/components/EditingStatus/EditingStatus.tsx
index d1d989d22f2..34b89a41a0d 100644
--- a/packages/client/components/EditingStatus/EditingStatus.tsx
+++ b/packages/client/components/EditingStatus/EditingStatus.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {ReactNode, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {EditingStatus_task$key} from '~/__generated__/EditingStatus_task.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useTooltip from '~/hooks/useTooltip'
-import {EditingStatus_task$key} from '~/__generated__/EditingStatus_task.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import {UseTaskChild} from '../../hooks/useTaskChildFocus'
 import {PALETTE} from '../../styles/paletteV3'
diff --git a/packages/client/components/EditorInputWrapper.tsx b/packages/client/components/EditorInputWrapper.tsx
index f567636c02b..f1ac2701673 100644
--- a/packages/client/components/EditorInputWrapper.tsx
+++ b/packages/client/components/EditorInputWrapper.tsx
@@ -16,8 +16,8 @@ import entitizeText from '../utils/draftjs/entitizeText'
 import isAndroid from '../utils/draftjs/isAndroid'
 import isRichDraft from '../utils/draftjs/isRichDraft'
 import lazyPreload from '../utils/lazyPreload'
-import blockStyleFn from './TaskEditor/blockStyleFn'
 import './TaskEditor/Draft.css'
+import blockStyleFn from './TaskEditor/blockStyleFn'
 
 type Handlers = Pick<
   EditorProps,
diff --git a/packages/client/components/EmailNotifications.tsx b/packages/client/components/EmailNotifications.tsx
index bda786ac1f0..077bd47ea45 100644
--- a/packages/client/components/EmailNotifications.tsx
+++ b/packages/client/components/EmailNotifications.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {EmailNotifications_viewer$key} from '../__generated__/EmailNotifications_viewer.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import ToggleSummaryEmailMutation from '../mutations/ToggleSummaryEmailMutation'
 import {PALETTE} from '../styles/paletteV3'
-import {EmailNotifications_viewer$key} from '../__generated__/EmailNotifications_viewer.graphql'
 import Checkbox from './Checkbox'
 import StyledError from './StyledError'
 
diff --git a/packages/client/components/EstimateDimensionColumn.tsx b/packages/client/components/EstimateDimensionColumn.tsx
index da3c6360ca8..2bd2ae39fa1 100644
--- a/packages/client/components/EstimateDimensionColumn.tsx
+++ b/packages/client/components/EstimateDimensionColumn.tsx
@@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
+import {EstimateDimensionColumn_meeting$key} from '../__generated__/EstimateDimensionColumn_meeting.graphql'
+import {EstimateDimensionColumn_stage$key} from '../__generated__/EstimateDimensionColumn_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useIsInitializing from '../hooks/useIsInitializing'
 import useIsPokerVotingClosing from '../hooks/useIsPokerVotingClosing'
 import PokerResetDimensionMutation from '../mutations/PokerResetDimensionMutation'
 import SetPokerSpectateMutation from '../mutations/SetPokerSpectateMutation'
 import {PALETTE} from '../styles/paletteV3'
-import {EstimateDimensionColumn_meeting$key} from '../__generated__/EstimateDimensionColumn_meeting.graphql'
-import {EstimateDimensionColumn_stage$key} from '../__generated__/EstimateDimensionColumn_stage.graphql'
 import DeckActivityAvatars from './DeckActivityAvatars'
 import LinkButton from './LinkButton'
 import PokerActiveVoting from './PokerActiveVoting'
diff --git a/packages/client/components/EstimatePhaseArea.tsx b/packages/client/components/EstimatePhaseArea.tsx
index ca0e6a12d0d..2af1cfdf9ca 100644
--- a/packages/client/components/EstimatePhaseArea.tsx
+++ b/packages/client/components/EstimatePhaseArea.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
+import {EstimatePhaseArea_meeting$key} from '~/__generated__/EstimatePhaseArea_meeting.graphql'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import useGotoStageId from '~/hooks/useGotoStageId'
 import {PALETTE} from '~/styles/paletteV3'
 import {Breakpoint} from '~/types/constEnums'
-import {EstimatePhaseArea_meeting$key} from '~/__generated__/EstimatePhaseArea_meeting.graphql'
 import EstimateDimensionColumn from './EstimateDimensionColumn'
 import PokerCardDeck from './PokerCardDeck'
 
diff --git a/packages/client/components/EstimatePhaseDiscussionDrawer.tsx b/packages/client/components/EstimatePhaseDiscussionDrawer.tsx
index ab4aaf7d0a4..49d9b65a1b1 100644
--- a/packages/client/components/EstimatePhaseDiscussionDrawer.tsx
+++ b/packages/client/components/EstimatePhaseDiscussionDrawer.tsx
@@ -3,9 +3,9 @@ import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {EstimatePhaseDiscussionDrawer_meeting$key} from '~/__generated__/EstimatePhaseDiscussionDrawer_meeting.graphql'
 import {desktopSidebarShadow} from '~/styles/elevation'
 import {PALETTE} from '~/styles/paletteV3'
-import {EstimatePhaseDiscussionDrawer_meeting$key} from '~/__generated__/EstimatePhaseDiscussionDrawer_meeting.graphql'
 import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../types/constEnums'
 import {DiscussionThreadables} from './DiscussionThreadList'
 import DiscussionThreadListEmptyState from './DiscussionThreadListEmptyState'
diff --git a/packages/client/components/EventTypeFilterMenuItemLabel.tsx b/packages/client/components/EventTypeFilterMenuItemLabel.tsx
index ed1e4ba0702..6455726166d 100644
--- a/packages/client/components/EventTypeFilterMenuItemLabel.tsx
+++ b/packages/client/components/EventTypeFilterMenuItemLabel.tsx
@@ -1,14 +1,14 @@
 import React from 'react'
+import {TimelineEventEnum} from '../__generated__/MyDashboardTimelineQuery.graphql'
+import {FilterLabels} from '../types/constEnums'
 import {
   CUSTOMIZED_SVG,
   timelineEventTypeMenuIcons,
   timelineEventTypeMenuLabels
 } from '../utils/constants'
-import TimelineEventTypeIcon from './TimelineEventTypeIcon'
-import MenuItemLabel from './MenuItemLabel'
-import {FilterLabels} from '../types/constEnums'
-import {TimelineEventEnum} from '../__generated__/MyDashboardTimelineQuery.graphql'
 import CardsSVG from './CardsSVG'
+import MenuItemLabel from './MenuItemLabel'
+import TimelineEventTypeIcon from './TimelineEventTypeIcon'
 
 interface Props {
   eventType?: TimelineEventEnum
diff --git a/packages/client/components/FacilitatorMenu.tsx b/packages/client/components/FacilitatorMenu.tsx
index d712e2338d9..4a6322d4d26 100644
--- a/packages/client/components/FacilitatorMenu.tsx
+++ b/packages/client/components/FacilitatorMenu.tsx
@@ -1,13 +1,13 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {FacilitatorMenu_meeting$key} from '../__generated__/FacilitatorMenu_meeting.graphql'
 import Menu from '../components/Menu'
 import MenuItem from '../components/MenuItem'
 import MenuItemLabel from '../components/MenuItemLabel'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import PromoteNewMeetingFacilitatorMutation from '../mutations/PromoteNewMeetingFacilitatorMutation'
-import {FacilitatorMenu_meeting$key} from '../__generated__/FacilitatorMenu_meeting.graphql'
 
 interface Props {
   menuProps: MenuProps
diff --git a/packages/client/components/GitHubFieldDimensionDropdown.tsx b/packages/client/components/GitHubFieldDimensionDropdown.tsx
index 80b40d2ffdd..ddeae024e74 100644
--- a/packages/client/components/GitHubFieldDimensionDropdown.tsx
+++ b/packages/client/components/GitHubFieldDimensionDropdown.tsx
@@ -4,11 +4,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
+import {GitHubFieldDimensionDropdown_stage$key} from '../__generated__/GitHubFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import interpolateGitHubLabelTemplate from '../shared/interpolateGitHubLabelTemplate'
 import {SprintPokerDefaults} from '../types/constEnums'
-import {GitHubFieldDimensionDropdown_stage$key} from '../__generated__/GitHubFieldDimensionDropdown_stage.graphql'
 import GitHubFieldMenu from './GitHubFieldMenu'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/GitHubFieldMenu.tsx b/packages/client/components/GitHubFieldMenu.tsx
index a642ce69956..2d984a45bf8 100644
--- a/packages/client/components/GitHubFieldMenu.tsx
+++ b/packages/client/components/GitHubFieldMenu.tsx
@@ -3,6 +3,7 @@ import {Edit} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {GitHubFieldMenu_stage$key} from '../__generated__/GitHubFieldMenu_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import useModal from '../hooks/useModal'
@@ -11,7 +12,6 @@ import textOverflow from '../styles/helpers/textOverflow'
 import {PALETTE} from '../styles/paletteV3'
 import {FONT_FAMILY} from '../styles/typographyV2'
 import {SprintPokerDefaults} from '../types/constEnums'
-import {GitHubFieldMenu_stage$key} from '../__generated__/GitHubFieldMenu_stage.graphql'
 import EditGitHubLabelTemplateModal from './EditGitHubLabelTemplateModal'
 import FlatButton from './FlatButton'
 import Menu from './Menu'
diff --git a/packages/client/components/GitHubRepoSearchFilterMenu.tsx b/packages/client/components/GitHubRepoSearchFilterMenu.tsx
index b90b0412987..4ca35ff2cb5 100644
--- a/packages/client/components/GitHubRepoSearchFilterMenu.tsx
+++ b/packages/client/components/GitHubRepoSearchFilterMenu.tsx
@@ -1,16 +1,16 @@
-import React, {useMemo} from 'react'
+import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
+import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
-import {MenuProps} from '../hooks/useMenu'
 import {GitHubRepoSearchFilterMenu_teamMember$key} from '../__generated__/GitHubRepoSearchFilterMenu_teamMember.graphql'
 import useGetRepoContributions from '../hooks/useGetRepoContributions'
+import {MenuProps} from '../hooks/useMenu'
 import useSearchFilter from '../hooks/useSearchFilter'
 import Checkbox from './Checkbox'
 import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 import MenuItemLabel from './MenuItemLabel'
-import styled from '@emotion/styled'
 import {SearchMenuItem} from './SearchMenuItem'
 import TypeAheadLabel from './TypeAheadLabel'
 
diff --git a/packages/client/components/GitHubScopingSearchBar.tsx b/packages/client/components/GitHubScopingSearchBar.tsx
index 0aabdc3a9d0..422aaabbb41 100644
--- a/packages/client/components/GitHubScopingSearchBar.tsx
+++ b/packages/client/components/GitHubScopingSearchBar.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {SprintPokerDefaults} from '../types/constEnums'
 import {GitHubScopingSearchBar_meeting$key} from '../__generated__/GitHubScopingSearchBar_meeting.graphql'
+import {SprintPokerDefaults} from '../types/constEnums'
 import GitHubScopingSearchFilterToggle from './GitHubScopingSearchFilterToggle'
 import GitHubScopingSearchHistoryToggle from './GitHubScopingSearchHistoryToggle'
 import ScopingSearchBar from './ScopingSearchBar'
diff --git a/packages/client/components/GitHubScopingSearchFilterMenu.tsx b/packages/client/components/GitHubScopingSearchFilterMenu.tsx
index 122b4dff0e0..ae97624b714 100644
--- a/packages/client/components/GitHubScopingSearchFilterMenu.tsx
+++ b/packages/client/components/GitHubScopingSearchFilterMenu.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {commitLocalUpdate, PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {GitHubScopingSearchFilterMenuQuery} from '../__generated__/GitHubScopingSearchFilterMenuQuery.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import SearchQueryId from '../shared/gqlIds/SearchQueryId'
 import getReposFromQueryStr from '../utils/getReposFromQueryStr'
-import {GitHubScopingSearchFilterMenuQuery} from '../__generated__/GitHubScopingSearchFilterMenuQuery.graphql'
 import GitHubRepoSearchFilterMenu from './GitHubRepoSearchFilterMenu'
 
 interface Props {
diff --git a/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx b/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx
index b8282b75508..c2fbf9b72eb 100644
--- a/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/GitHubScopingSearchFilterMenuRoot.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import {MenuProps} from '../hooks/useMenu'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import githubScopingSearchFilterMenuQuery, {
   GitHubScopingSearchFilterMenuQuery
 } from '../__generated__/GitHubScopingSearchFilterMenuQuery.graphql'
 import {GitHubScopingSearchFilterMenuRoot_meeting$key} from '../__generated__/GitHubScopingSearchFilterMenuRoot_meeting.graphql'
+import {MenuProps} from '../hooks/useMenu'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import GitHubScopingSearchFilterMenu from './GitHubScopingSearchFilterMenu'
 import MockFieldList from './MockFieldList'
 
diff --git a/packages/client/components/GitHubScopingSearchFilterToggle.tsx b/packages/client/components/GitHubScopingSearchFilterToggle.tsx
index b3512c66576..628522a6882 100644
--- a/packages/client/components/GitHubScopingSearchFilterToggle.tsx
+++ b/packages/client/components/GitHubScopingSearchFilterToggle.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {GitHubScopingSearchFilterToggle_meeting$key} from '../__generated__/GitHubScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import lazyPreload from '../utils/lazyPreload'
-import {GitHubScopingSearchFilterToggle_meeting$key} from '../__generated__/GitHubScopingSearchFilterToggle_meeting.graphql'
 import FilterButton from './FilterButton'
 
 const GitHubScopingSearchFilterMenuRoot = lazyPreload(
diff --git a/packages/client/components/GitHubScopingSearchHistoryToggle.tsx b/packages/client/components/GitHubScopingSearchHistoryToggle.tsx
index 32f010496c1..a88e6f124cb 100644
--- a/packages/client/components/GitHubScopingSearchHistoryToggle.tsx
+++ b/packages/client/components/GitHubScopingSearchHistoryToggle.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {GitHubScopingSearchHistoryToggle_meeting$key} from '../__generated__/GitHubScopingSearchHistoryToggle_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import PersistGitHubSearchQueryMutation from '../mutations/PersistGitHubSearchQueryMutation'
 import SearchQueryId from '../shared/gqlIds/SearchQueryId'
-import {GitHubScopingSearchHistoryToggle_meeting$key} from '../__generated__/GitHubScopingSearchHistoryToggle_meeting.graphql'
 import ScopingSearchHistoryToggle from './ScopingSearchHistoryToggle'
 
 interface Props {
diff --git a/packages/client/components/GitHubScopingSearchResults.tsx b/packages/client/components/GitHubScopingSearchResults.tsx
index 27b11d2ea0f..fa1535989f3 100644
--- a/packages/client/components/GitHubScopingSearchResults.tsx
+++ b/packages/client/components/GitHubScopingSearchResults.tsx
@@ -3,6 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
+import {GitHubScopingSearchResultsPaginationQuery} from '../__generated__/GitHubScopingSearchResultsPaginationQuery.graphql'
+import {GitHubScopingSearchResultsQuery} from '../__generated__/GitHubScopingSearchResultsQuery.graphql'
+import {GitHubScopingSearchResults_meeting$key} from '../__generated__/GitHubScopingSearchResults_meeting.graphql'
+import {GitHubScopingSearchResults_query$key} from '../__generated__/GitHubScopingSearchResults_query.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useGetUsedServiceTaskIds from '../hooks/useGetUsedServiceTaskIds'
 import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom'
@@ -12,10 +16,6 @@ import {SprintPokerDefaults} from '../types/constEnums'
 import {GQLType} from '../types/generics'
 import getNonNullEdges from '../utils/getNonNullEdges'
 import {gitHubQueryValidation} from '../validation/gitHubQueryValidation'
-import {GitHubScopingSearchResultsPaginationQuery} from '../__generated__/GitHubScopingSearchResultsPaginationQuery.graphql'
-import {GitHubScopingSearchResultsQuery} from '../__generated__/GitHubScopingSearchResultsQuery.graphql'
-import {GitHubScopingSearchResults_meeting$key} from '../__generated__/GitHubScopingSearchResults_meeting.graphql'
-import {GitHubScopingSearchResults_query$key} from '../__generated__/GitHubScopingSearchResults_query.graphql'
 import Ellipsis from './Ellipsis/Ellipsis'
 import GitHubScopingSelectAllIssues from './GitHubScopingSelectAllIssues'
 import IntegrationScopingNoResults from './IntegrationScopingNoResults'
diff --git a/packages/client/components/GitHubScopingSearchResultsRoot.tsx b/packages/client/components/GitHubScopingSearchResultsRoot.tsx
index ee82dd8c69f..633cc125899 100644
--- a/packages/client/components/GitHubScopingSearchResultsRoot.tsx
+++ b/packages/client/components/GitHubScopingSearchResultsRoot.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import githubScopingSearchResultsQuery, {
   GitHubScopingSearchResultsQuery
 } from '../__generated__/GitHubScopingSearchResultsQuery.graphql'
 import {GitHubScopingSearchResultsRoot_meeting$key} from '../__generated__/GitHubScopingSearchResultsRoot_meeting.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import GitHubScopingSearchResults from './GitHubScopingSearchResults'
 interface Props {
   meetingRef: GitHubScopingSearchResultsRoot_meeting$key
diff --git a/packages/client/components/GitHubScopingSelectAllIssues.tsx b/packages/client/components/GitHubScopingSelectAllIssues.tsx
index 2c9599eab2c..a7dd4f84321 100644
--- a/packages/client/components/GitHubScopingSelectAllIssues.tsx
+++ b/packages/client/components/GitHubScopingSelectAllIssues.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
+import {GitHubScopingSelectAllIssues_issues$key} from '../__generated__/GitHubScopingSelectAllIssues_issues.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
@@ -10,7 +11,6 @@ import GitHubIssueId from '../shared/gqlIds/GitHubIssueId'
 import {PALETTE} from '../styles/paletteV3'
 import {Threshold} from '../types/constEnums'
 import getSelectAllTitle from '../utils/getSelectAllTitle'
-import {GitHubScopingSelectAllIssues_issues$key} from '../__generated__/GitHubScopingSelectAllIssues_issues.graphql'
 import Checkbox from './Checkbox'
 const Item = styled('div')({
   display: 'flex',
diff --git a/packages/client/components/GitLabFieldDimensionDropdown.tsx b/packages/client/components/GitLabFieldDimensionDropdown.tsx
index 5d094055128..23d874bfb39 100644
--- a/packages/client/components/GitLabFieldDimensionDropdown.tsx
+++ b/packages/client/components/GitLabFieldDimensionDropdown.tsx
@@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
+import {GitLabFieldDimensionDropdown_stage$key} from '../__generated__/GitLabFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {SprintPokerDefaults} from '../types/constEnums'
-import {GitLabFieldDimensionDropdown_stage$key} from '../__generated__/GitLabFieldDimensionDropdown_stage.graphql'
 import GitLabFieldMenu from './GitLabFieldMenu'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/GitLabFieldMenu.tsx b/packages/client/components/GitLabFieldMenu.tsx
index f8de17601ad..0fbdbc20a93 100644
--- a/packages/client/components/GitLabFieldMenu.tsx
+++ b/packages/client/components/GitLabFieldMenu.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {GitLabFieldMenu_stage$key} from '../__generated__/GitLabFieldMenu_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import UpdateGitLabDimensionFieldMutation from '../mutations/UpdateGitLabDimensionFieldMutation'
 import {SprintPokerDefaults} from '../types/constEnums'
-import {GitLabFieldMenu_stage$key} from '../__generated__/GitLabFieldMenu_stage.graphql'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 
diff --git a/packages/client/components/GitLabScopingSearchFilterMenu.tsx b/packages/client/components/GitLabScopingSearchFilterMenu.tsx
index b77a1360a4f..ce418c7370d 100644
--- a/packages/client/components/GitLabScopingSearchFilterMenu.tsx
+++ b/packages/client/components/GitLabScopingSearchFilterMenu.tsx
@@ -3,12 +3,12 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {commitLocalUpdate, PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useSearchFilter from '~/hooks/useSearchFilter'
-import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import getNonNullEdges from '~/utils/getNonNullEdges'
+import SendClientSideEvent from '~/utils/SendClientSideEvent'
+import {GitLabScopingSearchFilterMenuQuery} from '../__generated__/GitLabScopingSearchFilterMenuQuery.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import SearchQueryId from '../shared/gqlIds/SearchQueryId'
-import {GitLabScopingSearchFilterMenuQuery} from '../__generated__/GitLabScopingSearchFilterMenuQuery.graphql'
 import Checkbox from './Checkbox'
 import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel'
 import Menu from './Menu'
diff --git a/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx b/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx
index 17cfa84668b..3206a7635fe 100644
--- a/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/GitLabScopingSearchFilterMenuRoot.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import {MenuProps} from '../hooks/useMenu'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import gitlabScopingSearchFilterMenuQuery, {
   GitLabScopingSearchFilterMenuQuery
 } from '../__generated__/GitLabScopingSearchFilterMenuQuery.graphql'
 import {GitLabScopingSearchFilterMenuRoot_meeting$key} from '../__generated__/GitLabScopingSearchFilterMenuRoot_meeting.graphql'
+import {MenuProps} from '../hooks/useMenu'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import GitLabScopingSearchFilterMenu from './GitLabScopingSearchFilterMenu'
 import MockFieldList from './MockFieldList'
 
diff --git a/packages/client/components/GitLabScopingSearchFilterToggle.tsx b/packages/client/components/GitLabScopingSearchFilterToggle.tsx
index 645a483ce58..edc62152e21 100644
--- a/packages/client/components/GitLabScopingSearchFilterToggle.tsx
+++ b/packages/client/components/GitLabScopingSearchFilterToggle.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {GitLabScopingSearchFilterToggle_meeting$key} from '../__generated__/GitLabScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import lazyPreload from '../utils/lazyPreload'
-import {GitLabScopingSearchFilterToggle_meeting$key} from '../__generated__/GitLabScopingSearchFilterToggle_meeting.graphql'
 import FilterButton from './FilterButton'
 
 const GitLabScopingSearchFilterMenuRoot = lazyPreload(
diff --git a/packages/client/components/GitLabScopingSearchResults.tsx b/packages/client/components/GitLabScopingSearchResults.tsx
index 2aeb35f7a57..814509d5ce5 100644
--- a/packages/client/components/GitLabScopingSearchResults.tsx
+++ b/packages/client/components/GitLabScopingSearchResults.tsx
@@ -5,13 +5,13 @@ import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} f
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import useLoadNextOnScrollBottom from '~/hooks/useLoadNextOnScrollBottom'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
-import GitLabIssueId from '../shared/gqlIds/GitLabIssueId'
-import getNonNullEdges from '../utils/getNonNullEdges'
-import {parseWebPath} from '../utils/parseWebPath'
 import {GitLabScopingSearchResultsPaginationQuery} from '../__generated__/GitLabScopingSearchResultsPaginationQuery.graphql'
 import {GitLabScopingSearchResultsQuery} from '../__generated__/GitLabScopingSearchResultsQuery.graphql'
 import {GitLabScopingSearchResults_meeting$key} from '../__generated__/GitLabScopingSearchResults_meeting.graphql'
 import {GitLabScopingSearchResults_query$key} from '../__generated__/GitLabScopingSearchResults_query.graphql'
+import GitLabIssueId from '../shared/gqlIds/GitLabIssueId'
+import getNonNullEdges from '../utils/getNonNullEdges'
+import {parseWebPath} from '../utils/parseWebPath'
 import Ellipsis from './Ellipsis/Ellipsis'
 import GitLabScopingSelectAllIssues from './GitLabScopingSelectAllIssues'
 import IntegrationScopingNoResults from './IntegrationScopingNoResults'
diff --git a/packages/client/components/GitLabScopingSearchResultsRoot.tsx b/packages/client/components/GitLabScopingSearchResultsRoot.tsx
index 4fe626203db..b7fbf59efed 100644
--- a/packages/client/components/GitLabScopingSearchResultsRoot.tsx
+++ b/packages/client/components/GitLabScopingSearchResultsRoot.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import gitlabScopingSearchResultsQuery, {
   GitLabScopingSearchResultsQuery
 } from '../__generated__/GitLabScopingSearchResultsQuery.graphql'
 import {GitLabScopingSearchResultsRoot_meeting$key} from '../__generated__/GitLabScopingSearchResultsRoot_meeting.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import GitLabScopingSearchResults from './GitLabScopingSearchResults'
 
 interface Props {
diff --git a/packages/client/components/GitLabScopingSelectAllIssues.tsx b/packages/client/components/GitLabScopingSelectAllIssues.tsx
index 1ad0082e02a..adb175f28a1 100644
--- a/packages/client/components/GitLabScopingSelectAllIssues.tsx
+++ b/packages/client/components/GitLabScopingSelectAllIssues.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
+import {GitLabScopingSelectAllIssues_issues$key} from '../__generated__/GitLabScopingSelectAllIssues_issues.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
@@ -10,7 +11,6 @@ import GitLabIssueId from '../shared/gqlIds/GitLabIssueId'
 import {PALETTE} from '../styles/paletteV3'
 import {Threshold} from '../types/constEnums'
 import getSelectAllTitle from '../utils/getSelectAllTitle'
-import {GitLabScopingSelectAllIssues_issues$key} from '../__generated__/GitLabScopingSelectAllIssues_issues.graphql'
 import Checkbox from './Checkbox'
 
 const Item = styled('div')({
diff --git a/packages/client/components/GoogleMeetProviderLogo.tsx b/packages/client/components/GoogleMeetProviderLogo.tsx
index 42d6bc7ec2d..f2bd53e8516 100644
--- a/packages/client/components/GoogleMeetProviderLogo.tsx
+++ b/packages/client/components/GoogleMeetProviderLogo.tsx
@@ -1,5 +1,5 @@
-import logo from '../styles/theme/images/graphics/google-meet-icon.svg'
 import React from 'react'
+import logo from '../styles/theme/images/graphics/google-meet-icon.svg'
 
 const GoogleMeetProviderLogo = () => {
   return (
diff --git a/packages/client/components/GroupingKanban.tsx b/packages/client/components/GroupingKanban.tsx
index 92bb79644cd..e827bfe45b0 100644
--- a/packages/client/components/GroupingKanban.tsx
+++ b/packages/client/components/GroupingKanban.tsx
@@ -3,8 +3,8 @@ import {captureException} from '@sentry/minimal'
 import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useEffect, useMemo, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
-import useCallbackRef from '~/hooks/useCallbackRef'
 import {GroupingKanban_meeting$key} from '~/__generated__/GroupingKanban_meeting.graphql'
+import useCallbackRef from '~/hooks/useCallbackRef'
 import useAnimatedSpotlightSource from '../hooks/useAnimatedSpotlightSource'
 import useBreakpoint from '../hooks/useBreakpoint'
 import useHideBodyScroll from '../hooks/useHideBodyScroll'
@@ -14,8 +14,8 @@ import useThrottledEvent from '../hooks/useThrottledEvent'
 import {Breakpoint, Times} from '../types/constEnums'
 import PortalProvider from './AtmosphereProvider/PortalProvider'
 import GroupingKanbanColumn from './GroupingKanbanColumn'
-import ReflectWrapperMobile from './RetroReflectPhase/ReflectionWrapperMobile'
 import ReflectWrapperDesktop from './RetroReflectPhase/ReflectWrapperDesktop'
+import ReflectWrapperMobile from './RetroReflectPhase/ReflectionWrapperMobile'
 import SpotlightModal from './SpotlightModal'
 
 interface Props {
diff --git a/packages/client/components/GroupingKanbanColumn.tsx b/packages/client/components/GroupingKanbanColumn.tsx
index 025e3bc5d0f..575496872bd 100644
--- a/packages/client/components/GroupingKanbanColumn.tsx
+++ b/packages/client/components/GroupingKanbanColumn.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {GroupingKanbanColumn_meeting$key} from '~/__generated__/GroupingKanbanColumn_meeting.graphql'
+import {GroupingKanbanColumn_prompt$key} from '~/__generated__/GroupingKanbanColumn_prompt.graphql'
+import {GroupingKanbanColumn_reflectionGroups$key} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql'
 import {useCoverable} from '~/hooks/useControlBarCovers'
 import useDeepEqual from '~/hooks/useDeepEqual'
 import useSubColumns from '~/hooks/useSubColumns'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
-import {GroupingKanbanColumn_meeting$key} from '~/__generated__/GroupingKanbanColumn_meeting.graphql'
-import {GroupingKanbanColumn_prompt$key} from '~/__generated__/GroupingKanbanColumn_prompt.graphql'
-import {GroupingKanbanColumn_reflectionGroups$key} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import CreateReflectionMutation from '../mutations/CreateReflectionMutation'
diff --git a/packages/client/components/IconLabel.tsx b/packages/client/components/IconLabel.tsx
index f1b9fe2ba5e..86025cb37c5 100644
--- a/packages/client/components/IconLabel.tsx
+++ b/packages/client/components/IconLabel.tsx
@@ -27,7 +27,7 @@ import {
   WebAsset,
   Widgets
 } from '@mui/icons-material'
-import React, {forwardRef, ReactNode} from 'react'
+import React, {ReactNode, forwardRef} from 'react'
 
 const LabelBlock = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/components/Insights.tsx b/packages/client/components/Insights.tsx
index fd2eb806331..b316c6d8995 100644
--- a/packages/client/components/Insights.tsx
+++ b/packages/client/components/Insights.tsx
@@ -4,8 +4,8 @@ import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import SendClientSideEvent from '~/utils/SendClientSideEvent'
-import {Elevation} from '../styles/elevation'
 import {InsightsQuery} from '../__generated__/InsightsQuery.graphql'
+import {Elevation} from '../styles/elevation'
 import InsightsCharts from './InsightsCharts'
 import InsightsDomainPanel from './InsightsDomainPanel'
 import Panel from './Panel/Panel'
diff --git a/packages/client/components/InsightsCharts.tsx b/packages/client/components/InsightsCharts.tsx
index 1427e8ab5f3..9f3344de22b 100644
--- a/packages/client/components/InsightsCharts.tsx
+++ b/packages/client/components/InsightsCharts.tsx
@@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro'
 import {
   BarElement,
   CategoryScale,
-  Chart as ChartJS,
   ChartData,
   ChartDataset,
+  Chart as ChartJS,
   ChartOptions,
   Filler,
   Legend,
-  LinearScale,
   LineElement,
+  LinearScale,
   PointElement,
   SubTitle,
   TimeScale,
@@ -23,14 +23,14 @@ import 'chartjs-adapter-dayjs-3'
 import React, {useMemo} from 'react'
 import {Bar, Line} from 'react-chartjs-2'
 import {useFragment} from 'react-relay'
-import {Elevation} from '../styles/elevation'
-import {PALETTE} from '../styles/paletteV3'
-import {FONT_FAMILY} from '../styles/typographyV2'
-import {ElementWidth} from '../types/constEnums'
 import {
   InsightsCharts_domain$key,
   MeetingTypeEnum
 } from '../__generated__/InsightsCharts_domain.graphql'
+import {Elevation} from '../styles/elevation'
+import {PALETTE} from '../styles/paletteV3'
+import {FONT_FAMILY} from '../styles/typographyV2'
+import {ElementWidth} from '../types/constEnums'
 
 ChartJS.register(
   BarElement,
diff --git a/packages/client/components/InsightsDomainNudge.tsx b/packages/client/components/InsightsDomainNudge.tsx
index 6e8c33a69c4..8256f31f4f2 100644
--- a/packages/client/components/InsightsDomainNudge.tsx
+++ b/packages/client/components/InsightsDomainNudge.tsx
@@ -5,12 +5,12 @@ import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import SendClientSideEvent from '~/utils/SendClientSideEvent'
+import {InsightsDomainNudge_domain$key} from '../__generated__/InsightsDomainNudge_domain.graphql'
 import useModal from '../hooks/useModal'
 import CreditCardModal from '../modules/userDashboard/components/CreditCardModal/CreditCardModal'
 import {PALETTE} from '../styles/paletteV3'
-import {InsightsDomainNudge_domain$key} from '../__generated__/InsightsDomainNudge_domain.graphql'
-import PrimaryButton from './PrimaryButton'
 import LimitExceededWarning from './LimitExceededWarning'
+import PrimaryButton from './PrimaryButton'
 
 const NudgeBlock = styled('div')({
   display: 'flex',
diff --git a/packages/client/components/InsightsDomainPanel.tsx b/packages/client/components/InsightsDomainPanel.tsx
index 0a4aa68b309..b612cc56a46 100644
--- a/packages/client/components/InsightsDomainPanel.tsx
+++ b/packages/client/components/InsightsDomainPanel.tsx
@@ -3,6 +3,7 @@ import {Info} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {InsightsDomainPanel_domain$key} from '../__generated__/InsightsDomainPanel_domain.graphql'
 import useBreakpoint from '../hooks/useBreakpoint'
 import {MenuPosition} from '../hooks/useCoords'
 import useTooltip from '../hooks/useTooltip'
@@ -10,7 +11,6 @@ import {Elevation} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
 import {Breakpoint} from '../types/constEnums'
 import plural from '../utils/plural'
-import {InsightsDomainPanel_domain$key} from '../__generated__/InsightsDomainPanel_domain.graphql'
 import InsightsDomainNudge from './InsightsDomainNudge'
 import Panel from './Panel/Panel'
 
diff --git a/packages/client/components/InsightsRoot.tsx b/packages/client/components/InsightsRoot.tsx
index 9fcf5b3f9cf..70a1e4f7d2f 100644
--- a/packages/client/components/InsightsRoot.tsx
+++ b/packages/client/components/InsightsRoot.tsx
@@ -1,6 +1,6 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import insightsQuery, {InsightsQuery} from '../__generated__/InsightsQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import Insights from './Insights'
 
 const InsightsRoot = () => {
diff --git a/packages/client/components/InvitationLinkDialog.tsx b/packages/client/components/InvitationLinkDialog.tsx
index 98059adbc17..55755069b6d 100644
--- a/packages/client/components/InvitationLinkDialog.tsx
+++ b/packages/client/components/InvitationLinkDialog.tsx
@@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
+import {InvitationLinkDialog_massInvitation$key} from '../__generated__/InvitationLinkDialog_massInvitation.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useRouter from '../hooks/useRouter'
 import {LocalStorageKey} from '../types/constEnums'
-import {InvitationLinkDialog_massInvitation$key} from '../__generated__/InvitationLinkDialog_massInvitation.graphql'
 import InvitationLinkAuthentication from './InvitationLinkAuthentication'
 import InvitationLinkErrorExpired from './InvitationLinkErrorExpired'
 import TeamInvitationAccept from './TeamInvitationAccept'
diff --git a/packages/client/components/InvitationLinkErrorExpired.tsx b/packages/client/components/InvitationLinkErrorExpired.tsx
index 95dee14f41c..b0dc095cc1e 100644
--- a/packages/client/components/InvitationLinkErrorExpired.tsx
+++ b/packages/client/components/InvitationLinkErrorExpired.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {InvitationLinkErrorExpired_massInvitation$key} from '../__generated__/InvitationLinkErrorExpired_massInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import useRouter from '../hooks/useRouter'
 import hasToken from '../utils/hasToken'
-import {InvitationLinkErrorExpired_massInvitation$key} from '../__generated__/InvitationLinkErrorExpired_massInvitation.graphql'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import FlatPrimaryButton from './FlatPrimaryButton'
diff --git a/packages/client/components/InviteTeamMemberAvatar.tsx b/packages/client/components/InviteTeamMemberAvatar.tsx
index 210a9df7e77..028f6303716 100644
--- a/packages/client/components/InviteTeamMemberAvatar.tsx
+++ b/packages/client/components/InviteTeamMemberAvatar.tsx
@@ -4,8 +4,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
-import useModal from '../hooks/useModal'
 import {InviteTeamMemberAvatar_teamMembers$key} from '../__generated__/InviteTeamMemberAvatar_teamMembers.graphql'
+import useModal from '../hooks/useModal'
 import AddTeamMemberModal from './AddTeamMemberModal'
 
 const Label = styled('div')({
diff --git a/packages/client/components/JiraFieldDimensionDropdown.tsx b/packages/client/components/JiraFieldDimensionDropdown.tsx
index bebcc387482..d1e464823ad 100644
--- a/packages/client/components/JiraFieldDimensionDropdown.tsx
+++ b/packages/client/components/JiraFieldDimensionDropdown.tsx
@@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
+import {JiraFieldDimensionDropdown_stage$key} from '../__generated__/JiraFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {SprintPokerDefaults} from '../types/constEnums'
-import {JiraFieldDimensionDropdown_stage$key} from '../__generated__/JiraFieldDimensionDropdown_stage.graphql'
 import JiraFieldMenu from './JiraFieldMenu'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/JiraFieldMenu.tsx b/packages/client/components/JiraFieldMenu.tsx
index 7c1cd5b86a9..b2b6c3fef32 100644
--- a/packages/client/components/JiraFieldMenu.tsx
+++ b/packages/client/components/JiraFieldMenu.tsx
@@ -3,13 +3,13 @@ import {OpenInNew} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {JiraFieldMenu_stage$key} from '../__generated__/JiraFieldMenu_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import UpdateJiraDimensionFieldMutation from '../mutations/UpdateJiraDimensionFieldMutation'
 import {PALETTE} from '../styles/paletteV3'
 import {ExternalLinks, SprintPokerDefaults} from '../types/constEnums'
-import {JiraFieldMenu_stage$key} from '../__generated__/JiraFieldMenu_stage.graphql'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 import MenuItemHR from './MenuItemHR'
diff --git a/packages/client/components/JiraScopingSearchCurrentFilters.tsx b/packages/client/components/JiraScopingSearchCurrentFilters.tsx
index bf0aac0f84a..d04ecfe050b 100644
--- a/packages/client/components/JiraScopingSearchCurrentFilters.tsx
+++ b/packages/client/components/JiraScopingSearchCurrentFilters.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '../styles/paletteV3'
 import {JiraScopingSearchCurrentFilters_meeting$key} from '../__generated__/JiraScopingSearchCurrentFilters_meeting.graphql'
+import {PALETTE} from '../styles/paletteV3'
 
 const Wrapper = styled('div')({
   width: '100%',
diff --git a/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx b/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx
index a37f7260d55..f6a5bceb690 100644
--- a/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/JiraScopingSearchFilterMenuRoot.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
-import {MenuProps} from '../hooks/useMenu'
 import {JiraScopingSearchFilterMenuRootQuery} from '../__generated__/JiraScopingSearchFilterMenuRootQuery.graphql'
+import {MenuProps} from '../hooks/useMenu'
 import JiraScopingSearchFilterMenu from './JiraScopingSearchFilterMenu'
 
 const query = graphql`
diff --git a/packages/client/components/JiraScopingSearchFilterToggle.tsx b/packages/client/components/JiraScopingSearchFilterToggle.tsx
index 31b331b548a..35c2ee567db 100644
--- a/packages/client/components/JiraScopingSearchFilterToggle.tsx
+++ b/packages/client/components/JiraScopingSearchFilterToggle.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {JiraScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import lazyPreload from '../utils/lazyPreload'
-import {JiraScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraScopingSearchFilterToggle_meeting.graphql'
 import FilterButton from './FilterButton'
 
 const JiraScopingSearchFilterMenuRoot = lazyPreload(
diff --git a/packages/client/components/JiraScopingSearchResults.tsx b/packages/client/components/JiraScopingSearchResults.tsx
index d0ebffff5ac..23aa7e914d9 100644
--- a/packages/client/components/JiraScopingSearchResults.tsx
+++ b/packages/client/components/JiraScopingSearchResults.tsx
@@ -1,12 +1,12 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
-import {useFragment, PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
-import useAtmosphere from '../hooks/useAtmosphere'
-import PersistJiraSearchQueryMutation from '../mutations/PersistJiraSearchQueryMutation'
 import {JiraScopingSearchResultsQuery} from '../__generated__/JiraScopingSearchResultsQuery.graphql'
 import {JiraScopingSearchResults_meeting$key} from '../__generated__/JiraScopingSearchResults_meeting.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import PersistJiraSearchQueryMutation from '../mutations/PersistJiraSearchQueryMutation'
 import IntegrationScopingNoResults from './IntegrationScopingNoResults'
 import JiraScopingSelectAllIssues from './JiraScopingSelectAllIssues'
 import NewIntegrationRecordButton from './NewIntegrationRecordButton'
diff --git a/packages/client/components/JiraScopingSearchResultsRoot.tsx b/packages/client/components/JiraScopingSearchResultsRoot.tsx
index 52e7a4a86d8..640d792ed18 100644
--- a/packages/client/components/JiraScopingSearchResultsRoot.tsx
+++ b/packages/client/components/JiraScopingSearchResultsRoot.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import jiraScopingSearchResultsQuery, {
   JiraScopingSearchResultsQuery
 } from '../__generated__/JiraScopingSearchResultsQuery.graphql'
 import {JiraScopingSearchResultsRoot_meeting$key} from '../__generated__/JiraScopingSearchResultsRoot_meeting.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import ErrorBoundary from './ErrorBoundary'
 import JiraScopingSearchResults from './JiraScopingSearchResults'
 
diff --git a/packages/client/components/JiraScopingSelectAllIssues.tsx b/packages/client/components/JiraScopingSelectAllIssues.tsx
index bbba141580e..ade3b46aa16 100644
--- a/packages/client/components/JiraScopingSelectAllIssues.tsx
+++ b/packages/client/components/JiraScopingSelectAllIssues.tsx
@@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
+import {JiraScopingSelectAllIssues_issues$key} from '../__generated__/JiraScopingSelectAllIssues_issues.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
 import {PALETTE} from '../styles/paletteV3'
 import {Threshold} from '../types/constEnums'
 import getSelectAllTitle from '../utils/getSelectAllTitle'
-import {JiraScopingSelectAllIssues_issues$key} from '../__generated__/JiraScopingSelectAllIssues_issues.graphql'
 import Checkbox from './Checkbox'
 
 const Item = styled('div')({
diff --git a/packages/client/components/JiraServerFieldDimensionDropdown.tsx b/packages/client/components/JiraServerFieldDimensionDropdown.tsx
index abeb881c8bf..1c2315517d1 100644
--- a/packages/client/components/JiraServerFieldDimensionDropdown.tsx
+++ b/packages/client/components/JiraServerFieldDimensionDropdown.tsx
@@ -3,11 +3,11 @@ import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {JiraServerFieldDimensionDropdown_stage$key} from '../__generated__/JiraServerFieldDimensionDropdown_stage.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {PALETTE} from '../styles/paletteV3'
 import {SprintPokerDefaults} from '../types/constEnums'
-import {JiraServerFieldDimensionDropdown_stage$key} from '../__generated__/JiraServerFieldDimensionDropdown_stage.graphql'
 import JiraServerFieldMenu from './JiraServerFieldMenu'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/JiraServerFieldMenu.tsx b/packages/client/components/JiraServerFieldMenu.tsx
index 890a42da3cc..ec14af8f755 100644
--- a/packages/client/components/JiraServerFieldMenu.tsx
+++ b/packages/client/components/JiraServerFieldMenu.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
+import {JiraServerFieldMenu_stage$key} from '../__generated__/JiraServerFieldMenu_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import UpdateJiraServerDimensionFieldMutation from '../mutations/UpdateJiraServerDimensionFieldMutation'
 import {SprintPokerDefaults} from '../types/constEnums'
-import {JiraServerFieldMenu_stage$key} from '../__generated__/JiraServerFieldMenu_stage.graphql'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 import MenuItemHR from './MenuItemHR'
diff --git a/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx b/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx
index ece8b0fc04b..05937171331 100644
--- a/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx
+++ b/packages/client/components/JiraServerScopingSearchFilterMenuRoot.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useLazyLoadQuery} from 'react-relay'
-import {MenuProps} from '../hooks/useMenu'
 import {JiraServerScopingSearchFilterMenuRootQuery} from '../__generated__/JiraServerScopingSearchFilterMenuRootQuery.graphql'
+import {MenuProps} from '../hooks/useMenu'
 import JiraScopingSearchFilterMenu from './JiraScopingSearchFilterMenu'
 
 const query = graphql`
diff --git a/packages/client/components/JiraServerScopingSearchFilterToggle.tsx b/packages/client/components/JiraServerScopingSearchFilterToggle.tsx
index 434ec2a7534..35f85ef0944 100644
--- a/packages/client/components/JiraServerScopingSearchFilterToggle.tsx
+++ b/packages/client/components/JiraServerScopingSearchFilterToggle.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {JiraServerScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraServerScopingSearchFilterToggle_meeting.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import lazyPreload from '../utils/lazyPreload'
-import {JiraServerScopingSearchFilterToggle_meeting$key} from '../__generated__/JiraServerScopingSearchFilterToggle_meeting.graphql'
 import FilterButton from './FilterButton'
 
 const JiraServerScopingSearchFilterMenuRoot = lazyPreload(
diff --git a/packages/client/components/JiraServerScopingSearchResults.tsx b/packages/client/components/JiraServerScopingSearchResults.tsx
index a324a9cf1ab..cbb680f5ca3 100644
--- a/packages/client/components/JiraServerScopingSearchResults.tsx
+++ b/packages/client/components/JiraServerScopingSearchResults.tsx
@@ -4,13 +4,13 @@ import React, {useState} from 'react'
 import {PreloadedQuery, useFragment, usePaginationFragment, usePreloadedQuery} from 'react-relay'
 import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom'
-import PersistJiraServerSearchQueryMutation from '../mutations/PersistJiraServerSearchQueryMutation'
 import {JiraServerScopingSearchResultsPaginationQuery} from '../__generated__/JiraServerScopingSearchResultsPaginationQuery.graphql'
 import {JiraServerScopingSearchResultsQuery} from '../__generated__/JiraServerScopingSearchResultsQuery.graphql'
 import {JiraServerScopingSearchResults_meeting$key} from '../__generated__/JiraServerScopingSearchResults_meeting.graphql'
 import {JiraServerScopingSearchResults_query$key} from '../__generated__/JiraServerScopingSearchResults_query.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom'
+import PersistJiraServerSearchQueryMutation from '../mutations/PersistJiraServerSearchQueryMutation'
 import Ellipsis from './Ellipsis/Ellipsis'
 import IntegrationScopingNoResults from './IntegrationScopingNoResults'
 import NewIntegrationRecordButton from './NewIntegrationRecordButton'
diff --git a/packages/client/components/JiraServerScopingSearchResultsRoot.tsx b/packages/client/components/JiraServerScopingSearchResultsRoot.tsx
index 847e501c55f..5c0bfe0cc8d 100644
--- a/packages/client/components/JiraServerScopingSearchResultsRoot.tsx
+++ b/packages/client/components/JiraServerScopingSearchResultsRoot.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import MockScopingList from '~/modules/meeting/components/MockScopingList'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import jiraServerScopingSearchResultsQuery, {
   JiraServerScopingSearchResultsQuery
 } from '../__generated__/JiraServerScopingSearchResultsQuery.graphql'
 import {JiraServerScopingSearchResultsRoot_meeting$key} from '../__generated__/JiraServerScopingSearchResultsRoot_meeting.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import JiraServerScopingSearchResults from './JiraServerScopingSearchResults'
 
 interface Props {
diff --git a/packages/client/components/KudosReceivedNotification.tsx b/packages/client/components/KudosReceivedNotification.tsx
index a9cc11ba396..8215f304e6b 100644
--- a/packages/client/components/KudosReceivedNotification.tsx
+++ b/packages/client/components/KudosReceivedNotification.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
-import {Link} from 'react-router-dom'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
+import {Link} from 'react-router-dom'
 import {KudosReceivedNotification_notification$key} from '~/__generated__/KudosReceivedNotification_notification.graphql'
-import NotificationTemplate from './NotificationTemplate'
 import useAtmosphere from '../hooks/useAtmosphere'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
+import NotificationTemplate from './NotificationTemplate'
 
 interface Props {
   notification: KudosReceivedNotification_notification$key
diff --git a/packages/client/components/LimitExceededWarning.tsx b/packages/client/components/LimitExceededWarning.tsx
index 4dfa1285be4..e52bc3b6d8a 100644
--- a/packages/client/components/LimitExceededWarning.tsx
+++ b/packages/client/components/LimitExceededWarning.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {LimitExceededWarning_organization$key} from '../__generated__/LimitExceededWarning_organization.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import {Threshold} from '../types/constEnums'
 import relativeDate from '../utils/date/relativeDate'
-import {LimitExceededWarning_organization$key} from '../__generated__/LimitExceededWarning_organization.graphql'
 
 const WarningMsg = styled('div')({
   background: PALETTE.GOLD_100,
diff --git a/packages/client/components/MassInvitationTokenLink.tsx b/packages/client/components/MassInvitationTokenLink.tsx
index 92c3ff1f04a..235f8aca58a 100644
--- a/packages/client/components/MassInvitationTokenLink.tsx
+++ b/packages/client/components/MassInvitationTokenLink.tsx
@@ -5,13 +5,13 @@ import React, {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import CreateMassInvitationMutation from '~/mutations/CreateMassInvitationMutation'
+import {MassInvitationTokenLinkQuery} from '../__generated__/MassInvitationTokenLinkQuery.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import CopyShortLink from '../modules/meeting/components/CopyShortLink/CopyShortLink'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {PALETTE} from '../styles/paletteV3'
 import {Threshold} from '../types/constEnums'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import getMassInvitationUrl from '../utils/getMassInvitationUrl'
-import {MassInvitationTokenLinkQuery} from '../__generated__/MassInvitationTokenLinkQuery.graphql'
 
 const StyledCopyShortLink = styled(CopyShortLink)({
   borderRadius: 4,
diff --git a/packages/client/components/MassInvitationTokenLinkRoot.tsx b/packages/client/components/MassInvitationTokenLinkRoot.tsx
index a41250451fc..9d82a7160f3 100644
--- a/packages/client/components/MassInvitationTokenLinkRoot.tsx
+++ b/packages/client/components/MassInvitationTokenLinkRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import massInvitationTokenLinkQuery, {
   MassInvitationTokenLinkQuery
 } from '../__generated__/MassInvitationTokenLinkQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import MassInvitationTokenLink from './MassInvitationTokenLink'
 
 interface Props {
diff --git a/packages/client/components/MeetingCard.tsx b/packages/client/components/MeetingCard.tsx
index e68a61dfc90..52cbfc61416 100644
--- a/packages/client/components/MeetingCard.tsx
+++ b/packages/client/components/MeetingCard.tsx
@@ -1,6 +1,7 @@
 import styled from '@emotion/styled'
 import * as Sentry from '@sentry/browser'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
@@ -8,11 +9,13 @@ import action from '../../../static/images/illustrations/action.png'
 import retrospective from '../../../static/images/illustrations/retrospective.png'
 import poker from '../../../static/images/illustrations/sprintPoker.png'
 import teamPrompt from '../../../static/images/illustrations/teamPrompt.png'
+import {MeetingCard_meeting$key} from '../__generated__/MeetingCard_meeting.graphql'
 import useAnimatedCard from '../hooks/useAnimatedCard'
 import useBreakpoint from '../hooks/useBreakpoint'
 import {MenuPosition} from '../hooks/useCoords'
 import useMeetingMemberAvatars from '../hooks/useMeetingMemberAvatars'
 import useMenu from '../hooks/useMenu'
+import useModal from '../hooks/useModal'
 import useTooltip from '../hooks/useTooltip'
 import {TransitionStatus} from '../hooks/useTransition'
 import {Elevation} from '../styles/elevation'
@@ -20,15 +23,12 @@ import {PALETTE} from '../styles/paletteV3'
 import {BezierCurve, Breakpoint, Card, ElementWidth} from '../types/constEnums'
 import getMeetingPhase from '../utils/getMeetingPhase'
 import {phaseLabelLookup} from '../utils/meetings/lookups'
-import {MeetingCard_meeting$key} from '../__generated__/MeetingCard_meeting.graphql'
 import AvatarList from './AvatarList'
 import CardButton from './CardButton'
 import IconLabel from './IconLabel'
 import MeetingCardOptionsMenuRoot from './MeetingCardOptionsMenuRoot'
-import useModal from '../hooks/useModal'
 import {EndRecurringMeetingModal} from './Recurrence/EndRecurringMeetingModal'
 import {UpdateRecurrenceSettingsModal} from './Recurrence/UpdateRecurrenceSettingsModal'
-import clsx from 'clsx'
 
 const CardWrapper = styled('div')<{
   maybeTabletPlus: boolean
diff --git a/packages/client/components/MeetingCardOptionsMenu.tsx b/packages/client/components/MeetingCardOptionsMenu.tsx
index a8e64c969f4..1937602413f 100644
--- a/packages/client/components/MeetingCardOptionsMenu.tsx
+++ b/packages/client/components/MeetingCardOptionsMenu.tsx
@@ -11,12 +11,12 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import useRouter from '~/hooks/useRouter'
+import {MeetingCardOptionsMenuQuery} from '../__generated__/MeetingCardOptionsMenuQuery.graphql'
 import {MenuProps} from '../hooks/useMenu'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {PALETTE} from '../styles/paletteV3'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import getMassInvitationUrl from '../utils/getMassInvitationUrl'
 import makeAppURL from '../utils/makeAppURL'
-import {MeetingCardOptionsMenuQuery} from '../__generated__/MeetingCardOptionsMenuQuery.graphql'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 import {MenuItemLabelStyle} from './MenuItemLabel'
diff --git a/packages/client/components/MeetingCardOptionsMenuRoot.tsx b/packages/client/components/MeetingCardOptionsMenuRoot.tsx
index e38c53b8163..379734f6603 100644
--- a/packages/client/components/MeetingCardOptionsMenuRoot.tsx
+++ b/packages/client/components/MeetingCardOptionsMenuRoot.tsx
@@ -1,9 +1,9 @@
 import React, {Suspense} from 'react'
-import {MenuProps} from '../hooks/useMenu'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import meetingCardOptionsMenuQuery, {
   MeetingCardOptionsMenuQuery
 } from '../__generated__/MeetingCardOptionsMenuQuery.graphql'
+import {MenuProps} from '../hooks/useMenu'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import MeetingCardOptionsMenu from './MeetingCardOptionsMenu'
 
 interface Props {
diff --git a/packages/client/components/MeetingControlBar.tsx b/packages/client/components/MeetingControlBar.tsx
index 9453836abb7..59f4d98bffa 100644
--- a/packages/client/components/MeetingControlBar.tsx
+++ b/packages/client/components/MeetingControlBar.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {MeetingControlBar_meeting$key} from '~/__generated__/MeetingControlBar_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {useCovering} from '~/hooks/useControlBarCovers'
@@ -15,10 +16,9 @@ import {PALETTE} from '~/styles/paletteV3'
 import {BezierCurve, Breakpoint, ElementWidth, ZIndex} from '~/types/constEnums'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
 import findStageAfterId from '~/utils/meetings/findStageAfterId'
-import {MeetingControlBar_meeting$key} from '~/__generated__/MeetingControlBar_meeting.graphql'
+import {NewMeetingPhaseTypeEnum} from '../__generated__/MeetingControlBar_meeting.graphql'
 import useClickConfirmation from '../hooks/useClickConfirmation'
 import {bottomBarShadow, desktopBarShadow} from '../styles/elevation'
-import {NewMeetingPhaseTypeEnum} from '../__generated__/MeetingControlBar_meeting.graphql'
 import BottomControlBarReady from './BottomControlBarReady'
 import BottomControlBarRejoin from './BottomControlBarRejoin'
 import BottomControlBarTips from './BottomControlBarTips'
diff --git a/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx b/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx
index af76ab6ba2a..09127c5d22d 100644
--- a/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx
+++ b/packages/client/components/MeetingHelp/TeamHealthHelpMenu.tsx
@@ -1,12 +1,12 @@
-import React, {forwardRef} from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import React, {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
+import {TeamHealthHelpMenu_stage$key} from '~/__generated__/TeamHealthHelpMenu_stage.graphql'
 import useClientSideTrack from '../../hooks/useClientSideTrack'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
 import HelpMenuContent from './HelpMenuContent'
 import HelpMenuCopy from './HelpMenuCopy'
 import HelpMenuHeader from './HelpMenuHeader'
-import {TeamHealthHelpMenu_stage$key} from '~/__generated__/TeamHealthHelpMenu_stage.graphql'
 
 interface Props {
   stageRef: TeamHealthHelpMenu_stage$key
diff --git a/packages/client/components/MeetingLockedOverlay.tsx b/packages/client/components/MeetingLockedOverlay.tsx
index 362423a6fb2..cf35d279cea 100644
--- a/packages/client/components/MeetingLockedOverlay.tsx
+++ b/packages/client/components/MeetingLockedOverlay.tsx
@@ -6,10 +6,10 @@ import {useFragment} from 'react-relay'
 import {MeetingLockedOverlay_meeting$key} from '~/__generated__/MeetingLockedOverlay_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useRouter from '../hooks/useRouter'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {modalShadow} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
 import {Radius} from '../types/constEnums'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import PrimaryButton from './PrimaryButton'
 
 interface Props {
diff --git a/packages/client/components/MeetingOptions.tsx b/packages/client/components/MeetingOptions.tsx
index 0c39571d8d7..17fef02c6c3 100644
--- a/packages/client/components/MeetingOptions.tsx
+++ b/packages/client/components/MeetingOptions.tsx
@@ -1,12 +1,12 @@
+import SwapHorizIcon from '@mui/icons-material/SwapHoriz'
 import React, {useState} from 'react'
-import IconLabel from './IconLabel'
 import {Menu} from '../ui/Menu/Menu'
 import {MenuItem} from '../ui/Menu/MenuItem'
-import SwapHorizIcon from '@mui/icons-material/SwapHoriz'
-import {OptionsButton} from './TeamPrompt/TeamPromptOptions'
 import {Tooltip} from '../ui/Tooltip/Tooltip'
-import {TooltipTrigger} from '../ui/Tooltip/TooltipTrigger'
 import {TooltipContent} from '../ui/Tooltip/TooltipContent'
+import {TooltipTrigger} from '../ui/Tooltip/TooltipTrigger'
+import IconLabel from './IconLabel'
+import {OptionsButton} from './TeamPrompt/TeamPromptOptions'
 
 type Props = {
   setShowDrawer: (showDrawer: boolean) => void
diff --git a/packages/client/components/MeetingRoot.tsx b/packages/client/components/MeetingRoot.tsx
index 5e3db73d2c4..a545a877fff 100644
--- a/packages/client/components/MeetingRoot.tsx
+++ b/packages/client/components/MeetingRoot.tsx
@@ -1,9 +1,9 @@
 import React, {Suspense, useEffect} from 'react'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
-import useRouter from '../hooks/useRouter'
 import meetingSelectorQuery, {
   MeetingSelectorQuery
 } from '../__generated__/MeetingSelectorQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import useRouter from '../hooks/useRouter'
 import MeetingSelector from './MeetingSelector'
 
 const MeetingRoot = () => {
diff --git a/packages/client/components/MeetingSelector.tsx b/packages/client/components/MeetingSelector.tsx
index b313a081927..f7913daba10 100644
--- a/packages/client/components/MeetingSelector.tsx
+++ b/packages/client/components/MeetingSelector.tsx
@@ -1,16 +1,16 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
-import {Redirect} from 'react-router'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {Redirect} from 'react-router'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import SetAppLocationMutation from '~/mutations/SetAppLocationMutation'
+import {MeetingSelectorQuery} from '../__generated__/MeetingSelectorQuery.graphql'
 import useSubscription from '../hooks/useSubscription'
 import NotificationSubscription from '../subscriptions/NotificationSubscription'
 import OrganizationSubscription from '../subscriptions/OrganizationSubscription'
 import TaskSubscription from '../subscriptions/TaskSubscription'
 import TeamSubscription from '../subscriptions/TeamSubscription'
 import lazyPreload from '../utils/lazyPreload'
-import {MeetingSelectorQuery} from '../__generated__/MeetingSelectorQuery.graphql'
 
 interface Props {
   meetingId: string
diff --git a/packages/client/components/MeetingSeriesRoot.tsx b/packages/client/components/MeetingSeriesRoot.tsx
index 7c2c1b0c8f6..00a8c5b3fce 100644
--- a/packages/client/components/MeetingSeriesRoot.tsx
+++ b/packages/client/components/MeetingSeriesRoot.tsx
@@ -1,10 +1,10 @@
 import React, {Suspense} from 'react'
 import {Redirect} from 'react-router'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
-import useRouter from '../hooks/useRouter'
 import meetingSeriesRedirectorQuery, {
   MeetingSeriesRedirectorQuery
 } from '../__generated__/MeetingSeriesRedirectorQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import useRouter from '../hooks/useRouter'
 import MeetingSeriesRedirector from './MeetingSeriesRedirector'
 
 const MeetingRoot = () => {
diff --git a/packages/client/components/MeetingStageTimeLimitEnd.tsx b/packages/client/components/MeetingStageTimeLimitEnd.tsx
index 16757c6580a..e4a431fcab9 100644
--- a/packages/client/components/MeetingStageTimeLimitEnd.tsx
+++ b/packages/client/components/MeetingStageTimeLimitEnd.tsx
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
-import useRouter from '../hooks/useRouter'
 import {MeetingStageTimeLimitEnd_notification$key} from '../__generated__/MeetingStageTimeLimitEnd_notification.graphql'
+import useRouter from '../hooks/useRouter'
 import NotificationTemplate from './NotificationTemplate'
 
 interface Props {
diff --git a/packages/client/components/MeetingTopBar.tsx b/packages/client/components/MeetingTopBar.tsx
index 287a53012b4..f8768749365 100644
--- a/packages/client/components/MeetingTopBar.tsx
+++ b/packages/client/components/MeetingTopBar.tsx
@@ -8,8 +8,8 @@ import isDemoRoute from '../utils/isDemoRoute'
 import makeMinWidthMediaQuery from '../utils/makeMinWidthMediaQuery'
 import DemoCreateAccountButton from './DemoCreateAccountButton'
 import PlainButton from './PlainButton/PlainButton'
-import SidebarToggle from './SidebarToggle'
 import RetroDrawerRoot from './RetroDrawerRoot'
+import SidebarToggle from './SidebarToggle'
 
 const localHeaderBreakpoint = makeMinWidthMediaQuery(600)
 
diff --git a/packages/client/components/MeetingsDash.tsx b/packages/client/components/MeetingsDash.tsx
index e92e3c5db81..7faf932e1b6 100644
--- a/packages/client/components/MeetingsDash.tsx
+++ b/packages/client/components/MeetingsDash.tsx
@@ -3,20 +3,20 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingsDash_viewer$key} from '~/__generated__/MeetingsDash_viewer.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
 import useBreakpoint from '../hooks/useBreakpoint'
 import useCardsPerRow from '../hooks/useCardsPerRow'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import useTransition from '../hooks/useTransition'
 import {Breakpoint, EmptyMeetingViewMessage, Layout} from '../types/constEnums'
 import getSafeRegex from '../utils/getSafeRegex'
+import {useQueryParameterParser} from '../utils/useQueryParameterParser'
 import DemoMeetingCard from './DemoMeetingCard'
 import MeetingCard from './MeetingCard'
 import MeetingsDashEmpty from './MeetingsDashEmpty'
 import MeetingsDashHeader from './MeetingsDashHeader'
 import StartMeetingFAB from './StartMeetingFAB'
 import TutorialMeetingCard from './TutorialMeetingCard'
-import {useQueryParameterParser} from '../utils/useQueryParameterParser'
-import useAtmosphere from '../hooks/useAtmosphere'
 
 interface Props {
   meetingsDashRef: RefObject<HTMLDivElement>
diff --git a/packages/client/components/MeetingsDashEmpty.tsx b/packages/client/components/MeetingsDashEmpty.tsx
index 6fcb45cf877..617e9588b3b 100644
--- a/packages/client/components/MeetingsDashEmpty.tsx
+++ b/packages/client/components/MeetingsDashEmpty.tsx
@@ -1,10 +1,10 @@
 import styled from '@emotion/styled'
 import React from 'react'
 import {Link} from 'react-router-dom'
+import {commitLocalUpdate} from 'relay-runtime'
 import {Breakpoint} from '~/types/constEnums'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
 import Atmosphere from '../Atmosphere'
-import {commitLocalUpdate} from 'relay-runtime'
 import useAtmosphere from '../hooks/useAtmosphere'
 
 const maybeTabletPlusMediaQuery = makeMinWidthMediaQuery(Breakpoint.FUZZY_TABLET)
diff --git a/packages/client/components/MeetingsDashHeader.tsx b/packages/client/components/MeetingsDashHeader.tsx
index 20c98397fcb..df2ee10887e 100644
--- a/packages/client/components/MeetingsDashHeader.tsx
+++ b/packages/client/components/MeetingsDashHeader.tsx
@@ -1,16 +1,16 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {MeetingsDashHeader_viewer$key} from '../__generated__/MeetingsDashHeader_viewer.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {FilterLabels} from '../types/constEnums'
 import lazyPreload from '../utils/lazyPreload'
-import {MeetingsDashHeader_viewer$key} from '../__generated__/MeetingsDashHeader_viewer.graphql'
+import {useQueryParameterParser} from '../utils/useQueryParameterParser'
+import DashFilterToggle from './DashFilterToggle/DashFilterToggle'
 import DashSectionControls from './Dashboard/DashSectionControls'
 import DashSectionHeader from './Dashboard/DashSectionHeader'
-import DashFilterToggle from './DashFilterToggle/DashFilterToggle'
-import {useQueryParameterParser} from '../utils/useQueryParameterParser'
-import useAtmosphere from '../hooks/useAtmosphere'
 
 const TeamFilterMenu = lazyPreload(
   () =>
diff --git a/packages/client/components/Mentioned.tsx b/packages/client/components/Mentioned.tsx
index f298f3f3056..e22a97c40ba 100644
--- a/packages/client/components/Mentioned.tsx
+++ b/packages/client/components/Mentioned.tsx
@@ -1,15 +1,15 @@
 import graphql from 'babel-plugin-relay/macro'
+import {Editor} from 'draft-js'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
-import useRouter from '../hooks/useRouter'
-import {Mentioned_notification$key} from '../__generated__/Mentioned_notification.graphql'
-import NotificationTemplate from './NotificationTemplate'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import anonymousAvatar from '~/styles/theme/images/anonymous-avatar.svg'
+import {Mentioned_notification$key} from '../__generated__/Mentioned_notification.graphql'
 import useEditorState from '../hooks/useEditorState'
-import {Editor} from 'draft-js'
+import useRouter from '../hooks/useRouter'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
+import NotificationTemplate from './NotificationTemplate'
 
 interface Props {
   notification: Mentioned_notification$key
diff --git a/packages/client/components/MicrosoftOAuthButtonBlock.tsx b/packages/client/components/MicrosoftOAuthButtonBlock.tsx
index 160c074955b..ec75bfb7532 100644
--- a/packages/client/components/MicrosoftOAuthButtonBlock.tsx
+++ b/packages/client/components/MicrosoftOAuthButtonBlock.tsx
@@ -1,14 +1,14 @@
 import styled from '@emotion/styled'
+import clsx from 'clsx'
 import React from 'react'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
+import logo from '../styles/theme/images/graphics/microsoft.svg'
 import MicrosoftClientManager from '../utils/MicrosoftClientManager'
+import RaisedButton from './RaisedButton'
 import StyledError from './StyledError'
 import StyledTip from './StyledTip'
-import logo from '../styles/theme/images/graphics/microsoft.svg'
-import RaisedButton from './RaisedButton'
-import clsx from 'clsx'
 
 interface Props {
   invitationToken?: string
diff --git a/packages/client/components/MyDashboardTasksAndHeader.tsx b/packages/client/components/MyDashboardTasksAndHeader.tsx
index 7cbcbfeef36..8ea14d366bd 100644
--- a/packages/client/components/MyDashboardTasksAndHeader.tsx
+++ b/packages/client/components/MyDashboardTasksAndHeader.tsx
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {MyDashboardTasksAndHeaderQuery} from '../__generated__/MyDashboardTasksAndHeaderQuery.graphql'
 import UserTasksHeader from '../modules/userDashboard/components/UserTasksHeader/UserTasksHeader'
 import UserColumnsContainer from '../modules/userDashboard/containers/UserColumns/UserColumnsContainer'
-import {MyDashboardTasksAndHeaderQuery} from '../__generated__/MyDashboardTasksAndHeaderQuery.graphql'
 
 interface Props {
   queryRef: PreloadedQuery<MyDashboardTasksAndHeaderQuery>
diff --git a/packages/client/components/MyDashboardTasksRoot.tsx b/packages/client/components/MyDashboardTasksRoot.tsx
index a5804a1d267..2477a161c90 100644
--- a/packages/client/components/MyDashboardTasksRoot.tsx
+++ b/packages/client/components/MyDashboardTasksRoot.tsx
@@ -1,11 +1,11 @@
 import React, {Suspense} from 'react'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
-import UserTasksHeader from '../modules/userDashboard/components/UserTasksHeader/UserTasksHeader'
 import myDashboardTasksAndHeaderQuery, {
   MyDashboardTasksAndHeaderQuery
 } from '../__generated__/MyDashboardTasksAndHeaderQuery.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import UserTasksHeader from '../modules/userDashboard/components/UserTasksHeader/UserTasksHeader'
 import ErrorBoundary from './ErrorBoundary'
 import MyDashboardTasksAndHeader from './MyDashboardTasksAndHeader'
 
diff --git a/packages/client/components/MyDashboardTimeline.tsx b/packages/client/components/MyDashboardTimeline.tsx
index 6b3240cf5d0..ad676f9c819 100644
--- a/packages/client/components/MyDashboardTimeline.tsx
+++ b/packages/client/components/MyDashboardTimeline.tsx
@@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useDocumentTitle from '~/hooks/useDocumentTitle'
-import {DashTimeline} from '../types/constEnums'
 import {MyDashboardTimelineQuery} from '../__generated__/MyDashboardTimelineQuery.graphql'
+import {DashTimeline} from '../types/constEnums'
 import ErrorBoundary from './ErrorBoundary'
 import TimelineFeedList from './TimelineFeedList'
+import TimelineHeader from './TimelineHeader'
 import TimelineLoadingEvents from './TimelineLoadingEvents'
 import TimelineRightDrawer from './TimelineRightDrawer'
 import TimelineSuggestedAction from './TimelineSuggestedAction'
-import TimelineHeader from './TimelineHeader'
 
 interface Props {
   queryRef: PreloadedQuery<MyDashboardTimelineQuery>
diff --git a/packages/client/components/MyDashboardTimelineRoot.tsx b/packages/client/components/MyDashboardTimelineRoot.tsx
index 382a6b20703..22e519e36a8 100644
--- a/packages/client/components/MyDashboardTimelineRoot.tsx
+++ b/packages/client/components/MyDashboardTimelineRoot.tsx
@@ -1,11 +1,11 @@
 import React, {Suspense} from 'react'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import myDashboardTimelineQuery, {
   MyDashboardTimelineQuery
 } from '../__generated__/MyDashboardTimelineQuery.graphql'
-import MyDashboardTimeline from './MyDashboardTimeline'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import {useQueryParameterParser} from '../utils/useQueryParameterParser'
+import MyDashboardTimeline from './MyDashboardTimeline'
 
 const MyDashboardTimelineRoot = () => {
   const atmosphere = useAtmosphere()
diff --git a/packages/client/components/NewAzureIssueInput.tsx b/packages/client/components/NewAzureIssueInput.tsx
index 85fbe4e350f..323f93e026a 100644
--- a/packages/client/components/NewAzureIssueInput.tsx
+++ b/packages/client/components/NewAzureIssueInput.tsx
@@ -3,6 +3,7 @@ import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {NewAzureIssueInput_viewer$key} from '~/__generated__/NewAzureIssueInput_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
@@ -10,7 +11,7 @@ import useMutationProps from '~/hooks/useMutationProps'
 import CreateTaskMutation from '~/mutations/CreateTaskMutation'
 import AzureDevOpsProjectId from '~/shared/gqlIds/AzureDevOpsProjectId'
 import {PALETTE} from '~/styles/paletteV3'
-import {NewAzureIssueInput_viewer$key} from '~/__generated__/NewAzureIssueInput_viewer.graphql'
+import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
 import useForm from '../hooks/useForm'
 import {PortalStatus} from '../hooks/usePortal'
 import useTimedState from '../hooks/useTimedState'
@@ -18,7 +19,6 @@ import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
 import {CompletedHandler} from '../types/relayMutations'
 import convertToTaskContent from '../utils/draftjs/convertToTaskContent'
 import Legitity from '../validation/Legitity'
-import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
 import Checkbox from './Checkbox'
 import NewAzureIssueMenu from './NewAzureIssueMenu'
 import PlainButton from './PlainButton/PlainButton'
diff --git a/packages/client/components/NewGitHubIssueInput.tsx b/packages/client/components/NewGitHubIssueInput.tsx
index 53d649aa027..a9be74bcf2f 100644
--- a/packages/client/components/NewGitHubIssueInput.tsx
+++ b/packages/client/components/NewGitHubIssueInput.tsx
@@ -3,14 +3,15 @@ import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {NewGitHubIssueInput_meeting$key} from '~/__generated__/NewGitHubIssueInput_meeting.graphql'
+import {NewGitHubIssueInput_viewer$key} from '~/__generated__/NewGitHubIssueInput_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {MenuPosition} from '~/hooks/useCoords'
 import useGetRepoContributions from '~/hooks/useGetRepoContributions'
 import useMenu from '~/hooks/useMenu'
 import useMutationProps from '~/hooks/useMutationProps'
 import {PALETTE} from '~/styles/paletteV3'
-import {NewGitHubIssueInput_meeting$key} from '~/__generated__/NewGitHubIssueInput_meeting.graphql'
-import {NewGitHubIssueInput_viewer$key} from '~/__generated__/NewGitHubIssueInput_viewer.graphql'
+import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
 import useForm from '../hooks/useForm'
 import {PortalStatus} from '../hooks/usePortal'
 import useTimedState from '../hooks/useTimedState'
@@ -20,7 +21,6 @@ import GitHubIssueId from '../shared/gqlIds/GitHubIssueId'
 import {CompletedHandler} from '../types/relayMutations'
 import convertToTaskContent from '../utils/draftjs/convertToTaskContent'
 import Legitity from '../validation/Legitity'
-import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
 import Checkbox from './Checkbox'
 import NewGitHubIssueMenu from './NewGitHubIssueMenu'
 import PlainButton from './PlainButton/PlainButton'
diff --git a/packages/client/components/NewGitLabIssueInput.tsx b/packages/client/components/NewGitLabIssueInput.tsx
index 0169acdeca5..140c5f314dc 100644
--- a/packages/client/components/NewGitLabIssueInput.tsx
+++ b/packages/client/components/NewGitLabIssueInput.tsx
@@ -3,13 +3,14 @@ import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {FormEvent, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {NewGitLabIssueInput_viewer$key} from '~/__generated__/NewGitLabIssueInput_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import useMutationProps from '~/hooks/useMutationProps'
 import {PALETTE} from '~/styles/paletteV3'
 import getNonNullEdges from '~/utils/getNonNullEdges'
-import {NewGitLabIssueInput_viewer$key} from '~/__generated__/NewGitLabIssueInput_viewer.graphql'
+import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
 import useForm from '../hooks/useForm'
 import {PortalStatus} from '../hooks/usePortal'
 import useTimedState from '../hooks/useTimedState'
@@ -18,7 +19,6 @@ import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
 import {CompletedHandler} from '../types/relayMutations'
 import convertToTaskContent from '../utils/draftjs/convertToTaskContent'
 import Legitity from '../validation/Legitity'
-import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
 import Checkbox from './Checkbox'
 import NewGitLabIssueMenu from './NewGitLabIssueMenu'
 import PlainButton from './PlainButton/PlainButton'
diff --git a/packages/client/components/NewJiraIssueInput.tsx b/packages/client/components/NewJiraIssueInput.tsx
index 4f9ad22c1aa..d904a5cc2d9 100644
--- a/packages/client/components/NewJiraIssueInput.tsx
+++ b/packages/client/components/NewJiraIssueInput.tsx
@@ -8,6 +8,8 @@ import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import useMutationProps from '~/hooks/useMutationProps'
 import {PALETTE} from '~/styles/paletteV3'
+import {NewJiraIssueInput_meeting$key} from '../__generated__/NewJiraIssueInput_meeting.graphql'
+import {NewJiraIssueInput_viewer$key} from '../__generated__/NewJiraIssueInput_viewer.graphql'
 import useForm from '../hooks/useForm'
 import {PortalStatus} from '../hooks/usePortal'
 import useTimedState from '../hooks/useTimedState'
@@ -18,8 +20,6 @@ import JiraProjectId from '../shared/gqlIds/JiraProjectId'
 import {CompletedHandler} from '../types/relayMutations'
 import convertToTaskContent from '../utils/draftjs/convertToTaskContent'
 import Legitity from '../validation/Legitity'
-import {NewJiraIssueInput_meeting$key} from '../__generated__/NewJiraIssueInput_meeting.graphql'
-import {NewJiraIssueInput_viewer$key} from '../__generated__/NewJiraIssueInput_viewer.graphql'
 import Checkbox from './Checkbox'
 import NewJiraIssueMenu from './NewJiraIssueMenu'
 import PlainButton from './PlainButton/PlainButton'
diff --git a/packages/client/components/NewMeetingActions.tsx b/packages/client/components/NewMeetingActions.tsx
index 9b557d1e5a2..9ee965291a5 100644
--- a/packages/client/components/NewMeetingActions.tsx
+++ b/packages/client/components/NewMeetingActions.tsx
@@ -4,8 +4,8 @@ import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingActions_team$key} from '~/__generated__/NewMeetingActions_team.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {Breakpoint, Threshold} from '../types/constEnums'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import FlatPrimaryButton from './FlatPrimaryButton'
 import NewMeetingActionsCurrentMeetings from './NewMeetingActionsCurrentMeetings'
 import StyledError from './StyledError'
diff --git a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx
index af6f2fb4840..59708912872 100644
--- a/packages/client/components/NewMeetingActionsCurrentMeetings.tsx
+++ b/packages/client/components/NewMeetingActionsCurrentMeetings.tsx
@@ -3,12 +3,12 @@ import {Forum} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {NewMeetingActionsCurrentMeetings_team$key} from '~/__generated__/NewMeetingActionsCurrentMeetings_team.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import useSnacksForNewMeetings from '~/hooks/useSnacksForNewMeetings'
 import {PALETTE} from '~/styles/paletteV3'
 import plural from '~/utils/plural'
-import {NewMeetingActionsCurrentMeetings_team$key} from '~/__generated__/NewMeetingActionsCurrentMeetings_team.graphql'
 import FlatButton from './FlatButton'
 import SelectMeetingDropdown from './SelectMeetingDropdown'
 
diff --git a/packages/client/components/NewMeetingCheckIn.tsx b/packages/client/components/NewMeetingCheckIn.tsx
index c90652753c6..9ca9869724a 100644
--- a/packages/client/components/NewMeetingCheckIn.tsx
+++ b/packages/client/components/NewMeetingCheckIn.tsx
@@ -3,8 +3,8 @@ import {RecordVoiceOver} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {ReactElement} from 'react'
 import {useFragment} from 'react-relay'
-import useGotoStageId from '~/hooks/useGotoStageId'
 import {NewMeetingCheckIn_meeting$key} from '~/__generated__/NewMeetingCheckIn_meeting.graphql'
+import useGotoStageId from '~/hooks/useGotoStageId'
 import useAtmosphere from '../hooks/useAtmosphere'
 import NewMeetingCheckInPrompt from '../modules/meeting/components/MeetingCheckInPrompt/NewMeetingCheckInPrompt'
 import MeetingFacilitationHint from '../modules/meeting/components/MeetingFacilitationHint/MeetingFacilitationHint'
diff --git a/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx b/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx
index 36f569d2723..08f6dc3286e 100644
--- a/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx
+++ b/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {NewMeetingSettingsRetrospectiveSettings_team$key} from '~/__generated__/NewMeetingSettingsRetrospectiveSettings_team.graphql'
 import {NewMeetingSettingsRetrospectiveSettings_organization$key} from '~/__generated__/NewMeetingSettingsRetrospectiveSettings_organization.graphql'
+import {NewMeetingSettingsRetrospectiveSettings_team$key} from '~/__generated__/NewMeetingSettingsRetrospectiveSettings_team.graphql'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {PortalStatus} from '../hooks/usePortal'
 import NewMeetingDropdown from './NewMeetingDropdown'
 import NewMeetingSettingsToggleAnonymity from './NewMeetingSettingsToggleAnonymity'
 import NewMeetingSettingsToggleCheckIn from './NewMeetingSettingsToggleCheckIn'
-import NewMeetingSettingsToggleTranscription from './NewMeetingSettingsToggleTranscription'
 import NewMeetingSettingsToggleTeamHealth from './NewMeetingSettingsToggleTeamHealth'
+import NewMeetingSettingsToggleTranscription from './NewMeetingSettingsToggleTranscription'
 
 const NewMeetingSettingsToggleCheckInMenuEntry = styled(NewMeetingSettingsToggleCheckIn)({
   background: 'none',
diff --git a/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx b/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx
index 94c295c9fa6..542938fd461 100644
--- a/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx
+++ b/packages/client/components/NewMeetingSettingsToggleTeamHealth.tsx
@@ -4,14 +4,14 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingSettingsToggleTeamHealth_settings$key} from '~/__generated__/NewMeetingSettingsToggleTeamHealth_settings.graphql'
 import {NewMeetingSettingsToggleTeamHealth_team$key} from '~/__generated__/NewMeetingSettingsToggleTeamHealth_team.graphql'
-import isTeamHealthAvailable from '../utils/features/isTeamHealthAvailable'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import SetMeetingSettingsMutation from '../mutations/SetMeetingSettingsMutation'
 import {PALETTE} from '../styles/paletteV3'
+import isTeamHealthAvailable from '../utils/features/isTeamHealthAvailable'
 import Checkbox from './Checkbox'
-import PlainButton from './PlainButton/PlainButton'
 import NewMeetingSettingsUpgradeForTeamHealth from './NewMeetingSettingsUpgradeForTeamHealth'
+import PlainButton from './PlainButton/PlainButton'
 
 const ButtonRow = styled(PlainButton)({
   background: PALETTE.SLATE_200,
diff --git a/packages/client/components/NewMeetingSettingsToggleTranscription.tsx b/packages/client/components/NewMeetingSettingsToggleTranscription.tsx
index 4f3c9a48f36..92ed4edba81 100644
--- a/packages/client/components/NewMeetingSettingsToggleTranscription.tsx
+++ b/packages/client/components/NewMeetingSettingsToggleTranscription.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled'
-import StyledError from './StyledError'
 import DeleteIcon from '@mui/icons-material/Delete'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
@@ -15,6 +14,7 @@ import Legitity from '../validation/Legitity'
 import Checkbox from './Checkbox'
 import FlatButton from './FlatButton'
 import PlainButton from './PlainButton/PlainButton'
+import StyledError from './StyledError'
 
 const ButtonRow = styled(PlainButton)({
   background: PALETTE.SLATE_200,
diff --git a/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx b/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx
index c354a0ed63f..2149ebf098e 100644
--- a/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx
+++ b/packages/client/components/NewMeetingSettingsUpgradeForTeamHealth.tsx
@@ -1,13 +1,13 @@
+import styled from '@emotion/styled'
+import {Lock} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {NewMeetingSettingsUpgradeForTeamHealth_team$key} from '~/__generated__/NewMeetingSettingsUpgradeForTeamHealth_team.graphql'
-import PlainButton from './PlainButton/PlainButton'
-import {Lock} from '@mui/icons-material'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import useAtmosphere from '../hooks/useAtmosphere'
-import styled from '@emotion/styled'
 import {PALETTE} from '../styles/paletteV3'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
+import PlainButton from './PlainButton/PlainButton'
 
 const ButtonRow = styled(PlainButton)({
   background: PALETTE.SLATE_200,
diff --git a/packages/client/components/NewMeetingSidebar.tsx b/packages/client/components/NewMeetingSidebar.tsx
index 58f62f932e8..22b76fa85f9 100644
--- a/packages/client/components/NewMeetingSidebar.tsx
+++ b/packages/client/components/NewMeetingSidebar.tsx
@@ -3,9 +3,9 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
+import {NewMeetingSidebar_meeting$key} from '~/__generated__/NewMeetingSidebar_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {useRenameMeeting} from '~/hooks/useRenameMeeting'
-import {NewMeetingSidebar_meeting$key} from '~/__generated__/NewMeetingSidebar_meeting.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import {NavSidebar} from '../types/constEnums'
 import isDemoRoute from '../utils/isDemoRoute'
diff --git a/packages/client/components/NewMeetingSidebarPhaseListItem.tsx b/packages/client/components/NewMeetingSidebarPhaseListItem.tsx
index ae1264faf81..31b929e1cf3 100644
--- a/packages/client/components/NewMeetingSidebarPhaseListItem.tsx
+++ b/packages/client/components/NewMeetingSidebarPhaseListItem.tsx
@@ -4,10 +4,10 @@ import {
   Edit,
   Group,
   GroupWork,
+  MonitorHeart,
   PlaylistAdd,
   Receipt,
   ThumbsUpDown,
-  MonitorHeart,
   Update
 } from '@mui/icons-material'
 import React from 'react'
diff --git a/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx b/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx
index 34b39cfc4dc..a87cad5ac2d 100644
--- a/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx
+++ b/packages/client/components/NewMeetingSidebarUpgradeBlock.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import React, {useEffect} from 'react'
 import {useHistory} from 'react-router'
 import useAtmosphere from '../hooks/useAtmosphere'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {PALETTE} from '../styles/paletteV3'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import FlatPrimaryButton from './FlatPrimaryButton'
 import IconButton from './IconButton'
 
diff --git a/packages/client/components/NewMeetingTeamPicker.tsx b/packages/client/components/NewMeetingTeamPicker.tsx
index 15bb5e35671..2443f8067c9 100644
--- a/packages/client/components/NewMeetingTeamPicker.tsx
+++ b/packages/client/components/NewMeetingTeamPicker.tsx
@@ -3,16 +3,16 @@ 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'
 import {PortalStatus} from '../hooks/usePortal'
 import lazyPreload from '../utils/lazyPreload'
+import setPreferredTeamId from '../utils/relay/setPreferredTeamId'
 import NewMeetingDropdown from './NewMeetingDropdown'
 import NewMeetingTeamPickerAvatars from './NewMeetingTeamPickerAvatars'
-import useAtmosphere from '../hooks/useAtmosphere'
-import setPreferredTeamId from '../utils/relay/setPreferredTeamId'
-import AddTeamDialogRoot from '~/components/AddTeamDialogRoot'
-import SendClientSideEvent from '~/utils/SendClientSideEvent'
 
 const SelectTeamDropdown = lazyPreload(
   () =>
diff --git a/packages/client/components/NewTeamOrgDropdown.tsx b/packages/client/components/NewTeamOrgDropdown.tsx
index 9f5fb0935d9..3778804e48a 100644
--- a/packages/client/components/NewTeamOrgDropdown.tsx
+++ b/packages/client/components/NewTeamOrgDropdown.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {MenuProps} from '../hooks/useMenu'
 import {NewTeamOrgDropdown_organizations$key} from '../__generated__/NewTeamOrgDropdown_organizations.graphql'
+import {MenuProps} from '../hooks/useMenu'
 import DropdownMenuItemLabel from './DropdownMenuItemLabel'
 import DropdownMenuLabel from './DropdownMenuLabel'
 import Menu from './Menu'
diff --git a/packages/client/components/NotificationDropdown.tsx b/packages/client/components/NotificationDropdown.tsx
index 0e923e81a99..3afb59a34a1 100644
--- a/packages/client/components/NotificationDropdown.tsx
+++ b/packages/client/components/NotificationDropdown.tsx
@@ -2,18 +2,18 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject} from 'react'
 import {usePaginationFragment} from 'react-relay'
-import useAtmosphere from '~/hooks/useAtmosphere'
-import useTimeout from '~/hooks/useTimeout'
-import SetNotificationStatusMutation from '~/mutations/SetNotificationStatusMutation'
 import {
   NotificationDropdown_query$data,
   NotificationDropdown_query$key
 } from '~/__generated__/NotificationDropdown_query.graphql'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import useTimeout from '~/hooks/useTimeout'
+import SetNotificationStatusMutation from '~/mutations/SetNotificationStatusMutation'
+import {NotificationDropdownPaginationQuery} from '../__generated__/NotificationDropdownPaginationQuery.graphql'
+import useClientSideTrack from '../hooks/useClientSideTrack'
 import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom'
 import {MenuProps} from '../hooks/useMenu'
-import useClientSideTrack from '../hooks/useClientSideTrack'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
-import {NotificationDropdownPaginationQuery} from '../__generated__/NotificationDropdownPaginationQuery.graphql'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 import NotificationPicker from './NotificationPicker'
diff --git a/packages/client/components/NotificationPicker.tsx b/packages/client/components/NotificationPicker.tsx
index d119db0dc74..1d562f24283 100644
--- a/packages/client/components/NotificationPicker.tsx
+++ b/packages/client/components/NotificationPicker.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import lazyPreload, {LazyExoticPreload} from '~/utils/lazyPreload'
 import {
   NotificationEnum,
   NotificationPicker_notification$key
 } from '~/__generated__/NotificationPicker_notification.graphql'
+import lazyPreload, {LazyExoticPreload} from '~/utils/lazyPreload'
 
 const typePicker: Record<NotificationEnum, LazyExoticPreload<any>> = {
   DISCUSSION_MENTIONED: lazyPreload(
diff --git a/packages/client/components/NotificationRow.tsx b/packages/client/components/NotificationRow.tsx
index 78d54cc32b9..eda7ebea52f 100644
--- a/packages/client/components/NotificationRow.tsx
+++ b/packages/client/components/NotificationRow.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import React, {ReactNode, useState} from 'react'
-import {PALETTE} from '../styles/paletteV3'
 import {NotificationStatusEnum} from '../__generated__/NotificationDropdown_query.graphql'
+import {PALETTE} from '../styles/paletteV3'
 
 const Row = styled('div')<{isNew: boolean}>(({isNew}) => ({
   background: isNew ? PALETTE.SLATE_300 : '#fff',
diff --git a/packages/client/components/NotificationTemplate.tsx b/packages/client/components/NotificationTemplate.tsx
index 78503bc33be..279ac41f640 100644
--- a/packages/client/components/NotificationTemplate.tsx
+++ b/packages/client/components/NotificationTemplate.tsx
@@ -3,9 +3,9 @@ import ms from 'ms'
 import React, {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import parabolLogo from 'static/images/brand/mark-color.svg'
+import {NotificationTemplate_notification$key} from '~/__generated__/NotificationTemplate_notification.graphql'
 import NotificationSubtitle from '~/components/NotificationSubtitle'
 import useRefreshInterval from '~/hooks/useRefreshInterval'
-import {NotificationTemplate_notification$key} from '~/__generated__/NotificationTemplate_notification.graphql'
 import NotificationBody from './NotificationBody'
 import NotificationMessage from './NotificationMessage'
 import NotificationRow from './NotificationRow'
diff --git a/packages/client/components/NullableTask/NullableTask.tsx b/packages/client/components/NullableTask/NullableTask.tsx
index 0057af98e49..bcca9e0e861 100644
--- a/packages/client/components/NullableTask/NullableTask.tsx
+++ b/packages/client/components/NullableTask/NullableTask.tsx
@@ -3,10 +3,10 @@ import {convertFromRaw} from 'draft-js'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import {NullableTask_task$key} from '../../__generated__/NullableTask_task.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import OutcomeCardContainer from '../../modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer'
 import makeEmptyStr from '../../utils/draftjs/makeEmptyStr'
-import {NullableTask_task$key} from '../../__generated__/NullableTask_task.graphql'
 import NullCard from '../NullCard/NullCard'
 
 interface Props {
diff --git a/packages/client/components/OrgAdminActionMenu.tsx b/packages/client/components/OrgAdminActionMenu.tsx
index 19799e08abb..adb94de0977 100644
--- a/packages/client/components/OrgAdminActionMenu.tsx
+++ b/packages/client/components/OrgAdminActionMenu.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
-import {MenuProps} from '../hooks/useMenu'
-import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation'
-import useMutationProps from '../hooks/useMutationProps'
 import {OrgAdminActionMenu_organization$key} from '../__generated__/OrgAdminActionMenu_organization.graphql'
 import {OrgAdminActionMenu_organizationUser$key} from '../__generated__/OrgAdminActionMenu_organizationUser.graphql'
+import {MenuProps} from '../hooks/useMenu'
+import useMutationProps from '../hooks/useMutationProps'
+import SetOrgUserRoleMutation from '../mutations/SetOrgUserRoleMutation'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
 
diff --git a/packages/client/components/PalettePicker/PalettePicker.tsx b/packages/client/components/PalettePicker/PalettePicker.tsx
index e2e841112b0..41cefa48c8d 100644
--- a/packages/client/components/PalettePicker/PalettePicker.tsx
+++ b/packages/client/components/PalettePicker/PalettePicker.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import ReflectTemplatePromptUpdateGroupColorMutation from '~/mutations/ReflectTemplatePromptUpdateGroupColorMutation'
 import {PalettePicker_prompt$key} from '~/__generated__/PalettePicker_prompt.graphql'
 import {PalettePicker_prompts$key} from '~/__generated__/PalettePicker_prompts.graphql'
+import ReflectTemplatePromptUpdateGroupColorMutation from '~/mutations/ReflectTemplatePromptUpdateGroupColorMutation'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import {MenuProps} from '../../hooks/useMenu'
 import palettePickerOptions from '../../styles/palettePickerOptions'
diff --git a/packages/client/components/ParabolScopingSearchFilterMenu.tsx b/packages/client/components/ParabolScopingSearchFilterMenu.tsx
index 4750326f46e..1a69f762037 100644
--- a/packages/client/components/ParabolScopingSearchFilterMenu.tsx
+++ b/packages/client/components/ParabolScopingSearchFilterMenu.tsx
@@ -5,8 +5,8 @@ import {commitLocalUpdate, useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {ParabolSearchQuery} from '~/types/clientSchema'
 import {taskScopingStatusFilters} from '~/utils/constants'
-import {MenuProps} from '../hooks/useMenu'
 import {ParabolScopingSearchFilterMenu_meeting$key} from '../__generated__/ParabolScopingSearchFilterMenu_meeting.graphql'
+import {MenuProps} from '../hooks/useMenu'
 import Checkbox from './Checkbox'
 import DropdownMenuLabel from './DropdownMenuLabel'
 import Menu from './Menu'
diff --git a/packages/client/components/ParabolScopingSearchResultItem.tsx b/packages/client/components/ParabolScopingSearchResultItem.tsx
index f84e0f58b67..c5e2f5b6858 100644
--- a/packages/client/components/ParabolScopingSearchResultItem.tsx
+++ b/packages/client/components/ParabolScopingSearchResultItem.tsx
@@ -14,10 +14,10 @@ import UpdateTaskMutation from '~/mutations/UpdateTaskMutation'
 import {PALETTE} from '~/styles/paletteV3'
 import convertToTaskContent from '~/utils/draftjs/convertToTaskContent'
 import isAndroid from '~/utils/draftjs/isAndroid'
-import {Threshold} from '../types/constEnums'
 import {ParabolScopingSearchResultItem_task$key} from '../__generated__/ParabolScopingSearchResultItem_task.graphql'
 import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql'
 import {AreaEnum} from '../__generated__/UpdateTaskMutation.graphql'
+import {Threshold} from '../types/constEnums'
 import Checkbox from './Checkbox'
 import TaskEditor from './TaskEditor/TaskEditor'
 
diff --git a/packages/client/components/ParabolScopingSearchResults.tsx b/packages/client/components/ParabolScopingSearchResults.tsx
index a767c7b286f..5726c7fa882 100644
--- a/packages/client/components/ParabolScopingSearchResults.tsx
+++ b/packages/client/components/ParabolScopingSearchResults.tsx
@@ -6,12 +6,12 @@ import useGetUsedServiceTaskIds from '~/hooks/useGetUsedServiceTaskIds'
 import useMutationProps from '~/hooks/useMutationProps'
 import CreateTaskMutation from '~/mutations/CreateTaskMutation'
 import dndNoise from '~/utils/dndNoise'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom'
 import {ParabolScopingSearchResultsPaginationQuery} from '../__generated__/ParabolScopingSearchResultsPaginationQuery.graphql'
 import {ParabolScopingSearchResultsQuery} from '../__generated__/ParabolScopingSearchResultsQuery.graphql'
 import {ParabolScopingSearchResults_meeting$key} from '../__generated__/ParabolScopingSearchResults_meeting.graphql'
 import {ParabolScopingSearchResults_query$key} from '../__generated__/ParabolScopingSearchResults_query.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useLoadNextOnScrollBottom from '../hooks/useLoadNextOnScrollBottom'
 import IntegrationScopingNoResults from './IntegrationScopingNoResults'
 import NewIntegrationRecordButton from './NewIntegrationRecordButton'
 import ParabolScopingSearchResultItem from './ParabolScopingSearchResultItem'
diff --git a/packages/client/components/ParabolScopingSearchResultsRoot.tsx b/packages/client/components/ParabolScopingSearchResultsRoot.tsx
index 56f29ae411d..9f69f579116 100644
--- a/packages/client/components/ParabolScopingSearchResultsRoot.tsx
+++ b/packages/client/components/ParabolScopingSearchResultsRoot.tsx
@@ -3,12 +3,12 @@ import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {ParabolSearchQuery} from '~/types/clientSchema'
 import {taskScopingStatusFilters} from '~/utils/constants'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
-import MockScopingList from '../modules/meeting/components/MockScopingList'
 import parabolScopingSearchResultsQuery, {
   ParabolScopingSearchResultsQuery
 } from '../__generated__/ParabolScopingSearchResultsQuery.graphql'
 import {ParabolScopingSearchResultsRoot_meeting$key} from '../__generated__/ParabolScopingSearchResultsRoot_meeting.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import MockScopingList from '../modules/meeting/components/MockScopingList'
 import ErrorBoundary from './ErrorBoundary'
 import ParabolScopingSearchResults from './ParabolScopingSearchResults'
 
diff --git a/packages/client/components/ParabolScopingSelectAllTasks.tsx b/packages/client/components/ParabolScopingSelectAllTasks.tsx
index 23406f7e8db..e0b019610af 100644
--- a/packages/client/components/ParabolScopingSelectAllTasks.tsx
+++ b/packages/client/components/ParabolScopingSelectAllTasks.tsx
@@ -6,9 +6,9 @@ import {useFragment} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import useUnusedRecords from '~/hooks/useUnusedRecords'
 import UpdatePokerScopeMutation from '~/mutations/UpdatePokerScopeMutation'
+import {ParabolScopingSelectAllTasks_tasks$key} from '../__generated__/ParabolScopingSelectAllTasks_tasks.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import getSelectAllTitle from '../utils/getSelectAllTitle'
-import {ParabolScopingSelectAllTasks_tasks$key} from '../__generated__/ParabolScopingSelectAllTasks_tasks.graphql'
 import Checkbox from './Checkbox'
 
 const Item = styled('div')({
diff --git a/packages/client/components/PasswordResetLink.tsx b/packages/client/components/PasswordResetLink.tsx
index 09040734765..59a59eb6f9b 100644
--- a/packages/client/components/PasswordResetLink.tsx
+++ b/packages/client/components/PasswordResetLink.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
 import passwordIcon from '../../../static/images/icons/password_black_24dp.svg'
+import {PasswordResetLink_viewer$key} from '../__generated__/PasswordResetLink_viewer.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import EmailPasswordResetMutation from '../mutations/EmailPasswordResetMutation'
 import {PALETTE} from '../styles/paletteV3'
-import {PasswordResetLink_viewer$key} from '../__generated__/PasswordResetLink_viewer.graphql'
 import StyledError from './StyledError'
 
 const Wrapper = styled('div')({
diff --git a/packages/client/components/PaymentRejected.tsx b/packages/client/components/PaymentRejected.tsx
index 8c4990c8c5e..f4fc172a364 100644
--- a/packages/client/components/PaymentRejected.tsx
+++ b/packages/client/components/PaymentRejected.tsx
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
-import useRouter from '../hooks/useRouter'
 import {PaymentRejected_notification$key} from '../__generated__/PaymentRejected_notification.graphql'
+import useRouter from '../hooks/useRouter'
 import NotificationTemplate from './NotificationTemplate'
 
 interface Props {
diff --git a/packages/client/components/PinnedSnackbarNotifications.tsx b/packages/client/components/PinnedSnackbarNotifications.tsx
index 9dbba6bf927..1baeb1ce5ab 100644
--- a/packages/client/components/PinnedSnackbarNotifications.tsx
+++ b/packages/client/components/PinnedSnackbarNotifications.tsx
@@ -2,15 +2,15 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {PinnedSnackbarNotifications_query$key} from '~/__generated__/PinnedSnackbarNotifications_query.graphql'
+import {NotificationEnum} from '../__generated__/popNotificationToast_notification.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useRouter from '../hooks/useRouter'
 import SetNotificationStatusMutation from '../mutations/SetNotificationStatusMutation'
-import mapTeamsLimitExceededToToast from '../mutations/toasts/mapTeamsLimitExceededToToast'
-import mapTeamsLimitReminderToToast from '../mutations/toasts/mapTeamsLimitReminderToToast'
 import mapPromptToJoinOrgToToast from '../mutations/toasts/mapPromptToJoinOrgToToast'
 import mapRequestToJoinOrgToToast from '../mutations/toasts/mapRequestToJoinOrgToToast'
+import mapTeamsLimitExceededToToast from '../mutations/toasts/mapTeamsLimitExceededToToast'
+import mapTeamsLimitReminderToToast from '../mutations/toasts/mapTeamsLimitReminderToToast'
 import {OnNextHistoryContext} from '../types/relayMutations'
-import {NotificationEnum} from '../__generated__/popNotificationToast_notification.graphql'
 import {Snack} from './Snackbar'
 
 interface Props {
diff --git a/packages/client/components/PokerCard.tsx b/packages/client/components/PokerCard.tsx
index 418eecd46c9..10d1be85bb5 100644
--- a/packages/client/components/PokerCard.tsx
+++ b/packages/client/components/PokerCard.tsx
@@ -4,11 +4,11 @@ import React, {RefObject, useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import PassSVG from '../../../static/images/icons/no_entry.svg'
+import {PokerCard_scaleValue$key} from '../__generated__/PokerCard_scaleValue.graphql'
 import usePokerZIndexOverride from '../hooks/usePokerZIndexOverride'
 import logoMarkWhite from '../styles/theme/images/brand/mark-white.svg'
 import {BezierCurve, Breakpoint, PokerCards} from '../types/constEnums'
 import getPokerCardBackground from '../utils/getPokerCardBackground'
-import {PokerCard_scaleValue$key} from '../__generated__/PokerCard_scaleValue.graphql'
 
 const COLLAPSE_DUR = 700
 const EXPAND_DUR = 300
diff --git a/packages/client/components/PokerCardDeck.tsx b/packages/client/components/PokerCardDeck.tsx
index 3339b284231..41932cae97e 100644
--- a/packages/client/components/PokerCardDeck.tsx
+++ b/packages/client/components/PokerCardDeck.tsx
@@ -4,6 +4,7 @@ import React, {KeyboardEvent, RefObject, useEffect, useMemo, useRef, useState} f
 import {useFragment} from 'react-relay'
 import useMutationProps from '~/hooks/useMutationProps'
 import usePokerDeckLeftEdge from '~/hooks/usePokerDeckLeftEdge'
+import {PokerCardDeck_meeting$key} from '../__generated__/PokerCardDeck_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useEventCallback from '../hooks/useEventCallback'
 import useHotkey from '../hooks/useHotkey'
@@ -13,7 +14,6 @@ import usePokerCardLocation from '../hooks/usePokerCardLocation'
 import PokerAnnounceDeckHoverMutation from '../mutations/PokerAnnounceDeckHoverMutation'
 import VoteForPokerStoryMutation from '../mutations/VoteForPokerStoryMutation'
 import {BezierCurve, PokerCards} from '../types/constEnums'
-import {PokerCardDeck_meeting$key} from '../__generated__/PokerCardDeck_meeting.graphql'
 import PokerCard from './PokerCard'
 
 const Deck = styled('div')<{left: number; isSpectating: boolean}>(({left, isSpectating}) => ({
diff --git a/packages/client/components/PokerDimensionFinalScorePicker.tsx b/packages/client/components/PokerDimensionFinalScorePicker.tsx
index 5c52f75995b..ad6e992b948 100644
--- a/packages/client/components/PokerDimensionFinalScorePicker.tsx
+++ b/packages/client/components/PokerDimensionFinalScorePicker.tsx
@@ -4,8 +4,8 @@ import React, {RefObject} from 'react'
 import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {Breakpoint} from '~/types/constEnums'
-import {PALETTE} from '../styles/paletteV3'
 import {PokerDimensionFinalScorePicker_stage$key} from '../__generated__/PokerDimensionFinalScorePicker_stage.graphql'
+import {PALETTE} from '../styles/paletteV3'
 import AzureDevOpsFieldDimensionDropdown from './AzureDevOpsFieldDimensionDropdown'
 import GitHubFieldDimensionDropdown from './GitHubFieldDimensionDropdown'
 import GitLabFieldDimensionDropdown from './GitLabFieldDimensionDropdown'
diff --git a/packages/client/components/PokerDimensionValueControl.tsx b/packages/client/components/PokerDimensionValueControl.tsx
index 9650c143950..1f62fe52492 100644
--- a/packages/client/components/PokerDimensionValueControl.tsx
+++ b/packages/client/components/PokerDimensionValueControl.tsx
@@ -5,8 +5,8 @@ import {useFragment} from 'react-relay'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {PALETTE} from '~/styles/paletteV3'
 import {Breakpoint} from '~/types/constEnums'
-import useResizeFontForElement from '../hooks/useResizeFontForElement'
 import {PokerDimensionValueControl_stage$key} from '../__generated__/PokerDimensionValueControl_stage.graphql'
+import useResizeFontForElement from '../hooks/useResizeFontForElement'
 import LinkButton from './LinkButton'
 import MiniPokerCard from './MiniPokerCard'
 import PokerDimensionFinalScorePicker from './PokerDimensionFinalScorePicker'
diff --git a/packages/client/components/PokerDiscussVoting.tsx b/packages/client/components/PokerDiscussVoting.tsx
index 06f5a86bd4d..148189efbcb 100644
--- a/packages/client/components/PokerDiscussVoting.tsx
+++ b/packages/client/components/PokerDiscussVoting.tsx
@@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useMemo, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
-import useForceUpdate from '../hooks/useForceUpdate'
-import {PokerCards} from '../types/constEnums'
-import isSpecialPokerLabel from '../utils/isSpecialPokerLabel'
 import {PokerDiscussVoting_meeting$key} from '../__generated__/PokerDiscussVoting_meeting.graphql'
 import {
-  PokerDiscussVoting_stage$key,
-  PokerDiscussVoting_stage$data
+  PokerDiscussVoting_stage$data,
+  PokerDiscussVoting_stage$key
 } from '../__generated__/PokerDiscussVoting_stage.graphql'
+import useForceUpdate from '../hooks/useForceUpdate'
+import {PokerCards} from '../types/constEnums'
+import isSpecialPokerLabel from '../utils/isSpecialPokerLabel'
 import PokerDimensionValueControl from './PokerDimensionValueControl'
 import PokerVotingRow from './PokerVotingRow'
 import useSetTaskEstimate from './useSetTaskEstimate'
diff --git a/packages/client/components/PokerEstimateHeaderCardParabol.tsx b/packages/client/components/PokerEstimateHeaderCardParabol.tsx
index cc55ca2abff..e0b54b7d65d 100644
--- a/packages/client/components/PokerEstimateHeaderCardParabol.tsx
+++ b/packages/client/components/PokerEstimateHeaderCardParabol.tsx
@@ -10,10 +10,10 @@ import {Elevation} from '~/styles/elevation'
 import {PALETTE} from '~/styles/paletteV3'
 import {Breakpoint} from '~/types/constEnums'
 import isAndroid from '~/utils/draftjs/isAndroid'
+import {PokerEstimateHeaderCardParabol_task$key} from '../__generated__/PokerEstimateHeaderCardParabol_task.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import UpdateTaskMutation from '../mutations/UpdateTaskMutation'
 import convertToTaskContent from '../utils/draftjs/convertToTaskContent'
-import {PokerEstimateHeaderCardParabol_task$key} from '../__generated__/PokerEstimateHeaderCardParabol_task.graphql'
 import CardButton from './CardButton'
 import IconLabel from './IconLabel'
 import TaskEditor from './TaskEditor/TaskEditor'
diff --git a/packages/client/components/PokerEstimatePhase.tsx b/packages/client/components/PokerEstimatePhase.tsx
index 8622217b040..a4008ca422c 100644
--- a/packages/client/components/PokerEstimatePhase.tsx
+++ b/packages/client/components/PokerEstimatePhase.tsx
@@ -6,8 +6,8 @@ import useBreakpoint from '~/hooks/useBreakpoint'
 import useGotoStageId from '~/hooks/useGotoStageId'
 import useRightDrawer from '~/hooks/useRightDrawer'
 import {Breakpoint, DiscussionThreadEnum} from '~/types/constEnums'
-import {phaseLabelLookup} from '../utils/meetings/lookups'
 import {PokerEstimatePhase_meeting$key} from '../__generated__/PokerEstimatePhase_meeting.graphql'
+import {phaseLabelLookup} from '../utils/meetings/lookups'
 import ErrorBoundary from './ErrorBoundary'
 import EstimatePhaseArea from './EstimatePhaseArea'
 import EstimatePhaseDiscussionDrawer from './EstimatePhaseDiscussionDrawer'
diff --git a/packages/client/components/PokerMeetingSidebar.tsx b/packages/client/components/PokerMeetingSidebar.tsx
index 59fc535522b..53e9cb6cfd7 100644
--- a/packages/client/components/PokerMeetingSidebar.tsx
+++ b/packages/client/components/PokerMeetingSidebar.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Fragment} from 'react'
 import {useFragment} from 'react-relay'
-import useRouter from '~/hooks/useRouter'
 import {
   NewMeetingPhaseTypeEnum,
   PokerMeetingSidebar_meeting$key
 } from '~/__generated__/PokerMeetingSidebar_meeting.graphql'
+import useRouter from '~/hooks/useRouter'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useGotoStageId from '../hooks/useGotoStageId'
 import getSidebarItemStage from '../utils/getSidebarItemStage'
diff --git a/packages/client/components/PokerSidebarEstimateSection.tsx b/packages/client/components/PokerSidebarEstimateSection.tsx
index 4bfd8080409..235267fa14c 100644
--- a/packages/client/components/PokerSidebarEstimateSection.tsx
+++ b/packages/client/components/PokerSidebarEstimateSection.tsx
@@ -3,8 +3,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
-import useGotoStageId from '~/hooks/useGotoStageId'
 import {PokerSidebarEstimateSection_meeting$key} from '~/__generated__/PokerSidebarEstimateSection_meeting.graphql'
+import useGotoStageId from '~/hooks/useGotoStageId'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMakeStageSummaries from '../hooks/useMakeStageSummaries'
 import DragEstimatingTaskMutation from '../mutations/DragEstimatingTaskMutation'
diff --git a/packages/client/components/PokerSidebarPhaseListItemChildren.tsx b/packages/client/components/PokerSidebarPhaseListItemChildren.tsx
index ba8da6bdef1..d40750e3f5e 100644
--- a/packages/client/components/PokerSidebarPhaseListItemChildren.tsx
+++ b/packages/client/components/PokerSidebarPhaseListItemChildren.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import useGotoStageId from '~/hooks/useGotoStageId'
 import {
   NewMeetingPhaseTypeEnum,
   PokerSidebarPhaseListItemChildren_meeting$key
 } from '~/__generated__/PokerSidebarPhaseListItemChildren_meeting.graphql'
+import useGotoStageId from '~/hooks/useGotoStageId'
 import MeetingSidebarTeamMemberStageItems from './MeetingSidebarTeamMemberStageItems'
 import PokerSidebarEstimateSection from './PokerSidebarEstimateSection'
 
diff --git a/packages/client/components/PokerVotingRow.tsx b/packages/client/components/PokerVotingRow.tsx
index 3e5f8690fd3..0256935ca6e 100644
--- a/packages/client/components/PokerVotingRow.tsx
+++ b/packages/client/components/PokerVotingRow.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '../styles/paletteV3'
-import {PokerCards} from '../types/constEnums'
 import {PokerVotingRow_scaleValue$key} from '../__generated__/PokerVotingRow_scaleValue.graphql'
 import {PokerVotingRow_scores$key} from '../__generated__/PokerVotingRow_scores.graphql'
+import {PALETTE} from '../styles/paletteV3'
+import {PokerCards} from '../types/constEnums'
 import AvatarList from './AvatarList'
 import MiniPokerCard from './MiniPokerCard'
 import PokerVotingNoVotes from './PokerVotingNoVotes'
diff --git a/packages/client/components/Poll/EditablePollOption.tsx b/packages/client/components/Poll/EditablePollOption.tsx
index 4aa7bda76d6..d5cbb5df84e 100644
--- a/packages/client/components/Poll/EditablePollOption.tsx
+++ b/packages/client/components/Poll/EditablePollOption.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {EditablePollOption_option$key} from '../../__generated__/EditablePollOption_option.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import {PALETTE} from '../../styles/paletteV3'
 import {Polls, PollsAriaLabels} from '../../types/constEnums'
-import {EditablePollOption_option$key} from '../../__generated__/EditablePollOption_option.graphql'
 import {updateLocalPollOption} from './local/newPoll'
 
 const PollOptionInputRoot = styled('div')({
diff --git a/packages/client/components/Poll/EditablePollTitle.tsx b/packages/client/components/Poll/EditablePollTitle.tsx
index 2c7754c10ff..9516e4c3256 100644
--- a/packages/client/components/Poll/EditablePollTitle.tsx
+++ b/packages/client/components/Poll/EditablePollTitle.tsx
@@ -4,8 +4,8 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
 import {Polls, PollsAriaLabels} from '~/types/constEnums'
-import useAtmosphere from '../../hooks/useAtmosphere'
 import {EditablePollTitle_poll$key} from '../../__generated__/EditablePollTitle_poll.graphql'
+import useAtmosphere from '../../hooks/useAtmosphere'
 import {updateLocalPoll} from './local/newPoll'
 
 const PollTitleInput = styled('input')({
diff --git a/packages/client/components/Poll/Poll.tsx b/packages/client/components/Poll/Poll.tsx
index 8a10e86279a..a012fc0f765 100644
--- a/packages/client/components/Poll/Poll.tsx
+++ b/packages/client/components/Poll/Poll.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {Poll_poll$key} from '~/__generated__/Poll_poll.graphql'
 import {cardShadow, Elevation} from '~/styles/elevation'
 import cardRootStyles from '~/styles/helpers/cardRootStyles'
 import {PALETTE} from '~/styles/paletteV3'
-import {Poll_poll$key} from '~/__generated__/Poll_poll.graphql'
 import ThreadedAvatarColumn from '../ThreadedAvatarColumn'
 import ThreadedItemHeaderDescription from '../ThreadedItemHeaderDescription'
 import ThreadedItemWrapper from '../ThreadedItemWrapper'
diff --git a/packages/client/components/PrivateRoutes.tsx b/packages/client/components/PrivateRoutes.tsx
index 5c5e81a8a97..178742810e2 100644
--- a/packages/client/components/PrivateRoutes.tsx
+++ b/packages/client/components/PrivateRoutes.tsx
@@ -1,5 +1,5 @@
-import React, {lazy} from 'react'
 import {Location} from 'history'
+import React, {lazy} from 'react'
 import {Redirect, Route, Switch, useLocation} from 'react-router'
 import useAuthRoute from '../hooks/useAuthRoute'
 import useNoIndex from '../hooks/useNoIndex'
diff --git a/packages/client/components/PromoteToBillingLeader.tsx b/packages/client/components/PromoteToBillingLeader.tsx
index f01871395ac..76844479944 100644
--- a/packages/client/components/PromoteToBillingLeader.tsx
+++ b/packages/client/components/PromoteToBillingLeader.tsx
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {PromoteToBillingLeader_notification$key} from '~/__generated__/PromoteToBillingLeader_notification.graphql'
 import useRouter from '~/hooks/useRouter'
 import defaultOrgAvatar from '~/styles/theme/images/avatar-organization.svg'
-import {PromoteToBillingLeader_notification$key} from '~/__generated__/PromoteToBillingLeader_notification.graphql'
 import NotificationAction from './NotificationAction'
 import NotificationTemplate from './NotificationTemplate'
 interface Props {
diff --git a/packages/client/components/PromptToJoinOrgNotification.tsx b/packages/client/components/PromptToJoinOrgNotification.tsx
index bb10eec1650..71e989f0980 100644
--- a/packages/client/components/PromptToJoinOrgNotification.tsx
+++ b/packages/client/components/PromptToJoinOrgNotification.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {PromptToJoinOrgNotification_notification$key} from '~/__generated__/PromptToJoinOrgNotification_notification.graphql'
-import NotificationAction from './NotificationAction'
-import NotificationTemplate from './NotificationTemplate'
 import useAtmosphere from '../hooks/useAtmosphere'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import RequestToJoinDomainMutation from '../mutations/RequestToJoinDomainMutation'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
+import NotificationAction from './NotificationAction'
+import NotificationTemplate from './NotificationTemplate'
 
 interface Props {
   notification: PromptToJoinOrgNotification_notification$key
diff --git a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
index 161709a6de8..49c409083d9 100644
--- a/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
+++ b/packages/client/components/Recurrence/EndRecurringMeetingModal.tsx
@@ -1,8 +1,10 @@
+import graphql from 'babel-plugin-relay/macro'
 import clsx from 'clsx'
 import React, {useMemo, useState} from 'react'
 import {useFragment} from 'react-relay'
-import graphql from 'babel-plugin-relay/macro'
 import {RRule} from 'rrule'
+import {EndRecurringMeetingModal_meeting$key} from '../../__generated__/EndRecurringMeetingModal_meeting.graphql'
+import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useMutationProps from '../../hooks/useMutationProps'
 import useRouter from '../../hooks/useRouter'
@@ -11,14 +13,12 @@ import EndRetrospectiveMutation from '../../mutations/EndRetrospectiveMutation'
 import EndSprintPokerMutation from '../../mutations/EndSprintPokerMutation'
 import EndTeamPromptMutation from '../../mutations/EndTeamPromptMutation'
 import UpdateRecurrenceSettingsMutation from '../../mutations/UpdateRecurrenceSettingsMutation'
-import {EndRecurringMeetingModal_meeting$key} from '../../__generated__/EndRecurringMeetingModal_meeting.graphql'
 import {
   CompletedHandler,
   HistoryMaybeLocalHandler,
   StandardMutation
 } from '../../types/relayMutations'
 import {humanReadableCountdown} from '../../utils/date/relativeDate'
-import {MeetingTypeEnum} from '../../__generated__/MeetingSelectorQuery.graphql'
 import DialogContainer from '../DialogContainer'
 
 export const EndMeetingMutationLookup = {
diff --git a/packages/client/components/Recurrence/RecurrenceSettings.tsx b/packages/client/components/Recurrence/RecurrenceSettings.tsx
index 8015c6a7772..a1e039e913a 100644
--- a/packages/client/components/Recurrence/RecurrenceSettings.tsx
+++ b/packages/client/components/Recurrence/RecurrenceSettings.tsx
@@ -5,12 +5,12 @@ import React, {PropsWithChildren, useEffect} from 'react'
 import {Frequency, RRule} from 'rrule'
 import {MenuPosition} from '../../hooks/useCoords'
 import useMenu from '../../hooks/useMenu'
+import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from '../../shared/rruleUtil'
 import plural from '../../utils/plural'
 import DropdownMenuToggle from '../DropdownMenuToggle'
 import {toHumanReadable} from './HumanReadableRecurrenceRule'
 import {Day, RecurrenceDayCheckbox} from './RecurrenceDayCheckbox'
 import {RecurrenceTimePicker} from './RecurrenceTimePicker'
-import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from '../../shared/rruleUtil'
 dayjs.extend(utcPlugin)
 
 export const ALL_DAYS: Day[] = [
diff --git a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
index 355d4137c9b..da69cf7f869 100644
--- a/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
+++ b/packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx
@@ -4,15 +4,15 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {ChangeEvent, useMemo, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
-import UpdateRecurrenceSettingsMutation from '~/mutations/UpdateRecurrenceSettingsMutation'
 import {UpdateRecurrenceSettingsModal_meeting$key} from '~/__generated__/UpdateRecurrenceSettingsModal_meeting.graphql'
+import UpdateRecurrenceSettingsMutation from '~/mutations/UpdateRecurrenceSettingsMutation'
+import {UpdateRecurrenceSettingsMutation as TUpdateRecurrenceSettingsMutation} from '../../__generated__/UpdateRecurrenceSettingsMutation.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useForm from '../../hooks/useForm'
 import useMutationProps, {getOnCompletedError} from '../../hooks/useMutationProps'
 import {PALETTE} from '../../styles/paletteV3'
 import {CompletedHandler} from '../../types/relayMutations'
 import Legitity from '../../validation/Legitity'
-import {UpdateRecurrenceSettingsMutation as TUpdateRecurrenceSettingsMutation} from '../../__generated__/UpdateRecurrenceSettingsMutation.graphql'
 import DialogContainer from '../DialogContainer'
 import PlainButton from '../PlainButton/PlainButton'
 import StyledError from '../StyledError'
diff --git a/packages/client/components/ReflectionCard/ColorBadge.tsx b/packages/client/components/ReflectionCard/ColorBadge.tsx
index 23afa905efe..b759a3430b8 100644
--- a/packages/client/components/ReflectionCard/ColorBadge.tsx
+++ b/packages/client/components/ReflectionCard/ColorBadge.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {MenuPosition} from '~/hooks/useCoords'
-import useTooltip from '~/hooks/useTooltip'
 import {NewMeetingPhaseTypeEnum} from '~/__generated__/ActionMeeting_meeting.graphql'
 import {ColorBadge_reflection$key} from '~/__generated__/ColorBadge_reflection.graphql'
+import {MenuPosition} from '~/hooks/useCoords'
+import useTooltip from '~/hooks/useTooltip'
 
 const DROP_SIZE = 32
 const DROP_SIZE_HALF = DROP_SIZE / 2
diff --git a/packages/client/components/ReflectionCard/ReactjiCount.tsx b/packages/client/components/ReflectionCard/ReactjiCount.tsx
index dce9f4210e6..65f5c7f30de 100644
--- a/packages/client/components/ReflectionCard/ReactjiCount.tsx
+++ b/packages/client/components/ReflectionCard/ReactjiCount.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ReactjiCount_reactji$key} from '~/__generated__/ReactjiCount_reactji.graphql'
 import PlainButton from '~/components/PlainButton/PlainButton'
 import {TransitionStatus} from '~/hooks/useTransition'
 import {PALETTE} from '~/styles/paletteV3'
 import {BezierCurve, Times} from '~/types/constEnums'
-import {ReactjiCount_reactji$key} from '~/__generated__/ReactjiCount_reactji.graphql'
 import {MenuPosition} from '../../hooks/useCoords'
 import useTooltip from '../../hooks/useTooltip'
 import ReactjiId from '../../shared/gqlIds/ReactjiId'
-import EmojiUsersReaction from './EmojiUsersReaction'
 import getReactji from '../../utils/getReactji'
+import EmojiUsersReaction from './EmojiUsersReaction'
 
 const Parent = styled('div')<{status: TransitionStatus}>(({status}) => ({
   height: status === TransitionStatus.MOUNTED || status === TransitionStatus.EXITING ? 0 : 24,
diff --git a/packages/client/components/ReflectionCard/ReactjiSection.tsx b/packages/client/components/ReflectionCard/ReactjiSection.tsx
index 9c495f4661b..c3fee9144ed 100644
--- a/packages/client/components/ReflectionCard/ReactjiSection.tsx
+++ b/packages/client/components/ReflectionCard/ReactjiSection.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ReactjiSection_reactjis$key} from '~/__generated__/ReactjiSection_reactjis.graphql'
 import useInitialRender from '~/hooks/useInitialRender'
 import useTransition, {TransitionStatus} from '~/hooks/useTransition'
 import {Threshold} from '~/types/constEnums'
-import {ReactjiSection_reactjis$key} from '~/__generated__/ReactjiSection_reactjis.graphql'
 import AddReactjiButton from './AddReactjiButton'
 import ReactjiCount from './ReactjiCount'
 
diff --git a/packages/client/components/ReflectionCard/ReflectionCard.tsx b/packages/client/components/ReflectionCard/ReflectionCard.tsx
index b23f03e0b97..402aa5722a1 100644
--- a/packages/client/components/ReflectionCard/ReflectionCard.tsx
+++ b/packages/client/components/ReflectionCard/ReflectionCard.tsx
@@ -3,12 +3,13 @@ import graphql from 'babel-plugin-relay/macro'
 import {convertToRaw, EditorProps} from 'draft-js'
 import React, {MouseEvent, useEffect, useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
-import AddReactjiToReactableMutation from '~/mutations/AddReactjiToReactableMutation'
-import isDemoRoute from '~/utils/isDemoRoute'
 import {
   NewMeetingPhaseTypeEnum,
   ReflectionCard_meeting$key
 } from '~/__generated__/ReflectionCard_meeting.graphql'
+import AddReactjiToReactableMutation from '~/mutations/AddReactjiToReactableMutation'
+import isDemoRoute from '~/utils/isDemoRoute'
+import {ReflectionCard_reflection$key} from '../../__generated__/ReflectionCard_reflection.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useBreakpoint from '../../hooks/useBreakpoint'
 import {MenuPosition} from '../../hooks/useCoords'
@@ -25,7 +26,6 @@ import isAndroid from '../../utils/draftjs/isAndroid'
 import remountDecorators from '../../utils/draftjs/remountDecorators'
 import isPhaseComplete from '../../utils/meetings/isPhaseComplete'
 import isTempId from '../../utils/relay/isTempId'
-import {ReflectionCard_reflection$key} from '../../__generated__/ReflectionCard_reflection.graphql'
 import CardButton from '../CardButton'
 import {OpenSpotlight} from '../GroupingKanbanColumn'
 import IconLabel from '../IconLabel'
diff --git a/packages/client/components/ReflectionEditorWrapper.tsx b/packages/client/components/ReflectionEditorWrapper.tsx
index 9da0ca6ab78..73436c33cd1 100644
--- a/packages/client/components/ReflectionEditorWrapper.tsx
+++ b/packages/client/components/ReflectionEditorWrapper.tsx
@@ -9,7 +9,8 @@ import {
   getDefaultKeyBinding
 } from 'draft-js'
 import React, {RefObject, Suspense, useEffect, useRef} from 'react'
-import {Card, Gutters, ElementHeight} from '../types/constEnums'
+import {PALETTE} from '~/styles/paletteV3'
+import {Card, ElementHeight, Gutters} from '../types/constEnums'
 import {textTags} from '../utils/constants'
 import completeEntity from '../utils/draftjs/completeEntity'
 import entitizeText from '../utils/draftjs/entitizeText'
@@ -19,7 +20,6 @@ import lazyPreload from '../utils/lazyPreload'
 import linkify from '../utils/linkify'
 import './TaskEditor/Draft.css'
 import useCommentPlugins from './TaskEditor/useCommentPlugins'
-import {PALETTE} from '~/styles/paletteV3'
 
 const EditorStyles = styled('div')(({useFallback, userSelect, isClipped}: any) => ({
   color: PALETTE.SLATE_700,
diff --git a/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx b/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx
index d1614b511d2..22b51205077 100644
--- a/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx
+++ b/packages/client/components/ReflectionGroup/DraggableReflectionCard.tsx
@@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo, useState} from 'react'
 import {useFragment} from 'react-relay'
 import useSpotlightResults from '~/hooks/useSpotlightResults'
-import useDraggableReflectionCard from '../../hooks/useDraggableReflectionCard'
 import {DraggableReflectionCard_meeting$key} from '../../__generated__/DraggableReflectionCard_meeting.graphql'
 import {DraggableReflectionCard_reflection$key} from '../../__generated__/DraggableReflectionCard_reflection.graphql'
 import {DraggableReflectionCard_staticReflections$key} from '../../__generated__/DraggableReflectionCard_staticReflections.graphql'
+import useDraggableReflectionCard from '../../hooks/useDraggableReflectionCard'
 import {SwipeColumn} from '../GroupingKanban'
 import {OpenSpotlight} from '../GroupingKanbanColumn'
 import ReflectionCard from '../ReflectionCard/ReflectionCard'
diff --git a/packages/client/components/ReflectionGroup/ReflectionGroup.tsx b/packages/client/components/ReflectionGroup/ReflectionGroup.tsx
index c7ab9183126..ffb5efa3419 100644
--- a/packages/client/components/ReflectionGroup/ReflectionGroup.tsx
+++ b/packages/client/components/ReflectionGroup/ReflectionGroup.tsx
@@ -2,6 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useEffect, useMemo, useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {ReflectionGroup_meeting$key} from '../../__generated__/ReflectionGroup_meeting.graphql'
+import {ReflectionGroup_reflectionGroup$key} from '../../__generated__/ReflectionGroup_reflectionGroup.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useEventCallback from '../../hooks/useEventCallback'
 import useExpandedReflections from '../../hooks/useExpandedReflections'
@@ -12,8 +14,6 @@ import {
   Times
 } from '../../types/constEnums'
 import {GROUP} from '../../utils/constants'
-import {ReflectionGroup_meeting$key} from '../../__generated__/ReflectionGroup_meeting.graphql'
-import {ReflectionGroup_reflectionGroup$key} from '../../__generated__/ReflectionGroup_reflectionGroup.graphql'
 import {SwipeColumn} from '../GroupingKanban'
 import {OpenSpotlight} from '../GroupingKanbanColumn'
 import ReflectionGroupHeader from '../ReflectionGroupHeader'
diff --git a/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx b/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx
index 64ec7fd9e09..c02a5677c69 100644
--- a/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx
+++ b/packages/client/components/ReflectionGroup/ReflectionGroupTitleEditor.tsx
@@ -2,6 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {ReflectionGroupTitleEditor_meeting$key} from '../../__generated__/ReflectionGroupTitleEditor_meeting.graphql'
+import {ReflectionGroupTitleEditor_reflectionGroup$key} from '../../__generated__/ReflectionGroupTitleEditor_reflectionGroup.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useMutationProps from '../../hooks/useMutationProps'
 import UpdateReflectionGroupTitleMutation from '../../mutations/UpdateReflectionGroupTitleMutation'
@@ -9,8 +11,6 @@ import {PALETTE} from '../../styles/paletteV3'
 import ui from '../../styles/ui'
 import {Card} from '../../types/constEnums'
 import {RETRO_TOPIC_LABEL} from '../../utils/constants'
-import {ReflectionGroupTitleEditor_meeting$key} from '../../__generated__/ReflectionGroupTitleEditor_meeting.graphql'
-import {ReflectionGroupTitleEditor_reflectionGroup$key} from '../../__generated__/ReflectionGroupTitleEditor_reflectionGroup.graphql'
 import StyledError from '../StyledError'
 
 interface Props {
diff --git a/packages/client/components/ReflectionGroup/RemoteReflection.tsx b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
index 522533d3f7d..02c05d48ade 100644
--- a/packages/client/components/ReflectionGroup/RemoteReflection.tsx
+++ b/packages/client/components/ReflectionGroup/RemoteReflection.tsx
@@ -4,6 +4,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useEffect, useMemo, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import useSpotlightResults from '~/hooks/useSpotlightResults'
+import {RemoteReflection_meeting$key} from '../../__generated__/RemoteReflection_meeting.graphql'
+import {
+  RemoteReflection_reflection$data,
+  RemoteReflection_reflection$key
+} from '../../__generated__/RemoteReflection_reflection.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useEditorState from '../../hooks/useEditorState'
 import {Elevation} from '../../styles/elevation'
@@ -11,11 +16,6 @@ import {BezierCurve, DragAttribute, ElementWidth, Times, ZIndex} from '../../typ
 import {DeepNonNullable} from '../../types/generics'
 import {VOTE} from '../../utils/constants'
 import {getMinTop} from '../../utils/retroGroup/updateClonePosition'
-import {RemoteReflection_meeting$key} from '../../__generated__/RemoteReflection_meeting.graphql'
-import {
-  RemoteReflection_reflection$key,
-  RemoteReflection_reflection$data
-} from '../../__generated__/RemoteReflection_reflection.graphql'
 import ReflectionCardAuthor from '../ReflectionCard/ReflectionCardAuthor'
 import ReflectionCardRoot from '../ReflectionCard/ReflectionCardRoot'
 import ReflectionEditorWrapper from '../ReflectionEditorWrapper'
diff --git a/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts b/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts
index c4c91b4efba..dbdfcd9511e 100644
--- a/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts
+++ b/packages/client/components/ReflectionGroup/useSpotlightReflectionGroup.ts
@@ -1,7 +1,7 @@
 import {useMemo} from 'react'
-import useSpotlightResults from '~/hooks/useSpotlightResults'
 import {ReflectionGroup_meeting$data} from '~/__generated__/ReflectionGroup_meeting.graphql'
 import {ReflectionGroup_reflectionGroup$data} from '~/__generated__/ReflectionGroup_reflectionGroup.graphql'
+import useSpotlightResults from '~/hooks/useSpotlightResults'
 import useSpotlightVisibleReflections from './useSpotlightVisibleReflections'
 
 const useSpotlightReflectionGroup = (
diff --git a/packages/client/components/ReflectionGroupHeader.tsx b/packages/client/components/ReflectionGroupHeader.tsx
index 85848189b46..9e79985b3e2 100644
--- a/packages/client/components/ReflectionGroupHeader.tsx
+++ b/packages/client/components/ReflectionGroupHeader.tsx
@@ -3,13 +3,13 @@ import {Edit} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {forwardRef, Ref, RefObject} from 'react'
 import {useFragment} from 'react-relay'
+import {ReflectionGroupHeader_meeting$key} from '../__generated__/ReflectionGroupHeader_meeting.graphql'
+import {ReflectionGroupHeader_reflectionGroup$key} from '../__generated__/ReflectionGroupHeader_reflectionGroup.graphql'
 import {PortalStatus} from '../hooks/usePortal'
 import {PALETTE} from '../styles/paletteV3'
 import {ElementWidth, Gutters} from '../types/constEnums'
 import {GROUP, VOTE} from '../utils/constants'
 import plural from '../utils/plural'
-import {ReflectionGroupHeader_meeting$key} from '../__generated__/ReflectionGroupHeader_meeting.graphql'
-import {ReflectionGroupHeader_reflectionGroup$key} from '../__generated__/ReflectionGroupHeader_reflectionGroup.graphql'
 import ReflectionGroupTitleEditor from './ReflectionGroup/ReflectionGroupTitleEditor'
 import ReflectionGroupVoting from './ReflectionGroupVoting'
 import BaseTag from './Tag/BaseTag'
diff --git a/packages/client/components/ReflectionGroupVoting.tsx b/packages/client/components/ReflectionGroupVoting.tsx
index 0797172425e..78b4c0b9cad 100644
--- a/packages/client/components/ReflectionGroupVoting.tsx
+++ b/packages/client/components/ReflectionGroupVoting.tsx
@@ -6,14 +6,14 @@ import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import Atmosphere from '../Atmosphere'
+import {ReflectionGroupVoting_meeting$key} from '../__generated__/ReflectionGroupVoting_meeting.graphql'
+import {ReflectionGroupVoting_reflectionGroup$key} from '../__generated__/ReflectionGroupVoting_reflectionGroup.graphql'
 import VoteForReflectionGroupMutation from '../mutations/VoteForReflectionGroupMutation'
 import {PALETTE} from '../styles/paletteV3'
 import {CompletedHandler} from '../types/relayMutations'
 import getGraphQLError from '../utils/relay/getGraphQLError'
 import isTempId from '../utils/relay/isTempId'
 import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps'
-import {ReflectionGroupVoting_meeting$key} from '../__generated__/ReflectionGroupVoting_meeting.graphql'
-import {ReflectionGroupVoting_reflectionGroup$key} from '../__generated__/ReflectionGroupVoting_reflectionGroup.graphql'
 import FlatButton from './FlatButton'
 
 interface Props extends WithMutationProps {
diff --git a/packages/client/components/RequestToJoinOrgNotification.tsx b/packages/client/components/RequestToJoinOrgNotification.tsx
index a2328c8c604..f48163a99ff 100644
--- a/packages/client/components/RequestToJoinOrgNotification.tsx
+++ b/packages/client/components/RequestToJoinOrgNotification.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
-import {useLocation} from 'react-router'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {useLocation} from 'react-router'
 import {RequestToJoinOrgNotification_notification$key} from '~/__generated__/RequestToJoinOrgNotification_notification.graphql'
+import useRouter from '../hooks/useRouter'
 import NotificationAction from './NotificationAction'
 import NotificationTemplate from './NotificationTemplate'
-import useRouter from '../hooks/useRouter'
 
 interface Props {
   notification: RequestToJoinOrgNotification_notification$key
diff --git a/packages/client/components/ResponseMentioned.tsx b/packages/client/components/ResponseMentioned.tsx
index e948edc9388..57a42589138 100644
--- a/packages/client/components/ResponseMentioned.tsx
+++ b/packages/client/components/ResponseMentioned.tsx
@@ -2,11 +2,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
-import useRouter from '../hooks/useRouter'
+import useAtmosphere from '~/hooks/useAtmosphere'
 import {ResponseMentioned_notification$key} from '../__generated__/ResponseMentioned_notification.graphql'
-import NotificationTemplate from './NotificationTemplate'
+import useRouter from '../hooks/useRouter'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
-import useAtmosphere from '~/hooks/useAtmosphere'
+import NotificationTemplate from './NotificationTemplate'
 
 interface Props {
   notification: ResponseMentioned_notification$key
diff --git a/packages/client/components/ResponseReplied.tsx b/packages/client/components/ResponseReplied.tsx
index 9c36ebd249e..3f84dbfa717 100644
--- a/packages/client/components/ResponseReplied.tsx
+++ b/packages/client/components/ResponseReplied.tsx
@@ -4,12 +4,12 @@ import {Editor} from 'draft-js'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import NotificationAction from '~/components/NotificationAction'
+import {ResponseReplied_notification$key} from '../__generated__/ResponseReplied_notification.graphql'
 import useEditorState from '../hooks/useEditorState'
 import useRouter from '../hooks/useRouter'
 import {cardShadow} from '../styles/elevation'
-import {ResponseReplied_notification$key} from '../__generated__/ResponseReplied_notification.graphql'
-import NotificationTemplate from './NotificationTemplate'
 import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg'
+import NotificationTemplate from './NotificationTemplate'
 
 const EditorWrapper = styled('div')({
   backgroundColor: '#fff',
diff --git a/packages/client/components/RetroDiscussPhase.tsx b/packages/client/components/RetroDiscussPhase.tsx
index b765f19874f..36cb0a6cd65 100644
--- a/packages/client/components/RetroDiscussPhase.tsx
+++ b/packages/client/components/RetroDiscussPhase.tsx
@@ -4,20 +4,20 @@ import * as Sentry from '@sentry/browser'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {RetroDiscussPhase_meeting$key} from '~/__generated__/RetroDiscussPhase_meeting.graphql'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import useCallbackRef from '~/hooks/useCallbackRef'
-import {RetroDiscussPhase_meeting$key} from '~/__generated__/RetroDiscussPhase_meeting.graphql'
 import EditorHelpModalContainer from '../containers/EditorHelpModalContainer/EditorHelpModalContainer'
 import {PALETTE} from '../styles/paletteV3'
 import {Breakpoint} from '../types/constEnums'
 import {phaseLabelLookup} from '../utils/meetings/lookups'
 import plural from '../utils/plural'
+import DiscussPhaseReflectionGrid from './DiscussPhaseReflectionGrid'
+import DiscussPhaseSqueeze from './DiscussPhaseSqueeze'
 import {DiscussionThreadables} from './DiscussionThreadList'
 import DiscussionThreadListEmptyState from './DiscussionThreadListEmptyState'
 import DiscussionThreadListEmptyTranscriptState from './DiscussionThreadListEmptyTranscriptState'
 import DiscussionThreadRoot from './DiscussionThreadRoot'
-import DiscussPhaseReflectionGrid from './DiscussPhaseReflectionGrid'
-import DiscussPhaseSqueeze from './DiscussPhaseSqueeze'
 import LabelHeading from './LabelHeading/LabelHeading'
 import MeetingContent from './MeetingContent'
 import MeetingHeaderAndPhase from './MeetingHeaderAndPhase'
@@ -26,9 +26,9 @@ import PhaseHeaderDescription from './PhaseHeaderDescription'
 import PhaseHeaderTitle from './PhaseHeaderTitle'
 import PhaseWrapper from './PhaseWrapper'
 import ReflectionGroup from './ReflectionGroup/ReflectionGroup'
+import RetroDiscussionThreadHeader from './RetroDiscussionThreadHeader'
 import {RetroMeetingPhaseProps} from './RetroMeeting'
 import StageTimerDisplay from './StageTimerDisplay'
-import RetroDiscussionThreadHeader from './RetroDiscussionThreadHeader'
 
 interface Props extends RetroMeetingPhaseProps {
   meeting: RetroDiscussPhase_meeting$key
diff --git a/packages/client/components/RetroDiscussionThreadHeader.tsx b/packages/client/components/RetroDiscussionThreadHeader.tsx
index 4317ba26d8b..15a0a29786b 100644
--- a/packages/client/components/RetroDiscussionThreadHeader.tsx
+++ b/packages/client/components/RetroDiscussionThreadHeader.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
-import FlatButton from './FlatButton'
-import graphql from 'babel-plugin-relay/macro'
 import styled from '@emotion/styled'
-import useAtmosphere from '../hooks/useAtmosphere'
-import {commitLocalUpdate} from 'relay-runtime'
+import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {useFragment} from 'react-relay'
+import {commitLocalUpdate} from 'relay-runtime'
+import {RetroDiscussionThreadHeader_organization$key} from '~/__generated__/RetroDiscussionThreadHeader_organization.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
 import {PALETTE} from '../styles/paletteV3'
 import {Header} from './DiscussionThreadList'
-import {RetroDiscussionThreadHeader_organization$key} from '~/__generated__/RetroDiscussionThreadHeader_organization.graphql'
+import FlatButton from './FlatButton'
 
 const HeaderWrapper = styled('div')({
   display: 'flex',
diff --git a/packages/client/components/RetroDrawer.tsx b/packages/client/components/RetroDrawer.tsx
index e03b4949533..bb877492d7c 100644
--- a/packages/client/components/RetroDrawer.tsx
+++ b/packages/client/components/RetroDrawer.tsx
@@ -2,13 +2,13 @@ import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql'
+import useBreakpoint from '../hooks/useBreakpoint'
 import {Breakpoint, DiscussionThreadEnum} from '../types/constEnums'
-import ResponsiveDashSidebar from './ResponsiveDashSidebar'
 import MeetingOptions from './MeetingOptions'
+import ResponsiveDashSidebar from './ResponsiveDashSidebar'
 import RetroDrawerTemplateCard from './RetroDrawerTemplateCard'
 import {Drawer} from './TeamPrompt/TeamPromptDrawer'
-import {RetroDrawerQuery} from '../__generated__/RetroDrawerQuery.graphql'
-import useBreakpoint from '../hooks/useBreakpoint'
 
 interface Props {
   setShowDrawer: (showDrawer: boolean) => void
diff --git a/packages/client/components/RetroDrawerTemplateCard.tsx b/packages/client/components/RetroDrawerTemplateCard.tsx
index 73fa7c30e3e..c732b060bdf 100644
--- a/packages/client/components/RetroDrawerTemplateCard.tsx
+++ b/packages/client/components/RetroDrawerTemplateCard.tsx
@@ -1,15 +1,15 @@
-import {ActivityBadge} from './ActivityLibrary/ActivityBadge'
-import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {ActivityLibraryCard} from './ActivityLibrary/ActivityLibraryCard'
-import {ActivityCardImage} from './ActivityLibrary/ActivityCard'
 import {RetroDrawerTemplateCard_template$key} from '~/__generated__/RetroDrawerTemplateCard_template.graphql'
-import {CategoryID, CATEGORY_THEMES} from '././ActivityLibrary/Categories'
-import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation'
-import useMutationProps from '../hooks/useMutationProps'
 import useAtmosphere from '../hooks/useAtmosphere'
+import useMutationProps from '../hooks/useMutationProps'
+import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation'
+import {CATEGORY_THEMES, CategoryID} from '././ActivityLibrary/Categories'
+import {ActivityBadge} from './ActivityLibrary/ActivityBadge'
+import {ActivityCardImage} from './ActivityLibrary/ActivityCard'
+import {ActivityLibraryCard} from './ActivityLibrary/ActivityLibraryCard'
+import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription'
 
 interface Props {
   templateRef: RetroDrawerTemplateCard_template$key
diff --git a/packages/client/components/RetroGroupPhase.tsx b/packages/client/components/RetroGroupPhase.tsx
index e9a9fd6c827..52dafdf05a8 100644
--- a/packages/client/components/RetroGroupPhase.tsx
+++ b/packages/client/components/RetroGroupPhase.tsx
@@ -3,11 +3,19 @@ import graphql from 'babel-plugin-relay/macro'
  * Renders the UI for the reflection phase of the retrospective meeting
  *
  */
+import styled from '@emotion/styled'
+import {Info as InfoIcon} from '@mui/icons-material'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {Info as InfoIcon} from '@mui/icons-material'
-import useCallbackRef from '~/hooks/useCallbackRef'
 import {RetroGroupPhase_meeting$key} from '~/__generated__/RetroGroupPhase_meeting.graphql'
+import useCallbackRef from '~/hooks/useCallbackRef'
+import useAtmosphere from '../hooks/useAtmosphere'
+import {MenuPosition} from '../hooks/useCoords'
+import useMutationProps from '../hooks/useMutationProps'
+import useTooltip from '../hooks/useTooltip'
+import AutogroupMutation from '../mutations/AutogroupMutation'
+import ResetReflectionGroupsMutation from '../mutations/ResetReflectionGroupsMutation'
+import {Elevation} from '../styles/elevation'
 import {phaseLabelLookup} from '../utils/meetings/lookups'
 import GroupingKanban from './GroupingKanban'
 import MeetingContent from './MeetingContent'
@@ -17,17 +25,9 @@ import MeetingTopBar from './MeetingTopBar'
 import PhaseHeaderDescription from './PhaseHeaderDescription'
 import PhaseHeaderTitle from './PhaseHeaderTitle'
 import PhaseWrapper from './PhaseWrapper'
+import PrimaryButton from './PrimaryButton'
 import {RetroMeetingPhaseProps} from './RetroMeeting'
 import StageTimerDisplay from './StageTimerDisplay'
-import PrimaryButton from './PrimaryButton'
-import styled from '@emotion/styled'
-import AutogroupMutation from '../mutations/AutogroupMutation'
-import ResetReflectionGroupsMutation from '../mutations/ResetReflectionGroupsMutation'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useMutationProps from '../hooks/useMutationProps'
-import {Elevation} from '../styles/elevation'
-import useTooltip from '../hooks/useTooltip'
-import {MenuPosition} from '../hooks/useCoords'
 
 const ButtonWrapper = styled('div')({
   display: 'flex',
diff --git a/packages/client/components/RetroMeetingSidebar.tsx b/packages/client/components/RetroMeetingSidebar.tsx
index 01722e479bd..a77fbd832ee 100644
--- a/packages/client/components/RetroMeetingSidebar.tsx
+++ b/packages/client/components/RetroMeetingSidebar.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Fragment, useState} from 'react'
 import {useFragment} from 'react-relay'
-import useRouter from '~/hooks/useRouter'
-import isDemoRoute from '~/utils/isDemoRoute'
 import {
   NewMeetingPhaseTypeEnum,
   RetroMeetingSidebar_meeting$key
 } from '~/__generated__/RetroMeetingSidebar_meeting.graphql'
+import useRouter from '~/hooks/useRouter'
+import isDemoRoute from '~/utils/isDemoRoute'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useGotoStageId from '../hooks/useGotoStageId'
 import getSidebarItemStage from '../utils/getSidebarItemStage'
diff --git a/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx b/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx
index 1053c5b95bc..d5ce339b896 100644
--- a/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx
+++ b/packages/client/components/RetroReflectPhase/PhaseItemColumn.tsx
@@ -4,6 +4,7 @@ import {EditorState} from 'draft-js'
 import React, {RefObject, useEffect, useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {PhaseItemColumn_prompt$key} from '~/__generated__/PhaseItemColumn_prompt.graphql'
+import {PhaseItemColumn_meeting$key} from '../../__generated__/PhaseItemColumn_meeting.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import {MenuPosition} from '../../hooks/useCoords'
 import useForceUpdate from '../../hooks/useForceUpdate'
@@ -13,7 +14,6 @@ import {DECELERATE} from '../../styles/animation'
 import {PALETTE} from '../../styles/paletteV3'
 import {BezierCurve, ElementWidth, Gutters} from '../../types/constEnums'
 import getNextSortOrder from '../../utils/getNextSortOrder'
-import {PhaseItemColumn_meeting$key} from '../../__generated__/PhaseItemColumn_meeting.graphql'
 import RetroPrompt from '../RetroPrompt'
 import PhaseItemChits from './PhaseItemChits'
 import PhaseItemEditor from './PhaseItemEditor'
diff --git a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
index 4edc7791790..51dfc541425 100644
--- a/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
+++ b/packages/client/components/RetroReflectPhase/PhaseItemEditor.tsx
@@ -1,10 +1,12 @@
 import styled from '@emotion/styled'
-import {Stack} from 'immutable'
 import graphql from 'babel-plugin-relay/macro'
-import {convertFromRaw, convertToRaw, EditorState, ContentState} from 'draft-js'
+import {ContentState, EditorState, convertFromRaw, convertToRaw} from 'draft-js'
+import {Stack} from 'immutable'
 import React, {MutableRefObject, RefObject, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {PhaseItemEditor_meeting$key} from '../../__generated__/PhaseItemEditor_meeting.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
+import useEditorState from '../../hooks/useEditorState'
 import useMutationProps from '../../hooks/useMutationProps'
 import usePortal from '../../hooks/usePortal'
 import CreateReflectionMutation from '../../mutations/CreateReflectionMutation'
@@ -13,13 +15,11 @@ import {Elevation} from '../../styles/elevation'
 import {PALETTE} from '../../styles/paletteV3'
 import {BezierCurve, ZIndex} from '../../types/constEnums'
 import convertToTaskContent from '../../utils/draftjs/convertToTaskContent'
-import {PhaseItemEditor_meeting$key} from '../../__generated__/PhaseItemEditor_meeting.graphql'
 import ReflectionCardAuthor from '../ReflectionCard/ReflectionCardAuthor'
 import ReflectionCardRoot from '../ReflectionCard/ReflectionCardRoot'
 import ReflectionEditorWrapper from '../ReflectionEditorWrapper'
-import getBBox from './getBBox'
 import {ReflectColumnCardInFlight} from './PhaseItemColumn'
-import useEditorState from '../../hooks/useEditorState'
+import getBBox from './getBBox'
 
 const FLIGHT_TIME = 500
 const CardInFlightStyles = styled(ReflectionCardRoot)<{transform: string; isStart: boolean}>(
diff --git a/packages/client/components/RetroReflectPhase/ReflectionStack.tsx b/packages/client/components/RetroReflectPhase/ReflectionStack.tsx
index d68242aadad..7a64cad67f4 100644
--- a/packages/client/components/RetroReflectPhase/ReflectionStack.tsx
+++ b/packages/client/components/RetroReflectPhase/ReflectionStack.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {ReflectionStack_meeting$key} from '~/__generated__/ReflectionStack_meeting.graphql'
+import {PhaseItemColumn_meeting$data} from '../../__generated__/PhaseItemColumn_meeting.graphql'
 import useExpandedReflections from '../../hooks/useExpandedReflections'
 import {
   Breakpoint,
@@ -10,7 +11,6 @@ import {
   ElementWidth,
   ReflectionStackPerspective
 } from '../../types/constEnums'
-import {PhaseItemColumn_meeting$data} from '../../__generated__/PhaseItemColumn_meeting.graphql'
 import ReflectionCard from '../ReflectionCard/ReflectionCard'
 import ExpandedReflectionStack from './ExpandedReflectionStack'
 import ReflectionStackPlaceholder from './ReflectionStackPlaceholder'
diff --git a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
index 493ae73247c..9fa7a86cfab 100644
--- a/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
+++ b/packages/client/components/RetroReflectPhase/RetroReflectPhase.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
-import useCallbackRef from '~/hooks/useCallbackRef'
 import {RetroReflectPhase_meeting$key} from '~/__generated__/RetroReflectPhase_meeting.graphql'
+import useCallbackRef from '~/hooks/useCallbackRef'
 import useBreakpoint from '../../hooks/useBreakpoint'
 import {Breakpoint} from '../../types/constEnums'
 import {phaseLabelLookup} from '../../utils/meetings/lookups'
@@ -15,8 +15,8 @@ import PhaseWrapper from '../PhaseWrapper'
 import {RetroMeetingPhaseProps} from '../RetroMeeting'
 import StageTimerDisplay from '../StageTimerDisplay'
 import PhaseItemColumn from './PhaseItemColumn'
-import ReflectWrapperMobile from './ReflectionWrapperMobile'
 import ReflectWrapperDesktop from './ReflectWrapperDesktop'
+import ReflectWrapperMobile from './ReflectionWrapperMobile'
 
 interface Props extends RetroMeetingPhaseProps {
   meeting: RetroReflectPhase_meeting$key
diff --git a/packages/client/components/RetroSidebarDiscussSection.tsx b/packages/client/components/RetroSidebarDiscussSection.tsx
index 4730d138d1c..d83e63fb5f6 100644
--- a/packages/client/components/RetroSidebarDiscussSection.tsx
+++ b/packages/client/components/RetroSidebarDiscussSection.tsx
@@ -4,13 +4,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
+import {
+  RetroSidebarDiscussSection_meeting$data,
+  RetroSidebarDiscussSection_meeting$key
+} from '~/__generated__/RetroSidebarDiscussSection_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useGotoStageId from '~/hooks/useGotoStageId'
 import {DeepNonNullable} from '~/types/generics'
-import {
-  RetroSidebarDiscussSection_meeting$key,
-  RetroSidebarDiscussSection_meeting$data
-} from '~/__generated__/RetroSidebarDiscussSection_meeting.graphql'
 import DragDiscussionTopicMutation from '../mutations/DragDiscussionTopicMutation'
 import {navItemRaised} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
diff --git a/packages/client/components/RetroSidebarPhaseListItemChildren.tsx b/packages/client/components/RetroSidebarPhaseListItemChildren.tsx
index 5ff5d86d4cf..83428fdb9e5 100644
--- a/packages/client/components/RetroSidebarPhaseListItemChildren.tsx
+++ b/packages/client/components/RetroSidebarPhaseListItemChildren.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import useGotoStageId from '~/hooks/useGotoStageId'
 import {
   NewMeetingPhaseTypeEnum,
   RetroSidebarPhaseListItemChildren_meeting$key
 } from '~/__generated__/RetroSidebarPhaseListItemChildren_meeting.graphql'
+import useGotoStageId from '~/hooks/useGotoStageId'
 import isPhaseComplete from '../utils/meetings/isPhaseComplete'
 import MeetingSidebarTeamMemberStageItems from './MeetingSidebarTeamMemberStageItems'
 import RetroSidebarDiscussSection from './RetroSidebarDiscussSection'
diff --git a/packages/client/components/RetroVoteMetaHeader.tsx b/packages/client/components/RetroVoteMetaHeader.tsx
index 0231438d5e6..38148c32f0d 100644
--- a/packages/client/components/RetroVoteMetaHeader.tsx
+++ b/packages/client/components/RetroVoteMetaHeader.tsx
@@ -3,11 +3,11 @@ import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {RetroVoteMetaHeader_meeting$key} from '~/__generated__/RetroVoteMetaHeader_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import lazyPreload from '~/utils/lazyPreload'
-import {RetroVoteMetaHeader_meeting$key} from '~/__generated__/RetroVoteMetaHeader_meeting.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import {FONT_FAMILY} from '../styles/typographyV2'
 import {Breakpoint} from '../types/constEnums'
diff --git a/packages/client/components/ReviewRequestToJoinOrgModal.tsx b/packages/client/components/ReviewRequestToJoinOrgModal.tsx
index 2604455e6f6..dcdd9844a2f 100644
--- a/packages/client/components/ReviewRequestToJoinOrgModal.tsx
+++ b/packages/client/components/ReviewRequestToJoinOrgModal.tsx
@@ -1,14 +1,14 @@
 import graphql from 'babel-plugin-relay/macro'
-import React, {useState, useMemo} from 'react'
-import {PreloadedQuery, usePreloadedQuery, useFragment} from 'react-relay'
+import React, {useMemo, useState} from 'react'
+import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
+import {ReviewRequestToJoinOrgModalQuery} from '../__generated__/ReviewRequestToJoinOrgModalQuery.graphql'
+import {ReviewRequestToJoinOrgModal_viewer$key} from '../__generated__/ReviewRequestToJoinOrgModal_viewer.graphql'
+import useAcceptRequestToJoinDomainMutation from '../mutations/useAcceptRequestToJoinDomainMutation'
+import Checkbox from './Checkbox'
 import DialogContainer from './DialogContainer'
 import DialogTitle from './DialogTitle'
 import PrimaryButton from './PrimaryButton'
 import SecondaryButton from './SecondaryButton'
-import {ReviewRequestToJoinOrgModalQuery} from '../__generated__/ReviewRequestToJoinOrgModalQuery.graphql'
-import {ReviewRequestToJoinOrgModal_viewer$key} from '../__generated__/ReviewRequestToJoinOrgModal_viewer.graphql'
-import Checkbox from './Checkbox'
-import useAcceptRequestToJoinDomainMutation from '../mutations/useAcceptRequestToJoinDomainMutation'
 
 const ReviewRequestToJoinOrgModalViewerFragment = graphql`
   fragment ReviewRequestToJoinOrgModal_viewer on User
diff --git a/packages/client/components/ReviewRequestToJoinOrgRoot.tsx b/packages/client/components/ReviewRequestToJoinOrgRoot.tsx
index e35f9011012..d4a4d018008 100644
--- a/packages/client/components/ReviewRequestToJoinOrgRoot.tsx
+++ b/packages/client/components/ReviewRequestToJoinOrgRoot.tsx
@@ -1,12 +1,12 @@
 import React, {Suspense, useCallback, useEffect} from 'react'
 import {useHistory, useLocation} from 'react-router'
-import useRouter from '../hooks/useRouter'
-import useModal from '../hooks/useModal'
 import ReviewRequestToJoinOrgModal from '~/components/ReviewRequestToJoinOrgModal'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import reviewRequestToJoinOrgModalQuery, {
   ReviewRequestToJoinOrgModalQuery
 } from '../__generated__/ReviewRequestToJoinOrgModalQuery.graphql'
+import useModal from '../hooks/useModal'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import useRouter from '../hooks/useRouter'
 
 const ReviewRequestToJoinOrgRoot = () => {
   const {match} = useRouter<{requestId: string}>()
diff --git a/packages/client/components/ScheduleDialog.tsx b/packages/client/components/ScheduleDialog.tsx
index 39f484dbff1..b3c6d5f6724 100644
--- a/packages/client/components/ScheduleDialog.tsx
+++ b/packages/client/components/ScheduleDialog.tsx
@@ -1,34 +1,34 @@
-import React, {ChangeEvent, useState} from 'react'
-import {RecurrenceSettings} from './Recurrence/RecurrenceSettings'
-import * as Collapsible from '@radix-ui/react-collapsible'
 import {EventRepeat, ExpandMore} from '@mui/icons-material'
-import PrimaryButton from './PrimaryButton'
-import {DialogActions} from '../ui/Dialog/DialogActions'
-import SecondaryButton from './SecondaryButton'
-import GcalSettings, {
-  GcalEventInput
-} from '../modules/userDashboard/components/GcalModal/GcalSettings'
-import logo from '../styles/theme/images/graphics/google.svg'
-import gcalLogo from '../styles/theme/images/graphics/google-calendar.svg'
-import useForm from '../hooks/useForm'
-import StyledError from './StyledError'
-import GcalClientManager from '../utils/GcalClientManager'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
+import * as Collapsible from '@radix-ui/react-collapsible'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
+import dayjs from 'dayjs'
+import React, {ChangeEvent, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {RRule} from 'rrule'
 import {ScheduleDialog_team$key} from '~/__generated__/ScheduleDialog_team.graphql'
-import useAtmosphere from '../hooks/useAtmosphere'
-import {MenuMutationProps} from '../hooks/useMutationProps'
-import Legitity from '../validation/Legitity'
 import {
   CreateGcalEventInput,
   RecurrenceSettingsInput
 } from '../__generated__/StartRetrospectiveMutation.graphql'
-import {RRule} from 'rrule'
-import dayjs from 'dayjs'
-import {toHumanReadable} from './Recurrence/HumanReadableRecurrenceRule'
-import clsx from 'clsx'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useForm from '../hooks/useForm'
+import {MenuMutationProps} from '../hooks/useMutationProps'
+import GcalSettings, {
+  GcalEventInput
+} from '../modules/userDashboard/components/GcalModal/GcalSettings'
+import gcalLogo from '../styles/theme/images/graphics/google-calendar.svg'
+import logo from '../styles/theme/images/graphics/google.svg'
+import {DialogActions} from '../ui/Dialog/DialogActions'
+import GcalClientManager from '../utils/GcalClientManager'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import plural from '../utils/plural'
+import Legitity from '../validation/Legitity'
+import PrimaryButton from './PrimaryButton'
+import {toHumanReadable} from './Recurrence/HumanReadableRecurrenceRule'
+import {RecurrenceSettings} from './Recurrence/RecurrenceSettings'
+import SecondaryButton from './SecondaryButton'
+import StyledError from './StyledError'
 
 const validateTitle = (title: string) =>
   new Legitity(title).trim().min(2, `C’mon, you call that a title?`)
diff --git a/packages/client/components/ScopePhase.tsx b/packages/client/components/ScopePhase.tsx
index dd90d6bc720..978338259c7 100644
--- a/packages/client/components/ScopePhase.tsx
+++ b/packages/client/components/ScopePhase.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import useGotoStageId from '~/hooks/useGotoStageId'
 import {ScopePhase_meeting$key} from '~/__generated__/ScopePhase_meeting.graphql'
+import useGotoStageId from '~/hooks/useGotoStageId'
 import {phaseLabelLookup} from '../utils/meetings/lookups'
 import MeetingContent from './MeetingContent'
 import MeetingHeaderAndPhase from './MeetingHeaderAndPhase'
diff --git a/packages/client/components/ScopePhaseArea.tsx b/packages/client/components/ScopePhaseArea.tsx
index 44702ccb239..7279ffb5e71 100644
--- a/packages/client/components/ScopePhaseArea.tsx
+++ b/packages/client/components/ScopePhaseArea.tsx
@@ -3,16 +3,16 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
+import {ScopePhaseArea_meeting$key} from '~/__generated__/ScopePhaseArea_meeting.graphql'
 import useBreakpoint from '~/hooks/useBreakpoint'
 import {Breakpoint} from '~/types/constEnums'
-import {ScopePhaseArea_meeting$key} from '~/__generated__/ScopePhaseArea_meeting.graphql'
 import {Elevation} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import GitHubSVG from './GitHubSVG'
 import GitLabSVG from './GitLabSVG'
-import JiraServerSVG from './JiraServerSVG'
 import JiraSVG from './JiraSVG'
+import JiraServerSVG from './JiraServerSVG'
 import ParabolLogoSVG from './ParabolLogoSVG'
 import ScopePhaseAreaAzureDevOps from './ScopePhaseAreaAzureDevOps'
 import ScopePhaseAreaGitHub from './ScopePhaseAreaGitHub'
diff --git a/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx b/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx
index 29a69d42b6e..02a3ed859bb 100644
--- a/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx
+++ b/packages/client/components/ScopePhaseAreaAddAzureDevOps.tsx
@@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import AzureDevOpsClientManager from '~/utils/AzureDevOpsClientManager'
+import {ScopePhaseAreaAddAzureDevOps_meeting$key} from '../__generated__/ScopePhaseAreaAddAzureDevOps_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import {PALETTE} from '../styles/paletteV3'
-import {ScopePhaseAreaAddAzureDevOps_meeting$key} from '../__generated__/ScopePhaseAreaAddAzureDevOps_meeting.graphql'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import RaisedButton from './RaisedButton'
 
diff --git a/packages/client/components/ScopePhaseAreaAddGitHub.tsx b/packages/client/components/ScopePhaseAreaAddGitHub.tsx
index 8984f860735..d761088d452 100644
--- a/packages/client/components/ScopePhaseAreaAddGitHub.tsx
+++ b/packages/client/components/ScopePhaseAreaAddGitHub.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ScopePhaseAreaAddGitHub_meeting$key} from '../__generated__/ScopePhaseAreaAddGitHub_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import {PALETTE} from '../styles/paletteV3'
 import GitHubClientManager from '../utils/GitHubClientManager'
-import {ScopePhaseAreaAddGitHub_meeting$key} from '../__generated__/ScopePhaseAreaAddGitHub_meeting.graphql'
 import GitHubSVG from './GitHubSVG'
 import RaisedButton from './RaisedButton'
 
diff --git a/packages/client/components/ScopePhaseAreaAddGitLab.tsx b/packages/client/components/ScopePhaseAreaAddGitLab.tsx
index 0625642c838..e589573c47d 100644
--- a/packages/client/components/ScopePhaseAreaAddGitLab.tsx
+++ b/packages/client/components/ScopePhaseAreaAddGitLab.tsx
@@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import GitLabClientManager from '~/utils/GitLabClientManager'
+import {ScopePhaseAreaAddGitLab_meeting$key} from '../__generated__/ScopePhaseAreaAddGitLab_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import {PALETTE} from '../styles/paletteV3'
-import {ScopePhaseAreaAddGitLab_meeting$key} from '../__generated__/ScopePhaseAreaAddGitLab_meeting.graphql'
 import GitLabSVG from './GitLabSVG'
 import RaisedButton from './RaisedButton'
 
diff --git a/packages/client/components/ScopePhaseAreaAddJira.tsx b/packages/client/components/ScopePhaseAreaAddJira.tsx
index 7fda1f3697c..2d48d5e7da7 100644
--- a/packages/client/components/ScopePhaseAreaAddJira.tsx
+++ b/packages/client/components/ScopePhaseAreaAddJira.tsx
@@ -1,13 +1,13 @@
-import React, {useMemo} from 'react'
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
+import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {ScopePhaseAreaAddJira_meeting$key} from '../__generated__/ScopePhaseAreaAddJira_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import {PALETTE} from '../styles/paletteV3'
-import AtlassianClientManager, {ERROR_POPUP_CLOSED} from '../utils/AtlassianClientManager'
 import {ExternalLinks} from '../types/constEnums'
-import {ScopePhaseAreaAddJira_meeting$key} from '../__generated__/ScopePhaseAreaAddJira_meeting.graphql'
+import AtlassianClientManager, {ERROR_POPUP_CLOSED} from '../utils/AtlassianClientManager'
 import JiraSVG from './JiraSVG'
 import RaisedButton from './RaisedButton'
 
diff --git a/packages/client/components/ScopePhaseAreaAddJiraServer.tsx b/packages/client/components/ScopePhaseAreaAddJiraServer.tsx
index 634be0a1158..4eec0b82e43 100644
--- a/packages/client/components/ScopePhaseAreaAddJiraServer.tsx
+++ b/packages/client/components/ScopePhaseAreaAddJiraServer.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ScopePhaseAreaAddJiraServer_meeting$key} from '../__generated__/ScopePhaseAreaAddJiraServer_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import {PALETTE} from '../styles/paletteV3'
 import JiraServerClientManager from '../utils/JiraServerClientManager'
-import {ScopePhaseAreaAddJiraServer_meeting$key} from '../__generated__/ScopePhaseAreaAddJiraServer_meeting.graphql'
 import JiraServerSVG from './JiraServerSVG'
 import RaisedButton from './RaisedButton'
 
diff --git a/packages/client/components/ScopePhaseAreaGitHub.tsx b/packages/client/components/ScopePhaseAreaGitHub.tsx
index ce15a0cd54e..7b6e5b10f09 100644
--- a/packages/client/components/ScopePhaseAreaGitHub.tsx
+++ b/packages/client/components/ScopePhaseAreaGitHub.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {Providers} from '../types/constEnums'
 import {ScopePhaseAreaGitHub_meeting$key} from '../__generated__/ScopePhaseAreaGitHub_meeting.graphql'
+import {Providers} from '../types/constEnums'
 import ScopePhaseAreaAddGitHub from './ScopePhaseAreaAddGitHub'
 import ScopePhaseAreaGitHubScoping from './ScopePhaseAreaGitHubScoping'
 
diff --git a/packages/client/components/ScopingSearchInput.tsx b/packages/client/components/ScopingSearchInput.tsx
index 1e6a21250e2..6343a6718f4 100644
--- a/packages/client/components/ScopingSearchInput.tsx
+++ b/packages/client/components/ScopingSearchInput.tsx
@@ -1,11 +1,11 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
+import {ServiceEnumType} from 'parabol-server/graphql/types/ServiceEnum'
 import React, {useEffect, useRef} from 'react'
 import {commitLocalUpdate} from 'react-relay'
 import useAtmosphere from '../hooks/useAtmosphere'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {PALETTE} from '../styles/paletteV3'
-import {ServiceEnumType} from 'parabol-server/graphql/types/ServiceEnum'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 const SearchInput = styled('input')({
   appearance: 'none',
diff --git a/packages/client/components/ScopingSearchResultItem.tsx b/packages/client/components/ScopingSearchResultItem.tsx
index 8b63233f05d..819571522e0 100644
--- a/packages/client/components/ScopingSearchResultItem.tsx
+++ b/packages/client/components/ScopingSearchResultItem.tsx
@@ -1,12 +1,12 @@
 import styled from '@emotion/styled'
 import React from 'react'
+import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
 import {PALETTE} from '../styles/paletteV3'
 import {Threshold} from '../types/constEnums'
 import isTempId from '../utils/relay/isTempId'
-import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql'
 import Checkbox from './Checkbox'
 import Ellipsis from './Ellipsis/Ellipsis'
 
diff --git a/packages/client/components/SelectMeetingDropdown.tsx b/packages/client/components/SelectMeetingDropdown.tsx
index 0f992d2b09b..c6179d9c990 100644
--- a/packages/client/components/SelectMeetingDropdown.tsx
+++ b/packages/client/components/SelectMeetingDropdown.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {SelectMeetingDropdown_meetings$key} from '~/__generated__/SelectMeetingDropdown_meetings.graphql'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
 import plural from '~/utils/plural'
-import {SelectMeetingDropdown_meetings$key} from '~/__generated__/SelectMeetingDropdown_meetings.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
diff --git a/packages/client/components/SelectMeetingDropdownItem.tsx b/packages/client/components/SelectMeetingDropdownItem.tsx
index b0883078e38..ba8e7114daf 100644
--- a/packages/client/components/SelectMeetingDropdownItem.tsx
+++ b/packages/client/components/SelectMeetingDropdownItem.tsx
@@ -9,11 +9,11 @@ import * as Sentry from '@sentry/browser'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {SelectMeetingDropdownItem_meeting$key} from '~/__generated__/SelectMeetingDropdownItem_meeting.graphql'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
 import getMeetingPhase from '~/utils/getMeetingPhase'
 import {meetingTypeToIcon, phaseLabelLookup} from '~/utils/meetings/lookups'
-import {SelectMeetingDropdownItem_meeting$key} from '~/__generated__/SelectMeetingDropdownItem_meeting.graphql'
 
 const Wrapper = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/components/SelectSharingScopeDropdown.tsx b/packages/client/components/SelectSharingScopeDropdown.tsx
index 2ca135a9214..57d2af47173 100644
--- a/packages/client/components/SelectSharingScopeDropdown.tsx
+++ b/packages/client/components/SelectSharingScopeDropdown.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {SelectSharingScopeDropdown_template$key} from '../__generated__/SelectSharingScopeDropdown_template.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdatePokerTemplateScopeMutation from '../mutations/UpdatePokerTemplateScopeMutation'
 import UpdateReflectTemplateScopeMutation from '../mutations/UpdateReflectTemplateScopeMutation'
-import {SelectSharingScopeDropdown_template$key} from '../__generated__/SelectSharingScopeDropdown_template.graphql'
 import DropdownMenuIconItemLabel from './DropdownMenuIconItemLabel'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
diff --git a/packages/client/components/ShareTopicModal.tsx b/packages/client/components/ShareTopicModal.tsx
index 2d80a9dc959..98fe17407de 100644
--- a/packages/client/components/ShareTopicModal.tsx
+++ b/packages/client/components/ShareTopicModal.tsx
@@ -1,27 +1,27 @@
+import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
-import {PreloadedQuery, usePreloadedQuery, useFragment} from 'react-relay'
-import PrimaryButton from './PrimaryButton'
-import SecondaryButton from './SecondaryButton'
+import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
+import {ShareTopicModalQuery} from '../__generated__/ShareTopicModalQuery.graphql'
+import {ShareTopicModal_viewer$key} from '../__generated__/ShareTopicModal_viewer.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useMutationProps from '../hooks/useMutationProps'
+import useSlackChannels from '../hooks/useSlackChannels'
+import useShareTopicMutation from '../mutations/useShareTopicMutation'
 import {Dialog} from '../ui/Dialog/Dialog'
+import {DialogActions} from '../ui/Dialog/DialogActions'
 import {DialogContent} from '../ui/Dialog/DialogContent'
-import {DialogTitle} from '../ui/Dialog/DialogTitle'
 import {DialogDescription} from '../ui/Dialog/DialogDescription'
-import {DialogActions} from '../ui/Dialog/DialogActions'
-import useShareTopicMutation from '../mutations/useShareTopicMutation'
+import {DialogTitle} from '../ui/Dialog/DialogTitle'
 import {Select} from '../ui/Select/Select'
+import {SelectContent} from '../ui/Select/SelectContent'
+import {SelectGroup} from '../ui/Select/SelectGroup'
 import {SelectItem} from '../ui/Select/SelectItem'
 import {SelectTrigger} from '../ui/Select/SelectTrigger'
-import {SelectGroup} from '../ui/Select/SelectGroup'
 import {SelectValue} from '../ui/Select/SelectValue'
-import {SelectContent} from '../ui/Select/SelectContent'
-import graphql from 'babel-plugin-relay/macro'
-import {ShareTopicModalQuery} from '../__generated__/ShareTopicModalQuery.graphql'
-import {ShareTopicModal_viewer$key} from '../__generated__/ShareTopicModal_viewer.graphql'
 import SlackClientManager from '../utils/SlackClientManager'
-import useMutationProps from '../hooks/useMutationProps'
-import useAtmosphere from '../hooks/useAtmosphere'
-import useSlackChannels from '../hooks/useSlackChannels'
 import findStageById from '../utils/meetings/findStageById'
+import PrimaryButton from './PrimaryButton'
+import SecondaryButton from './SecondaryButton'
 
 interface Props {
   isOpen: boolean
diff --git a/packages/client/components/ShareTopicRoot.tsx b/packages/client/components/ShareTopicRoot.tsx
index 66da72f76d5..04f248254c2 100644
--- a/packages/client/components/ShareTopicRoot.tsx
+++ b/packages/client/components/ShareTopicRoot.tsx
@@ -1,10 +1,10 @@
 import React, {Suspense} from 'react'
 import ShareTopicModal from '~/components/ShareTopicModal'
-import {Loader} from '../utils/relay/renderLoader'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import shareTopicModalQuery, {
   ShareTopicModalQuery
 } from '../__generated__/ShareTopicModalQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import {Loader} from '../utils/relay/renderLoader'
 
 interface Props {
   onClose: () => void
diff --git a/packages/client/components/ShareTopicRouterRoot.tsx b/packages/client/components/ShareTopicRouterRoot.tsx
index 7f13c349bbf..de90986081c 100644
--- a/packages/client/components/ShareTopicRouterRoot.tsx
+++ b/packages/client/components/ShareTopicRouterRoot.tsx
@@ -1,12 +1,12 @@
 import React, {Suspense, useCallback} from 'react'
 import {useHistory, useLocation} from 'react-router'
-import useRouter from '../hooks/useRouter'
 import ShareTopicModal from '~/components/ShareTopicModal'
-import {Loader} from '../utils/relay/renderLoader'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import shareTopicModalQuery, {
   ShareTopicModalQuery
 } from '../__generated__/ShareTopicModalQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import useRouter from '../hooks/useRouter'
+import {Loader} from '../utils/relay/renderLoader'
 
 const ShareTopicRouterRoot = () => {
   const {match} = useRouter<{stageId: string; meetingId: string}>()
diff --git a/packages/client/components/SpotlightModal.tsx b/packages/client/components/SpotlightModal.tsx
index a204ae380ee..e885b01250a 100644
--- a/packages/client/components/SpotlightModal.tsx
+++ b/packages/client/components/SpotlightModal.tsx
@@ -5,10 +5,10 @@ import {useFragment} from 'react-relay'
 import {PortalStatus} from '~/hooks/usePortal'
 import {MAX_SPOTLIGHT_COLUMNS, SPOTLIGHT_TOP_SECTION_HEIGHT} from '~/utils/constants'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
+import {SpotlightModal_meeting$key} from '../__generated__/SpotlightModal_meeting.graphql'
 import {Elevation} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
 import {BezierCurve, Breakpoint, ElementWidth, Times, ZIndex} from '../types/constEnums'
-import {SpotlightModal_meeting$key} from '../__generated__/SpotlightModal_meeting.graphql'
 import SpotlightResultsRoot from './SpotlightResultsRoot'
 import SpotlightSearchBar from './SpotlightSearchBar'
 import SpotlightSourceGroup from './SpotlightSourceGroup'
diff --git a/packages/client/components/SpotlightResults.tsx b/packages/client/components/SpotlightResults.tsx
index 2c6bf66b5f5..cd2b0c88f9b 100644
--- a/packages/client/components/SpotlightResults.tsx
+++ b/packages/client/components/SpotlightResults.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject, useRef} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {SpotlightResultsQuery} from '~/__generated__/SpotlightResultsQuery.graphql'
 import useResultsHeight from '~/hooks/useResultsHeight'
 import {ElementHeight, ElementWidth} from '~/types/constEnums'
-import {SpotlightResultsQuery} from '~/__generated__/SpotlightResultsQuery.graphql'
 import useGroupMatrix from '../hooks/useGroupMatrix'
 import ReflectionGroup from './ReflectionGroup/ReflectionGroup'
 import SpotlightResultsEmptyState from './SpotlightResultsEmptyState'
diff --git a/packages/client/components/SpotlightSearchBar.tsx b/packages/client/components/SpotlightSearchBar.tsx
index d2e689326e6..a85b2e21b30 100644
--- a/packages/client/components/SpotlightSearchBar.tsx
+++ b/packages/client/components/SpotlightSearchBar.tsx
@@ -5,10 +5,10 @@ import React, {useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import Atmosphere from '../Atmosphere'
+import {SpotlightSearchBar_meeting$key} from '../__generated__/SpotlightSearchBar_meeting.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {PALETTE} from '../styles/paletteV3'
 import {ElementHeight, ElementWidth} from '../types/constEnums'
-import {SpotlightSearchBar_meeting$key} from '../__generated__/SpotlightSearchBar_meeting.graphql'
 import MenuItemComponentAvatar from './MenuItemComponentAvatar'
 import MenuItemLabel from './MenuItemLabel'
 
diff --git a/packages/client/components/SpotlightSourceGroup.tsx b/packages/client/components/SpotlightSourceGroup.tsx
index 0caaa45f145..5d23a6a38a7 100644
--- a/packages/client/components/SpotlightSourceGroup.tsx
+++ b/packages/client/components/SpotlightSourceGroup.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {RefObject} from 'react'
 import {useFragment} from 'react-relay'
-import {ElementHeight} from '../types/constEnums'
 import {SpotlightSourceGroup_meeting$key} from '../__generated__/SpotlightSourceGroup_meeting.graphql'
+import {ElementHeight} from '../types/constEnums'
 import ReflectionGroup from './ReflectionGroup/ReflectionGroup'
 
 const Source = styled('div')({
diff --git a/packages/client/components/StageTimerControl.tsx b/packages/client/components/StageTimerControl.tsx
index b541e7a3be5..9ac8d00ec9d 100644
--- a/packages/client/components/StageTimerControl.tsx
+++ b/packages/client/components/StageTimerControl.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {TransitionStatus} from '~/hooks/useTransition'
 import {StageTimerControl_meeting$key} from '~/__generated__/StageTimerControl_meeting.graphql'
+import {TransitionStatus} from '~/hooks/useTransition'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {MeetingLabels} from '../types/constEnums'
diff --git a/packages/client/components/StageTimerDisplay.tsx b/packages/client/components/StageTimerDisplay.tsx
index ad654014eb2..5edba7dd6c5 100644
--- a/packages/client/components/StageTimerDisplay.tsx
+++ b/packages/client/components/StageTimerDisplay.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {StageTimerDisplay_meeting$key} from '~/__generated__/StageTimerDisplay_meeting.graphql'
 import PhaseCompleteTag from '~/components/Tag/PhaseCompleteTag'
 import UndoableGroupPhaseControl from '~/components/UndoableGroupPhaseControl'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {Breakpoint} from '~/types/constEnums'
 import isDemoRoute from '~/utils/isDemoRoute'
-import {StageTimerDisplay_meeting$key} from '~/__generated__/StageTimerDisplay_meeting.graphql'
 import StageTimerDisplayGauge from './StageTimerDisplayGauge'
 
 interface Props {
diff --git a/packages/client/components/StageTimerModal.tsx b/packages/client/components/StageTimerModal.tsx
index 06aff10725a..e9f30b379fb 100644
--- a/packages/client/components/StageTimerModal.tsx
+++ b/packages/client/components/StageTimerModal.tsx
@@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
-import {MenuProps} from '../hooks/useMenu'
-import {PALETTE} from '../styles/paletteV3'
 import {StageTimerModal_facilitator$key} from '../__generated__/StageTimerModal_facilitator.graphql'
 import {StageTimerModal_stage$key} from '../__generated__/StageTimerModal_stage.graphql'
+import {MenuProps} from '../hooks/useMenu'
+import {PALETTE} from '../styles/paletteV3'
 import StageTimerModalEditTimeEnd from './StageTimerModalEditTimeEnd'
 import StageTimerModalEditTimeLimit from './StageTimerModalEditTimeLimit'
 import StageTimerModalEndTime from './StageTimerModalEndTime'
diff --git a/packages/client/components/StageTimerModalEditTimeEnd.tsx b/packages/client/components/StageTimerModalEditTimeEnd.tsx
index b680cb7f876..d1857b20ed9 100644
--- a/packages/client/components/StageTimerModalEditTimeEnd.tsx
+++ b/packages/client/components/StageTimerModalEditTimeEnd.tsx
@@ -3,13 +3,13 @@ import {Stop} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {StageTimerModalEditTimeEnd_facilitator$key} from '../__generated__/StageTimerModalEditTimeEnd_facilitator.graphql'
+import {StageTimerModalEditTimeEnd_stage$key} from '../__generated__/StageTimerModalEditTimeEnd_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import SetStageTimerMutation from '../mutations/SetStageTimerMutation'
 import {PALETTE} from '../styles/paletteV3'
 import {MeetingLabels} from '../types/constEnums'
-import {StageTimerModalEditTimeEnd_facilitator$key} from '../__generated__/StageTimerModalEditTimeEnd_facilitator.graphql'
-import {StageTimerModalEditTimeEnd_stage$key} from '../__generated__/StageTimerModalEditTimeEnd_stage.graphql'
 import MenuItemHR from './MenuItemHR'
 import PlainButton from './PlainButton/PlainButton'
 import StageTimerModalEndTime from './StageTimerModalEndTime'
diff --git a/packages/client/components/StageTimerModalEditTimeLimit.tsx b/packages/client/components/StageTimerModalEditTimeLimit.tsx
index 0c001e7d0d2..827e3f56b7a 100644
--- a/packages/client/components/StageTimerModalEditTimeLimit.tsx
+++ b/packages/client/components/StageTimerModalEditTimeLimit.tsx
@@ -3,12 +3,12 @@ import {TimerOff} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {StageTimerModalEditTimeLimit_stage$key} from '../__generated__/StageTimerModalEditTimeLimit_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import SetStageTimerMutation from '../mutations/SetStageTimerMutation'
 import {PALETTE} from '../styles/paletteV3'
 import {MeetingLabels} from '../types/constEnums'
-import {StageTimerModalEditTimeLimit_stage$key} from '../__generated__/StageTimerModalEditTimeLimit_stage.graphql'
 import MenuItemHR from './MenuItemHR'
 import PlainButton from './PlainButton/PlainButton'
 import StageTimerModalTimeLimit from './StageTimerModalTimeLimit'
diff --git a/packages/client/components/StageTimerModalEndTime.tsx b/packages/client/components/StageTimerModalEndTime.tsx
index cabe5ecfaaf..c6c3e10fbd9 100644
--- a/packages/client/components/StageTimerModalEndTime.tsx
+++ b/packages/client/components/StageTimerModalEndTime.tsx
@@ -3,14 +3,14 @@ import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
+import {StageTimerModalEndTime_facilitator$key} from '../__generated__/StageTimerModalEndTime_facilitator.graphql'
+import {StageTimerModalEndTime_stage$key} from '../__generated__/StageTimerModalEndTime_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import NotificationErrorMessage from '../modules/notifications/components/NotificationErrorMessage'
 import SetStageTimerMutation from '../mutations/SetStageTimerMutation'
 import {MeetingLabels} from '../types/constEnums'
 import roundDateToNearestHalfHour from '../utils/roundDateToNearestHalfHour'
-import {StageTimerModalEndTime_facilitator$key} from '../__generated__/StageTimerModalEndTime_facilitator.graphql'
-import {StageTimerModalEndTime_stage$key} from '../__generated__/StageTimerModalEndTime_stage.graphql'
 import SecondaryButton from './SecondaryButton'
 import StageTimerModalEndTimeDate from './StageTimerModalEndTimeDate'
 import StageTimerModalEndTimeHour from './StageTimerModalEndTimeHour'
diff --git a/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx b/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx
index e3eda4a664e..39b695a17fd 100644
--- a/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx
+++ b/packages/client/components/StageTimerModalEndTimeSlackToggle.tsx
@@ -2,14 +2,14 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql'
+import {StageTimerModalEndTimeSlackToggle_facilitator$key} from '../__generated__/StageTimerModalEndTimeSlackToggle_facilitator.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import NotificationErrorMessage from '../modules/notifications/components/NotificationErrorMessage'
 import SetSlackNotificationMutation from '../mutations/SetSlackNotificationMutation'
 import {ICON_SIZE} from '../styles/typographyV2'
 import SlackClientManager from '../utils/SlackClientManager'
-import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql'
-import {StageTimerModalEndTimeSlackToggle_facilitator$key} from '../__generated__/StageTimerModalEndTimeSlackToggle_facilitator.graphql'
 import Checkbox from './Checkbox'
 import PlainButton from './PlainButton/PlainButton'
 
diff --git a/packages/client/components/StageTimerModalTimeLimit.tsx b/packages/client/components/StageTimerModalTimeLimit.tsx
index 1dc913e7b52..8e2f52f78ca 100644
--- a/packages/client/components/StageTimerModalTimeLimit.tsx
+++ b/packages/client/components/StageTimerModalTimeLimit.tsx
@@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
+import {StageTimerModalTimeLimit_stage$key} from '../__generated__/StageTimerModalTimeLimit_stage.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
@@ -12,7 +13,6 @@ import SetStageTimerMutation from '../mutations/SetStageTimerMutation'
 import {PALETTE} from '../styles/paletteV3'
 import {MeetingLabels} from '../types/constEnums'
 import plural from '../utils/plural'
-import {StageTimerModalTimeLimit_stage$key} from '../__generated__/StageTimerModalTimeLimit_stage.graphql'
 import DropdownMenuToggle from './DropdownMenuToggle'
 import SecondaryButton from './SecondaryButton'
 import StageTimerMinutePicker from './StageTimerMinutePicker'
diff --git a/packages/client/components/StandardHubUserMenu.tsx b/packages/client/components/StandardHubUserMenu.tsx
index 86a84d358f3..00c0c2f9e35 100644
--- a/packages/client/components/StandardHubUserMenu.tsx
+++ b/packages/client/components/StandardHubUserMenu.tsx
@@ -4,10 +4,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
+import {StandardHubUserMenu_viewer$key} from '../__generated__/StandardHubUserMenu_viewer.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import {PALETTE} from '../styles/paletteV3'
 import {SIGNOUT_LABEL, SIGNOUT_SLUG} from '../utils/constants'
-import {StandardHubUserMenu_viewer$key} from '../__generated__/StandardHubUserMenu_viewer.graphql'
 import DropdownMenuLabel from './DropdownMenuLabel'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
diff --git a/packages/client/components/SubmittedForgotPasswordPage.tsx b/packages/client/components/SubmittedForgotPasswordPage.tsx
index c4cb6d42e2f..9a6fd89394d 100644
--- a/packages/client/components/SubmittedForgotPasswordPage.tsx
+++ b/packages/client/components/SubmittedForgotPasswordPage.tsx
@@ -8,8 +8,8 @@ import AuthenticationDialog from './AuthenticationDialog'
 import DialogTitle from './DialogTitle'
 import {AuthPageSlug, GotoAuthPage} from './GenericAuthentication'
 import GoogleOAuthButtonBlock from './GoogleOAuthButtonBlock'
-import MicrosoftOAuthButtonBlock from './MicrosoftOAuthButtonBlock'
 import IconLabel from './IconLabel'
+import MicrosoftOAuthButtonBlock from './MicrosoftOAuthButtonBlock'
 import PlainButton from './PlainButton/PlainButton'
 import PrimaryButton from './PrimaryButton'
 
diff --git a/packages/client/components/SuggestMentionableUsers.tsx b/packages/client/components/SuggestMentionableUsers.tsx
index 30e9cc7796c..8a1fad5aac1 100644
--- a/packages/client/components/SuggestMentionableUsers.tsx
+++ b/packages/client/components/SuggestMentionableUsers.tsx
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import stringScore from 'string-score'
-import {BBox} from '../types/animations'
 import {SuggestMentionableUsersQuery} from '../__generated__/SuggestMentionableUsersQuery.graphql'
+import {BBox} from '../types/animations'
 import EditorSuggestions from './EditorSuggestions/EditorSuggestions'
 import {MentionSuggestion} from './TaskEditor/useSuggestions'
 
diff --git a/packages/client/components/SuggestMentionableUsersRoot.tsx b/packages/client/components/SuggestMentionableUsersRoot.tsx
index efa94f84e21..9f7d4207a4f 100644
--- a/packages/client/components/SuggestMentionableUsersRoot.tsx
+++ b/packages/client/components/SuggestMentionableUsersRoot.tsx
@@ -1,9 +1,9 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
-import {BBox} from '../types/animations'
 import suggestMentionableUsersQuery, {
   SuggestMentionableUsersQuery
 } from '../__generated__/SuggestMentionableUsersQuery.graphql'
+import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
+import {BBox} from '../types/animations'
 import SuggestMentionableUsers from './SuggestMentionableUsers'
 import {MentionSuggestion} from './TaskEditor/useSuggestions'
 
diff --git a/packages/client/components/SuggestedActionCreateNewTeam.tsx b/packages/client/components/SuggestedActionCreateNewTeam.tsx
index d8835bf59df..b7f9eb440ed 100644
--- a/packages/client/components/SuggestedActionCreateNewTeam.tsx
+++ b/packages/client/components/SuggestedActionCreateNewTeam.tsx
@@ -2,9 +2,9 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
+import {SuggestedActionCreateNewTeam_suggestedAction$key} from '../__generated__/SuggestedActionCreateNewTeam_suggestedAction.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps'
-import {SuggestedActionCreateNewTeam_suggestedAction$key} from '../__generated__/SuggestedActionCreateNewTeam_suggestedAction.graphql'
 import SuggestedActionButton from './SuggestedActionButton'
 import SuggestedActionCard from './SuggestedActionCard'
 import SuggestedActionCopy from './SuggestedActionCopy'
diff --git a/packages/client/components/SuggestedActionInviteYourTeam.tsx b/packages/client/components/SuggestedActionInviteYourTeam.tsx
index ec8879e69d2..3ba3bc1d9a3 100644
--- a/packages/client/components/SuggestedActionInviteYourTeam.tsx
+++ b/packages/client/components/SuggestedActionInviteYourTeam.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {lazy} from 'react'
 import {useFragment} from 'react-relay'
+import {SuggestedActionInviteYourTeam_suggestedAction$key} from '../__generated__/SuggestedActionInviteYourTeam_suggestedAction.graphql'
 import useModal from '../hooks/useModal'
 import {PALETTE} from '../styles/paletteV3'
-import {SuggestedActionInviteYourTeam_suggestedAction$key} from '../__generated__/SuggestedActionInviteYourTeam_suggestedAction.graphql'
 import SuggestedActionButton from './SuggestedActionButton'
 import SuggestedActionCard from './SuggestedActionCard'
 import SuggestedActionCopy from './SuggestedActionCopy'
diff --git a/packages/client/components/SuggestedActionTryActionMeeting.tsx b/packages/client/components/SuggestedActionTryActionMeeting.tsx
index ac26fe9ec9d..2f2264d2e78 100644
--- a/packages/client/components/SuggestedActionTryActionMeeting.tsx
+++ b/packages/client/components/SuggestedActionTryActionMeeting.tsx
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
-import {PALETTE} from '../styles/paletteV3'
 import {SuggestedActionTryActionMeeting_suggestedAction$key} from '../__generated__/SuggestedActionTryActionMeeting_suggestedAction.graphql'
+import {PALETTE} from '../styles/paletteV3'
 import SuggestedActionButton from './SuggestedActionButton'
 import SuggestedActionCard from './SuggestedActionCard'
 import SuggestedActionCopy from './SuggestedActionCopy'
diff --git a/packages/client/components/SuggestedActionTryRetroMeeting.tsx b/packages/client/components/SuggestedActionTryRetroMeeting.tsx
index e9f9c1e5072..8290a1f9078 100644
--- a/packages/client/components/SuggestedActionTryRetroMeeting.tsx
+++ b/packages/client/components/SuggestedActionTryRetroMeeting.tsx
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
-import {PALETTE} from '../styles/paletteV3'
 import {SuggestedActionTryRetroMeeting_suggestedAction$key} from '../__generated__/SuggestedActionTryRetroMeeting_suggestedAction.graphql'
+import {PALETTE} from '../styles/paletteV3'
 import SuggestedActionButton from './SuggestedActionButton'
 import SuggestedActionCard from './SuggestedActionCard'
 import SuggestedActionCopy from './SuggestedActionCopy'
diff --git a/packages/client/components/SuggestedActionTryTheDemo.tsx b/packages/client/components/SuggestedActionTryTheDemo.tsx
index 2bf920bf38b..a6e1ef8bc43 100644
--- a/packages/client/components/SuggestedActionTryTheDemo.tsx
+++ b/packages/client/components/SuggestedActionTryTheDemo.tsx
@@ -3,10 +3,10 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {SuggestedActionTryTheDemo_suggestedAction$key} from '../__generated__/SuggestedActionTryTheDemo_suggestedAction.graphql'
 import DismissSuggestedActionMutation from '../mutations/DismissSuggestedActionMutation'
 import {PALETTE} from '../styles/paletteV3'
 import withMutationProps, {WithMutationProps} from '../utils/relay/withMutationProps'
-import {SuggestedActionTryTheDemo_suggestedAction$key} from '../__generated__/SuggestedActionTryTheDemo_suggestedAction.graphql'
 import SuggestedActionButton from './SuggestedActionButton'
 import SuggestedActionCard from './SuggestedActionCard'
 import SuggestedActionCopy from './SuggestedActionCopy'
diff --git a/packages/client/components/Tag/TierTag.tsx b/packages/client/components/Tag/TierTag.tsx
index 89dff6ea7e6..221c526972b 100644
--- a/packages/client/components/Tag/TierTag.tsx
+++ b/packages/client/components/Tag/TierTag.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled'
 import React from 'react'
+import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql'
 import {PALETTE} from '../../styles/paletteV3'
 import {TierLabel} from '../../types/constEnums'
-import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql'
 import BaseTag from './BaseTag'
 
 interface Props {
diff --git a/packages/client/components/TaskColumns/TaskColumns.tsx b/packages/client/components/TaskColumns/TaskColumns.tsx
index 18d664d91ce..bd42a583e8f 100644
--- a/packages/client/components/TaskColumns/TaskColumns.tsx
+++ b/packages/client/components/TaskColumns/TaskColumns.tsx
@@ -4,18 +4,18 @@ import React, {useMemo} from 'react'
 import {DragDropContext, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {TaskColumns_teams$key} from '~/__generated__/TaskColumns_teams.graphql'
+import {TaskStatusEnum} from '../../__generated__/CreateTaskMutation.graphql'
+import {TaskColumns_tasks$key} from '../../__generated__/TaskColumns_tasks.graphql'
+import {AreaEnum} from '../../__generated__/UpdateTaskMutation.graphql'
 import EditorHelpModalContainer from '../../containers/EditorHelpModalContainer/EditorHelpModalContainer'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useEventCallback from '../../hooks/useEventCallback'
 import TaskColumn from '../../modules/teamDashboard/components/TaskColumn/TaskColumn'
 import UpdateTaskMutation from '../../mutations/UpdateTaskMutation'
 import {Layout} from '../../types/constEnums'
-import {columnArray, MEETING, meetingColumnArray, SORT_STEP} from '../../utils/constants'
+import {MEETING, SORT_STEP, columnArray, meetingColumnArray} from '../../utils/constants'
 import dndNoise from '../../utils/dndNoise'
 import makeTasksByStatus from '../../utils/makeTasksByStatus'
-import {TaskStatusEnum} from '../../__generated__/CreateTaskMutation.graphql'
-import {TaskColumns_tasks$key} from '../../__generated__/TaskColumns_tasks.graphql'
-import {AreaEnum} from '../../__generated__/UpdateTaskMutation.graphql'
 
 const ColumnsBlock = styled('div')({
   display: 'flex',
diff --git a/packages/client/components/TaskEditor/CommentEditor.tsx b/packages/client/components/TaskEditor/CommentEditor.tsx
index bb75b4da787..cb7378613bb 100644
--- a/packages/client/components/TaskEditor/CommentEditor.tsx
+++ b/packages/client/components/TaskEditor/CommentEditor.tsx
@@ -16,8 +16,8 @@ import isAndroid from '../../utils/draftjs/isAndroid'
 import isRichDraft from '../../utils/draftjs/isRichDraft'
 import lazyPreload from '../../utils/lazyPreload'
 import linkify from '../../utils/linkify'
-import blockStyleFn from './blockStyleFn'
 import './Draft.css'
+import blockStyleFn from './blockStyleFn'
 import useCommentPlugins from './useCommentPlugins'
 
 const RootEditor = styled('div')({
diff --git a/packages/client/components/TaskEditor/TaskEditor.tsx b/packages/client/components/TaskEditor/TaskEditor.tsx
index 075054bba5b..3e85bb6fec8 100644
--- a/packages/client/components/TaskEditor/TaskEditor.tsx
+++ b/packages/client/components/TaskEditor/TaskEditor.tsx
@@ -17,8 +17,8 @@ import entitizeText from '../../utils/draftjs/entitizeText'
 import isAndroid from '../../utils/draftjs/isAndroid'
 import isRichDraft from '../../utils/draftjs/isRichDraft'
 import lazyPreload from '../../utils/lazyPreload'
-import blockStyleFn from './blockStyleFn'
 import './Draft.css'
+import blockStyleFn from './blockStyleFn'
 import useTaskPlugins from './useTaskPlugins'
 
 const RootEditor = styled('div')<{noText: boolean; readOnly: boolean | undefined}>(
diff --git a/packages/client/components/TaskEditor/useSuggestions.tsx b/packages/client/components/TaskEditor/useSuggestions.tsx
index 483d8bea660..ca381e7c5c9 100644
--- a/packages/client/components/TaskEditor/useSuggestions.tsx
+++ b/packages/client/components/TaskEditor/useSuggestions.tsx
@@ -1,5 +1,5 @@
 import {EditorProps, EditorState} from 'draft-js'
-import React, {lazy, Suspense, useState} from 'react'
+import React, {Suspense, lazy, useState} from 'react'
 import useForceUpdate from '../../hooks/useForceUpdate'
 import {SetEditorState} from '../../types/draft'
 import completeEntity from '../../utils/draftjs/completeEntity'
diff --git a/packages/client/components/TaskFooterIntegrateMenu.tsx b/packages/client/components/TaskFooterIntegrateMenu.tsx
index f989bc6072c..06e19980674 100644
--- a/packages/client/components/TaskFooterIntegrateMenu.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenu.tsx
@@ -1,16 +1,16 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
-import {MenuProps} from '../hooks/useMenu'
-import {MenuMutationProps} from '../hooks/useMutationProps'
+import {IntegrationProviderServiceEnum} from '../__generated__/CreateTaskIntegrationMutation.graphql'
 import {TaskFooterIntegrateMenuQuery} from '../__generated__/TaskFooterIntegrateMenuQuery.graphql'
 import {TaskFooterIntegrateMenu_task$key} from '../__generated__/TaskFooterIntegrateMenu_task.graphql'
-import TaskFooterIntegrateMenuList from './TaskFooterIntegrateMenuList'
-import TaskFooterIntegrateMenuSignup from './TaskFooterIntegrateMenuSignup'
-import {IntegrationProviderServiceEnum} from '../__generated__/CreateTaskIntegrationMutation.graphql'
-import CreateTaskIntegrationMutation from '../mutations/CreateTaskIntegrationMutation'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {makePlaceholder, useIsIntegrated} from '../hooks/useIsIntegrated'
+import {MenuProps} from '../hooks/useMenu'
+import {MenuMutationProps} from '../hooks/useMutationProps'
+import CreateTaskIntegrationMutation from '../mutations/CreateTaskIntegrationMutation'
+import TaskFooterIntegrateMenuList from './TaskFooterIntegrateMenuList'
+import TaskFooterIntegrateMenuSignup from './TaskFooterIntegrateMenuSignup'
 
 interface Props {
   menuProps: MenuProps
diff --git a/packages/client/components/TaskFooterIntegrateMenuList.tsx b/packages/client/components/TaskFooterIntegrateMenuList.tsx
index 0c5c470e7f5..0ac264f345a 100644
--- a/packages/client/components/TaskFooterIntegrateMenuList.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenuList.tsx
@@ -4,15 +4,15 @@ import React, {useEffect, useState} from 'react'
 import {useLazyLoadQuery} from 'react-relay'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import IntegrationRepoId from '~/shared/gqlIds/IntegrationRepoId'
+import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql'
+import {TaskFooterIntegrateMenuListLocalQuery} from '../__generated__/TaskFooterIntegrateMenuListLocalQuery.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import {PALETTE} from '../styles/paletteV3'
-import {TaskFooterIntegrateMenuListLocalQuery} from '../__generated__/TaskFooterIntegrateMenuListLocalQuery.graphql'
 import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel'
 import Menu from './Menu'
 import MenuItemHR from './MenuItemHR'
 import {SearchMenuItem} from './SearchMenuItem'
 import TaskIntegrationMenuItem from './TaskIntegrationMenuItem'
-import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql'
 
 interface Props {
   menuProps: MenuProps
diff --git a/packages/client/components/TaskFooterIntegrateMenuRoot.tsx b/packages/client/components/TaskFooterIntegrateMenuRoot.tsx
index 6dddbb894a1..d9dd8740cc7 100644
--- a/packages/client/components/TaskFooterIntegrateMenuRoot.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenuRoot.tsx
@@ -1,15 +1,15 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
+import taskFooterIntegrateMenuQuery, {
+  TaskFooterIntegrateMenuQuery
+} from '../__generated__/TaskFooterIntegrateMenuQuery.graphql'
+import {TaskFooterIntegrateMenuRoot_task$key} from '../__generated__/TaskFooterIntegrateMenuRoot_task.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import {UseTaskChild} from '../hooks/useTaskChildFocus'
 import {LoaderSize} from '../types/constEnums'
-import taskFooterIntegrateMenuQuery, {
-  TaskFooterIntegrateMenuQuery
-} from '../__generated__/TaskFooterIntegrateMenuQuery.graphql'
-import {TaskFooterIntegrateMenuRoot_task$key} from '../__generated__/TaskFooterIntegrateMenuRoot_task.graphql'
 import LoadingComponent from './LoadingComponent/LoadingComponent'
 import TaskFooterIntegrateMenu from './TaskFooterIntegrateMenu'
 
diff --git a/packages/client/components/TaskFooterIntegrateMenuSignup.tsx b/packages/client/components/TaskFooterIntegrateMenuSignup.tsx
index e69b1af3ae7..4455346f7a4 100644
--- a/packages/client/components/TaskFooterIntegrateMenuSignup.tsx
+++ b/packages/client/components/TaskFooterIntegrateMenuSignup.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '~/styles/paletteV3'
 import {TaskFooterIntegrateMenuSignup_TeamMemberIntegrations$key} from '~/__generated__/TaskFooterIntegrateMenuSignup_TeamMemberIntegrations.graphql'
+import {PALETTE} from '~/styles/paletteV3'
 import {MenuProps} from '../hooks/useMenu'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import AddToAzureMenuItem from './AddToAzureMenuItem'
diff --git a/packages/client/components/TaskIntegrationLink.tsx b/packages/client/components/TaskIntegrationLink.tsx
index 8059177592d..050af864ad3 100644
--- a/packages/client/components/TaskIntegrationLink.tsx
+++ b/packages/client/components/TaskIntegrationLink.tsx
@@ -3,9 +3,9 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
 import {parseWebPath} from '~/utils/parseWebPath'
+import {TaskIntegrationLink_integration$key} from '../__generated__/TaskIntegrationLink_integration.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import {Card} from '../types/constEnums'
-import {TaskIntegrationLink_integration$key} from '../__generated__/TaskIntegrationLink_integration.graphql'
 import JiraIssueLink from './JiraIssueLink'
 
 const StyledLink = styled('a')({
diff --git a/packages/client/components/TaskIntegrationMenuItem.tsx b/packages/client/components/TaskIntegrationMenuItem.tsx
index b67910c4770..c8212b3b687 100644
--- a/packages/client/components/TaskIntegrationMenuItem.tsx
+++ b/packages/client/components/TaskIntegrationMenuItem.tsx
@@ -3,8 +3,8 @@ import {TaskServiceEnum} from '~/../server/database/types/Task'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import GitHubSVG from './GitHubSVG'
 import GitLabSVG from './GitLabSVG'
-import JiraServerSVG from './JiraServerSVG'
 import JiraSVG from './JiraSVG'
+import JiraServerSVG from './JiraServerSVG'
 import MenuItem from './MenuItem'
 import MenuItemAvatar from './MenuItemAvatar'
 import MenuItemLabel from './MenuItemLabel'
diff --git a/packages/client/components/TaskInvolves.tsx b/packages/client/components/TaskInvolves.tsx
index 88e4dac4931..0fae1dbfdd9 100644
--- a/packages/client/components/TaskInvolves.tsx
+++ b/packages/client/components/TaskInvolves.tsx
@@ -7,13 +7,13 @@ import NotificationAction from '~/components/NotificationAction'
 import OutcomeCardStatusIndicator from '~/modules/outcomeCard/components/OutcomeCardStatusIndicator/OutcomeCardStatusIndicator'
 import {cardShadow} from '~/styles/elevation'
 import convertToTaskContent from '~/utils/draftjs/convertToTaskContent'
+import {TaskInvolves_notification$key} from '../__generated__/TaskInvolves_notification.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useEditorState from '../hooks/useEditorState'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
 import SetNotificationStatusMutation from '../mutations/SetNotificationStatusMutation'
 import {ASSIGNEE, MENTIONEE} from '../utils/constants'
-import {TaskInvolves_notification$key} from '../__generated__/TaskInvolves_notification.graphql'
 import NotificationTemplate from './NotificationTemplate'
 
 const involvementWord = {
diff --git a/packages/client/components/TaskWatermark.tsx b/packages/client/components/TaskWatermark.tsx
index 83e7cd503d8..f98f8177ac4 100644
--- a/packages/client/components/TaskWatermark.tsx
+++ b/packages/client/components/TaskWatermark.tsx
@@ -3,8 +3,8 @@ import React from 'react'
 import AzureDevOpsSVG from './AzureDevOpsSVG'
 import GitHubSVG from './GitHubSVG'
 import GitLabSVG from './GitLabSVG'
-import JiraServerSVG from './JiraServerSVG'
 import JiraSVG from './JiraSVG'
+import JiraServerSVG from './JiraServerSVG'
 
 const iconLookup = {
   _xGitHubIssue: GitHubSVG,
diff --git a/packages/client/components/TeamDashTeamMemberMenu.tsx b/packages/client/components/TeamDashTeamMemberMenu.tsx
index 25c01145d3d..d4897ffd634 100644
--- a/packages/client/components/TeamDashTeamMemberMenu.tsx
+++ b/packages/client/components/TeamDashTeamMemberMenu.tsx
@@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useSearchFilter from '~/hooks/useSearchFilter'
+import {TeamDashTeamMemberMenu_team$key} from '../__generated__/TeamDashTeamMemberMenu_team.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuProps} from '../hooks/useMenu'
 import filterTeamMember from '../utils/relay/filterTeamMember'
-import {TeamDashTeamMemberMenu_team$key} from '../__generated__/TeamDashTeamMemberMenu_team.graphql'
 import DropdownMenuLabel from './DropdownMenuLabel'
 import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel'
 import Menu from './Menu'
diff --git a/packages/client/components/TeamFilterMenu.tsx b/packages/client/components/TeamFilterMenu.tsx
index c047c766518..375af20d163 100644
--- a/packages/client/components/TeamFilterMenu.tsx
+++ b/packages/client/components/TeamFilterMenu.tsx
@@ -1,16 +1,16 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {
+  TeamFilterMenu_viewer$data,
+  TeamFilterMenu_viewer$key
+} from '~/__generated__/TeamFilterMenu_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useRouter from '~/hooks/useRouter'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import {FilterLabels} from '~/types/constEnums'
 import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
-import {
-  TeamFilterMenu_viewer$data,
-  TeamFilterMenu_viewer$key
-} from '~/__generated__/TeamFilterMenu_viewer.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import DropdownMenuLabel from './DropdownMenuLabel'
 import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel'
diff --git a/packages/client/components/TeamHealth.tsx b/packages/client/components/TeamHealth.tsx
index 6c62b85061f..2f746c182cf 100644
--- a/packages/client/components/TeamHealth.tsx
+++ b/packages/client/components/TeamHealth.tsx
@@ -1,24 +1,24 @@
+import * as RadioGroup from '@radix-ui/react-radio-group'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
 import React, {ReactElement} from 'react'
 import {useFragment} from 'react-relay'
-import useGotoStageId from '~/hooks/useGotoStageId'
 import {TeamHealth_meeting$key} from '~/__generated__/TeamHealth_meeting.graphql'
+import useGotoStageId from '~/hooks/useGotoStageId'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useMutationProps from '../hooks/useMutationProps'
+import RevealTeamHealthVotesMutation from '../mutations/RevealTeamHealthVotesMutation'
+import SetTeamHealthVoteMutation from '../mutations/SetTeamHealthVoteMutation'
+import getTeamHealthVoteColor from '../utils/getTeamHealthVoteColor'
 import {phaseLabelLookup} from '../utils/meetings/lookups'
 import MeetingContent from './MeetingContent'
 import MeetingHeaderAndPhase from './MeetingHeaderAndPhase'
 import MeetingTopBar from './MeetingTopBar'
 import PhaseHeaderTitle from './PhaseHeaderTitle'
 import PhaseWrapper from './PhaseWrapper'
-import TeamHealthVotingRow from './TeamHealthVotingRow'
-import useMutationProps from '../hooks/useMutationProps'
-import useAtmosphere from '../hooks/useAtmosphere'
-import SetTeamHealthVoteMutation from '../mutations/SetTeamHealthVoteMutation'
-import RevealTeamHealthVotesMutation from '../mutations/RevealTeamHealthVotesMutation'
-import * as RadioGroup from '@radix-ui/react-radio-group'
-import clsx from 'clsx'
 import RaisedButton from './RaisedButton'
-import getTeamHealthVoteColor from '../utils/getTeamHealthVoteColor'
 import StageTimerDisplay from './StageTimerDisplay'
+import TeamHealthVotingRow from './TeamHealthVotingRow'
 
 interface Props {
   avatarGroup: ReactElement
diff --git a/packages/client/components/TeamInvitationDialog.tsx b/packages/client/components/TeamInvitationDialog.tsx
index f28a47d7950..2b14e65c979 100644
--- a/packages/client/components/TeamInvitationDialog.tsx
+++ b/packages/client/components/TeamInvitationDialog.tsx
@@ -3,8 +3,8 @@ import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import {RouteComponentProps, withRouter} from 'react-router'
 import useAtmosphere from '~/hooks/useAtmosphere'
-import {LocalStorageKey} from '../types/constEnums'
 import {TeamInvitationDialog_verifiedInvitation$key} from '../__generated__/TeamInvitationDialog_verifiedInvitation.graphql'
+import {LocalStorageKey} from '../types/constEnums'
 import TeamInvitationAccept from './TeamInvitationAccept'
 import TeamInvitationEmailCreateAccount from './TeamInvitationEmailCreateAccount'
 import TeamInvitationEmailSignin from './TeamInvitationEmailSignin'
diff --git a/packages/client/components/TeamInvitationEmailSignin.tsx b/packages/client/components/TeamInvitationEmailSignin.tsx
index 092bcaf6894..fabd428ed54 100644
--- a/packages/client/components/TeamInvitationEmailSignin.tsx
+++ b/packages/client/components/TeamInvitationEmailSignin.tsx
@@ -2,8 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import useDocumentTitle from '../hooks/useDocumentTitle'
 import {TeamInvitationEmailSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationEmailSignin_verifiedInvitation.graphql'
+import useDocumentTitle from '../hooks/useDocumentTitle'
+import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import EmailPasswordAuthForm from './EmailPasswordAuthForm'
@@ -11,7 +12,6 @@ import ForgotPasswordOneClick from './ForgotPasswordOneClick'
 import InvitationCenteredCopy from './InvitationCenteredCopy'
 import InvitationDialogCopy from './InvitationDialogCopy'
 import InviteDialog from './InviteDialog'
-import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 
 interface Props {
   invitationToken: string
diff --git a/packages/client/components/TeamInvitationErrorAccepted.tsx b/packages/client/components/TeamInvitationErrorAccepted.tsx
index 62a901725f3..03788963fca 100644
--- a/packages/client/components/TeamInvitationErrorAccepted.tsx
+++ b/packages/client/components/TeamInvitationErrorAccepted.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import useDocumentTitle from '../hooks/useDocumentTitle'
 import {TeamInvitationErrorAccepted_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorAccepted_verifiedInvitation.graphql'
+import useDocumentTitle from '../hooks/useDocumentTitle'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import InvitationDialogCopy from './InvitationDialogCopy'
diff --git a/packages/client/components/TeamInvitationErrorExpired.tsx b/packages/client/components/TeamInvitationErrorExpired.tsx
index b3003497c2e..119e96987a2 100644
--- a/packages/client/components/TeamInvitationErrorExpired.tsx
+++ b/packages/client/components/TeamInvitationErrorExpired.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamInvitationErrorExpired_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorExpired_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import {PALETTE} from '../styles/paletteV3'
-import {TeamInvitationErrorExpired_verifiedInvitation$key} from '../__generated__/TeamInvitationErrorExpired_verifiedInvitation.graphql'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import InvitationDialogCopy from './InvitationDialogCopy'
diff --git a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
index e0df5c4b409..f55d4d11a9a 100644
--- a/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
+++ b/packages/client/components/TeamInvitationGoogleCreateAccount.tsx
@@ -2,11 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
+import {TeamInvitationGoogleCreateAccount_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleCreateAccount_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import useRouter from '../hooks/useRouter'
 import {PALETTE} from '../styles/paletteV3'
-import {TeamInvitationGoogleCreateAccount_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleCreateAccount_verifiedInvitation.graphql'
 import AuthPrivacyFooter from './AuthPrivacyFooter'
+import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import EmailPasswordAuthForm from './EmailPasswordAuthForm'
@@ -16,7 +17,6 @@ import InvitationCenteredCopy from './InvitationCenteredCopy'
 import InvitationDialogCopy from './InvitationDialogCopy'
 import InviteDialog from './InviteDialog'
 import PlainButton from './PlainButton/PlainButton'
-import {AUTH_DIALOG_WIDTH} from './AuthenticationDialog'
 
 interface Props {
   invitationToken: string
diff --git a/packages/client/components/TeamInvitationGoogleSignin.tsx b/packages/client/components/TeamInvitationGoogleSignin.tsx
index 463ade9ac2d..d7695aa5c49 100644
--- a/packages/client/components/TeamInvitationGoogleSignin.tsx
+++ b/packages/client/components/TeamInvitationGoogleSignin.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamInvitationGoogleSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleSignin_verifiedInvitation.graphql'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import useRouter from '../hooks/useRouter'
-import {TeamInvitationGoogleSignin_verifiedInvitation$key} from '../__generated__/TeamInvitationGoogleSignin_verifiedInvitation.graphql'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import GoogleOAuthButtonBlock from './GoogleOAuthButtonBlock'
diff --git a/packages/client/components/TeamInvitationNotification.tsx b/packages/client/components/TeamInvitationNotification.tsx
index 4f8a5156e04..cd51db6de15 100644
--- a/packages/client/components/TeamInvitationNotification.tsx
+++ b/packages/client/components/TeamInvitationNotification.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamInvitationNotification_notification$key} from '~/__generated__/TeamInvitationNotification_notification.graphql'
 import NotificationAction from '~/components/NotificationAction'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import useRouter from '~/hooks/useRouter'
-import {TeamInvitationNotification_notification$key} from '~/__generated__/TeamInvitationNotification_notification.graphql'
 import AcceptTeamInvitationMutation from '../mutations/AcceptTeamInvitationMutation'
 import NotificationTemplate from './NotificationTemplate'
 
diff --git a/packages/client/components/TeamInvitationRoot.tsx b/packages/client/components/TeamInvitationRoot.tsx
index 6dbf2011256..f64b07f2923 100644
--- a/packages/client/components/TeamInvitationRoot.tsx
+++ b/packages/client/components/TeamInvitationRoot.tsx
@@ -1,7 +1,7 @@
 import React, {Suspense} from 'react'
 import {RouteComponentProps} from 'react-router'
-import useNoIndex from '~/hooks/useNoIndex'
 import teamInvitationQuery, {TeamInvitationQuery} from '~/__generated__/TeamInvitationQuery.graphql'
+import useNoIndex from '~/hooks/useNoIndex'
 import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import TeamInvitation from './TeamInvitation'
 
diff --git a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
index df0281c13b3..3392a34bcb7 100644
--- a/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptDrawer.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
-import useAtmosphere from '~/hooks/useAtmosphere'
 import {TeamPromptDrawer_meeting$key} from '~/__generated__/TeamPromptDrawer_meeting.graphql'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import useBreakpoint from '../../hooks/useBreakpoint'
 import {desktopSidebarShadow} from '../../styles/elevation'
 import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../../types/constEnums'
+import SendClientSideEvent from '../../utils/SendClientSideEvent'
+import findStageById from '../../utils/meetings/findStageById'
 import ResponsiveDashSidebar from '../ResponsiveDashSidebar'
 import TeamPromptDiscussionDrawer from './TeamPromptDiscussionDrawer'
 import TeamPromptWorkDrawer from './TeamPromptWorkDrawer'
-import useBreakpoint from '../../hooks/useBreakpoint'
-import findStageById from '../../utils/meetings/findStageById'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
 
 export const Drawer = styled('div')<{isDesktop: boolean; isMobile: boolean; isOpen: boolean}>(
   ({isDesktop, isMobile, isOpen}) => ({
diff --git a/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx b/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx
index e9d870fd4ea..c31f0c79eaa 100644
--- a/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptEditablePrompt.tsx
@@ -3,12 +3,12 @@ import {Edit} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamPromptEditablePrompt_meeting$key} from '~/__generated__/TeamPromptEditablePrompt_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useModal from '~/hooks/useModal'
 import useMutationProps from '~/hooks/useMutationProps'
 import UpdateMeetingPromptMutation from '~/mutations/UpdateMeetingPromptMutation'
 import {PALETTE} from '~/styles/paletteV3'
-import {TeamPromptEditablePrompt_meeting$key} from '~/__generated__/TeamPromptEditablePrompt_meeting.graphql'
 import TeamPromptEditablePromptModal from './TeamPromptEditablePromptModal'
 
 const Prompt = styled('h1')<{isEditable?: boolean}>(({isEditable = false}) => ({
diff --git a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
index bef32e09be0..cf307d37157 100644
--- a/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptOptions.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamPromptOptions_meeting$key} from '~/__generated__/TeamPromptOptions_meeting.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import {PALETTE} from '~/styles/paletteV3'
 import {mergeRefs} from '~/utils/react/mergeRefs'
-import {TeamPromptOptions_meeting$key} from '~/__generated__/TeamPromptOptions_meeting.graphql'
 import useTooltip from '../../hooks/useTooltip'
 import BaseButton from '../BaseButton'
 import IconLabel from '../IconLabel'
diff --git a/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx b/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx
index d0d1d211609..ce8ed1e29df 100644
--- a/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptOptionsMenu.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import {Flag, Link as MuiLink, OpenInNew, Replay} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
-import {Link} from 'react-router-dom'
 import {useFragment} from 'react-relay'
+import {Link} from 'react-router-dom'
+import {TeamPromptOptionsMenu_meeting$key} from '~/__generated__/TeamPromptOptionsMenu_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {MenuProps} from '~/hooks/useMenu'
 import useMutationProps from '~/hooks/useMutationProps'
 import useRouter from '~/hooks/useRouter'
 import EndTeamPromptMutation from '~/mutations/EndTeamPromptMutation'
-import {TeamPromptOptionsMenu_meeting$key} from '~/__generated__/TeamPromptOptionsMenu_meeting.graphql'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import {PALETTE} from '../../styles/paletteV3'
+import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import makeAppURL from '../../utils/makeAppURL'
 import Menu from '../Menu'
 import MenuItem from '../MenuItem'
diff --git a/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx b/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx
index 712858a306c..69c435bb3a7 100644
--- a/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptResponseEmojis.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptResponseEmojis_response$key} from '~/__generated__/TeamPromptResponseEmojis_response.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useMutationProps from '../../hooks/useMutationProps'
 import AddReactjiToReactableMutation from '../../mutations/AddReactjiToReactableMutation'
 import ReactjiId from '../../shared/gqlIds/ReactjiId'
-import React from 'react'
 import ReactjiSection from '../ReflectionCard/ReactjiSection'
 
 interface Props {
diff --git a/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx b/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx
index d99f03661ef..bcf1ff3477f 100644
--- a/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptTopBar.tsx
@@ -1,25 +1,25 @@
 import styled from '@emotion/styled'
+import {KeyboardArrowLeft, KeyboardArrowRight} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import {Link} from 'react-router-dom'
 import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {Link} from 'react-router-dom'
+import {TeamPromptTopBar_meeting$key} from '~/__generated__/TeamPromptTopBar_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {useRenameMeeting} from '~/hooks/useRenameMeeting'
 import NewMeetingAvatarGroup from '~/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup'
-import {TeamPromptTopBar_meeting$key} from '~/__generated__/TeamPromptTopBar_meeting.graphql'
 import useModal from '../../hooks/useModal'
 import {meetingAvatarMediaQueries, meetingTopBarMediaQuery} from '../../styles/meeting'
+import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import EditableText from '../EditableText'
+import IconLabel from '../IconLabel'
 import LogoBlock from '../LogoBlock/LogoBlock'
 import {IconGroupBlock, MeetingTopBarStyles} from '../MeetingTopBar'
+import {EndRecurringMeetingModal} from '../Recurrence/EndRecurringMeetingModal'
 import {HumanReadableRecurrenceRule} from '../Recurrence/HumanReadableRecurrenceRule'
 import {UpdateRecurrenceSettingsModal} from '../Recurrence/UpdateRecurrenceSettingsModal'
-import {EndRecurringMeetingModal} from '../Recurrence/EndRecurringMeetingModal'
 import {TeamPromptMeetingStatus} from './TeamPromptMeetingStatus'
 import TeamPromptOptions from './TeamPromptOptions'
-import {KeyboardArrowLeft, KeyboardArrowRight} from '@mui/icons-material'
-import IconLabel from '../IconLabel'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
 
 const TeamPromptLogoBlock = styled(LogoBlock)({
   marginRight: '8px',
diff --git a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
index b095e66d6f9..9f51d4e28cd 100644
--- a/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
+++ b/packages/client/components/TeamPrompt/TeamPromptWorkDrawer.tsx
@@ -3,18 +3,18 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {TeamPromptWorkDrawer_meeting$key} from '../../__generated__/TeamPromptWorkDrawer_meeting.graphql'
-import Tabs from '../Tabs/Tabs'
-import Tab from '../Tab/Tab'
-import ParabolLogoSVG from '../ParabolLogoSVG'
+import useAtmosphere from '../../hooks/useAtmosphere'
+import gcalLogo from '../../styles/theme/images/graphics/google-calendar.svg'
+import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import GitHubSVG from '../GitHubSVG'
-import ParabolTasksPanel from './WorkDrawer/ParabolTasksPanel'
-import GitHubIntegrationPanel from './WorkDrawer/GitHubIntegrationPanel'
 import JiraSVG from '../JiraSVG'
-import JiraIntegrationPanel from './WorkDrawer/JiraIntegrationPanel'
-import gcalLogo from '../../styles/theme/images/graphics/google-calendar.svg'
+import ParabolLogoSVG from '../ParabolLogoSVG'
+import Tab from '../Tab/Tab'
+import Tabs from '../Tabs/Tabs'
 import GCalIntegrationPanel from './WorkDrawer/GCalIntegrationPanel'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
-import useAtmosphere from '../../hooks/useAtmosphere'
+import GitHubIntegrationPanel from './WorkDrawer/GitHubIntegrationPanel'
+import JiraIntegrationPanel from './WorkDrawer/JiraIntegrationPanel'
+import ParabolTasksPanel from './WorkDrawer/ParabolTasksPanel'
 
 interface Props {
   meetingRef: TeamPromptWorkDrawer_meeting$key
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx
index d07a773d4a9..0c975f1f8a9 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalEventCard.tsx
@@ -1,16 +1,16 @@
+import {ContentCopy} from '@mui/icons-material'
+import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
+import ms from 'ms'
 import React from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
-import useTooltip from '../../../hooks/useTooltip'
-import {MenuPosition} from '../../../hooks/useCoords'
 import {useFragment} from 'react-relay'
-import graphql from 'babel-plugin-relay/macro'
 import {GCalEventCard_event$key} from '../../../__generated__/GCalEventCard_event.graphql'
-import {mergeRefs} from '../../../utils/react/mergeRefs'
-import clsx from 'clsx'
-import {ContentCopy} from '@mui/icons-material'
-import ms from 'ms'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import useAtmosphere from '../../../hooks/useAtmosphere'
+import {MenuPosition} from '../../../hooks/useCoords'
+import useTooltip from '../../../hooks/useTooltip'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
+import {mergeRefs} from '../../../utils/react/mergeRefs'
 
 interface Props {
   eventRef: GCalEventCard_event$key
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx
index f27505d9411..88ce942c7ec 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationPanel.tsx
@@ -1,14 +1,14 @@
-import React, {useState} from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
+import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GCalIntegrationPanel_meeting$key} from '../../../__generated__/GCalIntegrationPanel_meeting.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
-import GCalIntegrationResultsRoot from './GCalIntegrationResultsRoot'
-import GcalClientManager from '../../../utils/GcalClientManager'
 import gcalSVG from '../../../styles/theme/images/graphics/google-calendar.svg'
-import clsx from 'clsx'
+import GcalClientManager from '../../../utils/GcalClientManager'
 import SendClientSideEvent from '../../../utils/SendClientSideEvent'
+import GCalIntegrationResultsRoot from './GCalIntegrationResultsRoot'
 
 const GCAL_QUERY_TABS = [
   {
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx
index 5f007cd29f8..3d125709b65 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResults.tsx
@@ -1,11 +1,11 @@
-import React from 'react'
+import {OpenInNew} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {GCalIntegrationResultsQuery} from '../../../__generated__/GCalIntegrationResultsQuery.graphql'
+import {Link} from 'react-router-dom'
 import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
+import {GCalIntegrationResultsQuery} from '../../../__generated__/GCalIntegrationResultsQuery.graphql'
 import GCalEventCard from './GCalEventCard'
-import {OpenInNew} from '@mui/icons-material'
-import {Link} from 'react-router-dom'
 
 interface Props {
   queryRef: PreloadedQuery<GCalIntegrationResultsQuery>
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx
index abb92e6da8c..b9f6a2f7362 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GCalIntegrationResultsRoot.tsx
@@ -1,12 +1,12 @@
+import ms from 'ms'
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import {Loader} from '~/utils/relay/renderLoader'
 import gcalIntegrationResultsQuery, {
   GCalIntegrationResultsQuery
 } from '../../../__generated__/GCalIntegrationResultsQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import ErrorBoundary from '../../ErrorBoundary'
 import GCalIntegrationResults from './GCalIntegrationResults'
-import {Loader} from '~/utils/relay/renderLoader'
-import ms from 'ms'
 
 interface Props {
   teamId: string
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx
index f683a5d4187..5f7bfd142e7 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationPanel.tsx
@@ -1,15 +1,15 @@
-import React, {useState} from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
+import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubIntegrationPanel_meeting$key} from '../../../__generated__/GitHubIntegrationPanel_meeting.graphql'
-import clsx from 'clsx'
-import gitHubSVG from '../../../styles/theme/images/graphics/github-circle.svg'
-import GitHubClientManager from '../../../utils/GitHubClientManager'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
+import gitHubSVG from '../../../styles/theme/images/graphics/github-circle.svg'
+import GitHubClientManager from '../../../utils/GitHubClientManager'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import GitHubIntegrationResultsRoot from './GitHubIntegrationResultsRoot'
 import GitHubRepoFilterBar from './GitHubRepoFilterBar'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 
 const GITHUB_QUERY_TABS: {key: 'issue' | 'pullRequest'; label: string}[] = [
   {
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx
index b8e5b88d804..cf9914e1d4a 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResults.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay'
+import {Link} from 'react-router-dom'
+import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
 import {GitHubIntegrationResultsQuery} from '../../../__generated__/GitHubIntegrationResultsQuery.graphql'
 import {GitHubIntegrationResultsSearchPaginationQuery} from '../../../__generated__/GitHubIntegrationResultsSearchPaginationQuery.graphql'
 import {GitHubIntegrationResults_search$key} from '../../../__generated__/GitHubIntegrationResults_search.graphql'
 import useLoadNextOnScrollBottom from '../../../hooks/useLoadNextOnScrollBottom'
-import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
-import GitHubObjectCard from './GitHubObjectCard'
 import Ellipsis from '../../Ellipsis/Ellipsis'
-import {Link} from 'react-router-dom'
+import GitHubObjectCard from './GitHubObjectCard'
 
 interface Props {
   queryRef: PreloadedQuery<GitHubIntegrationResultsQuery>
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx
index 32b3c8c8d90..394487eb5ed 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubIntegrationResultsRoot.tsx
@@ -1,11 +1,11 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import {Loader} from '~/utils/relay/renderLoader'
 import gitHubIntegrationResultsQuery, {
   GitHubIntegrationResultsQuery
 } from '../../../__generated__/GitHubIntegrationResultsQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import ErrorBoundary from '../../ErrorBoundary'
 import GitHubIntegrationResults from './GitHubIntegrationResults'
-import {Loader} from '~/utils/relay/renderLoader'
 
 interface Props {
   teamId: string
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx
index 266a9e459f3..678ab58dffb 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubObjectCard.tsx
@@ -1,22 +1,22 @@
+import {Link} from '@mui/icons-material'
+import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
+import {useFragment} from 'react-relay'
+import {GitHubObjectCard_result$key} from '../../../__generated__/GitHubObjectCard_result.graphql'
+import useAtmosphere from '../../../hooks/useAtmosphere'
+import {MenuPosition} from '../../../hooks/useCoords'
+import useTooltip from '../../../hooks/useTooltip'
 import gitHubSVG from '../../../styles/theme/images/graphics/github-circle.svg'
-import gitHubMerged from '../../../styles/theme/images/graphics/github-merged.svg'
 import githubIssueClosed from '../../../styles/theme/images/graphics/github-issue-closed.svg'
 import githubIssueOpen from '../../../styles/theme/images/graphics/github-issue-open.svg'
-import githubPROpen from '../../../styles/theme/images/graphics/github-pr-open.svg'
-import githubPRDraft from '../../../styles/theme/images/graphics/github-pr-draft.svg'
+import gitHubMerged from '../../../styles/theme/images/graphics/github-merged.svg'
 import githubPRClosed from '../../../styles/theme/images/graphics/github-pr-closed.svg'
+import githubPRDraft from '../../../styles/theme/images/graphics/github-pr-draft.svg'
+import githubPROpen from '../../../styles/theme/images/graphics/github-pr-open.svg'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import relativeDate from '../../../utils/date/relativeDate'
-import {Link} from '@mui/icons-material'
-import useTooltip from '../../../hooks/useTooltip'
-import {MenuPosition} from '../../../hooks/useCoords'
-import {useFragment} from 'react-relay'
-import graphql from 'babel-plugin-relay/macro'
-import {GitHubObjectCard_result$key} from '../../../__generated__/GitHubObjectCard_result.graphql'
 import {mergeRefs} from '../../../utils/react/mergeRefs'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 
 const ISSUE_STATUS_MAP: Record<string, any> = {
   OPEN: githubIssueOpen,
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx b/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx
index b845085f343..8cae46ae645 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/GitHubRepoFilterBar.tsx
@@ -1,15 +1,14 @@
-import React from 'react'
+import {ExpandMore, FilterList} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import {FilterList} from '@mui/icons-material'
-import useMenu from '../../../hooks/useMenu'
-import {MenuPosition} from '../../../hooks/useCoords'
-import GitHubRepoSearchFilterMenu from '../../GitHubRepoSearchFilterMenu'
+import clsx from 'clsx'
+import React from 'react'
 import {useFragment} from 'react-relay'
 import {GitHubRepoFilterBar_teamMember$key} from '../../../__generated__/GitHubRepoFilterBar_teamMember.graphql'
-import {ExpandMore} from '@mui/icons-material'
+import {MenuPosition} from '../../../hooks/useCoords'
+import useMenu from '../../../hooks/useMenu'
 import {PortalStatus} from '../../../hooks/usePortal'
-import clsx from 'clsx'
 import plural from '../../../utils/plural'
+import GitHubRepoSearchFilterMenu from '../../GitHubRepoSearchFilterMenu'
 
 interface Props {
   teamMemberRef: GitHubRepoFilterBar_teamMember$key
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx
index 88901f01b9b..6430d4724b0 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationPanel.tsx
@@ -1,12 +1,12 @@
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {useFragment} from 'react-relay'
 import {JiraIntegrationPanel_meeting$key} from '../../../__generated__/JiraIntegrationPanel_meeting.graphql'
-import AtlassianClientManager from '../../../utils/AtlassianClientManager'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
-import JiraIntegrationResultsRoot from './JiraIntegrationResultsRoot'
+import AtlassianClientManager from '../../../utils/AtlassianClientManager'
 import SendClientSideEvent from '../../../utils/SendClientSideEvent'
+import JiraIntegrationResultsRoot from './JiraIntegrationResultsRoot'
 
 interface Props {
   meetingRef: JiraIntegrationPanel_meeting$key
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx
index 1d01c707b37..6da260ddbc4 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResults.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {PreloadedQuery, usePaginationFragment, usePreloadedQuery} from 'react-relay'
+import {Link} from 'react-router-dom'
+import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
 import {JiraIntegrationResultsQuery} from '../../../__generated__/JiraIntegrationResultsQuery.graphql'
 import {JiraIntegrationResultsSearchPaginationQuery} from '../../../__generated__/JiraIntegrationResultsSearchPaginationQuery.graphql'
 import {JiraIntegrationResults_search$key} from '../../../__generated__/JiraIntegrationResults_search.graphql'
-import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
-import JiraObjectCard from './JiraObjectCard'
 import useLoadNextOnScrollBottom from '../../../hooks/useLoadNextOnScrollBottom'
 import Ellipsis from '../../Ellipsis/Ellipsis'
-import {Link} from 'react-router-dom'
+import JiraObjectCard from './JiraObjectCard'
 
 interface Props {
   queryRef: PreloadedQuery<JiraIntegrationResultsQuery>
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx
index cadccb256d2..dac120c9396 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraIntegrationResultsRoot.tsx
@@ -1,11 +1,11 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import {Loader} from '~/utils/relay/renderLoader'
 import jiraIntegrationResultsQuery, {
   JiraIntegrationResultsQuery
 } from '../../../__generated__/JiraIntegrationResultsQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import ErrorBoundary from '../../ErrorBoundary'
 import JiraIntegrationResults from './JiraIntegrationResults'
-import {Loader} from '~/utils/relay/renderLoader'
 
 interface Props {
   teamId: string
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx b/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx
index 97974a53660..76e35dbb96f 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/JiraObjectCard.tsx
@@ -1,16 +1,16 @@
+import {Link} from '@mui/icons-material'
+import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import CopyToClipboard from 'react-copy-to-clipboard'
-import jiraSVG from '../../../styles/theme/images/graphics/jira.svg'
-import relativeDate from '../../../utils/date/relativeDate'
-import {Link} from '@mui/icons-material'
-import useTooltip from '../../../hooks/useTooltip'
-import {MenuPosition} from '../../../hooks/useCoords'
 import {useFragment} from 'react-relay'
-import graphql from 'babel-plugin-relay/macro'
 import {JiraObjectCard_result$key} from '../../../__generated__/JiraObjectCard_result.graphql'
-import {mergeRefs} from '../../../utils/react/mergeRefs'
 import useAtmosphere from '../../../hooks/useAtmosphere'
+import {MenuPosition} from '../../../hooks/useCoords'
+import useTooltip from '../../../hooks/useTooltip'
+import jiraSVG from '../../../styles/theme/images/graphics/jira.svg'
 import SendClientSideEvent from '../../../utils/SendClientSideEvent'
+import relativeDate from '../../../utils/date/relativeDate'
+import {mergeRefs} from '../../../utils/react/mergeRefs'
 
 interface Props {
   resultRef: JiraObjectCard_result$key
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx
index 1099adffba0..e3538eb5db4 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksPanel.tsx
@@ -1,18 +1,18 @@
-import React, {useState} from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
+import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
-import {TaskStatusEnum} from '../../../__generated__/ParabolTasksResultsQuery.graphql'
 import {ParabolTasksPanel_meeting$key} from '../../../__generated__/ParabolTasksPanel_meeting.graphql'
-import {TaskStatus} from '../../../types/constEnums'
-import {meetingColumnArray} from '../../../utils/constants'
-import {taskStatusLabels} from '../../../utils/taskStatus'
+import {TaskStatusEnum} from '../../../__generated__/ParabolTasksResultsQuery.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import CreateTaskMutation from '../../../mutations/CreateTaskMutation'
+import {TaskStatus} from '../../../types/constEnums'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
+import {meetingColumnArray} from '../../../utils/constants'
 import dndNoise from '../../../utils/dndNoise'
+import {taskStatusLabels} from '../../../utils/taskStatus'
 import AddTaskButton from '../../AddTaskButton'
 import ParabolTasksResultsRoot from './ParabolTasksResultsRoot'
-import clsx from 'clsx'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 
 interface Props {
   meetingRef: ParabolTasksPanel_meeting$key
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx
index 107ce9f2ab4..d6cb4fbee39 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResults.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
 import {
   ParabolTasksResultsQuery,
   TaskStatusEnum
 } from '../../../__generated__/ParabolTasksResultsQuery.graphql'
-import NullableTask from '../../NullableTask/NullableTask'
-import halloweenRetrospectiveTemplate from '../../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
-import {taskStatusLabels} from '../../../utils/taskStatus'
 import useAtmosphere from '../../../hooks/useAtmosphere'
+import {taskStatusLabels} from '../../../utils/taskStatus'
+import NullableTask from '../../NullableTask/NullableTask'
 
 interface Props {
   queryRef: PreloadedQuery<ParabolTasksResultsQuery>
diff --git a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx
index 4e508ab58e5..3fa964fba44 100644
--- a/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx
+++ b/packages/client/components/TeamPrompt/WorkDrawer/ParabolTasksResultsRoot.tsx
@@ -1,13 +1,13 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import {Loader} from '~/utils/relay/renderLoader'
 import parabolTasksResultsQuery, {
   ParabolTasksResultsQuery,
   TaskStatusEnum
 } from '../../../__generated__/ParabolTasksResultsQuery.graphql'
+import useAtmosphere from '../../../hooks/useAtmosphere'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import ErrorBoundary from '../../ErrorBoundary'
 import ParabolTasksResults from './ParabolTasksResults'
-import {Loader} from '~/utils/relay/renderLoader'
-import useAtmosphere from '../../../hooks/useAtmosphere'
 
 interface Props {
   selectedStatus: TaskStatusEnum
diff --git a/packages/client/components/TeamPromptMeeting.tsx b/packages/client/components/TeamPromptMeeting.tsx
index bc5cdbfdbf0..203a1b25fb9 100644
--- a/packages/client/components/TeamPromptMeeting.tsx
+++ b/packages/client/components/TeamPromptMeeting.tsx
@@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense, useEffect, useMemo} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
+import {TeamPromptMeeting_meeting$key} from '~/__generated__/TeamPromptMeeting_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMeeting from '~/hooks/useMeeting'
 import useTransition from '~/hooks/useTransition'
 import {DiscussionThreadEnum} from '~/types/constEnums'
 import {isNotNull} from '~/utils/predicates'
 import sortByISO8601Date from '~/utils/sortByISO8601Date'
-import {TeamPromptMeeting_meeting$key} from '~/__generated__/TeamPromptMeeting_meeting.graphql'
 import getPhaseByTypename from '../utils/getPhaseByTypename'
 import ErrorBoundary from './ErrorBoundary'
 import MeetingArea from './MeetingArea'
diff --git a/packages/client/components/TeamsLimitExceededNotification.tsx b/packages/client/components/TeamsLimitExceededNotification.tsx
index 36edacb7c0b..4238767e500 100644
--- a/packages/client/components/TeamsLimitExceededNotification.tsx
+++ b/packages/client/components/TeamsLimitExceededNotification.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TeamsLimitExceededNotification_notification$key} from '~/__generated__/TeamsLimitExceededNotification_notification.graphql'
 import useRouter from '~/hooks/useRouter'
 import defaultOrgAvatar from '~/styles/theme/images/avatar-organization.svg'
-import {TeamsLimitExceededNotification_notification$key} from '~/__generated__/TeamsLimitExceededNotification_notification.graphql'
+import {Threshold} from '../types/constEnums'
 import NotificationAction from './NotificationAction'
 import NotificationTemplate from './NotificationTemplate'
-import {Threshold} from '../types/constEnums'
 
 interface Props {
   notification: TeamsLimitExceededNotification_notification$key
diff --git a/packages/client/components/TeamsLimitReminderNotification.tsx b/packages/client/components/TeamsLimitReminderNotification.tsx
index afdc9d8e403..b432f4c812a 100644
--- a/packages/client/components/TeamsLimitReminderNotification.tsx
+++ b/packages/client/components/TeamsLimitReminderNotification.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
+import {TeamsLimitReminderNotification_notification$key} from '~/__generated__/TeamsLimitReminderNotification_notification.graphql'
 import useRouter from '~/hooks/useRouter'
 import defaultOrgAvatar from '~/styles/theme/images/avatar-organization.svg'
-import {TeamsLimitReminderNotification_notification$key} from '~/__generated__/TeamsLimitReminderNotification_notification.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {Threshold} from '../types/constEnums'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import makeDateString from '../utils/makeDateString'
 import NotificationAction from './NotificationAction'
 import NotificationTemplate from './NotificationTemplate'
diff --git a/packages/client/components/ThreadedCommentBase.tsx b/packages/client/components/ThreadedCommentBase.tsx
index 0b46cfb7682..e592c81116e 100644
--- a/packages/client/components/ThreadedCommentBase.tsx
+++ b/packages/client/components/ThreadedCommentBase.tsx
@@ -3,6 +3,9 @@ import graphql from 'babel-plugin-relay/macro'
 import {convertToRaw, EditorState} from 'draft-js'
 import React, {ReactNode, useEffect, useRef, useState} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {ThreadedCommentBase_comment$key} from '~/__generated__/ThreadedCommentBase_comment.graphql'
+import {ThreadedCommentBase_discussion$key} from '~/__generated__/ThreadedCommentBase_discussion.graphql'
+import {ThreadedCommentBase_viewer$key} from '~/__generated__/ThreadedCommentBase_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useEditorState from '~/hooks/useEditorState'
 import useMutationProps from '~/hooks/useMutationProps'
@@ -11,13 +14,10 @@ import UpdateCommentContentMutation from '~/mutations/UpdateCommentContentMutati
 import convertToTaskContent from '~/utils/draftjs/convertToTaskContent'
 import isAndroid from '~/utils/draftjs/isAndroid'
 import isTempId from '~/utils/relay/isTempId'
-import {ThreadedCommentBase_comment$key} from '~/__generated__/ThreadedCommentBase_comment.graphql'
-import {ThreadedCommentBase_discussion$key} from '~/__generated__/ThreadedCommentBase_discussion.graphql'
-import {ThreadedCommentBase_viewer$key} from '~/__generated__/ThreadedCommentBase_viewer.graphql'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import anonymousAvatar from '../styles/theme/images/anonymous-avatar.svg'
 import deletedAvatar from '../styles/theme/images/deleted-avatar-placeholder.svg'
 import {PARABOL_AI_USER_ID} from '../utils/constants'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {DiscussionThreadables} from './DiscussionThreadList'
 import CommentEditor from './TaskEditor/CommentEditor'
 import ThreadedAvatarColumn from './ThreadedAvatarColumn'
diff --git a/packages/client/components/ThreadedCommentFooter.tsx b/packages/client/components/ThreadedCommentFooter.tsx
index bfaf75f403e..9178c2cb77e 100644
--- a/packages/client/components/ThreadedCommentFooter.tsx
+++ b/packages/client/components/ThreadedCommentFooter.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '~/styles/paletteV3'
 import {ThreadedCommentFooter_reactjis$key} from '~/__generated__/ThreadedCommentFooter_reactjis.graphql'
+import {PALETTE} from '~/styles/paletteV3'
 import ReactjiSection from './ReflectionCard/ReactjiSection'
 import ThreadedReplyButton from './ThreadedReplyButton'
 
diff --git a/packages/client/components/ThreadedCommentHeader.tsx b/packages/client/components/ThreadedCommentHeader.tsx
index 0b33e7f92ef..5a902055eaa 100644
--- a/packages/client/components/ThreadedCommentHeader.tsx
+++ b/packages/client/components/ThreadedCommentHeader.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {PALETTE} from '~/styles/paletteV3'
-import relativeDate from '~/utils/date/relativeDate'
 import {
-  ThreadedCommentHeader_comment$key,
-  ThreadedCommentHeader_comment$data
+  ThreadedCommentHeader_comment$data,
+  ThreadedCommentHeader_comment$key
 } from '~/__generated__/ThreadedCommentHeader_comment.graphql'
+import {PALETTE} from '~/styles/paletteV3'
+import relativeDate from '~/utils/date/relativeDate'
 import {PARABOL_AI_USER_ID} from '../utils/constants'
 import CommentAuthorOptionsButton from './CommentAuthorOptionsButton'
 import AddReactjiButton from './ReflectionCard/AddReactjiButton'
diff --git a/packages/client/components/ThreadedItemReply.tsx b/packages/client/components/ThreadedItemReply.tsx
index f0a0999a832..590d02e8f19 100644
--- a/packages/client/components/ThreadedItemReply.tsx
+++ b/packages/client/components/ThreadedItemReply.tsx
@@ -2,12 +2,12 @@ import graphql from 'babel-plugin-relay/macro'
 import {Editor} from 'draft-js'
 import React, {RefObject, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
-import useAtmosphere from '~/hooks/useAtmosphere'
-import useClickAway from '~/hooks/useClickAway'
-import isAndroid from '~/utils/draftjs/isAndroid'
 import {ThreadedItemReply_discussion$key} from '~/__generated__/ThreadedItemReply_discussion.graphql'
 import {ThreadedItemReply_threadable$key} from '~/__generated__/ThreadedItemReply_threadable.graphql'
 import {ThreadedItemReply_viewer$key} from '~/__generated__/ThreadedItemReply_viewer.graphql'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import useClickAway from '~/hooks/useClickAway'
+import isAndroid from '~/utils/draftjs/isAndroid'
 import DiscussionThreadInput from './DiscussionThreadInput'
 import {DiscussionThreadables} from './DiscussionThreadList'
 import {ReplyMention, SetReplyMention} from './ThreadedItem'
diff --git a/packages/client/components/ThreadedPollBase.tsx b/packages/client/components/ThreadedPollBase.tsx
index bde8b9840e7..7e19e8b3958 100644
--- a/packages/client/components/ThreadedPollBase.tsx
+++ b/packages/client/components/ThreadedPollBase.tsx
@@ -13,11 +13,11 @@ import PlainButton from './PlainButton/PlainButton'
 import {AddPollOptionButton} from './Poll/AddPollOptionButton'
 import EditablePollOption from './Poll/EditablePollOption'
 import EditablePollTitle from './Poll/EditablePollTitle'
-import {addLocalPollOption} from './Poll/local/newPoll'
 import Poll from './Poll/Poll'
 import PollOption from './Poll/PollOption'
 import {getPollState} from './Poll/PollState'
 import PollTitle from './Poll/PollTitle'
+import {addLocalPollOption} from './Poll/local/newPoll'
 
 const PollOptions = styled('div')({
   fontSize: '14px',
diff --git a/packages/client/components/ThreadedTaskBase.tsx b/packages/client/components/ThreadedTaskBase.tsx
index 176f8dfdd06..eb05e3a2f99 100644
--- a/packages/client/components/ThreadedTaskBase.tsx
+++ b/packages/client/components/ThreadedTaskBase.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {ReactNode, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
-import useAtmosphere from '~/hooks/useAtmosphere'
-import {PALETTE} from '~/styles/paletteV3'
 import {ThreadedTaskBase_discussion$key} from '~/__generated__/ThreadedTaskBase_discussion.graphql'
 import {ThreadedTaskBase_task$key} from '~/__generated__/ThreadedTaskBase_task.graphql'
 import {ThreadedTaskBase_viewer$key} from '~/__generated__/ThreadedTaskBase_viewer.graphql'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import {PALETTE} from '~/styles/paletteV3'
 import {DiscussionThreadables} from './DiscussionThreadList'
 import NullableTask from './NullableTask/NullableTask'
 import ThreadedAvatarColumn from './ThreadedAvatarColumn'
diff --git a/packages/client/components/TimelineEvent.tsx b/packages/client/components/TimelineEvent.tsx
index 0a3596d74a3..05c9e906aea 100644
--- a/packages/client/components/TimelineEvent.tsx
+++ b/packages/client/components/TimelineEvent.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {lazy, Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import {ValueOf} from '../types/generics'
 import {TimelineEvent_timelineEvent$key} from '../__generated__/TimelineEvent_timelineEvent.graphql'
+import {ValueOf} from '../types/generics'
 import DelayUnmount from './DelayUnmount'
 import TimelineEventMock from './TimelineEventMock'
 
diff --git a/packages/client/components/TimelineEventCard.tsx b/packages/client/components/TimelineEventCard.tsx
index 7cb80393a73..86ab45b8154 100644
--- a/packages/client/components/TimelineEventCard.tsx
+++ b/packages/client/components/TimelineEventCard.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {ReactNode} from 'react'
 import {useFragment} from 'react-relay'
-import {cardShadow} from '../styles/elevation'
 import {TimelineEventCard_timelineEvent$key} from '../__generated__/TimelineEventCard_timelineEvent.graphql'
+import {cardShadow} from '../styles/elevation'
 import TimelineEventDate from './TimelineEventDate'
 import TimelineEventHeaderMenuToggle from './TimelineEventHeaderMenuToggle'
 import TimelineEventTypeIcon from './TimelineEventTypeIcon'
diff --git a/packages/client/components/TimelineEventCompletedActionMeeting.tsx b/packages/client/components/TimelineEventCompletedActionMeeting.tsx
index 77b4465806a..d9d0b1ca00f 100644
--- a/packages/client/components/TimelineEventCompletedActionMeeting.tsx
+++ b/packages/client/components/TimelineEventCompletedActionMeeting.tsx
@@ -2,15 +2,15 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TimelineEventCompletedActionMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedActionMeeting_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
 import relativeDate from '../utils/date/relativeDate'
 import plural from '../utils/plural'
-import {TimelineEventCompletedActionMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedActionMeeting_timelineEvent.graphql'
 import StyledLink from './StyledLink'
+import TimelineEventTitle from './TImelineEventTitle'
 import TimelineEventBody from './TimelineEventBody'
 import TimelineEventCard from './TimelineEventCard'
-import TimelineEventTitle from './TImelineEventTitle'
 
 interface Props {
   timelineEvent: TimelineEventCompletedActionMeeting_timelineEvent$key
diff --git a/packages/client/components/TimelineEventCompletedRetroMeeting.tsx b/packages/client/components/TimelineEventCompletedRetroMeeting.tsx
index 1391de3e57a..e555203ee63 100644
--- a/packages/client/components/TimelineEventCompletedRetroMeeting.tsx
+++ b/packages/client/components/TimelineEventCompletedRetroMeeting.tsx
@@ -2,14 +2,14 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TimelineEventCompletedRetroMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedRetroMeeting_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
 import plural from '../utils/plural'
-import {TimelineEventCompletedRetroMeeting_timelineEvent$key} from '../__generated__/TimelineEventCompletedRetroMeeting_timelineEvent.graphql'
 import StyledLink from './StyledLink'
+import TimelineEventTitle from './TImelineEventTitle'
 import TimelineEventBody from './TimelineEventBody'
 import TimelineEventCard from './TimelineEventCard'
-import TimelineEventTitle from './TImelineEventTitle'
 
 interface Props {
   timelineEvent: TimelineEventCompletedRetroMeeting_timelineEvent$key
diff --git a/packages/client/components/TimelineEventJoinedParabol.tsx b/packages/client/components/TimelineEventJoinedParabol.tsx
index ba9a5cb17dc..9da3265431e 100644
--- a/packages/client/components/TimelineEventJoinedParabol.tsx
+++ b/packages/client/components/TimelineEventJoinedParabol.tsx
@@ -4,9 +4,9 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventJoinedParabol_timelineEvent$key} from '../__generated__/TimelineEventJoinedParabol_timelineEvent.graphql'
 import StyledLink from './StyledLink'
+import TimelineEventTitle from './TImelineEventTitle'
 import TimelineEventBody from './TimelineEventBody'
 import TimelineEventCard from './TimelineEventCard'
-import TimelineEventTitle from './TImelineEventTitle'
 
 interface Props {
   timelineEvent: TimelineEventJoinedParabol_timelineEvent$key
diff --git a/packages/client/components/TimelineEventPokerComplete.tsx b/packages/client/components/TimelineEventPokerComplete.tsx
index 1cc02fe7a8e..02c8935011e 100644
--- a/packages/client/components/TimelineEventPokerComplete.tsx
+++ b/packages/client/components/TimelineEventPokerComplete.tsx
@@ -2,15 +2,15 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TimelineEventPokerComplete_timelineEvent$key} from '../__generated__/TimelineEventPokerComplete_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
 import plural from '../utils/plural'
-import {TimelineEventPokerComplete_timelineEvent$key} from '../__generated__/TimelineEventPokerComplete_timelineEvent.graphql'
+import CardsSVG from './CardsSVG'
 import StyledLink from './StyledLink'
+import TimelineEventTitle from './TImelineEventTitle'
 import TimelineEventBody from './TimelineEventBody'
 import TimelineEventCard from './TimelineEventCard'
-import TimelineEventTitle from './TImelineEventTitle'
-import CardsSVG from './CardsSVG'
 
 interface Props {
   timelineEvent: TimelineEventPokerComplete_timelineEvent$key
diff --git a/packages/client/components/TimelineEventTeamCreated.tsx b/packages/client/components/TimelineEventTeamCreated.tsx
index 8c7f43f0821..2a922fd9c40 100644
--- a/packages/client/components/TimelineEventTeamCreated.tsx
+++ b/packages/client/components/TimelineEventTeamCreated.tsx
@@ -4,9 +4,9 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {TimelineEventTeamCreated_timelineEvent$key} from '../__generated__/TimelineEventTeamCreated_timelineEvent.graphql'
 import StyledLink from './StyledLink'
+import TimelineEventTitle from './TImelineEventTitle'
 import TimelineEventBody from './TimelineEventBody'
 import TimelineEventCard from './TimelineEventCard'
-import TimelineEventTitle from './TImelineEventTitle'
 
 interface Props {
   timelineEvent: TimelineEventTeamCreated_timelineEvent$key
diff --git a/packages/client/components/TimelineEventTeamPromptComplete.tsx b/packages/client/components/TimelineEventTeamPromptComplete.tsx
index 9bf42575646..d74a9671494 100644
--- a/packages/client/components/TimelineEventTeamPromptComplete.tsx
+++ b/packages/client/components/TimelineEventTeamPromptComplete.tsx
@@ -2,14 +2,14 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TimelineEventTeamPromptComplete_timelineEvent$key} from '../__generated__/TimelineEventTeamPromptComplete_timelineEvent.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
 import plural from '../utils/plural'
-import {TimelineEventTeamPromptComplete_timelineEvent$key} from '../__generated__/TimelineEventTeamPromptComplete_timelineEvent.graphql'
 import StyledLink from './StyledLink'
+import TimelineEventTitle from './TImelineEventTitle'
 import TimelineEventBody from './TimelineEventBody'
 import TimelineEventCard from './TimelineEventCard'
-import TimelineEventTitle from './TImelineEventTitle'
 
 interface Props {
   timelineEvent: TimelineEventTeamPromptComplete_timelineEvent$key
diff --git a/packages/client/components/TimelineEventTypeIcon.tsx b/packages/client/components/TimelineEventTypeIcon.tsx
index d896df2ed98..a957f1b8eaf 100644
--- a/packages/client/components/TimelineEventTypeIcon.tsx
+++ b/packages/client/components/TimelineEventTypeIcon.tsx
@@ -9,8 +9,8 @@ import {
   Style,
   Timeline
 } from '@mui/icons-material'
-import {PALETTE} from '../styles/paletteV3'
 import React from 'react'
+import {PALETTE} from '../styles/paletteV3'
 
 interface Props {
   iconName?: string
diff --git a/packages/client/components/TimelineEventTypeMenu.tsx b/packages/client/components/TimelineEventTypeMenu.tsx
index 24ff1d0745a..2194f374570 100644
--- a/packages/client/components/TimelineEventTypeMenu.tsx
+++ b/packages/client/components/TimelineEventTypeMenu.tsx
@@ -3,12 +3,12 @@ import useAtmosphere from '~/hooks/useAtmosphere'
 import useRouter from '~/hooks/useRouter'
 import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
+import TimelineEventTypeEnum from '../../server/graphql/types/TimelineEventTypeEnum'
 import {MenuProps} from '../hooks/useMenu'
 import DropdownMenuLabel from './DropdownMenuLabel'
+import EventTypeFilterMenuItemLabel from './EventTypeFilterMenuItemLabel'
 import Menu from './Menu'
 import MenuItem from './MenuItem'
-import TimelineEventTypeEnum from '../../server/graphql/types/TimelineEventTypeEnum'
-import EventTypeFilterMenuItemLabel from './EventTypeFilterMenuItemLabel'
 
 interface Props {
   menuProps: MenuProps
diff --git a/packages/client/components/TimelineFeedList.tsx b/packages/client/components/TimelineFeedList.tsx
index 9b175bf45db..b0c1159f355 100644
--- a/packages/client/components/TimelineFeedList.tsx
+++ b/packages/client/components/TimelineFeedList.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {usePaginationFragment} from 'react-relay'
+import {Link} from 'react-router-dom'
 import useLoadNextOnScrollBottom from '~/hooks/useLoadNextOnScrollBottom'
 import {TimelineFeedListPaginationQuery} from '../__generated__/TimelineFeedListPaginationQuery.graphql'
 import {TimelineFeedList_query$key} from '../__generated__/TimelineFeedList_query.graphql'
 import TimelineEvent from './TimelineEvent'
 import TimelineHistoryLockedCard from './TimelineHistoryLockedCard'
-import {Link} from 'react-router-dom'
 
 const ResultScroller = styled('div')({
   overflow: 'auto'
diff --git a/packages/client/components/TimelineHeader.tsx b/packages/client/components/TimelineHeader.tsx
index a659e0f3248..003a0b3bde4 100644
--- a/packages/client/components/TimelineHeader.tsx
+++ b/packages/client/components/TimelineHeader.tsx
@@ -1,17 +1,17 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
+import {useFragment} from 'react-relay'
+import {TimelineHeader_viewer$key} from '../__generated__/TimelineHeader_viewer.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
 import {MenuPosition} from '../hooks/useCoords'
 import useMenu from '../hooks/useMenu'
 import {FilterLabels} from '../types/constEnums'
+import {timelineEventTypeMenuLabels} from '../utils/constants'
 import lazyPreload from '../utils/lazyPreload'
+import {useQueryParameterParser} from '../utils/useQueryParameterParser'
+import DashFilterToggle from './DashFilterToggle/DashFilterToggle'
 import DashSectionControls from './Dashboard/DashSectionControls'
 import DashSectionHeader from './Dashboard/DashSectionHeader'
-import DashFilterToggle from './DashFilterToggle/DashFilterToggle'
-import {useQueryParameterParser} from '../utils/useQueryParameterParser'
-import useAtmosphere from '../hooks/useAtmosphere'
-import {timelineEventTypeMenuLabels} from '../utils/constants'
-import {useFragment} from 'react-relay'
-import {TimelineHeader_viewer$key} from '../__generated__/TimelineHeader_viewer.graphql'
 
 const TeamFilterMenu = lazyPreload(
   () =>
diff --git a/packages/client/components/TimelineHistoryLockedCard.tsx b/packages/client/components/TimelineHistoryLockedCard.tsx
index c6d052e68f1..020ae2730ce 100644
--- a/packages/client/components/TimelineHistoryLockedCard.tsx
+++ b/packages/client/components/TimelineHistoryLockedCard.tsx
@@ -3,13 +3,13 @@ import {Lock} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {TimelineHistoryLockedCard_organization$key} from '../__generated__/TimelineHistoryLockedCard_organization.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useIsVisible from '../hooks/useIsVisible'
 import useRouter from '../hooks/useRouter'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 import {cardShadow} from '../styles/elevation'
 import {PALETTE} from '../styles/paletteV3'
-import {TimelineHistoryLockedCard_organization$key} from '../__generated__/TimelineHistoryLockedCard_organization.graphql'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import PrimaryButton from './PrimaryButton'
 
 interface Props {
diff --git a/packages/client/components/TimelinePriorityTasks.tsx b/packages/client/components/TimelinePriorityTasks.tsx
index 3834aff904b..554ba4ba218 100644
--- a/packages/client/components/TimelinePriorityTasks.tsx
+++ b/packages/client/components/TimelinePriorityTasks.tsx
@@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {DragDropContext, Droppable, DroppableProvided, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
+import {TimelinePriorityTasks_viewer$key} from '../__generated__/TimelinePriorityTasks_viewer.graphql'
 import DraggableTask from '../containers/TaskCard/DraggableTask'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useEventCallback from '../hooks/useEventCallback'
@@ -12,7 +13,6 @@ import {PALETTE} from '../styles/paletteV3'
 import {DroppableType} from '../types/constEnums'
 import {ACTIVE, ACTIVE_TASK, SORT_STEP} from '../utils/constants'
 import dndNoise from '../utils/dndNoise'
-import {TimelinePriorityTasks_viewer$key} from '../__generated__/TimelinePriorityTasks_viewer.graphql'
 import TimelineNoTasks from './TimelineNoTasks'
 
 interface Props {
diff --git a/packages/client/components/TimelineRightDrawer.tsx b/packages/client/components/TimelineRightDrawer.tsx
index 5f6f4b3838a..f634ecc9387 100644
--- a/packages/client/components/TimelineRightDrawer.tsx
+++ b/packages/client/components/TimelineRightDrawer.tsx
@@ -3,9 +3,9 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
+import {TimelineRightDrawer_viewer$key} from '../__generated__/TimelineRightDrawer_viewer.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import {DashTimeline, NavSidebar} from '../types/constEnums'
-import {TimelineRightDrawer_viewer$key} from '../__generated__/TimelineRightDrawer_viewer.graphql'
 import ErrorBoundary from './ErrorBoundary'
 import TimelinePriorityTasks from './TimelinePriorityTasks'
 
diff --git a/packages/client/components/TimelineSuggestedAction.tsx b/packages/client/components/TimelineSuggestedAction.tsx
index d0623439e7e..5f192adb47a 100644
--- a/packages/client/components/TimelineSuggestedAction.tsx
+++ b/packages/client/components/TimelineSuggestedAction.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {lazy} from 'react'
 import {useFragment} from 'react-relay'
-import {ValueOf} from '../types/generics'
 import {TimelineSuggestedAction_viewer$key} from '../__generated__/TimelineSuggestedAction_viewer.graphql'
+import {ValueOf} from '../types/generics'
 import DelayUnmount from './DelayUnmount'
 
 interface Props {
diff --git a/packages/client/components/TopBarNotifications.tsx b/packages/client/components/TopBarNotifications.tsx
index 5586877a812..d4f3322fa36 100644
--- a/packages/client/components/TopBarNotifications.tsx
+++ b/packages/client/components/TopBarNotifications.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {TopBarNotifications_query$key} from '~/__generated__/TopBarNotifications_query.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import lazyPreload from '~/utils/lazyPreload'
-import {TopBarNotifications_query$key} from '~/__generated__/TopBarNotifications_query.graphql'
 import useRouter from '../hooks/useRouter'
 import TopBarIcon from './TopBarIcon'
 
diff --git a/packages/client/components/TopBarSearch.tsx b/packages/client/components/TopBarSearch.tsx
index d87394ce467..db7b7045f3f 100644
--- a/packages/client/components/TopBarSearch.tsx
+++ b/packages/client/components/TopBarSearch.tsx
@@ -3,12 +3,12 @@ import {Close, Search} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
-import {matchPath, RouteProps} from 'react-router'
+import {RouteProps, matchPath} from 'react-router'
 import {commitLocalUpdate} from 'relay-runtime'
+import {TopBarSearch_viewer$key} from '~/__generated__/TopBarSearch_viewer.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useRouter from '~/hooks/useRouter'
 import {PALETTE} from '~/styles/paletteV3'
-import {TopBarSearch_viewer$key} from '~/__generated__/TopBarSearch_viewer.graphql'
 import Atmosphere from '../Atmosphere'
 
 const getShowSearch = (location: NonNullable<RouteProps['location']>) => {
diff --git a/packages/client/components/UserDashTeamMemberMenu.tsx b/packages/client/components/UserDashTeamMemberMenu.tsx
index f466c0c29ae..af1f60138e8 100644
--- a/packages/client/components/UserDashTeamMemberMenu.tsx
+++ b/packages/client/components/UserDashTeamMemberMenu.tsx
@@ -7,11 +7,11 @@ import useSearchFilter from '~/hooks/useSearchFilter'
 import {FilterLabels} from '~/types/constEnums'
 import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
-import {MenuProps} from '../hooks/useMenu'
 import {
-  UserDashTeamMemberMenu_viewer$key,
-  UserDashTeamMemberMenu_viewer$data
+  UserDashTeamMemberMenu_viewer$data,
+  UserDashTeamMemberMenu_viewer$key
 } from '../__generated__/UserDashTeamMemberMenu_viewer.graphql'
+import {MenuProps} from '../hooks/useMenu'
 import DropdownMenuLabel from './DropdownMenuLabel'
 import {EmptyDropdownMenuItemLabel} from './EmptyDropdownMenuItemLabel'
 import Menu from './Menu'
diff --git a/packages/client/components/ViewerNotOnTeam.tsx b/packages/client/components/ViewerNotOnTeam.tsx
index cd67491fe62..cddcd3e536a 100644
--- a/packages/client/components/ViewerNotOnTeam.tsx
+++ b/packages/client/components/ViewerNotOnTeam.tsx
@@ -1,13 +1,13 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {ViewerNotOnTeamQuery} from '../__generated__/ViewerNotOnTeamQuery.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useDocumentTitle from '../hooks/useDocumentTitle'
 import useMutationProps from '../hooks/useMutationProps'
 import useRouter from '../hooks/useRouter'
 import AcceptTeamInvitationMutation from '../mutations/AcceptTeamInvitationMutation'
 import PushInvitationMutation from '../mutations/PushInvitationMutation'
-import {ViewerNotOnTeamQuery} from '../__generated__/ViewerNotOnTeamQuery.graphql'
 import DialogContent from './DialogContent'
 import DialogTitle from './DialogTitle'
 import Ellipsis from './Ellipsis/Ellipsis'
diff --git a/packages/client/components/ViewerNotOnTeamRoot.tsx b/packages/client/components/ViewerNotOnTeamRoot.tsx
index a90bc899b09..174650f60c0 100644
--- a/packages/client/components/ViewerNotOnTeamRoot.tsx
+++ b/packages/client/components/ViewerNotOnTeamRoot.tsx
@@ -1,12 +1,12 @@
 import React, {Suspense} from 'react'
+import viewerNotOnTeamQuery, {
+  ViewerNotOnTeamQuery
+} from '../__generated__/ViewerNotOnTeamQuery.graphql'
 import useQueryLoaderNow from '../hooks/useQueryLoaderNow'
 import useSubscription from '../hooks/useSubscription'
 import NotificationSubscription from '../subscriptions/NotificationSubscription'
 import {LoaderSize} from '../types/constEnums'
 import {Loader} from '../utils/relay/renderLoader'
-import viewerNotOnTeamQuery, {
-  ViewerNotOnTeamQuery
-} from '../__generated__/ViewerNotOnTeamQuery.graphql'
 import ViewerNotOnTeam from './ViewerNotOnTeam'
 
 const ViewerNotOnTeamRoot = () => {
diff --git a/packages/client/components/VoteSettingsMenu.tsx b/packages/client/components/VoteSettingsMenu.tsx
index 55fbe472d7b..cfc99fffb85 100644
--- a/packages/client/components/VoteSettingsMenu.tsx
+++ b/packages/client/components/VoteSettingsMenu.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {VoteSettingsMenu_meeting$key} from '~/__generated__/VoteSettingsMenu_meeting.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import UpdateRetroMaxVotesMutation from '~/mutations/UpdateRetroMaxVotesMutation'
 import {PALETTE} from '~/styles/paletteV3'
 import {MeetingSettingsThreshold} from '~/types/constEnums'
-import {VoteSettingsMenu_meeting$key} from '~/__generated__/VoteSettingsMenu_meeting.graphql'
 import {MenuProps} from '../hooks/useMenu'
 import Menu from './Menu'
 import StyledError from './StyledError'
diff --git a/packages/client/components/promptResponse/PromptResponseEditor.tsx b/packages/client/components/promptResponse/PromptResponseEditor.tsx
index 43cd588ad79..fcb7c1e60ca 100644
--- a/packages/client/components/promptResponse/PromptResponseEditor.tsx
+++ b/packages/client/components/promptResponse/PromptResponseEditor.tsx
@@ -11,8 +11,8 @@ import EditorLinkChangerTipTap from '../EditorLinkChanger/EditorLinkChangerTipTa
 import EditorLinkViewerTipTap from '../EditorLinkViewer/EditorLinkViewerTipTap'
 import EmojiMenuTipTap from './EmojiMenuTipTap'
 import MentionsTipTap from './MentionsTipTap'
-import {createEditorExtensions, getLinkProps, LinkMenuProps, LinkPreviewProps} from './tiptapConfig'
 import {unfurlLoomLinks} from './loomExtension'
+import {LinkMenuProps, LinkPreviewProps, createEditorExtensions, getLinkProps} from './tiptapConfig'
 
 const LinkIcon = styled(Link)({
   height: 18,
diff --git a/packages/client/components/useSetTaskEstimate.ts b/packages/client/components/useSetTaskEstimate.ts
index 717fc423d31..1ca9cb39046 100644
--- a/packages/client/components/useSetTaskEstimate.ts
+++ b/packages/client/components/useSetTaskEstimate.ts
@@ -1,11 +1,11 @@
-import useAtmosphere from '../hooks/useAtmosphere'
-import useMutationProps from '../hooks/useMutationProps'
-import SetTaskEstimateMutation from '../mutations/SetTaskEstimateMutation'
-import {CompletedHandler} from '../types/relayMutations'
 import {
   SetTaskEstimateMutation as TSetTaskEstimateMutation,
   TaskEstimateInput
 } from '../__generated__/SetTaskEstimateMutation.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
+import useMutationProps from '../hooks/useMutationProps'
+import SetTaskEstimateMutation from '../mutations/SetTaskEstimateMutation'
+import {CompletedHandler} from '../types/relayMutations'
 
 const useSetTaskEstimate = () => {
   const {submitMutation, submitting, error, onError, onCompleted} = useMutationProps()
diff --git a/packages/client/containers/Signout/signout.ts b/packages/client/containers/Signout/signout.ts
index e32cba1b1f3..ceca7c3a68e 100644
--- a/packages/client/containers/Signout/signout.ts
+++ b/packages/client/containers/Signout/signout.ts
@@ -1,6 +1,6 @@
 import Atmosphere from '../../Atmosphere'
-import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import {LocalStorageKey} from '../../types/constEnums'
+import SendClientSideEvent from '../../utils/SendClientSideEvent'
 
 const signout = (atmosphere: Atmosphere, history: any) => {
   window.localStorage.removeItem(LocalStorageKey.APP_TOKEN_KEY)
diff --git a/packages/client/containers/TaskCard/DraggableTask.tsx b/packages/client/containers/TaskCard/DraggableTask.tsx
index 75e124abacf..a0a0183b746 100644
--- a/packages/client/containers/TaskCard/DraggableTask.tsx
+++ b/packages/client/containers/TaskCard/DraggableTask.tsx
@@ -4,8 +4,8 @@ import React from 'react'
 import {Draggable, DraggableProvided, DraggableStateSnapshot} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
-import NullableTask from '../../components/NullableTask/NullableTask'
 import {DraggableTask_task$key} from '../../__generated__/DraggableTask_task.graphql'
+import NullableTask from '../../components/NullableTask/NullableTask'
 
 const DraggableStyles = styled('div')({
   // sometimes the default blue fuzzies show up around the containing div
diff --git a/packages/client/hooks/useAnimatedSpotlightSource.ts b/packages/client/hooks/useAnimatedSpotlightSource.ts
index b974ec36a24..2eeb2d60e76 100644
--- a/packages/client/hooks/useAnimatedSpotlightSource.ts
+++ b/packages/client/hooks/useAnimatedSpotlightSource.ts
@@ -2,10 +2,10 @@ import {Times} from 'parabol-client/types/constEnums'
 import {MutableRefObject, useLayoutEffect, useRef} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {PortalStatus} from '~/hooks/usePortal'
-import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import StartDraggingReflectionMutation from '~/mutations/StartDraggingReflectionMutation'
 import {Elevation} from '~/styles/elevation'
 import {BezierCurve, ElementWidth} from '~/types/constEnums'
+import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import clientTempId from '~/utils/relay/clientTempId'
 import cloneReflection from '~/utils/retroGroup/cloneReflection'
 
diff --git a/packages/client/hooks/useClientSideTrack.ts b/packages/client/hooks/useClientSideTrack.ts
index f498bfb5a6c..7824e059659 100644
--- a/packages/client/hooks/useClientSideTrack.ts
+++ b/packages/client/hooks/useClientSideTrack.ts
@@ -1,6 +1,6 @@
 import {useEffect, useRef} from 'react'
-import useAtmosphere from './useAtmosphere'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
+import useAtmosphere from './useAtmosphere'
 
 // certain users keep sending this non-stop. not sure why.
 // include an eventId so we know if it's the component. if it's not here, then in must be in trebuchet
diff --git a/packages/client/hooks/useDraggableReflectionCard.tsx b/packages/client/hooks/useDraggableReflectionCard.tsx
index 8d4d0e2df69..6e6e82e83c5 100644
--- a/packages/client/hooks/useDraggableReflectionCard.tsx
+++ b/packages/client/hooks/useDraggableReflectionCard.tsx
@@ -1,8 +1,9 @@
 import React, {useContext, useEffect, useRef, useState} from 'react'
 import {commitLocalUpdate} from 'relay-runtime'
-import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import {DraggableReflectionCard_meeting$data} from '~/__generated__/DraggableReflectionCard_meeting.graphql'
 import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation_meeting.graphql'
+import SendClientSideEvent from '~/utils/SendClientSideEvent'
+import {DraggableReflectionCard_reflection$data} from '../__generated__/DraggableReflectionCard_reflection.graphql'
 import {PortalContext, SetPortal} from '../components/AtmosphereProvider/PortalProvider'
 import {SwipeColumn} from '../components/GroupingKanban'
 import {ReflectionDragState} from '../components/ReflectionGroup/DraggableReflectionCard'
@@ -23,7 +24,6 @@ import updateClonePosition, {
   getDroppingStyles,
   getSpotlightAnimation
 } from '../utils/retroGroup/updateClonePosition'
-import {DraggableReflectionCard_reflection$data} from '../__generated__/DraggableReflectionCard_reflection.graphql'
 import useAtmosphere from './useAtmosphere'
 import useEventCallback from './useEventCallback'
 import useSpotlightResults from './useSpotlightResults'
diff --git a/packages/client/hooks/useEndMeetingHotkey.ts b/packages/client/hooks/useEndMeetingHotkey.ts
index 6122816cf2e..92668697366 100644
--- a/packages/client/hooks/useEndMeetingHotkey.ts
+++ b/packages/client/hooks/useEndMeetingHotkey.ts
@@ -1,7 +1,7 @@
+import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import EndCheckInMutation from '~/mutations/EndCheckInMutation'
 import EndRetrospectiveMutation from '~/mutations/EndRetrospectiveMutation'
 import EndSprintPokerMutation from '~/mutations/EndSprintPokerMutation'
-import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
 import handleHotkey from '../utils/meetings/handleHotkey'
 import useAtmosphere from './useAtmosphere'
 import useHotkey from './useHotkey'
diff --git a/packages/client/hooks/useGotoStageId.ts b/packages/client/hooks/useGotoStageId.ts
index 73d6aeb219e..b73eac1e94a 100644
--- a/packages/client/hooks/useGotoStageId.ts
+++ b/packages/client/hooks/useGotoStageId.ts
@@ -3,8 +3,8 @@ import {useCallback} from 'react'
 import {readInlineData} from 'relay-runtime'
 import {NavigateMeetingMutation as TNavigateMeetingMutation} from '~/__generated__/NavigateMeetingMutation.graphql'
 import {useGotoStageId_meeting$key} from '~/__generated__/useGotoStageId_meeting.graphql'
-import {demoTeamId} from '../modules/demo/initDB'
 import LocalAtmosphere from '../modules/demo/LocalAtmosphere'
+import {demoTeamId} from '../modules/demo/initDB'
 import NavigateMeetingMutation from '../mutations/NavigateMeetingMutation'
 import findStageById from '../utils/meetings/findStageById'
 import isForwardProgress from '../utils/meetings/isForwardProgress'
diff --git a/packages/client/hooks/useInitialSafeRoute.ts b/packages/client/hooks/useInitialSafeRoute.ts
index 4210c177ef4..84d3e7fb75b 100644
--- a/packages/client/hooks/useInitialSafeRoute.ts
+++ b/packages/client/hooks/useInitialSafeRoute.ts
@@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import {Dispatch, SetStateAction, useEffect} from 'react'
 import {readInlineData} from 'relay-runtime'
 import {useInitialSafeRoute_meeting$key} from '~/__generated__/useInitialSafeRoute_meeting.graphql'
+import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
 import {RetroDemo} from '../types/constEnums'
 import findKeyByValue from '../utils/findKeyByValue'
 import findStageById from '../utils/meetings/findStageById'
@@ -9,7 +10,6 @@ import fromStageIdToUrl from '../utils/meetings/fromStageIdToUrl'
 import getMeetingPathParams from '../utils/meetings/getMeetingPathParams'
 import {phaseTypeToSlug} from '../utils/meetings/lookups'
 import updateLocalStage from '../utils/relay/updateLocalStage'
-import {NewMeetingPhaseTypeEnum} from '../__generated__/ActionMeeting_meeting.graphql'
 import useAtmosphere from './useAtmosphere'
 import useRouter from './useRouter'
 
diff --git a/packages/client/hooks/useIsIntegrated.ts b/packages/client/hooks/useIsIntegrated.ts
index cd05f887bed..e7ac801b8ca 100644
--- a/packages/client/hooks/useIsIntegrated.ts
+++ b/packages/client/hooks/useIsIntegrated.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 
-import {useIsIntegrated_integrations$key} from '../__generated__/useIsIntegrated_integrations.graphql'
 import {useFragment} from 'react-relay'
+import {useIsIntegrated_integrations$key} from '../__generated__/useIsIntegrated_integrations.graphql'
 
 type IntegrationLookup = {
   hasGitHub: boolean
diff --git a/packages/client/hooks/useMeeting.ts b/packages/client/hooks/useMeeting.ts
index 6f5f16d2e5b..e5f00e7db34 100644
--- a/packages/client/hooks/useMeeting.ts
+++ b/packages/client/hooks/useMeeting.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {readInlineData} from 'relay-runtime'
-import isDemoRoute from '~/utils/isDemoRoute'
 import {useMeeting_meeting$key} from '~/__generated__/useMeeting_meeting.graphql'
+import isDemoRoute from '~/utils/isDemoRoute'
 import {Breakpoint} from '../types/constEnums'
 import useAutoCheckIn from './useAutoCheckIn'
 import useBreakpoint from './useBreakpoint'
diff --git a/packages/client/hooks/useNewFeatureSnackbar.ts b/packages/client/hooks/useNewFeatureSnackbar.ts
index 6e4d103bc62..30f6730b342 100644
--- a/packages/client/hooks/useNewFeatureSnackbar.ts
+++ b/packages/client/hooks/useNewFeatureSnackbar.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {useEffect} from 'react'
 import {useFragment} from 'react-relay'
-import DismissNewFeatureMutation from '../mutations/DismissNewFeatureMutation'
 import {useNewFeatureSnackbar_viewer$key} from '../__generated__/useNewFeatureSnackbar_viewer.graphql'
+import DismissNewFeatureMutation from '../mutations/DismissNewFeatureMutation'
 import useAtmosphere from './useAtmosphere'
 import useMutationProps from './useMutationProps'
 
diff --git a/packages/client/hooks/useQueryLoaderNow.tsx b/packages/client/hooks/useQueryLoaderNow.tsx
index 4e7207e6a35..33f2bd2d36e 100644
--- a/packages/client/hooks/useQueryLoaderNow.tsx
+++ b/packages/client/hooks/useQueryLoaderNow.tsx
@@ -1,9 +1,9 @@
 import areEqual from 'fbjs/lib/areEqual'
 import {useCallback, useEffect, useRef} from 'react'
 import {
-  fetchQuery,
-  PreloadableConcreteRequest,
   PreloadFetchPolicy,
+  PreloadableConcreteRequest,
+  fetchQuery,
   useQueryLoader
 } from 'react-relay'
 import {GraphQLTaggedNode, OperationType, VariablesOf} from 'relay-runtime'
diff --git a/packages/client/hooks/useSnacksForNewMeetings.ts b/packages/client/hooks/useSnacksForNewMeetings.ts
index c72f6b9bda7..2a41b9735ab 100644
--- a/packages/client/hooks/useSnacksForNewMeetings.ts
+++ b/packages/client/hooks/useSnacksForNewMeetings.ts
@@ -2,9 +2,9 @@ import graphql from 'babel-plugin-relay/macro'
 import ms from 'ms'
 import {useEffect, useState} from 'react'
 import {readInlineData} from 'relay-runtime'
+import {useSnacksForNewMeetings_meetings$key} from '~/__generated__/useSnacksForNewMeetings_meetings.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useRouter from '~/hooks/useRouter'
-import {useSnacksForNewMeetings_meetings$key} from '~/__generated__/useSnacksForNewMeetings_meetings.graphql'
 
 const useSnacksForNewMeetings = (meetingsRef: readonly useSnacksForNewMeetings_meetings$key[]) => {
   const [dismissedMeetingIds] = useState(() => new Set<string>())
diff --git a/packages/client/hooks/useSpotlightSimulatedDrag.tsx b/packages/client/hooks/useSpotlightSimulatedDrag.tsx
index ad9774ebb09..bf93a24cbe2 100644
--- a/packages/client/hooks/useSpotlightSimulatedDrag.tsx
+++ b/packages/client/hooks/useSpotlightSimulatedDrag.tsx
@@ -1,8 +1,8 @@
 import {MutableRefObject, useCallback, useEffect, useMemo, useRef} from 'react'
 import {commitLocalUpdate} from 'react-relay'
-import SendClientSideEvent from '~/utils/SendClientSideEvent'
-import {Times} from '~/types/constEnums'
 import {GroupingKanban_meeting$data} from '~/__generated__/GroupingKanban_meeting.graphql'
+import {Times} from '~/types/constEnums'
+import SendClientSideEvent from '~/utils/SendClientSideEvent'
 import EndDraggingReflectionMutation from '../mutations/EndDraggingReflectionMutation'
 import useAtmosphere from './useAtmosphere'
 
diff --git a/packages/client/hooks/useSubColumns.ts b/packages/client/hooks/useSubColumns.ts
index 48e4ce6b9ef..7e653bf7441 100644
--- a/packages/client/hooks/useSubColumns.ts
+++ b/packages/client/hooks/useSubColumns.ts
@@ -1,8 +1,8 @@
 import {RefObject, useMemo, useState} from 'react'
 import {commitLocalUpdate} from 'react-relay'
+import {GroupingKanbanColumn_reflectionGroups$data} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql'
 import getBBox from '~/components/RetroReflectPhase/getBBox'
 import {Breakpoint, ElementHeight, ElementWidth} from '~/types/constEnums'
-import {GroupingKanbanColumn_reflectionGroups$data} from '~/__generated__/GroupingKanbanColumn_reflectionGroups.graphql'
 import useAtmosphere from './useAtmosphere'
 import useBreakpoint from './useBreakpoint'
 import useResizeObserver from './useResizeObserver'
diff --git a/packages/client/modules/demo/ClientGraphQLServer.ts b/packages/client/modules/demo/ClientGraphQLServer.ts
index 1053d69b2b3..e58c5f10f22 100644
--- a/packages/client/modules/demo/ClientGraphQLServer.ts
+++ b/packages/client/modules/demo/ClientGraphQLServer.ts
@@ -5,17 +5,17 @@ import ms from 'ms'
 import {Variables} from 'relay-runtime'
 import StrictEventEmitter from 'strict-event-emitter-types'
 import stringSimilarity from 'string-similarity'
-import {PALETTE} from '~/styles/paletteV3'
 import {ReactableEnum} from '~/__generated__/AddReactjiToReactableMutation.graphql'
 import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation.graphql'
+import {PALETTE} from '~/styles/paletteV3'
 import DiscussPhase from '../../../server/database/types/DiscussPhase'
 import DiscussStage from '../../../server/database/types/DiscussStage'
 import NewMeetingPhase from '../../../server/database/types/GenericMeetingPhase'
 import NewMeetingStage from '../../../server/database/types/GenericMeetingStage'
 import GoogleAnalyzedEntity from '../../../server/database/types/GoogleAnalyzedEntity'
+import ReflectPhase from '../../../server/database/types/ReflectPhase'
 import Reflection from '../../../server/database/types/Reflection'
 import ReflectionGroup from '../../../server/database/types/ReflectionGroup'
-import ReflectPhase from '../../../server/database/types/ReflectPhase'
 import ITask from '../../../server/database/types/Task'
 import {
   ExternalLinks,
@@ -36,6 +36,7 @@ import startStage_ from '../../utils/startStage_'
 import unlockAllStagesForPhase from '../../utils/unlockAllStagesForPhase'
 import unlockNextStages from '../../utils/unlockNextStages'
 import normalizeRawDraftJS from '../../validation/normalizeRawDraftJS'
+import LocalAtmosphere from './LocalAtmosphere'
 import entityLookup from './entityLookup'
 import getDemoEntities from './getDemoEntities'
 import handleCompletedDemoStage from './handleCompletedDemoStage'
@@ -43,13 +44,12 @@ import initBotScript from './initBotScript'
 import initDB, {
   DemoComment,
   DemoDiscussion,
-  demoTeamId,
   DemoThreadableEdge,
-  demoViewerId,
   JiraProjectKeyLookup,
-  RetroDemoDB
+  RetroDemoDB,
+  demoTeamId,
+  demoViewerId
 } from './initDB'
-import LocalAtmosphere from './LocalAtmosphere'
 
 export type DemoReflection = Omit<Reflection, 'reactjis' | 'createdAt' | 'updatedAt'> & {
   __typename: string
diff --git a/packages/client/modules/demo/DemoGenericMeetingStage.ts b/packages/client/modules/demo/DemoGenericMeetingStage.ts
index 6429428d7d4..6e386d14f2d 100644
--- a/packages/client/modules/demo/DemoGenericMeetingStage.ts
+++ b/packages/client/modules/demo/DemoGenericMeetingStage.ts
@@ -1,5 +1,5 @@
-import {RetroDemo} from '../../types/constEnums'
 import {NewMeetingPhaseTypeEnum} from '../../__generated__/MeetingControlBar_meeting.graphql'
+import {RetroDemo} from '../../types/constEnums'
 
 export default class DemoGenericMeetingStage {
   __typename = 'GenericMeetingStage'
diff --git a/packages/client/modules/demo/handleCompletedDemoStage.ts b/packages/client/modules/demo/handleCompletedDemoStage.ts
index f7b48422363..7589b1fe285 100644
--- a/packages/client/modules/demo/handleCompletedDemoStage.ts
+++ b/packages/client/modules/demo/handleCompletedDemoStage.ts
@@ -3,8 +3,8 @@ import {ACTIVE, GROUP, REFLECT, VOTE} from '../../utils/constants'
 import extractTextFromDraftString from '../../utils/draftjs/extractTextFromDraftString'
 import mapGroupsToStages from '../../utils/makeGroupsToStages'
 import clientTempId from '../../utils/relay/clientTempId'
-import commentLookup from './commentLookup'
 import DemoDiscussStage from './DemoDiscussStage'
+import commentLookup from './commentLookup'
 import {RetroDemoDB} from './initDB'
 import reactjiLookup from './reactjiLookup'
 import taskLookup from './taskLookup'
diff --git a/packages/client/modules/demo/initBotScript.ts b/packages/client/modules/demo/initBotScript.ts
index 8dc9cdd840a..151cc3524a2 100644
--- a/packages/client/modules/demo/initBotScript.ts
+++ b/packages/client/modules/demo/initBotScript.ts
@@ -1,5 +1,5 @@
-import {RetroDemo} from '~/types/constEnums'
 import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation.graphql'
+import {RetroDemo} from '~/types/constEnums'
 import {demoTeamId} from './initDB'
 
 // 3 -> 1
diff --git a/packages/client/modules/demo/initDB.ts b/packages/client/modules/demo/initDB.ts
index 7d1b673b94c..d452d9ee3af 100644
--- a/packages/client/modules/demo/initDB.ts
+++ b/packages/client/modules/demo/initDB.ts
@@ -1,5 +1,5 @@
-import {PALETTE} from '~/styles/paletteV3'
 import {SlackNotificationEventEnum} from '~/__generated__/SlackNotificationList_viewer.graphql'
+import {PALETTE} from '~/styles/paletteV3'
 import RetrospectiveMeeting from '../../../server/database/types/MeetingRetrospective'
 import RetrospectiveMeetingSettings from '../../../server/database/types/MeetingSettingsRetrospective'
 import ITask from '../../../server/database/types/Task'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx b/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx
index 4322938195c..2a842df7432 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailNotificationPicker.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
-import typedLookup from 'parabol-client/types/typedLookup'
 import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql'
+import typedLookup from 'parabol-client/types/typedLookup'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailDiscussionMentioned from './EmailDiscussionMentioned'
diff --git a/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx b/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx
index 257992f5800..942f993fe21 100644
--- a/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx
+++ b/packages/client/modules/email/components/EmailNotifications/EmailTaskInvolves.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
-import {ASSIGNEE, MENTIONEE} from 'parabol-client/utils/constants'
 import {EmailTaskInvolves_notification$key} from 'parabol-client/__generated__/EmailTaskInvolves_notification.graphql'
+import {ASSIGNEE, MENTIONEE} from 'parabol-client/utils/constants'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../utils/makeAppURL'
diff --git a/packages/client/modules/email/components/NotificationSummaryEmail.tsx b/packages/client/modules/email/components/NotificationSummaryEmail.tsx
index a989e981d32..09584b916a3 100644
--- a/packages/client/modules/email/components/NotificationSummaryEmail.tsx
+++ b/packages/client/modules/email/components/NotificationSummaryEmail.tsx
@@ -1,6 +1,6 @@
+import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql'
 import {ContactInfo, ExternalLinks} from 'parabol-client/types/constEnums'
 import plural from 'parabol-client/utils/plural'
-import {EmailNotificationPicker_notification$key} from 'parabol-client/__generated__/EmailNotificationPicker_notification.graphql'
 import React from 'react'
 import {EMAIL_CORS_OPTIONS} from '../../../types/cors'
 import makeAppURL from '../../../utils/makeAppURL'
diff --git a/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx b/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx
index 1d5446caefc..fc69ed57121 100644
--- a/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import type {Parser as JSON2CSVParser} from 'json2csv'
 import Parser from 'json2csv/lib/JSON2CSVParser' // only grab the sync parser
+import {ExportToCSVQuery} from 'parabol-client/__generated__/ExportToCSVQuery.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import extractTextFromDraftString from 'parabol-client/utils/draftjs/extractTextFromDraftString'
 import withMutationProps, {WithMutationProps} from 'parabol-client/utils/relay/withMutationProps'
-import {ExportToCSVQuery} from 'parabol-client/__generated__/ExportToCSVQuery.graphql'
 import React, {useEffect} from 'react'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {ExternalLinks, PokerCards} from '../../../../types/constEnums'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx
index 7b91722c527..dfb3bd67f4c 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailReflectionCard.tsx
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import {convertFromRaw, Editor, EditorState} from 'draft-js'
+import {EmailReflectionCard_reflection$key} from 'parabol-client/__generated__/EmailReflectionCard_reflection.graphql'
 import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import {EmailReflectionCard_reflection$key} from 'parabol-client/__generated__/EmailReflectionCard_reflection.graphql'
 import React, {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
 
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx
index 4dea1f88ef4..bb8ae51275f 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/EmailTaskCard.tsx
@@ -1,14 +1,14 @@
 import graphql from 'babel-plugin-relay/macro'
 import {convertFromRaw, Editor, EditorState} from 'draft-js'
+import {EmailTaskCard_task$key} from 'parabol-client/__generated__/EmailTaskCard_task.graphql'
 import editorDecorators from 'parabol-client/components/TaskEditor/decorators'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {taskStatusColors} from 'parabol-client/utils/taskStatus'
-import {EmailTaskCard_task$key} from 'parabol-client/__generated__/EmailTaskCard_task.graphql'
 import React, {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
-import convertToTaskContent from '../../../../../utils/draftjs/convertToTaskContent'
 import {TaskStatusEnum} from '../../../../../__generated__/EmailTaskCard_task.graphql'
+import convertToTaskContent from '../../../../../utils/draftjs/convertToTaskContent'
 
 interface Props {
   task: EmailTaskCard_task$key | null
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx
index 1d83a71cd71..65ed83c6d83 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasks.tsx
@@ -1,24 +1,24 @@
+import {Loop} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
 import React, {useState} from 'react'
-import {Loop} from '@mui/icons-material'
-import {MenuPosition} from '../../../../../hooks/useCoords'
-import useMenu from '../../../../../hooks/useMenu'
-import useMutationProps, {getOnCompletedError} from '../../../../../hooks/useMutationProps'
-import lazyPreload from '../../../../../utils/lazyPreload'
 import {useFragment} from 'react-relay'
 import {
   ExportAllTasks_meeting$key,
   TaskServiceEnum
 } from '../../../../../__generated__/ExportAllTasks_meeting.graphql'
-import CreateTaskIntegrationMutation from '../../../../../mutations/CreateTaskIntegrationMutation'
-import useAtmosphere from '../../../../../hooks/useAtmosphere'
-import {integrationSvgLookup} from '../../../../../components/TaskIntegrationMenuItem'
-import {Providers} from '../../../../../types/constEnums'
 import GitHubSVG from '../../../../../components/GitHubSVG'
-import JiraSVG from '../../../../../components/JiraSVG'
 import GitLabSVG from '../../../../../components/GitLabSVG'
-import clsx from 'clsx'
+import JiraSVG from '../../../../../components/JiraSVG'
+import {integrationSvgLookup} from '../../../../../components/TaskIntegrationMenuItem'
+import useAtmosphere from '../../../../../hooks/useAtmosphere'
+import {MenuPosition} from '../../../../../hooks/useCoords'
+import useMenu from '../../../../../hooks/useMenu'
+import useMutationProps, {getOnCompletedError} from '../../../../../hooks/useMutationProps'
+import CreateTaskIntegrationMutation from '../../../../../mutations/CreateTaskIntegrationMutation'
+import {Providers} from '../../../../../types/constEnums'
 import SendClientSideEvent from '../../../../../utils/SendClientSideEvent'
+import lazyPreload from '../../../../../utils/lazyPreload'
 
 const ExportAllTasksMenuRoot = lazyPreload(
   () => import(/* webpackChunkName: 'ExportAllTasksMenuRoot' */ './ExportAllTasksMenuRoot')
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx
index 7ada66e8765..d96f590c3cb 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenu.tsx
@@ -1,14 +1,14 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
-import {MenuProps} from '../../../../../hooks/useMenu'
-import {MenuMutationProps} from '../../../../../hooks/useMutationProps'
+import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql'
 import {ExportAllTasksMenuQuery} from '../../../../../__generated__/ExportAllTasksMenuQuery.graphql'
 import {ExportAllTasksMenu_meeting$key} from '../../../../../__generated__/ExportAllTasksMenu_meeting.graphql'
 import TaskFooterIntegrateMenuList from '../../../../../components/TaskFooterIntegrateMenuList'
 import TaskFooterIntegrateMenuSignup from '../../../../../components/TaskFooterIntegrateMenuSignup'
-import {useIsIntegrated, makePlaceholder} from '../../../../../hooks/useIsIntegrated'
-import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql'
+import {makePlaceholder, useIsIntegrated} from '../../../../../hooks/useIsIntegrated'
+import {MenuProps} from '../../../../../hooks/useMenu'
+import {MenuMutationProps} from '../../../../../hooks/useMutationProps'
 
 interface Props {
   menuProps: MenuProps
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx
index c0a5c4cc4be..df7a84f8220 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ExportAllTasksMenuRoot.tsx
@@ -1,17 +1,17 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import useQueryLoaderNow from '../../../../../hooks/useQueryLoaderNow'
-import {LoaderSize} from '../../../../../types/constEnums'
+import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql'
 import exportAllTasksMenuQuery, {
   ExportAllTasksMenuQuery
 } from '../../../../../__generated__/ExportAllTasksMenuQuery.graphql'
 import {ExportAllTasksMenuRoot_meeting$key} from '../../../../../__generated__/ExportAllTasksMenuRoot_meeting.graphql'
 import LoadingComponent from '../../../../../components/LoadingComponent/LoadingComponent'
-import ExportAllTasksMenu from './ExportAllTasksMenu'
 import {MenuProps} from '../../../../../hooks/useMenu'
 import {MenuMutationProps} from '../../../../../hooks/useMutationProps'
-import {TaskServiceEnum} from '../../../../../__generated__/CreateTaskMutation.graphql'
+import useQueryLoaderNow from '../../../../../hooks/useQueryLoaderNow'
+import {LoaderSize} from '../../../../../types/constEnums'
+import ExportAllTasksMenu from './ExportAllTasksMenu'
 
 interface Props {
   menuProps: MenuProps
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx
index 534279c9b9b..aeca571181d 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMemberTaskSummaryList.tsx
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
-import plural from 'parabol-client/utils/plural'
 import {MeetingMemberTaskSummaryList_meetingMember$key} from 'parabol-client/__generated__/MeetingMemberTaskSummaryList_meetingMember.graphql'
+import plural from 'parabol-client/utils/plural'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import SummaryAvatarHeader from './SummaryAvatarHeader'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx
index ee62beef884..5498b2565ab 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingMembersWithoutTasks.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
-import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid'
-import {PALETTE} from 'parabol-client/styles/paletteV3'
-import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {
   MeetingMembersWithoutTasks_meeting$key,
   MeetingTypeEnum
 } from 'parabol-client/__generated__/MeetingMembersWithoutTasks_meeting.graphql'
+import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid'
+import {PALETTE} from 'parabol-client/styles/paletteV3'
+import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailBorderBottom from './EmailBorderBottom'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
index 67b3e25f034..e3fb8fafd21 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/QuickStats.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
+import {QuickStats_meeting$key} from 'parabol-client/__generated__/QuickStats_meeting.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {ACTION, RETROSPECTIVE} from 'parabol-client/utils/constants'
-import {QuickStats_meeting$key} from 'parabol-client/__generated__/QuickStats_meeting.graphql'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import makeActionStats from './makeActionStats'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
index 15eb9aeb052..d89d5c32738 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopic.tsx
@@ -5,10 +5,10 @@ import {FONT_FAMILY, ICON_SIZE} from 'parabol-client/styles/typographyV2'
 import plural from 'parabol-client/utils/plural'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {RetroTopic_meeting$key} from '../../../../../__generated__/RetroTopic_meeting.graphql'
+import {RetroTopic_stage$key} from '../../../../../__generated__/RetroTopic_stage.graphql'
 import {ExternalLinks} from '../../../../../types/constEnums'
 import {APP_CORS_OPTIONS, EMAIL_CORS_OPTIONS} from '../../../../../types/cors'
-import {RetroTopic_stage$key} from '../../../../../__generated__/RetroTopic_stage.graphql'
-import {RetroTopic_meeting$key} from '../../../../../__generated__/RetroTopic_meeting.graphql'
 import AnchorIfEmail from './AnchorIfEmail'
 import EmailReflectionCard from './EmailReflectionCard'
 import ShareTopic from './ShareTopic'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx
index 0c2b2805db9..123d02e2897 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/RetroTopics.tsx
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
+import {RetroTopics_meeting$key} from 'parabol-client/__generated__/RetroTopics_meeting.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import {RETRO_TOPIC_LABEL} from 'parabol-client/utils/constants'
 import plural from 'parabol-client/utils/plural'
-import {RetroTopics_meeting$key} from 'parabol-client/__generated__/RetroTopics_meeting.graphql'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useEmailItemGrid from '../../../../../hooks/useEmailItemGrid'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx
index 083e2a3f29c..2f72c71d09c 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/ShareTopic.tsx
@@ -1,10 +1,10 @@
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import React from 'react'
-import AnchorIfEmail from './AnchorIfEmail'
-import makeAppURL from '../../../../../utils/makeAppURL'
-import {useDialogState} from '../../../../../ui/Dialog/useDialogState'
 import ShareTopicRoot from '../../../../../components/ShareTopicRoot'
+import {useDialogState} from '../../../../../ui/Dialog/useDialogState'
+import makeAppURL from '../../../../../utils/makeAppURL'
+import AnchorIfEmail from './AnchorIfEmail'
 
 interface Props {
   isEmail: boolean
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx
index 287a18df668..2dffc5f88de 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryAvatarHeader.tsx
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
+import {SummaryAvatarHeader_meetingMember$key} from 'parabol-client/__generated__/SummaryAvatarHeader_meetingMember.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import {SummaryAvatarHeader_meetingMember$key} from 'parabol-client/__generated__/SummaryAvatarHeader_meetingMember.graphql'
 import React from 'react'
 import {useFragment} from 'react-relay'
 
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx
index 0f4a11b3147..3e5699f9460 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryHeader.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
+import {SummaryHeader_meeting$key} from 'parabol-client/__generated__/SummaryHeader_meeting.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
 import makeDateString from 'parabol-client/utils/makeDateString'
-import {SummaryHeader_meeting$key} from 'parabol-client/__generated__/SummaryHeader_meeting.graphql'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {ExternalLinks} from '../../../../../types/constEnums'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx
index 3e386b23117..5df09279819 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummaryPokerStories.tsx
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
+import {SummaryPokerStories_meeting$key} from 'parabol-client/__generated__/SummaryPokerStories_meeting.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import {SummaryPokerStories_meeting$key} from 'parabol-client/__generated__/SummaryPokerStories_meeting.graphql'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import makeAppURL from '../../../../../utils/makeAppURL'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx
index 93d37ee81f7..138200b6327 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/SummarySheet.tsx
@@ -1,33 +1,33 @@
-import graphql from 'babel-plugin-relay/macro'
+import {TableChart} from '@mui/icons-material'
 import PictureAsPdf from '@mui/icons-material/PictureAsPdf'
+import graphql from 'babel-plugin-relay/macro'
+import {SummarySheet_meeting$key} from 'parabol-client/__generated__/SummarySheet_meeting.graphql'
 import CreateAccountSection from 'parabol-client/modules/demo/components/CreateAccountSection'
 import {sheetShadow} from 'parabol-client/styles/elevation'
 import {ACTION} from 'parabol-client/utils/constants'
-import {SummarySheet_meeting$key} from 'parabol-client/__generated__/SummarySheet_meeting.graphql'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {Link} from 'react-router-dom'
+import useAtmosphere from '../../../../../hooks/useAtmosphere'
+import {PALETTE} from '../../../../../styles/paletteV3'
 import {CorsOptions} from '../../../../../types/cors'
+import SendClientSideEvent from '../../../../../utils/SendClientSideEvent'
+import lazyPreload from '../../../../../utils/lazyPreload'
 import ExportToCSV from '../ExportToCSV'
+import EmailBorderBottom from '../MeetingSummaryEmail/EmailBorderBottom'
 import ContactUsFooter from './ContactUsFooter'
 import LogoFooter from './LogoFooter'
-import MeetingMembersWithoutTasks from './MeetingMembersWithoutTasks'
 import MeetingMembersWithTasks from './MeetingMembersWithTasks'
+import MeetingMembersWithoutTasks from './MeetingMembersWithoutTasks'
 import {MeetingSummaryReferrer} from './MeetingSummaryEmail'
 import QuickStats from './QuickStats'
-import TeamHealthSummary from './TeamHealthSummary'
 import RetroTopics from './RetroTopics'
 import SummaryHeader from './SummaryHeader'
 import SummaryPokerStories from './SummaryPokerStories'
 import SummarySheetCTA from './SummarySheetCTA'
+import TeamHealthSummary from './TeamHealthSummary'
 import TeamPromptResponseSummary from './TeamPromptResponseSummary'
 import WholeMeetingSummary from './WholeMeetingSummary'
-import lazyPreload from '../../../../../utils/lazyPreload'
-import EmailBorderBottom from '../MeetingSummaryEmail/EmailBorderBottom'
-import {PALETTE} from '../../../../../styles/paletteV3'
-import {TableChart} from '@mui/icons-material'
-import {Link} from 'react-router-dom'
-import SendClientSideEvent from '../../../../../utils/SendClientSideEvent'
-import useAtmosphere from '../../../../../hooks/useAtmosphere'
 
 const ExportAllTasks = lazyPreload(() => import('./ExportAllTasks'))
 
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx
index 5a9906bfedd..05c56291daa 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TaskSummarySection.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
+import {TaskSummarySection_tasks$key} from 'parabol-client/__generated__/TaskSummarySection_tasks.graphql'
 import useEmailItemGrid from 'parabol-client/hooks/useEmailItemGrid'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import {TaskSummarySection_tasks$key} from 'parabol-client/__generated__/TaskSummarySection_tasks.graphql'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import EmailTaskCard from './EmailTaskCard'
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx
index ccbd216e355..ab8b8ae8e65 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/TeamHealthSummary.tsx
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
+import {TeamHealthSummary_meeting$key} from 'parabol-client/__generated__/TeamHealthSummary_meeting.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import {TeamHealthSummary_meeting$key} from 'parabol-client/__generated__/TeamHealthSummary_meeting.graphql'
+import getTeamHealthVoteColor from 'parabol-client/utils/getTeamHealthVoteColor'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import getTeamHealthVoteColor from 'parabol-client/utils/getTeamHealthVoteColor'
 
 interface Props {
   meeting: TeamHealthSummary_meeting$key
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
index 76aba9a8828..56e30fea03b 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/WholeMeetingSummaryResult.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
+import {WholeMeetingSummaryResult_meeting$key} from 'parabol-client/__generated__/WholeMeetingSummaryResult_meeting.graphql'
 import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {FONT_FAMILY} from 'parabol-client/styles/typographyV2'
-import {WholeMeetingSummaryResult_meeting$key} from 'parabol-client/__generated__/WholeMeetingSummaryResult_meeting.graphql'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '../../../../../hooks/useAtmosphere'
-import SendClientSideEvent from '../../../../../utils/SendClientSideEvent'
 import {AIExplainer} from '../../../../../types/constEnums'
+import SendClientSideEvent from '../../../../../utils/SendClientSideEvent'
 import EmailBorderBottom from './EmailBorderBottom'
 
 const topicTitleStyle = {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts
index 1c37f760f88..55957107842 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makePokerStats.ts
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
-import plural from 'parabol-client/utils/plural'
 import {makePokerStats_meeting$key} from 'parabol-client/__generated__/makePokerStats_meeting.graphql'
+import plural from 'parabol-client/utils/plural'
 import {readInlineData} from 'react-relay'
 
 const makePokerStats = (meetingRef: makePokerStats_meeting$key) => {
diff --git a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts
index cf1ac967e70..32606d8fdb8 100644
--- a/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts
+++ b/packages/client/modules/email/components/SummaryEmail/MeetingSummaryEmail/makeTeamPromptStats.ts
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
-import plural from 'parabol-client/utils/plural'
 import {makeTeamPromptStats_meeting$key} from 'parabol-client/__generated__/makeTeamPromptStats_meeting.graphql'
+import plural from 'parabol-client/utils/plural'
 import {readInlineData} from 'react-relay'
 
 const makeTeamPromptStats = (meetingRef: makeTeamPromptStats_meeting$key) => {
diff --git a/packages/client/modules/invoice/components/Invoice/Invoice.tsx b/packages/client/modules/invoice/components/Invoice/Invoice.tsx
index 5fc39073e19..a50d9543b35 100644
--- a/packages/client/modules/invoice/components/Invoice/Invoice.tsx
+++ b/packages/client/modules/invoice/components/Invoice/Invoice.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {InvoiceQuery, InvoiceStatusEnum} from '../../../../__generated__/InvoiceQuery.graphql'
 import EmphasisTag from '../../../../components/Tag/EmphasisTag'
 import useDocumentTitle from '../../../../hooks/useDocumentTitle'
 import {Elevation} from '../../../../styles/elevation'
@@ -9,7 +10,6 @@ import {PALETTE} from '../../../../styles/paletteV3'
 import {Breakpoint} from '../../../../types/constEnums'
 import makeDateString from '../../../../utils/makeDateString'
 import makeMonthString from '../../../../utils/makeMonthString'
-import {InvoiceQuery, InvoiceStatusEnum} from '../../../../__generated__/InvoiceQuery.graphql'
 import invoiceLineFormat from '../../helpers/invoiceLineFormat'
 import InvoiceFooter from '../InvoiceFooter/InvoiceFooter'
 import InvoiceHeader from '../InvoiceHeader/InvoiceHeader'
diff --git a/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx b/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx
index 54613866c6b..e92025814e1 100644
--- a/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx
+++ b/packages/client/modules/invoice/components/InvoiceLineItem/InvoiceLineItemDetails.tsx
@@ -3,8 +3,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {useFragment} from 'react-relay'
 import {
-  InvoiceLineItemDetails_details$key,
-  InvoiceLineItemDetails_details$data
+  InvoiceLineItemDetails_details$data,
+  InvoiceLineItemDetails_details$key
 } from '~/__generated__/InvoiceLineItemDetails_details.graphql'
 import {InvoiceLineItemEnum} from '~/__generated__/InvoiceLineItem_item.graphql'
 import {PALETTE} from '../../../../styles/paletteV3'
diff --git a/packages/client/modules/invoice/containers/InvoiceRoot.tsx b/packages/client/modules/invoice/containers/InvoiceRoot.tsx
index ae07a433979..b0db1125ae9 100644
--- a/packages/client/modules/invoice/containers/InvoiceRoot.tsx
+++ b/packages/client/modules/invoice/containers/InvoiceRoot.tsx
@@ -1,7 +1,7 @@
 import React, {Suspense} from 'react'
 import {RouteComponentProps} from 'react-router'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import invoiceQuery, {InvoiceQuery} from '../../../__generated__/InvoiceQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import Invoice from '../components/Invoice/Invoice'
 
 interface Props extends RouteComponentProps<{invoiceId: string}> {}
diff --git a/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx b/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx
index 23bbe6a7bf5..efb77f608d4 100644
--- a/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx
+++ b/packages/client/modules/meeting/components/ActionMeetingUpdatesPromptTeamHelpText.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember$key} from '../../../__generated__/ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import {PALETTE} from '../../../styles/paletteV3'
-import {ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember$key} from '../../../__generated__/ActionMeetingUpdatesPromptTeamHelpText_currentMeetingMember.graphql'
 
 const AgendaControl = styled('span')({
   color: PALETTE.SKY_500,
diff --git a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
index b1e4c9e5206..5a6307d7fdd 100644
--- a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
+++ b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {AddNewPokerTemplate_pokerTemplates$key} from '../../../__generated__/AddNewPokerTemplate_pokerTemplates.graphql'
+import {AddNewPokerTemplate_team$key} from '../../../__generated__/AddNewPokerTemplate_team.graphql'
 import LinkButton from '../../../components/LinkButton'
 import TooltipStyled from '../../../components/TooltipStyled'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation'
-import {AddNewPokerTemplate_pokerTemplates$key} from '../../../__generated__/AddNewPokerTemplate_pokerTemplates.graphql'
-import {AddNewPokerTemplate_team$key} from '../../../__generated__/AddNewPokerTemplate_team.graphql'
 
 const ErrorLine = styled(TooltipStyled)({
   margin: '0 0 8px'
diff --git a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
index 4e1bff87056..6b87c2a9ff3 100644
--- a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
+++ b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {AddNewReflectTemplate_reflectTemplates$key} from '../../../__generated__/AddNewReflectTemplate_reflectTemplates.graphql'
+import {AddNewReflectTemplate_team$key} from '../../../__generated__/AddNewReflectTemplate_team.graphql'
 import LinkButton from '../../../components/LinkButton'
 import TooltipStyled from '../../../components/TooltipStyled'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
-import {AddNewReflectTemplate_reflectTemplates$key} from '../../../__generated__/AddNewReflectTemplate_reflectTemplates.graphql'
-import {AddNewReflectTemplate_team$key} from '../../../__generated__/AddNewReflectTemplate_team.graphql'
 
 const ErrorLine = styled(TooltipStyled)({
   margin: '0 0 8px'
diff --git a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
index 454d555cdf4..d9fb3314fea 100644
--- a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
+++ b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
@@ -4,12 +4,12 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {Threshold} from '~/types/constEnums'
+import {AddPokerTemplateDimension_dimensions$key} from '../../../__generated__/AddPokerTemplateDimension_dimensions.graphql'
 import LinkButton from '../../../components/LinkButton'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddPokerTemplateDimensionMutation from '../../../mutations/AddPokerTemplateDimensionMutation'
 import dndNoise from '../../../utils/dndNoise'
-import {AddPokerTemplateDimension_dimensions$key} from '../../../__generated__/AddPokerTemplateDimension_dimensions.graphql'
 
 const AddDimensionLink = styled(LinkButton)({
   alignItems: 'center',
diff --git a/packages/client/modules/meeting/components/AddTemplatePrompt.tsx b/packages/client/modules/meeting/components/AddTemplatePrompt.tsx
index 18db3452b4a..1e97063dbe1 100644
--- a/packages/client/modules/meeting/components/AddTemplatePrompt.tsx
+++ b/packages/client/modules/meeting/components/AddTemplatePrompt.tsx
@@ -5,11 +5,11 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import {Threshold} from '~/types/constEnums'
+import {AddTemplatePrompt_prompts$key} from '../../../__generated__/AddTemplatePrompt_prompts.graphql'
 import LinkButton from '../../../components/LinkButton'
 import AddReflectTemplatePromptMutation from '../../../mutations/AddReflectTemplatePromptMutation'
 import dndNoise from '../../../utils/dndNoise'
 import withMutationProps, {WithMutationProps} from '../../../utils/relay/withMutationProps'
-import {AddTemplatePrompt_prompts$key} from '../../../__generated__/AddTemplatePrompt_prompts.graphql'
 
 const AddPromptLink = styled(LinkButton)({
   alignItems: 'center',
diff --git a/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx b/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx
index 626a61e6c79..68a5ffb0073 100644
--- a/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx
+++ b/packages/client/modules/meeting/components/CustomTemplateUpgradeMsg.tsx
@@ -3,11 +3,11 @@ import styled from '@emotion/styled'
 import React from 'react'
 import {useHistory} from 'react-router'
 import customTemplate from '../../../../../static/images/illustrations/customTemplate.png'
+import {MeetingTypeEnum} from '../../../__generated__/TeamInvitationQuery.graphql'
 import FloatingActionButton from '../../../components/FloatingActionButton'
 import useAtmosphere from '../../../hooks/useAtmosphere'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {BezierCurve} from '../../../types/constEnums'
-import {MeetingTypeEnum} from '../../../__generated__/TeamInvitationQuery.graphql'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 
 const fadein = keyframes`
 0% { opacity: 0; }
diff --git a/packages/client/modules/meeting/components/EditableTemplateDimension.tsx b/packages/client/modules/meeting/components/EditableTemplateDimension.tsx
index f6e424768ca..9eedc7f8ddf 100644
--- a/packages/client/modules/meeting/components/EditableTemplateDimension.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateDimension.tsx
@@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
 import {PALETTE} from '~/styles/paletteV3'
+import {EditableTemplateDimension_dimensions$key} from '../../../__generated__/EditableTemplateDimension_dimensions.graphql'
 import EditableText from '../../../components/EditableText'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import useScrollIntoView from '../../../hooks/useScrollIntoVIew'
 import RenamePokerTemplateDimensionMutation from '../../../mutations/RenamePokerTemplateDimensionMutation'
 import Legitity from '../../../validation/Legitity'
-import {EditableTemplateDimension_dimensions$key} from '../../../__generated__/EditableTemplateDimension_dimensions.graphql'
 
 const StyledEditableText = styled(EditableText)({
   fontFamily: PALETTE.SLATE_700,
diff --git a/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx b/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx
index c7214e51e69..54b9af04bcc 100644
--- a/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplatePrompt.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {EditableTemplatePrompt_prompts$key} from '../../../__generated__/EditableTemplatePrompt_prompts.graphql'
 import EditableText from '../../../components/EditableText'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import RenameReflectTemplatePromptMutation from '../../../mutations/RenameReflectTemplatePromptMutation'
 import Legitity from '../../../validation/Legitity'
-import {EditableTemplatePrompt_prompts$key} from '../../../__generated__/EditableTemplatePrompt_prompts.graphql'
 
 const StyledEditableText = styled(EditableText)({
   fontSize: 16,
diff --git a/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx b/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx
index 3360f57a707..3220269c6f2 100644
--- a/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplatePromptColor.tsx
@@ -3,10 +3,10 @@ import {ArrowDropDown as ArrowDropDownIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import PlainButton from '~/components/PlainButton/PlainButton'
-import {BezierCurve} from '~/types/constEnums'
 import {EditableTemplatePromptColor_prompt$key} from '~/__generated__/EditableTemplatePromptColor_prompt.graphql'
 import {EditableTemplatePromptColor_prompts$key} from '~/__generated__/EditableTemplatePromptColor_prompts.graphql'
+import PlainButton from '~/components/PlainButton/PlainButton'
+import {BezierCurve} from '~/types/constEnums'
 import PalettePicker from '../../../components/PalettePicker/PalettePicker'
 import {MenuPosition} from '../../../hooks/useCoords'
 import useMenu from '../../../hooks/useMenu'
diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx
index 3da7b1b6214..a4bd3f7e4f2 100644
--- a/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateScaleName.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {EditableTemplateScaleName_scales$key} from '../../../__generated__/EditableTemplateScaleName_scales.graphql'
 import EditableText from '../../../components/EditableText'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import RenamePokerTemplateScaleMutation from '../../../mutations/RenamePokerTemplateScaleMutation'
 import Legitity from '../../../validation/Legitity'
-import {EditableTemplateScaleName_scales$key} from '../../../__generated__/EditableTemplateScaleName_scales.graphql'
 
 interface Props {
   name: string
diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx
index c5d82a4481b..18f7332b77a 100644
--- a/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateScaleValueColor.tsx
@@ -3,9 +3,9 @@ import {ArrowDropDown as ArrowDropDownIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {EditableTemplateScaleValueColor_scale$key} from '~/__generated__/EditableTemplateScaleValueColor_scale.graphql'
 import PlainButton from '~/components/PlainButton/PlainButton'
 import {BezierCurve} from '~/types/constEnums'
-import {EditableTemplateScaleValueColor_scale$key} from '~/__generated__/EditableTemplateScaleValueColor_scale.graphql'
 import {MenuPosition} from '../../../hooks/useCoords'
 import useMenu from '../../../hooks/useMenu'
 import {PALETTE} from '../../../styles/paletteV3'
diff --git a/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx b/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx
index b2ddba3c5d9..dc8bec0242d 100644
--- a/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx
+++ b/packages/client/modules/meeting/components/EditableTemplateScaleValueLabel.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import UpdatePokerTemplateScaleValueMutation from '~/mutations/UpdatePokerTemplateScaleValueMutation'
-import {PALETTE} from '~/styles/paletteV3'
 import {EditableTemplateScaleValueLabel_scale$key} from '~/__generated__/EditableTemplateScaleValueLabel_scale.graphql'
 import {EditableTemplateScaleValueLabel_scaleValue$key} from '~/__generated__/EditableTemplateScaleValueLabel_scaleValue.graphql'
+import UpdatePokerTemplateScaleValueMutation from '~/mutations/UpdatePokerTemplateScaleValueMutation'
+import {PALETTE} from '~/styles/paletteV3'
 import EditableText from '../../../components/EditableText'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
+import {Threshold} from '../../../types/constEnums'
 import isSpecialPokerLabel from '../../../utils/isSpecialPokerLabel'
 import Legitity from '../../../validation/Legitity'
-import {Threshold} from '../../../types/constEnums'
 
 const StyledEditableText = styled(EditableText)<{disabled: boolean | undefined}>(({disabled}) => ({
   fontFamily: PALETTE.SLATE_700,
diff --git a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx
index 97c0445acab..97b8f3af468 100644
--- a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx
+++ b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatar.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {NewMeetingAvatar_teamMember$key} from '../../../../__generated__/NewMeetingAvatar_teamMember.graphql'
 import ErrorBoundary from '../../../../components/ErrorBoundary'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useTooltip from '../../../../hooks/useTooltip'
 import {TransitionStatus} from '../../../../hooks/useTransition'
 import {DECELERATE} from '../../../../styles/animation'
 import {meetingAvatarMediaQueries} from '../../../../styles/meeting'
-import {NewMeetingAvatar_teamMember$key} from '../../../../__generated__/NewMeetingAvatar_teamMember.graphql'
 
 const Item = styled('div')({
   position: 'relative'
diff --git a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx
index 6faa1d0f419..675a34dcd79 100644
--- a/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx
+++ b/packages/client/modules/meeting/components/MeetingAvatarGroup/NewMeetingAvatarGroup.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {NewMeetingAvatarGroup_meeting$key} from '../../../../__generated__/NewMeetingAvatarGroup_meeting.graphql'
 import AddTeamMemberAvatarButton from '../../../../components/AddTeamMemberAvatarButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useBreakpoint from '../../../../hooks/useBreakpoint'
@@ -11,7 +12,6 @@ import {DECELERATE} from '../../../../styles/animation'
 import {meetingAvatarMediaQueries} from '../../../../styles/meeting'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Breakpoint} from '../../../../types/constEnums'
-import {NewMeetingAvatarGroup_meeting$key} from '../../../../__generated__/NewMeetingAvatarGroup_meeting.graphql'
 import NewMeetingAvatar from './NewMeetingAvatar'
 
 const MeetingAvatarGroupRoot = styled('div')({
diff --git a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
index dac4215e2e2..7a4779194b8 100644
--- a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
+++ b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
@@ -1,27 +1,27 @@
 import styled from '@emotion/styled'
 import {Create as CreateIcon, Refresh as RefreshIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import {ContentState, convertToRaw, EditorState, SelectionState} from 'draft-js'
+import {ContentState, EditorState, SelectionState, convertToRaw} from 'draft-js'
 import React, {useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {NewCheckInQuestion_meeting$key} from '~/__generated__/NewCheckInQuestion_meeting.graphql'
+import {
+  ModifyType,
+  useModifyCheckInQuestionMutation$data as TModifyCheckInQuestion$data
+} from '../../../../__generated__/useModifyCheckInQuestionMutation.graphql'
 import EditorInputWrapper from '../../../../components/EditorInputWrapper'
 import PlainButton from '../../../../components/PlainButton/PlainButton'
 import '../../../../components/TaskEditor/Draft.css'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useEditorState from '../../../../hooks/useEditorState'
+import useMutationProps from '../../../../hooks/useMutationProps'
 import useTooltip from '../../../../hooks/useTooltip'
 import UpdateNewCheckInQuestionMutation from '../../../../mutations/UpdateNewCheckInQuestionMutation'
+import {useModifyCheckInQuestionMutation} from '../../../../mutations/useModifyCheckInQuestionMutation'
 import {PALETTE} from '../../../../styles/paletteV3'
-import convertToTaskContent from '../../../../utils/draftjs/convertToTaskContent'
-import useMutationProps from '../../../../hooks/useMutationProps'
-import {
-  useModifyCheckInQuestionMutation$data as TModifyCheckInQuestion$data,
-  ModifyType
-} from '../../../../__generated__/useModifyCheckInQuestionMutation.graphql'
 import {Button} from '../../../../ui/Button/Button'
-import {useModifyCheckInQuestionMutation} from '../../../../mutations/useModifyCheckInQuestionMutation'
+import convertToTaskContent from '../../../../utils/draftjs/convertToTaskContent'
 
 const CogIcon = styled('div')({
   color: PALETTE.SLATE_700,
diff --git a/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx b/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx
index faaee3dabfa..bf7d6eb5c92 100644
--- a/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx
+++ b/packages/client/modules/meeting/components/NewMeetingCheckInGreeting.tsx
@@ -2,10 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import {MenuPosition} from '../../../hooks/useCoords'
-import useTooltip from '../../../hooks/useTooltip'
 import {NewMeetingCheckInGreeting_checkInGreeting$key} from '../../../__generated__/NewMeetingCheckInGreeting_checkInGreeting.graphql'
 import {NewMeetingCheckInGreeting_teamMember$key} from '../../../__generated__/NewMeetingCheckInGreeting_teamMember.graphql'
+import {MenuPosition} from '../../../hooks/useCoords'
+import useTooltip from '../../../hooks/useTooltip'
 
 const GreetingBlock = styled('div')({
   fontSize: '1.5rem',
diff --git a/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx b/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx
index cdb75badb24..2f7fce4b9fd 100644
--- a/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx
+++ b/packages/client/modules/meeting/components/NewTemplateScaleValueLabelInput.tsx
@@ -6,17 +6,17 @@ import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import {PALETTE} from '~/styles/paletteV3'
+import {
+  NewTemplateScaleValueLabelInput_scale$data,
+  NewTemplateScaleValueLabelInput_scale$key
+} from '../../../__generated__/NewTemplateScaleValueLabelInput_scale.graphql'
 import useScrollIntoView from '../../../hooks/useScrollIntoVIew'
 import AddPokerTemplateScaleValueMutation from '../../../mutations/AddPokerTemplateScaleValueMutation'
 import palettePickerOptions from '../../../styles/palettePickerOptions'
+import {Threshold} from '../../../types/constEnums'
 import isSpecialPokerLabel from '../../../utils/isSpecialPokerLabel'
 import Legitity from '../../../validation/Legitity'
-import {
-  NewTemplateScaleValueLabelInput_scale$key,
-  NewTemplateScaleValueLabelInput_scale$data
-} from '../../../__generated__/NewTemplateScaleValueLabelInput_scale.graphql'
 import EditableTemplateScaleValueColor from './EditableTemplateScaleValueColor'
-import {Threshold} from '../../../types/constEnums'
 
 const Form = styled('form')({
   width: '100%',
diff --git a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx b/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
index c42794d1508..e1fd1e27d4e 100644
--- a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {PokerTemplateDetails_settings$key} from '../../../__generated__/PokerTemplateDetails_settings.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation'
 import {PALETTE} from '../../../styles/paletteV3'
 import getTemplateList from '../../../utils/getTemplateList'
 import useTemplateDescription from '../../../utils/useTemplateDescription'
-import {PokerTemplateDetails_settings$key} from '../../../__generated__/PokerTemplateDetails_settings.graphql'
 import AddPokerTemplateDimension from './AddPokerTemplateDimension'
 import CloneTemplate from './CloneTemplate'
 import EditableTemplateName from './EditableTemplateName'
diff --git a/packages/client/modules/meeting/components/PokerTemplateItem.tsx b/packages/client/modules/meeting/components/PokerTemplateItem.tsx
index 14a2c32323b..96bf03c302d 100644
--- a/packages/client/modules/meeting/components/PokerTemplateItem.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateItem.tsx
@@ -2,15 +2,15 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {PokerTemplateItem_template$key} from '../../../__generated__/PokerTemplateItem_template.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useScrollIntoView from '../../../hooks/useScrollIntoVIew'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {DECELERATE} from '../../../styles/animation'
 import textOverflow from '../../../styles/helpers/textOverflow'
 import {PALETTE} from '../../../styles/paletteV3'
-import useTemplateDescription from '../../../utils/useTemplateDescription'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import {PokerTemplateItem_template$key} from '../../../__generated__/PokerTemplateItem_template.graphql'
+import useTemplateDescription from '../../../utils/useTemplateDescription'
 
 const TemplateItem = styled('li')<{isActive: boolean}>(({isActive}) => ({
   backgroundColor: isActive ? PALETTE.SLATE_200 : undefined,
diff --git a/packages/client/modules/meeting/components/PokerTemplateList.tsx b/packages/client/modules/meeting/components/PokerTemplateList.tsx
index d3c4b3f0f89..ba699a47f4e 100644
--- a/packages/client/modules/meeting/components/PokerTemplateList.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateList.tsx
@@ -8,13 +8,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
+import {PokerTemplateList_settings$key} from '../../../__generated__/PokerTemplateList_settings.graphql'
 import Tab from '../../../components/Tab/Tab'
 import Tabs from '../../../components/Tabs/Tabs'
 import useBreakpoint from '../../../hooks/useBreakpoint'
 import {desktopSidebarShadow} from '../../../styles/elevation'
 import {PALETTE} from '../../../styles/paletteV3'
 import {Breakpoint} from '../../../types/constEnums'
-import {PokerTemplateList_settings$key} from '../../../__generated__/PokerTemplateList_settings.graphql'
 import AddNewPokerTemplate from './AddNewPokerTemplate'
 import PokerTemplateListOrgRoot from './PokerTemplateListOrgRoot'
 import PokerTemplateListPublicRoot from './PokerTemplateListPublicRoot'
diff --git a/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx b/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx
index 1f12196d9d0..d5baa9de65f 100644
--- a/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {useHistory} from 'react-router'
+import {PokerTemplateListOrgQuery} from '../../../__generated__/PokerTemplateListOrgQuery.graphql'
 import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import useAtmosphere from '../../../hooks/useAtmosphere'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {PALETTE} from '../../../styles/paletteV3'
-import {PokerTemplateListOrgQuery} from '../../../__generated__/PokerTemplateListOrgQuery.graphql'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import PokerTemplateItem from './PokerTemplateItem'
 
 const TemplateList = styled('ul')({
diff --git a/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx b/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx
index b1ae0cc1d52..6964af2cd94 100644
--- a/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import pokerTemplateListOrgQuery, {
   PokerTemplateListOrgQuery
 } from '../../../__generated__/PokerTemplateListOrgQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import MockTemplateList from './MockTemplateList'
 import PokerTemplateListOrg from './PokerTemplateListOrg'
 
diff --git a/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx b/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx
index 1e990c56e20..d0464cf896a 100644
--- a/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import {PokerTemplateListPublicQuery} from '../../../__generated__/PokerTemplateListPublicQuery.graphql'
+import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import PokerTemplateItem from './PokerTemplateItem'
 
 const TemplateList = styled('ul')({
diff --git a/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx b/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx
index 6f59f30c4b1..63a0da5e425 100644
--- a/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import pokerTemplateListPublicQuery, {
   PokerTemplateListPublicQuery
 } from '../../../__generated__/PokerTemplateListPublicQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import MockTemplateList from './MockTemplateList'
 import PokerTemplateListPublic from './PokerTemplateListPublic'
 
diff --git a/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx b/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx
index 6bab382b0bd..1917ef7da1c 100644
--- a/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx
@@ -3,12 +3,12 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
+import {PokerTemplateListTeam_team$key} from '../../../__generated__/PokerTemplateListTeam_team.graphql'
+import {PokerTemplateListTeam_teamTemplates$key} from '../../../__generated__/PokerTemplateListTeam_teamTemplates.graphql'
 import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import useAtmosphere from '../../../hooks/useAtmosphere'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {PALETTE} from '../../../styles/paletteV3'
-import {PokerTemplateListTeam_team$key} from '../../../__generated__/PokerTemplateListTeam_team.graphql'
-import {PokerTemplateListTeam_teamTemplates$key} from '../../../__generated__/PokerTemplateListTeam_teamTemplates.graphql'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import PokerTemplateItem from './PokerTemplateItem'
 
 const TemplateList = styled('ul')({
diff --git a/packages/client/modules/meeting/components/PokerTemplateModal.tsx b/packages/client/modules/meeting/components/PokerTemplateModal.tsx
index 007c360db22..8527779afbc 100644
--- a/packages/client/modules/meeting/components/PokerTemplateModal.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateModal.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {PokerTemplateModal_pokerMeetingSettings$key} from '../../../__generated__/PokerTemplateModal_pokerMeetingSettings.graphql'
 import DialogContainer from '../../../components/DialogContainer'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import getTemplateList from '../../../utils/getTemplateList'
 import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import {PokerTemplateModal_pokerMeetingSettings$key} from '../../../__generated__/PokerTemplateModal_pokerMeetingSettings.graphql'
 import CustomTemplateUpgradeMsg from './CustomTemplateUpgradeMsg'
 import PokerTemplateDetails from './PokerTemplateDetails'
 import PokerTemplateList from './PokerTemplateList'
diff --git a/packages/client/modules/meeting/components/PokerTemplatePicker.tsx b/packages/client/modules/meeting/components/PokerTemplatePicker.tsx
index 33940b0581a..eb2524e7bf9 100644
--- a/packages/client/modules/meeting/components/PokerTemplatePicker.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplatePicker.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {PokerTemplatePicker_settings$key} from '../../../__generated__/PokerTemplatePicker_settings.graphql'
 import NewMeetingDropdown from '../../../components/NewMeetingDropdown'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useModal from '../../../hooks/useModal'
 import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import lazyPreload from '../../../utils/lazyPreload'
-import {PokerTemplatePicker_settings$key} from '../../../__generated__/PokerTemplatePicker_settings.graphql'
 
 interface Props {
   settingsRef: PokerTemplatePicker_settings$key
diff --git a/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx b/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx
index 066d1f7d841..014b693da05 100644
--- a/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateScaleDetails.tsx
@@ -3,15 +3,15 @@ import {ArrowBack} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {PokerTemplateScaleDetails_team$key} from '../../../__generated__/PokerTemplateScaleDetails_team.graphql'
 import FlatButton from '../../../components/FlatButton'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import textOverflow from '../../../styles/helpers/textOverflow'
 import {PALETTE} from '../../../styles/paletteV3'
 import {FONT_FAMILY} from '../../../styles/typographyV2'
-import {PokerTemplateScaleDetails_team$key} from '../../../__generated__/PokerTemplateScaleDetails_team.graphql'
 import EditableTemplateScaleName from './EditableTemplateScaleName'
-import scaleValueString from './scaleValueString'
 import TemplateScaleValueList from './TemplateScaleValueList'
+import scaleValueString from './scaleValueString'
 
 const ScaleHeader = styled('div')({
   display: 'flex',
diff --git a/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx b/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx
index 3bcfc9d3d54..5b25e5f165e 100644
--- a/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx
+++ b/packages/client/modules/meeting/components/PokerTemplateScalePicker.tsx
@@ -3,6 +3,7 @@ import {ExpandMore} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {PokerTemplateScalePicker_dimension$key} from '../../../__generated__/PokerTemplateScalePicker_dimension.graphql'
 import {MenuPosition} from '../../../hooks/useCoords'
 import useMenu from '../../../hooks/useMenu'
 import useTooltip from '../../../hooks/useTooltip'
@@ -10,7 +11,6 @@ import textOverflow from '../../../styles/helpers/textOverflow'
 import {PALETTE} from '../../../styles/paletteV3'
 import {FONT_FAMILY} from '../../../styles/typographyV2'
 import lazyPreload from '../../../utils/lazyPreload'
-import {PokerTemplateScalePicker_dimension$key} from '../../../__generated__/PokerTemplateScalePicker_dimension.graphql'
 
 const SelectScaleDropdown = lazyPreload(
   () =>
diff --git a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx b/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
index 2d45402d52e..81f27ef8cb0 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ReflectTemplateDetails_settings$key} from '../../../__generated__/ReflectTemplateDetails_settings.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
 import {PALETTE} from '../../../styles/paletteV3'
 import getTemplateList from '../../../utils/getTemplateList'
 import useTemplateDescription from '../../../utils/useTemplateDescription'
-import {ReflectTemplateDetails_settings$key} from '../../../__generated__/ReflectTemplateDetails_settings.graphql'
 import AddTemplatePrompt from './AddTemplatePrompt'
 import CloneTemplate from './CloneTemplate'
 import EditableTemplateName from './EditableTemplateName'
diff --git a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx b/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
index 1be0bb114a8..82ecc0b860a 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
@@ -3,16 +3,16 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
 import TypeAheadLabel from '~/components/TypeAheadLabel'
+import {TierEnum} from '../../../__generated__/OrganizationSubscription.graphql'
+import {ReflectTemplateItem_template$key} from '../../../__generated__/ReflectTemplateItem_template.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useScrollIntoView from '../../../hooks/useScrollIntoVIew'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {DECELERATE} from '../../../styles/animation'
 import textOverflow from '../../../styles/helpers/textOverflow'
 import {PALETTE} from '../../../styles/paletteV3'
-import useTemplateDescription from '../../../utils/useTemplateDescription'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import {ReflectTemplateItem_template$key} from '../../../__generated__/ReflectTemplateItem_template.graphql'
-import {TierEnum} from '../../../__generated__/OrganizationSubscription.graphql'
+import useTemplateDescription from '../../../utils/useTemplateDescription'
 
 const TemplateItem = styled('li')<{isActive: boolean}>(({isActive}) => ({
   backgroundColor: isActive ? PALETTE.SLATE_200 : undefined,
diff --git a/packages/client/modules/meeting/components/ReflectTemplateList.tsx b/packages/client/modules/meeting/components/ReflectTemplateList.tsx
index c781df75727..f26a201be81 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateList.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateList.tsx
@@ -8,15 +8,15 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import SwipeableViews from 'react-swipeable-views'
-import useAtmosphere from '~/hooks/useAtmosphere'
 import {SharingScopeEnum} from '~/__generated__/ReflectTemplateItem_template.graphql'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import {ReflectTemplateList_settings$key} from '../../../__generated__/ReflectTemplateList_settings.graphql'
 import Tab from '../../../components/Tab/Tab'
 import Tabs from '../../../components/Tabs/Tabs'
 import useBreakpoint from '../../../hooks/useBreakpoint'
 import {desktopSidebarShadow} from '../../../styles/elevation'
 import {PALETTE} from '../../../styles/paletteV3'
 import {Breakpoint} from '../../../types/constEnums'
-import {ReflectTemplateList_settings$key} from '../../../__generated__/ReflectTemplateList_settings.graphql'
 import AddNewReflectTemplate from './AddNewReflectTemplate'
 import ReflectTemplateListOrgRoot from './ReflectTemplateListOrgRoot'
 import ReflectTemplateListPublicRoot from './ReflectTemplateListPublicRoot'
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx b/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx
index 0384993ebcf..cb3be11db2a 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx
@@ -4,11 +4,11 @@ import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {useHistory} from 'react-router'
 import useFilteredItems from '~/hooks/useFilteredItems'
+import {ReflectTemplateListOrgQuery} from '../../../__generated__/ReflectTemplateListOrgQuery.graphql'
 import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import useAtmosphere from '../../../hooks/useAtmosphere'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {PALETTE} from '../../../styles/paletteV3'
-import {ReflectTemplateListOrgQuery} from '../../../__generated__/ReflectTemplateListOrgQuery.graphql'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import ReflectTemplateItem from './ReflectTemplateItem'
 
 const TemplateList = styled('ul')({
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx b/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx
index e68e54885e3..13013cb74ea 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import reflectTemplateListOrgQuery, {
   ReflectTemplateListOrgQuery
 } from '../../../__generated__/ReflectTemplateListOrgQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import MockTemplateList from './MockTemplateList'
 import ReflectTemplateListOrg from './ReflectTemplateListOrg'
 
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx b/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx
index 3073437edca..4db3cc5fef4 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx
@@ -4,8 +4,8 @@ import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useFilteredItems from '~/hooks/useFilteredItems'
 import {PALETTE} from '~/styles/paletteV3'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import {ReflectTemplateListPublicQuery} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql'
+import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import ReflectTemplateItem from './ReflectTemplateItem'
 
 const TemplateList = styled('ul')({
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx b/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx
index 639ce903046..98d478b0fb1 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import reflectTemplateListPublicQuery, {
   ReflectTemplateListPublicQuery
 } from '../../../__generated__/ReflectTemplateListPublicQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import MockTemplateList from './MockTemplateList'
 import ReflectTemplateListPublic from './ReflectTemplateListPublic'
 
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx b/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx
index b0474685df6..49abd2e6ab8 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx
@@ -4,15 +4,15 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
 import useFilteredItems from '~/hooks/useFilteredItems'
+import {ReflectTemplateListTeam_team$key} from '../../../__generated__/ReflectTemplateListTeam_team.graphql'
+import {
+  ReflectTemplateListTeam_teamTemplates$data,
+  ReflectTemplateListTeam_teamTemplates$key
+} from '../../../__generated__/ReflectTemplateListTeam_teamTemplates.graphql'
 import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
 import useAtmosphere from '../../../hooks/useAtmosphere'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {PALETTE} from '../../../styles/paletteV3'
-import {
-  ReflectTemplateListTeam_teamTemplates$key,
-  ReflectTemplateListTeam_teamTemplates$data
-} from '../../../__generated__/ReflectTemplateListTeam_teamTemplates.graphql'
-import {ReflectTemplateListTeam_team$key} from '../../../__generated__/ReflectTemplateListTeam_team.graphql'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import ReflectTemplateItem from './ReflectTemplateItem'
 
 const TemplateList = styled('ul')({
diff --git a/packages/client/modules/meeting/components/ReflectTemplateModal.tsx b/packages/client/modules/meeting/components/ReflectTemplateModal.tsx
index e226a4191db..384ebb73cd7 100644
--- a/packages/client/modules/meeting/components/ReflectTemplateModal.tsx
+++ b/packages/client/modules/meeting/components/ReflectTemplateModal.tsx
@@ -2,11 +2,11 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {ReflectTemplateModal_retroMeetingSettings$key} from '../../../__generated__/ReflectTemplateModal_retroMeetingSettings.graphql'
 import DialogContainer from '../../../components/DialogContainer'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import getTemplateList from '../../../utils/getTemplateList'
 import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import {ReflectTemplateModal_retroMeetingSettings$key} from '../../../__generated__/ReflectTemplateModal_retroMeetingSettings.graphql'
 import CustomTemplateUpgradeMsg from './CustomTemplateUpgradeMsg'
 import ReflectTemplateDetails from './ReflectTemplateDetails'
 import ReflectTemplateList from './ReflectTemplateList'
diff --git a/packages/client/modules/meeting/components/RemoveTemplate.tsx b/packages/client/modules/meeting/components/RemoveTemplate.tsx
index 5d8c9ab0c1e..b9a594d8d57 100644
--- a/packages/client/modules/meeting/components/RemoveTemplate.tsx
+++ b/packages/client/modules/meeting/components/RemoveTemplate.tsx
@@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
+import {RemoveTemplate_teamTemplates$key} from '../../../__generated__/RemoveTemplate_teamTemplates.graphql'
 import DetailAction from '../../../components/DetailAction'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
@@ -9,7 +10,6 @@ import RemovePokerTemplateMutation from '../../../mutations/RemovePokerTemplateM
 import RemoveReflectTemplateMutation from '../../../mutations/RemoveReflectTemplateMutation'
 import {SprintPokerDefaults} from '../../../types/constEnums'
 import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import {RemoveTemplate_teamTemplates$key} from '../../../__generated__/RemoveTemplate_teamTemplates.graphql'
 
 interface Props {
   gotoPublicTemplates: () => void
diff --git a/packages/client/modules/meeting/components/RetroTemplatePicker.tsx b/packages/client/modules/meeting/components/RetroTemplatePicker.tsx
index e115658b103..348f38cebf2 100644
--- a/packages/client/modules/meeting/components/RetroTemplatePicker.tsx
+++ b/packages/client/modules/meeting/components/RetroTemplatePicker.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {RetroTemplatePicker_settings$key} from '../../../__generated__/RetroTemplatePicker_settings.graphql'
 import NewMeetingDropdown from '../../../components/NewMeetingDropdown'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useModal from '../../../hooks/useModal'
 import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import lazyPreload from '../../../utils/lazyPreload'
-import {RetroTemplatePicker_settings$key} from '../../../__generated__/RetroTemplatePicker_settings.graphql'
 
 interface Props {
   settingsRef: RetroTemplatePicker_settings$key
diff --git a/packages/client/modules/meeting/components/ScaleActions.tsx b/packages/client/modules/meeting/components/ScaleActions.tsx
index b917e50ad40..301bf51b885 100644
--- a/packages/client/modules/meeting/components/ScaleActions.tsx
+++ b/packages/client/modules/meeting/components/ScaleActions.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {ScaleActions_scale$key} from '../../../__generated__/ScaleActions_scale.graphql'
 import DetailAction from '../../../components/DetailAction'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import AddPokerTemplateScaleMutation from '../../../mutations/AddPokerTemplateScaleMutation'
 import RemovePokerTemplateScaleMutation from '../../../mutations/RemovePokerTemplateScaleMutation'
 import {Threshold} from '../../../types/constEnums'
-import {ScaleActions_scale$key} from '../../../__generated__/ScaleActions_scale.graphql'
 
 const CloneAndDelete = styled('div')({
   display: 'flex',
diff --git a/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx b/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx
index aa269931e77..6362418d51e 100644
--- a/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx
+++ b/packages/client/modules/meeting/components/ScaleDropdownMenuItem.tsx
@@ -6,12 +6,12 @@ import {useFragment} from 'react-relay'
 import textOverflow from '~/styles/helpers/textOverflow'
 import {PALETTE} from '~/styles/paletteV3'
 import {FONT_FAMILY} from '~/styles/typographyV2'
+import {ScaleDropdownMenuItem_dimension$key} from '../../../__generated__/ScaleDropdownMenuItem_dimension.graphql'
+import {ScaleDropdownMenuItem_scale$key} from '../../../__generated__/ScaleDropdownMenuItem_scale.graphql'
 import MenuItem from '../../../components/MenuItem'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import UpdatePokerTemplateDimensionScaleMutation from '../../../mutations/UpdatePokerTemplateDimensionScaleMutation'
-import {ScaleDropdownMenuItem_dimension$key} from '../../../__generated__/ScaleDropdownMenuItem_dimension.graphql'
-import {ScaleDropdownMenuItem_scale$key} from '../../../__generated__/ScaleDropdownMenuItem_scale.graphql'
 import ScaleActions from './ScaleActions'
 import scaleValueString from './scaleValueString'
 
diff --git a/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx b/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx
index 9f08a8a5820..265485aee72 100644
--- a/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx
+++ b/packages/client/modules/meeting/components/ScaleValuePalettePicker.tsx
@@ -6,10 +6,10 @@ import Menu from '~/components/Menu'
 import PaletteColor from '~/components/PaletteColor/PaletteColor'
 import UpdatePokerTemplateScaleValueMutation from '~/mutations/UpdatePokerTemplateScaleValueMutation'
 import palettePickerOptions from '~/styles/palettePickerOptions'
+import {ScaleValuePalettePicker_scale$key} from '../../../__generated__/ScaleValuePalettePicker_scale.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import {MenuProps} from '../../../hooks/useMenu'
 import useMutationProps from '../../../hooks/useMutationProps'
-import {ScaleValuePalettePicker_scale$key} from '../../../__generated__/ScaleValuePalettePicker_scale.graphql'
 
 interface Props {
   scale: ScaleValuePalettePicker_scale$key
diff --git a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
index 07671dec36c..3d7e91864de 100644
--- a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
+++ b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
@@ -3,6 +3,7 @@ import {Add} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {SelectScaleDropdown_dimension$key} from '../../../__generated__/SelectScaleDropdown_dimension.graphql'
 import LinkButton from '../../../components/LinkButton'
 import Menu from '../../../components/Menu'
 import MenuItem from '../../../components/MenuItem'
@@ -13,7 +14,6 @@ import useMutationProps from '../../../hooks/useMutationProps'
 import AddPokerTemplateScaleMutation from '../../../mutations/AddPokerTemplateScaleMutation'
 import {FONT_FAMILY} from '../../../styles/typographyV2'
 import {Threshold} from '../../../types/constEnums'
-import {SelectScaleDropdown_dimension$key} from '../../../__generated__/SelectScaleDropdown_dimension.graphql'
 import ScaleDropdownMenuItem from './ScaleDropdownMenuItem'
 
 interface Props {
diff --git a/packages/client/modules/meeting/components/SelectTemplate.tsx b/packages/client/modules/meeting/components/SelectTemplate.tsx
index d101abe3304..26dc199aae6 100644
--- a/packages/client/modules/meeting/components/SelectTemplate.tsx
+++ b/packages/client/modules/meeting/components/SelectTemplate.tsx
@@ -5,15 +5,15 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
+import {TierEnum} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql'
+import {SelectTemplate_template$key} from '../../../__generated__/SelectTemplate_template.graphql'
 import FloatingActionButton from '../../../components/FloatingActionButton'
 import StyledError from '../../../components/StyledError'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import useMutationProps from '../../../hooks/useMutationProps'
 import SelectTemplateMutation from '../../../mutations/SelectTemplateMutation'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 import {BezierCurve} from '../../../types/constEnums'
-import {TierEnum} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql'
-import {SelectTemplate_template$key} from '../../../__generated__/SelectTemplate_template.graphql'
+import SendClientSideEvent from '../../../utils/SendClientSideEvent'
 
 const fadein = keyframes`
 0% { opacity: 0; }
diff --git a/packages/client/modules/meeting/components/TemplateDimensionItem.tsx b/packages/client/modules/meeting/components/TemplateDimensionItem.tsx
index 2de98a069af..1e7e93c0c76 100644
--- a/packages/client/modules/meeting/components/TemplateDimensionItem.tsx
+++ b/packages/client/modules/meeting/components/TemplateDimensionItem.tsx
@@ -4,12 +4,12 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {DraggableProvided} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
+import {TemplateDimensionItem_dimensions$key} from '~/__generated__/TemplateDimensionItem_dimensions.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import RemovePokerTemplateDimensionMutation from '~/mutations/RemovePokerTemplateDimensionMutation'
-import {TemplateDimensionItem_dimensions$key} from '~/__generated__/TemplateDimensionItem_dimensions.graphql'
-import {PALETTE} from '../../../styles/paletteV3'
 import {TemplateDimensionItem_dimension$key} from '../../../__generated__/TemplateDimensionItem_dimension.graphql'
+import {PALETTE} from '../../../styles/paletteV3'
 import EditableTemplateDimension from './EditableTemplateDimension'
 import PokerTemplateScalePicker from './PokerTemplateScalePicker'
 
diff --git a/packages/client/modules/meeting/components/TemplateDimensionList.tsx b/packages/client/modules/meeting/components/TemplateDimensionList.tsx
index 519f1a63a58..7d352ab5ba4 100644
--- a/packages/client/modules/meeting/components/TemplateDimensionList.tsx
+++ b/packages/client/modules/meeting/components/TemplateDimensionList.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
+import {TemplateDimensionList_dimensions$key} from '../../../__generated__/TemplateDimensionList_dimensions.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import MovePokerTemplateDimensionMutation from '../../../mutations/MovePokerTemplateDimensionMutation'
 import {TEMPLATE_DIMENSION} from '../../../utils/constants'
 import dndNoise from '../../../utils/dndNoise'
-import {TemplateDimensionList_dimensions$key} from '../../../__generated__/TemplateDimensionList_dimensions.graphql'
 import TemplateDimensionItem from './TemplateDimensionItem'
 
 interface Props {
diff --git a/packages/client/modules/meeting/components/TemplatePromptItem.tsx b/packages/client/modules/meeting/components/TemplatePromptItem.tsx
index 6894fe8ac17..b893c5925dc 100644
--- a/packages/client/modules/meeting/components/TemplatePromptItem.tsx
+++ b/packages/client/modules/meeting/components/TemplatePromptItem.tsx
@@ -4,12 +4,12 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {DraggableProvided} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
+import {TemplatePromptItem_prompts$key} from '~/__generated__/TemplatePromptItem_prompts.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
-import {TemplatePromptItem_prompts$key} from '~/__generated__/TemplatePromptItem_prompts.graphql'
+import {TemplatePromptItem_prompt$key} from '../../../__generated__/TemplatePromptItem_prompt.graphql'
 import RemoveReflectTemplatePromptMutation from '../../../mutations/RemoveReflectTemplatePromptMutation'
 import {PALETTE} from '../../../styles/paletteV3'
-import {TemplatePromptItem_prompt$key} from '../../../__generated__/TemplatePromptItem_prompt.graphql'
 import EditableTemplateDescription from './EditableTemplateDescription'
 import EditableTemplatePrompt from './EditableTemplatePrompt'
 import EditableTemplatePromptColor from './EditableTemplatePromptColor'
diff --git a/packages/client/modules/meeting/components/TemplatePromptList.tsx b/packages/client/modules/meeting/components/TemplatePromptList.tsx
index fe41a4cd469..8c7c8317e05 100644
--- a/packages/client/modules/meeting/components/TemplatePromptList.tsx
+++ b/packages/client/modules/meeting/components/TemplatePromptList.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {DragDropContext, Draggable, Droppable, DropResult} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
+import {TemplatePromptList_prompts$key} from '../../../__generated__/TemplatePromptList_prompts.graphql'
 import useAtmosphere from '../../../hooks/useAtmosphere'
 import MoveReflectTemplatePromptMutation from '../../../mutations/MoveReflectTemplatePromptMutation'
 import {TEMPLATE_PROMPT} from '../../../utils/constants'
 import dndNoise from '../../../utils/dndNoise'
-import {TemplatePromptList_prompts$key} from '../../../__generated__/TemplatePromptList_prompts.graphql'
 import TemplatePromptItem from './TemplatePromptItem'
 
 interface Props {
diff --git a/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx b/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx
index 77409a53479..739be82b776 100644
--- a/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx
+++ b/packages/client/modules/meeting/components/TemplateScaleValueItem.tsx
@@ -4,13 +4,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
 import {DraggableProvided} from 'react-beautiful-dnd'
 import {useFragment} from 'react-relay'
+import {TemplateScaleValueItem_scale$key} from '~/__generated__/TemplateScaleValueItem_scale.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useMutationProps from '~/hooks/useMutationProps'
 import RemovePokerTemplateScaleValueMutation from '~/mutations/RemovePokerTemplateScaleValueMutation'
-import {TemplateScaleValueItem_scale$key} from '~/__generated__/TemplateScaleValueItem_scale.graphql'
+import {TemplateScaleValueItem_scaleValue$key} from '../../../__generated__/TemplateScaleValueItem_scaleValue.graphql'
 import {PALETTE} from '../../../styles/paletteV3'
 import isSpecialPokerLabel from '../../../utils/isSpecialPokerLabel'
-import {TemplateScaleValueItem_scaleValue$key} from '../../../__generated__/TemplateScaleValueItem_scaleValue.graphql'
 import EditableTemplateScaleValueColor from './EditableTemplateScaleValueColor'
 import EditableTemplateScaleValueLabel from './EditableTemplateScaleValueLabel'
 
diff --git a/packages/client/modules/meeting/components/TemplateSharing.tsx b/packages/client/modules/meeting/components/TemplateSharing.tsx
index 874fbe3b3a1..a64d315bfd6 100644
--- a/packages/client/modules/meeting/components/TemplateSharing.tsx
+++ b/packages/client/modules/meeting/components/TemplateSharing.tsx
@@ -3,11 +3,11 @@ import {ExpandMore as ExpandMoreIcon, Share as ShareIcon} from '@mui/icons-mater
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {TemplateSharing_template$key} from '../../../__generated__/TemplateSharing_template.graphql'
 import {MenuPosition} from '../../../hooks/useCoords'
 import useMenu from '../../../hooks/useMenu'
 import {PALETTE} from '../../../styles/paletteV3'
 import lazyPreload from '../../../utils/lazyPreload'
-import {TemplateSharing_template$key} from '../../../__generated__/TemplateSharing_template.graphql'
 
 const SelectSharingScopeDropdown = lazyPreload(
   () =>
diff --git a/packages/client/modules/newTeam/NewTeam.tsx b/packages/client/modules/newTeam/NewTeam.tsx
index 2f1d2ab3080..68a8346979f 100644
--- a/packages/client/modules/newTeam/NewTeam.tsx
+++ b/packages/client/modules/newTeam/NewTeam.tsx
@@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import useDocumentTitle from '~/hooks/useDocumentTitle'
+import {NewTeamQuery} from '../../__generated__/NewTeamQuery.graphql'
 import IconLabel from '../../components/IconLabel'
 import LinkButton from '../../components/LinkButton'
 import useBreakpoint from '../../hooks/useBreakpoint'
 import {cardShadow} from '../../styles/elevation'
 import {PALETTE} from '../../styles/paletteV3'
 import {ExternalLinks} from '../../types/constEnums'
-import {NewTeamQuery} from '../../__generated__/NewTeamQuery.graphql'
 import NewTeamForm from './components/NewTeamForm/NewTeamForm'
 const NewTeamLayout = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx
index 8269686eb2b..5892919926e 100644
--- a/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx
+++ b/packages/client/modules/newTeam/components/NewTeamForm/NewTeamForm.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {ChangeEvent, FormEvent, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {NewTeamForm_organizations$key} from '../../../../__generated__/NewTeamForm_organizations.graphql'
 import Checkbox from '../../../../components/Checkbox'
 import DashHeaderTitle from '../../../../components/DashHeaderTitle'
 import FieldLabel from '../../../../components/FieldLabel/FieldLabel'
@@ -16,14 +17,13 @@ import useMutationProps from '../../../../hooks/useMutationProps'
 import useRouter from '../../../../hooks/useRouter'
 import AddOrgMutation from '../../../../mutations/AddOrgMutation'
 import AddTeamMutation from '../../../../mutations/AddTeamMutation'
-import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Threshold} from '../../../../types/constEnums'
+import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 import linkify from '../../../../utils/linkify'
 import parseEmailAddressList from '../../../../utils/parseEmailAddressList'
 import Legitity from '../../../../validation/Legitity'
 import teamNameValidation from '../../../../validation/teamNameValidation'
-import {NewTeamForm_organizations$key} from '../../../../__generated__/NewTeamForm_organizations.graphql'
 import NewTeamOrgPicker from '../../../team/components/NewTeamOrgPicker'
 import NewTeamFormBlock from './NewTeamFormBlock'
 import NewTeamFormOrgName from './NewTeamFormOrgName'
diff --git a/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx b/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx
index 74542d4d6d3..f699fdc8543 100644
--- a/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx
+++ b/packages/client/modules/newTeam/containers/NewTeamForm/NewTeamRoot.tsx
@@ -1,7 +1,7 @@
 import React, {Suspense} from 'react'
+import newTeamQuery, {NewTeamQuery} from '../../../../__generated__/NewTeamQuery.graphql'
 import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import useRouter from '../../../../hooks/useRouter'
-import newTeamQuery, {NewTeamQuery} from '../../../../__generated__/NewTeamQuery.graphql'
 import NewTeam from '../../NewTeam'
 
 const NewTeamRoot = () => {
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
index 30a500b6392..5f1ce1a37ba 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCard/OutcomeCard.tsx
@@ -3,14 +3,15 @@ import graphql from 'babel-plugin-relay/macro'
 import {EditorState} from 'draft-js'
 import React, {memo, RefObject} from 'react'
 import {useFragment} from 'react-relay'
-import EditingStatus from '~/components/EditingStatus/EditingStatus'
-import {PALETTE} from '~/styles/paletteV3'
 import {OutcomeCard_task$key} from '~/__generated__/OutcomeCard_task.graphql'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import EditingStatus from '~/components/EditingStatus/EditingStatus'
+import {PALETTE} from '~/styles/paletteV3'
 import IntegratedTaskContent from '../../../../components/IntegratedTaskContent'
 import TaskEditor from '../../../../components/TaskEditor/TaskEditor'
 import TaskIntegrationLink from '../../../../components/TaskIntegrationLink'
 import TaskWatermark from '../../../../components/TaskWatermark'
+import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useTaskChildFocus, {UseTaskChild} from '../../../../hooks/useTaskChildFocus'
 import {cardFocusShadow, cardHoverShadow, cardShadow, Elevation} from '../../../../styles/elevation'
 import cardRootStyles from '../../../../styles/helpers/cardRootStyles'
@@ -21,7 +22,6 @@ import isTempId from '../../../../utils/relay/isTempId'
 import {taskStatusLabels} from '../../../../utils/taskStatus'
 import TaskFooter from '../OutcomeCardFooter/TaskFooter'
 import OutcomeCardStatusIndicator from '../OutcomeCardStatusIndicator/OutcomeCardStatusIndicator'
-import useAtmosphere from '../../../../hooks/useAtmosphere'
 
 const RootCard = styled('div')<{
   isTaskHovered: boolean
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
index c36d02b3385..52da89bd3e3 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterTeamAssigneeMenu.tsx
@@ -1,13 +1,15 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo, useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
+import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql'
 import {EmptyDropdownMenuItemLabel} from '~/components/EmptyDropdownMenuItemLabel'
 import {SearchMenuItem} from '~/components/SearchMenuItem'
 import useEventCallback from '~/hooks/useEventCallback'
 import useModal from '~/hooks/useModal'
 import useSearchFilter from '~/hooks/useSearchFilter'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
-import {TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery} from '~/__generated__/TaskFooterTeamAssigneeMenu_viewerIntegrationsQuery.graphql'
+import {TaskFooterTeamAssigneeMenuQuery} from '../../../../__generated__/TaskFooterTeamAssigneeMenuQuery.graphql'
+import {TaskFooterTeamAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterTeamAssigneeMenu_task.graphql'
 import DropdownMenuLabel from '../../../../components/DropdownMenuLabel'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
@@ -15,8 +17,6 @@ import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuProps} from '../../../../hooks/useMenu'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import ChangeTaskTeamMutation from '../../../../mutations/ChangeTaskTeamMutation'
-import {TaskFooterTeamAssigneeMenuQuery} from '../../../../__generated__/TaskFooterTeamAssigneeMenuQuery.graphql'
-import {TaskFooterTeamAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterTeamAssigneeMenu_task.graphql'
 import TaskFooterTeamAssigneeAddIntegrationDialog from './TaskFooterTeamAssigneeAddIntegrationDialog'
 
 const query = graphql`
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx
index eb43c9da077..c985bf70f49 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu.tsx
@@ -1,11 +1,13 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
-import {useFragment, PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {PreloadedQuery, useFragment, usePreloadedQuery} from 'react-relay'
+import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import {EmptyDropdownMenuItemLabel} from '~/components/EmptyDropdownMenuItemLabel'
 import {SearchMenuItem} from '~/components/SearchMenuItem'
 import useSearchFilter from '~/hooks/useSearchFilter'
-import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import {TaskFooterUserAssigneeMenuQuery} from '../../../../__generated__/TaskFooterUserAssigneeMenuQuery.graphql'
+import {TaskFooterUserAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterUserAssigneeMenu_task.graphql'
 import DropdownMenuLabel from '../../../../components/DropdownMenuLabel'
 import Menu from '../../../../components/Menu'
 import MenuAvatar from '../../../../components/MenuAvatar'
@@ -15,8 +17,6 @@ import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuProps} from '../../../../hooks/useMenu'
 import UpdateTaskMutation from '../../../../mutations/UpdateTaskMutation'
 import avatarUser from '../../../../styles/theme/images/avatar-user.svg'
-import {TaskFooterUserAssigneeMenuQuery} from '../../../../__generated__/TaskFooterUserAssigneeMenuQuery.graphql'
-import {TaskFooterUserAssigneeMenu_task$key} from '../../../../__generated__/TaskFooterUserAssigneeMenu_task.graphql'
 
 const StyledPreferredName = styled('div')({
   whiteSpace: 'nowrap',
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
index 77a8f7e9708..6853f991fd0 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooter.tsx
@@ -4,6 +4,7 @@ import {EditorState} from 'draft-js'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import {TaskFooter_task$key} from '../../../../__generated__/TaskFooter_task.graphql'
 import CardButton from '../../../../components/CardButton'
 import IconLabel from '../../../../components/IconLabel'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
@@ -15,7 +16,6 @@ import {USER_DASH} from '../../../../utils/constants'
 import removeContentTag from '../../../../utils/draftjs/removeContentTag'
 import isTaskArchived from '../../../../utils/isTaskArchived'
 import setLocalTaskError from '../../../../utils/relay/setLocalTaskError'
-import {TaskFooter_task$key} from '../../../../__generated__/TaskFooter_task.graphql'
 import OutcomeCardMessage from '../OutcomeCardMessage/OutcomeCardMessage'
 import TaskFooterIntegrateToggle from './TaskFooterIntegrateToggle'
 import TaskFooterTagMenuToggle from './TaskFooterTagMenuToggle'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx
index 58f47f7dd07..bcf5f8e1cd0 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTagMenuToggle.tsx
@@ -1,7 +1,7 @@
 import {EditorState} from 'draft-js'
 import React from 'react'
-import useTooltip from '~/hooks/useTooltip'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import useTooltip from '~/hooks/useTooltip'
 import CardButton from '../../../../components/CardButton'
 import IconLabel from '../../../../components/IconLabel'
 import {MenuPosition} from '../../../../hooks/useCoords'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
index b8ef7a9eecc..06478015f97 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterTeamAssignee.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useTooltip from '~/hooks/useTooltip'
+import {TaskFooterTeamAssignee_task$key} from '../../../../__generated__/TaskFooterTeamAssignee_task.graphql'
 import CardButton from '../../../../components/CardButton'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
@@ -11,7 +12,6 @@ import textOverflow from '../../../../styles/helpers/textOverflow'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Radius} from '../../../../types/constEnums'
 import lazyPreload from '../../../../utils/lazyPreload'
-import {TaskFooterTeamAssignee_task$key} from '../../../../__generated__/TaskFooterTeamAssignee_task.graphql'
 
 const TooltipToggle = styled('div')({
   width: '100%'
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx
index aa6f98b71b2..c9d2744f814 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardFooter/TaskFooterUserAssignee.tsx
@@ -4,6 +4,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useTooltip from '~/hooks/useTooltip'
+import {TaskFooterUserAssignee_task$key} from '../../../../__generated__/TaskFooterUserAssignee_task.graphql'
 import BaseButton from '../../../../components/BaseButton'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
@@ -12,7 +13,6 @@ import textOverflow from '../../../../styles/helpers/textOverflow'
 import {PALETTE} from '../../../../styles/paletteV3'
 import avatarUser from '../../../../styles/theme/images/avatar-user.svg'
 import lazyPreload from '../../../../utils/lazyPreload'
-import {TaskFooterUserAssignee_task$key} from '../../../../__generated__/TaskFooterUserAssignee_task.graphql'
 
 const label = {
   ...textOverflow,
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx
index fdd078811bf..820389e901e 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenu.tsx
@@ -3,6 +3,7 @@ import {EditorState} from 'draft-js'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import {TaskFooterTagMenu_task$key} from '../../../../__generated__/TaskFooterTagMenu_task.graphql'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
 import MenuItemDot from '../../../../components/MenuItemDot'
@@ -18,7 +19,6 @@ import {TaskStatus} from '../../../../types/constEnums'
 import addContentTag from '../../../../utils/draftjs/addContentTag'
 import removeContentTag from '../../../../utils/draftjs/removeContentTag'
 import isTaskPrivate from '../../../../utils/isTaskPrivate'
-import {TaskFooterTagMenu_task$key} from '../../../../__generated__/TaskFooterTagMenu_task.graphql'
 import TaskFooterTagMenuStatusItem from './TaskFooterTagMenuStatusItem'
 
 const statusItems = [TaskStatus.DONE, TaskStatus.ACTIVE, TaskStatus.STUCK, TaskStatus.FUTURE]
diff --git a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx
index 082ede4e2c7..80b15babf37 100644
--- a/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx
+++ b/packages/client/modules/outcomeCard/components/OutcomeCardStatusMenu/TaskFooterTagMenuStatusItem.tsx
@@ -2,13 +2,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {forwardRef} from 'react'
 import {useFragment} from 'react-relay'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import {TaskFooterTagMenuStatusItem_task$key} from '../../../../__generated__/TaskFooterTagMenuStatusItem_task.graphql'
 import MenuItem from '../../../../components/MenuItem'
 import MenuItemDot from '../../../../components/MenuItemDot'
 import MenuItemLabel from '../../../../components/MenuItemLabel'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import UpdateTaskMutation from '../../../../mutations/UpdateTaskMutation'
 import {taskStatusColors, taskStatusLabels} from '../../../../utils/taskStatus'
-import {TaskFooterTagMenuStatusItem_task$key} from '../../../../__generated__/TaskFooterTagMenuStatusItem_task.graphql'
 
 interface Props {
   area: AreaEnum
diff --git a/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx b/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx
index 3a0099ffc19..1d9bb53ad24 100644
--- a/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx
+++ b/packages/client/modules/outcomeCard/components/TaskFooterUserAssigneeMenuRoot.tsx
@@ -1,15 +1,15 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import {MenuProps} from '../../../hooks/useMenu'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import {UseTaskChild} from '../../../hooks/useTaskChildFocus'
-import {Loader} from '../../../utils/relay/renderLoader'
 import taskFooterUserAssigneeMenuQuery, {
   TaskFooterUserAssigneeMenuQuery
 } from '../../../__generated__/TaskFooterUserAssigneeMenuQuery.graphql'
 import {TaskFooterUserAssigneeMenuRoot_task$key} from '../../../__generated__/TaskFooterUserAssigneeMenuRoot_task.graphql'
 import {AreaEnum} from '../../../__generated__/UpdateTaskMutation.graphql'
+import {MenuProps} from '../../../hooks/useMenu'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import {UseTaskChild} from '../../../hooks/useTaskChildFocus'
+import {Loader} from '../../../utils/relay/renderLoader'
 import TaskFooterUserAssigneeMenu from './OutcomeCardAssignMenu/TaskFooterUserAssigneeMenu'
 
 interface Props {
diff --git a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
index b736bcf20b0..14e9804204c 100644
--- a/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
+++ b/packages/client/modules/outcomeCard/containers/OutcomeCard/OutcomeCardContainer.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import {ContentState, convertToRaw} from 'draft-js'
 import React, {memo, useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
+import {OutcomeCardContainer_task$key} from '~/__generated__/OutcomeCardContainer_task.graphql'
+import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import useClickAway from '~/hooks/useClickAway'
 import useScrollIntoView from '~/hooks/useScrollIntoVIew'
 import SetTaskHighlightMutation from '~/mutations/SetTaskHighlightMutation'
-import {OutcomeCardContainer_task$key} from '~/__generated__/OutcomeCardContainer_task.graphql'
-import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useEditorState from '../../../../hooks/useEditorState'
 import useTaskChildFocus from '../../../../hooks/useTaskChildFocus'
diff --git a/packages/client/modules/summary/components/NewMeetingSummary.tsx b/packages/client/modules/summary/components/NewMeetingSummary.tsx
index 11e11406a67..cb42c5637a8 100644
--- a/packages/client/modules/summary/components/NewMeetingSummary.tsx
+++ b/packages/client/modules/summary/components/NewMeetingSummary.tsx
@@ -1,8 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import DashSidebar from '../../../components/Dashboard/DashSidebar'
+import {NewMeetingSummaryQuery} from '../../../__generated__/NewMeetingSummaryQuery.graphql'
 import DashTopBar from '../../../components/DashTopBar'
+import DashSidebar from '../../../components/Dashboard/DashSidebar'
 import MeetingLockedOverlay from '../../../components/MeetingLockedOverlay'
 import useDocumentTitle from '../../../hooks/useDocumentTitle'
 import useRouter from '../../../hooks/useRouter'
@@ -12,7 +13,6 @@ import {APP_CORS_OPTIONS} from '../../../types/cors'
 import {MEETING_SUMMARY_LABEL} from '../../../utils/constants'
 import isDemoRoute from '../../../utils/isDemoRoute'
 import makeHref from '../../../utils/makeHref'
-import {NewMeetingSummaryQuery} from '../../../__generated__/NewMeetingSummaryQuery.graphql'
 import {demoTeamId} from '../../demo/initDB'
 import MeetingSummaryEmail from '../../email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail'
 
diff --git a/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx b/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx
index 1d318a7aef2..9ba0a91c003 100644
--- a/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx
+++ b/packages/client/modules/summary/components/NewMeetingSummaryRoot.tsx
@@ -1,11 +1,11 @@
 import React, {Suspense} from 'react'
+import newMeetingSummaryQuery, {
+  NewMeetingSummaryQuery
+} from '../../../__generated__/NewMeetingSummaryQuery.graphql'
 import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import useRouter from '../../../hooks/useRouter'
 import {LoaderSize} from '../../../types/constEnums'
 import {Loader} from '../../../utils/relay/renderLoader'
-import newMeetingSummaryQuery, {
-  NewMeetingSummaryQuery
-} from '../../../__generated__/NewMeetingSummaryQuery.graphql'
 import NewMeetingSummary from './NewMeetingSummary'
 
 const NewMeetingSummaryRoot = () => {
diff --git a/packages/client/modules/team/components/NewTeamOrgPicker.tsx b/packages/client/modules/team/components/NewTeamOrgPicker.tsx
index f0e942e07da..a4f208672b4 100644
--- a/packages/client/modules/team/components/NewTeamOrgPicker.tsx
+++ b/packages/client/modules/team/components/NewTeamOrgPicker.tsx
@@ -2,13 +2,13 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useMemo} from 'react'
 import {useFragment} from 'react-relay'
+import {NewTeamOrgPicker_organizations$key} from '../../../__generated__/NewTeamOrgPicker_organizations.graphql'
 import DropdownMenuToggle from '../../../components/DropdownMenuToggle'
 import TierTag from '../../../components/Tag/TierTag'
 import {MenuPosition} from '../../../hooks/useCoords'
 import useMenu from '../../../hooks/useMenu'
 import lazyPreload from '../../../utils/lazyPreload'
 import sortByTier from '../../../utils/sortByTier'
-import {NewTeamOrgPicker_organizations$key} from '../../../__generated__/NewTeamOrgPicker_organizations.graphql'
 
 const MenuToggleInner = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx b/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx
index 81e30e21738..774fe017c27 100644
--- a/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaInput/AgendaInput.tsx
@@ -3,6 +3,7 @@ import {Add} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {AgendaInput_team$key} from '../../../../__generated__/AgendaInput_team.graphql'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useAtmosphereListener from '../../../../hooks/useAtmosphereListener'
 import {MenuPosition} from '../../../../hooks/useCoords'
@@ -17,7 +18,6 @@ import {PALETTE} from '../../../../styles/paletteV3'
 import ui from '../../../../styles/ui'
 import getNextSortOrder from '../../../../utils/getNextSortOrder'
 import toTeamMemberId from '../../../../utils/relay/toTeamMemberId'
-import {AgendaInput_team$key} from '../../../../__generated__/AgendaInput_team.graphql'
 
 const AgendaInputBlock = styled('div')({
   padding: `8px 0`,
diff --git a/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx b/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx
index 3fe10d1af0c..f338fe6a7a0 100644
--- a/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx
+++ b/packages/client/modules/teamDashboard/components/AgendaListAndInput/AgendaListAndInput.tsx
@@ -3,11 +3,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {
-  AgendaListAndInput_meeting$key,
-  AgendaListAndInput_meeting$data
+  AgendaListAndInput_meeting$data,
+  AgendaListAndInput_meeting$key
 } from '~/__generated__/AgendaListAndInput_meeting.graphql'
-import useGotoStageId from '../../../../hooks/useGotoStageId'
 import {AgendaListAndInput_team$key} from '../../../../__generated__/AgendaListAndInput_team.graphql'
+import useGotoStageId from '../../../../hooks/useGotoStageId'
 import AgendaInput from '../AgendaInput/AgendaInput'
 import AgendaList from '../AgendaList/AgendaList'
 
diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx
index dfa5e8319cc..b72437a5de2 100644
--- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx
+++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganizationForm.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ArchiveOrganizationForm_organization$key} from '~/__generated__/ArchiveOrganizationForm_organization.graphql'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useForm from '~/hooks/useForm'
 import useMutationProps from '~/hooks/useMutationProps'
 import useRouter from '~/hooks/useRouter'
 import ArchiveOrganizationMutation from '~/mutations/ArchiveOrganizationMutation'
-import {ArchiveOrganizationForm_organization$key} from '~/__generated__/ArchiveOrganizationForm_organization.graphql'
 import FieldLabel from '../../../../components/FieldLabel/FieldLabel'
 import BasicInput from '../../../../components/InputField/BasicInput'
 import Legitity from '../../../../validation/Legitity'
diff --git a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx
index cd390663f21..bc57a0a1419 100644
--- a/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx
+++ b/packages/client/modules/teamDashboard/components/ArchiveTeam/ArchiveTeamForm.tsx
@@ -2,12 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {ArchiveTeamForm_team$key} from '~/__generated__/ArchiveTeamForm_team.graphql'
 import SecondaryButton from '~/components/SecondaryButton'
 import useAtmosphere from '~/hooks/useAtmosphere'
 import useForm from '~/hooks/useForm'
 import useMutationProps from '~/hooks/useMutationProps'
 import useRouter from '~/hooks/useRouter'
-import {ArchiveTeamForm_team$key} from '~/__generated__/ArchiveTeamForm_team.graphql'
 import FieldLabel from '../../../../components/FieldLabel/FieldLabel'
 import BasicInput from '../../../../components/InputField/BasicInput'
 import PrimaryButton from '../../../../components/PrimaryButton'
diff --git a/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx b/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx
index 295d27e9862..257f4525787 100644
--- a/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx
+++ b/packages/client/modules/teamDashboard/components/EditTeamName/EditableTeamName.tsx
@@ -3,12 +3,12 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {EditableTeamName_team$key} from '../../../../__generated__/EditableTeamName_team.graphql'
 import EditableText from '../../../../components/EditableText'
 import UpdateTeamNameMutation from '../../../../mutations/UpdateTeamNameMutation'
 import {FONT_FAMILY} from '../../../../styles/typographyV2'
 import withMutationProps, {WithMutationProps} from '../../../../utils/relay/withMutationProps'
 import teamNameValidation from '../../../../validation/teamNameValidation'
-import {EditableTeamName_team$key} from '../../../../__generated__/EditableTeamName_team.graphql'
 
 interface Props extends WithMutationProps {
   team: EditableTeamName_team$key
diff --git a/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx b/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx
index b90e145b708..6354a84f718 100644
--- a/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx
+++ b/packages/client/modules/teamDashboard/components/LeaveTeamModal/LeaveTeamModal.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {LeaveTeamModal_teamMember$key} from '../../../../__generated__/LeaveTeamModal_teamMember.graphql'
 import DialogContainer from '../../../../components/DialogContainer'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
@@ -10,7 +11,6 @@ import PrimaryButton from '../../../../components/PrimaryButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useRouter from '../../../../hooks/useRouter'
 import RemoveTeamMemberMutation from '../../../../mutations/RemoveTeamMemberMutation'
-import {LeaveTeamModal_teamMember$key} from '../../../../__generated__/LeaveTeamModal_teamMember.graphql'
 
 const StyledDialogContainer = styled(DialogContainer)({
   width: 356
diff --git a/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx b/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx
index 5c4208bd2e8..8536b80cd54 100644
--- a/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx
+++ b/packages/client/modules/teamDashboard/components/PromoteTeamMemberModal/PromoteTeamMemberModal.tsx
@@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {PromoteTeamMemberModal_teamMember$key} from '../../../../__generated__/PromoteTeamMemberModal_teamMember.graphql'
 import DialogContainer from '../../../../components/DialogContainer'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
@@ -10,7 +11,6 @@ import IconLabel from '../../../../components/IconLabel'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import PromoteToTeamLeadMutation from '../../../../mutations/PromoteToTeamLeadMutation'
 import withMutationProps, {WithMutationProps} from '../../../../utils/relay/withMutationProps'
-import {PromoteTeamMemberModal_teamMember$key} from '../../../../__generated__/PromoteTeamMemberModal_teamMember.graphql'
 
 const StyledDialogContainer = styled(DialogContainer)({
   width: 420
diff --git a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
index 6f2360fad6b..2e5881b2706 100644
--- a/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderList/ProviderList.tsx
@@ -2,18 +2,18 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {ProviderListQuery} from '../../../../__generated__/ProviderListQuery.graphql'
 import SettingsWrapper from '../../../../components/Settings/SettingsWrapper'
 import {PALETTE} from '../../../../styles/paletteV3'
-import {ProviderListQuery} from '../../../../__generated__/ProviderListQuery.graphql'
 import AtlassianProviderRow from '../ProviderRow/AtlassianProviderRow'
 import AzureDevOpsProviderRow from '../ProviderRow/AzureDevOpsProviderRow'
+import GcalProviderRow from '../ProviderRow/GcalProviderRow'
 import GitHubProviderRow from '../ProviderRow/GitHubProviderRow'
 import GitLabProviderRow from '../ProviderRow/GitLabProviderRow'
 import JiraServerProviderRow from '../ProviderRow/JiraServerProviderRow'
-import MattermostProviderRow from '../ProviderRow/MattermostProviderRow'
 import MSTeamsProviderRow from '../ProviderRow/MSTeamsProviderRow'
+import MattermostProviderRow from '../ProviderRow/MattermostProviderRow'
 import SlackProviderRow from '../ProviderRow/SlackProviderRow'
-import GcalProviderRow from '../ProviderRow/GcalProviderRow'
 
 interface Props {
   queryRef: PreloadedQuery<ProviderListQuery>
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx
index e88012c723b..f9cbb9c06b5 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/AtlassianProviderRow.tsx
@@ -3,6 +3,7 @@ import jwtDecode from 'jwt-decode'
 import React, {useEffect, useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import AtlassianProviderLogo from '../../../../AtlassianProviderLogo'
+import {AtlassianProviderRow_viewer$key} from '../../../../__generated__/AtlassianProviderRow_viewer.graphql'
 import AtlassianConfigMenu from '../../../../components/AtlassianConfigMenu'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
@@ -11,7 +12,6 @@ import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutation
 import {AuthToken} from '../../../../types/AuthToken'
 import {ExternalLinks, Providers} from '../../../../types/constEnums'
 import AtlassianClientManager, {ERROR_POPUP_CLOSED} from '../../../../utils/AtlassianClientManager'
-import {AtlassianProviderRow_viewer$key} from '../../../../__generated__/AtlassianProviderRow_viewer.graphql'
 import ProviderRow from './ProviderRow'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx
index 69de67e2b2c..c8675c83689 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/AzureDevOpsProviderRow.tsx
@@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {AzureDevOpsProviderRow_viewer$key} from '../../../../__generated__/AzureDevOpsProviderRow_viewer.graphql'
 import AzureDevOpsConfigMenu from '../../../../components/AzureDevOpsConfigMenu'
 import AzureDevOpsProviderLogo from '../../../../components/AzureDevOpsProviderLogo'
 import {MenuPosition} from '../../../../hooks/useCoords'
@@ -9,7 +10,6 @@ import useMenu from '../../../../hooks/useMenu'
 import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps'
 import {Providers} from '../../../../types/constEnums'
 import AzureDevOpsClientManager from '../../../../utils/AzureDevOpsClientManager'
-import {AzureDevOpsProviderRow_viewer$key} from '../../../../__generated__/AzureDevOpsProviderRow_viewer.graphql'
 import ProviderRow from './ProviderRow'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx
index c29ac58985a..208ede99d93 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/GcalProviderRow.tsx
@@ -1,16 +1,16 @@
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
+import {useFragment} from 'react-relay'
+import {GcalProviderRow_viewer$key} from '../../../../__generated__/GcalProviderRow_viewer.graphql'
+import GcalConfigMenu from '../../../../components/GcalConfigMenu'
 import GcalProviderLogo from '../../../../components/GcalProviderLogo'
+import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import {Providers} from '../../../../types/constEnums'
-import ProviderRow from './ProviderRow'
-import GcalConfigMenu from '../../../../components/GcalConfigMenu'
-import {useFragment} from 'react-relay'
-import useAtmosphere from '../../../../hooks/useAtmosphere'
-import {GcalProviderRow_viewer$key} from '../../../../__generated__/GcalProviderRow_viewer.graphql'
 import GcalClientManager from '../../../../utils/GcalClientManager'
+import ProviderRow from './ProviderRow'
 
 type Props = {
   teamId: string
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx
index fbb70f01cc2..9fcb4f755b9 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/GitHubProviderRow.tsx
@@ -1,6 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {GitHubProviderRow_viewer$key} from '../../../../__generated__/GitHubProviderRow_viewer.graphql'
 import GitHubConfigMenu from '../../../../components/GitHubConfigMenu'
 import GitHubProviderLogo from '../../../../components/GitHubProviderLogo'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
@@ -9,7 +10,6 @@ import useMenu from '../../../../hooks/useMenu'
 import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps'
 import {Providers} from '../../../../types/constEnums'
 import GitHubClientManager from '../../../../utils/GitHubClientManager'
-import {GitHubProviderRow_viewer$key} from '../../../../__generated__/GitHubProviderRow_viewer.graphql'
 import ProviderRow from './ProviderRow'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx
index 7750f4b48c7..187e453ac1e 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/GitLabProviderRow.tsx
@@ -1,13 +1,13 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {GitLabProviderRow_viewer$key} from '../../../../__generated__/GitLabProviderRow_viewer.graphql'
 import GitLabProviderLogo from '../../../../components/GitLabProviderLogo'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import GitLabClientManager from '../../../../utils/GitLabClientManager'
-import {GitLabProviderRow_viewer$key} from '../../../../__generated__/GitLabProviderRow_viewer.graphql'
 import GitLabConfigMenu from './GitLabConfigMenu'
 import ProviderRow from './ProviderRow'
 
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx
index 4c231bbae2c..c7ec67958d9 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/JiraServerProviderRow.tsx
@@ -8,9 +8,9 @@ import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
 import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps'
-import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 import {ExternalLinks, Providers} from '../../../../types/constEnums'
 import JiraServerClientManager from '../../../../utils/JiraServerClientManager'
+import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 import ProviderRowContactUs from './ProviderRowContactUs'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx
index 9f42ae9afee..4b4ea36591d 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MSTeamsPanel.tsx
@@ -2,11 +2,12 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {FormEvent} from 'react'
 import {useFragment} from 'react-relay'
+import {MSTeamsPanel_viewer$key} from '~/__generated__/MSTeamsPanel_viewer.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useForm from '~/hooks/useForm'
 import useTooltip from '~/hooks/useTooltip'
 import linkify from '~/utils/linkify'
-import {MSTeamsPanel_viewer$key} from '~/__generated__/MSTeamsPanel_viewer.graphql'
+import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql'
 import FlatButton from '../../../../components/FlatButton'
 import BasicInput from '../../../../components/InputField/BasicInput'
 import LabelHeading from '../../../../components/LabelHeading/LabelHeading'
@@ -19,7 +20,6 @@ import UpdateIntegrationProviderMutation from '../../../../mutations/UpdateInteg
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Layout} from '../../../../types/constEnums'
 import Legitity from '../../../../validation/Legitity'
-import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql'
 
 interface Props {
   viewerRef: MSTeamsPanel_viewer$key
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx
index d8f0a8147c6..fb67dfbb884 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/MattermostPanel.tsx
@@ -3,11 +3,12 @@ import {Info as InfoIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {FormEvent} from 'react'
 import {useFragment} from 'react-relay'
+import {MattermostPanel_viewer$key} from '~/__generated__/MattermostPanel_viewer.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useForm from '~/hooks/useForm'
 import useTooltip from '~/hooks/useTooltip'
 import linkify from '~/utils/linkify'
-import {MattermostPanel_viewer$key} from '~/__generated__/MattermostPanel_viewer.graphql'
+import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql'
 import FlatButton from '../../../../components/FlatButton'
 import BasicInput from '../../../../components/InputField/BasicInput'
 import LabelHeading from '../../../../components/LabelHeading/LabelHeading'
@@ -20,7 +21,6 @@ import UpdateIntegrationProviderMutation from '../../../../mutations/UpdateInteg
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Layout} from '../../../../types/constEnums'
 import Legitity from '../../../../validation/Legitity'
-import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../../../../__generated__/AddIntegrationProviderMutation.graphql'
 
 interface Props {
   viewerRef: MattermostPanel_viewer$key
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
index 793b7dee707..9b25abbe96b 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackChannelPicker.tsx
@@ -8,8 +8,8 @@ import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
 import useMutationProps from '../../../../hooks/useMutationProps'
-import lazyPreload from '../../../../utils/lazyPreload'
 import SlackClientManager from '../../../../utils/SlackClientManager'
+import lazyPreload from '../../../../utils/lazyPreload'
 
 interface Props {
   isTokenValid: boolean
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx
index 399d34aa072..f6029e9502b 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationList.tsx
@@ -3,6 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import SetDefaultSlackChannelMutation from '~/mutations/SetDefaultSlackChannelMutation'
+import {
+  SlackNotificationEventEnum,
+  SlackNotificationList_viewer$key
+} from '../../../../__generated__/SlackNotificationList_viewer.graphql'
 import LabelHeading from '../../../../components/LabelHeading/LabelHeading'
 import {SlackChannelDropdownOnClick} from '../../../../components/SlackChannelDropdown'
 import StyledError from '../../../../components/StyledError'
@@ -13,10 +17,6 @@ import useSlackChannels from '../../../../hooks/useSlackChannels'
 import SetSlackNotificationMutation from '../../../../mutations/SetSlackNotificationMutation'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Layout} from '../../../../types/constEnums'
-import {
-  SlackNotificationEventEnum,
-  SlackNotificationList_viewer$key
-} from '../../../../__generated__/SlackNotificationList_viewer.graphql'
 import SlackChannelPicker from './SlackChannelPicker'
 import SlackNotificationRow from './SlackNotificationRow'
 
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx
index 52e5393c417..8c832e697bd 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackNotificationRow.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {
+  SlackNotificationEventEnum,
+  SlackNotificationRow_viewer$key
+} from '../../../../__generated__/SlackNotificationRow_viewer.graphql'
 import StyledError from '../../../../components/StyledError'
 import Toggle from '../../../../components/Toggle/Toggle'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import SetSlackNotificationMutation from '../../../../mutations/SetSlackNotificationMutation'
 import {MeetingLabels} from '../../../../types/constEnums'
-import {
-  SlackNotificationEventEnum,
-  SlackNotificationRow_viewer$key
-} from '../../../../__generated__/SlackNotificationRow_viewer.graphql'
 
 interface Props {
   event: SlackNotificationEventEnum
diff --git a/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx b/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx
index 5f8ae1def86..f11a91bb864 100644
--- a/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx
+++ b/packages/client/modules/teamDashboard/components/ProviderRow/SlackProviderRow.tsx
@@ -1,6 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {SlackProviderRow_viewer$key} from '../../../../__generated__/SlackProviderRow_viewer.graphql'
 import SlackConfigMenu from '../../../../components/SlackConfigMenu'
 import SlackProviderLogo from '../../../../components/SlackProviderLogo'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
@@ -9,7 +10,6 @@ import useMenu from '../../../../hooks/useMenu'
 import useMutationProps, {MenuMutationProps} from '../../../../hooks/useMutationProps'
 import {Providers} from '../../../../types/constEnums'
 import SlackClientManager from '../../../../utils/SlackClientManager'
-import {SlackProviderRow_viewer$key} from '../../../../__generated__/SlackProviderRow_viewer.graphql'
 import ProviderRow from './ProviderRow'
 import SlackNotificationList from './SlackNotificationList'
 
diff --git a/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx b/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx
index cd339f21f81..fb7a5c6a8bb 100644
--- a/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx
+++ b/packages/client/modules/teamDashboard/components/RemoveTeamMemberModal/RemoveTeamMemberModal.tsx
@@ -3,13 +3,13 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import useAtmosphere from '~/hooks/useAtmosphere'
+import {RemoveTeamMemberModal_teamMember$key} from '../../../../__generated__/RemoveTeamMemberModal_teamMember.graphql'
 import DialogContainer from '../../../../components/DialogContainer'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
 import IconLabel from '../../../../components/IconLabel'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import RemoveTeamMemberMutation from '../../../../mutations/RemoveTeamMemberMutation'
-import {RemoveTeamMemberModal_teamMember$key} from '../../../../__generated__/RemoveTeamMemberModal_teamMember.graphql'
 
 const StyledDialogContainer = styled(DialogContainer)({
   width: 320
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx
index cc5880c7322..ebaf8d161ea 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/ArchiveAllDoneTasksModal.tsx
@@ -1,10 +1,10 @@
+import {Close} from '@mui/icons-material'
 import React from 'react'
+import DialogTitle from '../../../../components/DialogTitle'
+import FlatButton from '../../../../components/FlatButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import BatchArchiveTasksMutation from '../../../../mutations/BatchArchiveTasksMutation'
-import {Close} from '@mui/icons-material'
-import FlatButton from '../../../../components/FlatButton'
-import DialogTitle from '../../../../components/DialogTitle'
 
 type Props = {
   taskIds: string[]
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx
index e52ec7dddb3..5ab592b4081 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumn.tsx
@@ -5,15 +5,15 @@ import {Droppable, DroppableProvided, DroppableStateSnapshot} from 'react-beauti
 import {useFragment} from 'react-relay'
 import {TaskColumn_teams$key} from '~/__generated__/TaskColumn_teams.graphql'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import {TaskColumn_tasks$key} from '../../../../__generated__/TaskColumn_tasks.graphql'
+import useModal from '../../../../hooks/useModal'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {BezierCurve, DroppableType} from '../../../../types/constEnums'
 import {DONE, TEAM_DASH, USER_DASH} from '../../../../utils/constants'
 import {taskStatusLabels} from '../../../../utils/taskStatus'
-import {TaskColumn_tasks$key} from '../../../../__generated__/TaskColumn_tasks.graphql'
+import ArchiveAllDoneTasksModal from './ArchiveAllDoneTasksModal'
 import TaskColumnAddTask from './TaskColumnAddTask'
 import TaskColumnInner from './TaskColumnInner'
-import useModal from '../../../../hooks/useModal'
-import ArchiveAllDoneTasksModal from './ArchiveAllDoneTasksModal'
 
 const Column = styled('div')<{isDragging: boolean}>(({isDragging}) => ({
   background: isDragging ? PALETTE.SLATE_300 : undefined,
diff --git a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx
index 58b3f8768c8..d58e99dc84c 100644
--- a/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx
+++ b/packages/client/modules/teamDashboard/components/TaskColumn/TaskColumnAddTask.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {TaskColumnAddTask_teams$key} from '~/__generated__/TaskColumnAddTask_teams.graphql'
 import {AreaEnum, TaskStatusEnum} from '~/__generated__/UpdateTaskMutation.graphql'
+import {TaskColumnAddTask_tasks$key} from '../../../../__generated__/TaskColumnAddTask_tasks.graphql'
 import AddTaskButton from '../../../../components/AddTaskButton/AddTaskButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import CreateTaskMutation from '../../../../mutations/CreateTaskMutation'
@@ -10,7 +11,6 @@ import dndNoise from '../../../../utils/dndNoise'
 import getNextSortOrder from '../../../../utils/getNextSortOrder'
 import fromTeamMemberId from '../../../../utils/relay/fromTeamMemberId'
 import {taskStatusLabels} from '../../../../utils/taskStatus'
-import {TaskColumnAddTask_tasks$key} from '../../../../__generated__/TaskColumnAddTask_tasks.graphql'
 import TaskColumnAddTaskSelectTeam from './TaskColumnAddTaskSelectTeam'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/Team/Team.tsx b/packages/client/modules/teamDashboard/components/Team/Team.tsx
index b552e9dcaab..0051f53821a 100644
--- a/packages/client/modules/teamDashboard/components/Team/Team.tsx
+++ b/packages/client/modules/teamDashboard/components/Team/Team.tsx
@@ -4,11 +4,11 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {lazy, ReactNode, Suspense} from 'react'
 import {useFragment} from 'react-relay'
 import {Layout} from '~/types/constEnums'
+import {Team_team$key} from '../../../../__generated__/Team_team.graphql'
 import DashContent from '../../../../components/Dashboard/DashContent'
 import FlatButton from '../../../../components/FlatButton'
 import useRouter from '../../../../hooks/useRouter'
 import {PALETTE} from '../../../../styles/paletteV3'
-import {Team_team$key} from '../../../../__generated__/Team_team.graphql'
 import EditableTeamName from '../EditTeamName/EditableTeamName'
 // import DebugButton from '../../../userDashboard/components/UserDashMain/DebugButton'
 
diff --git a/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx b/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx
index dd5c27b76fe..3f3f190f8af 100644
--- a/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamArchive/TeamArchive.tsx
@@ -11,16 +11,16 @@ import {
   InfiniteLoaderProps
 } from 'react-virtualized'
 import {GridCellRenderer, GridCoreProps} from 'react-virtualized/dist/es/Grid'
+import {TeamArchive_team$key} from '~/__generated__/TeamArchive_team.graphql'
 import extractTextFromDraftString from '~/utils/draftjs/extractTextFromDraftString'
 import getSafeRegex from '~/utils/getSafeRegex'
 import toTeamMemberId from '~/utils/relay/toTeamMemberId'
-import {TeamArchive_team$key} from '~/__generated__/TeamArchive_team.graphql'
-import NullableTask from '../../../../components/NullableTask/NullableTask'
-import {PALETTE} from '../../../../styles/paletteV3'
-import {Card, Layout, MathEnum} from '../../../../types/constEnums'
 import {TeamArchiveArchivedTasksQuery} from '../../../../__generated__/TeamArchiveArchivedTasksQuery.graphql'
 import {TeamArchiveQuery} from '../../../../__generated__/TeamArchiveQuery.graphql'
 import {TeamArchive_query$key} from '../../../../__generated__/TeamArchive_query.graphql'
+import NullableTask from '../../../../components/NullableTask/NullableTask'
+import {PALETTE} from '../../../../styles/paletteV3'
+import {Card, Layout, MathEnum} from '../../../../types/constEnums'
 import UserTasksHeader from '../../../userDashboard/components/UserTasksHeader/UserTasksHeader'
 import getRallyLink from '../../../userDashboard/helpers/getRallyLink'
 import TeamArchiveHeader from '../TeamArchiveHeader/TeamArchiveHeader'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx
index 7f5963a3a04..1698bc099a5 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashActivityTab/TeamDashActivityTab.tsx
@@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamDashActivityTab_team$key} from '~/__generated__/TeamDashActivityTab_team.graphql'
-import useTransition from '../../../../hooks/useTransition'
-import MeetingCard from '../../../../components/MeetingCard'
 import DemoMeetingCard from '../../../../components/DemoMeetingCard'
+import MeetingCard from '../../../../components/MeetingCard'
 import TutorialMeetingCard from '../../../../components/TutorialMeetingCard'
+import useTransition from '../../../../hooks/useTransition'
 import TeamDashInsights from '../TeamDashInsights/TeamDashInsights'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx b/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx
index 86274843a65..d4b427dcffd 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashHeader/TeamDashHeader.tsx
@@ -8,6 +8,7 @@ import {NavLink} from 'react-router-dom'
 import DashboardAvatars from '~/components/DashboardAvatars/DashboardAvatars'
 import AgendaToggle from '~/modules/teamDashboard/components/AgendaToggle/AgendaToggle'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
+import {TeamDashHeader_team$key} from '../../../../__generated__/TeamDashHeader_team.graphql'
 import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader'
 import InviteTeamMemberAvatar from '../../../../components/InviteTeamMemberAvatar'
 import Tab from '../../../../components/Tab/Tab'
@@ -15,7 +16,6 @@ import Tabs from '../../../../components/Tabs/Tabs'
 import useRouter from '../../../../hooks/useRouter'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Breakpoint} from '../../../../types/constEnums'
-import {TeamDashHeader_team$key} from '../../../../__generated__/TeamDashHeader_team.graphql'
 
 const desktopBreakpoint = makeMinWidthMediaQuery(Breakpoint.SIDEBAR_LEFT)
 
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx
index 219fbe54e83..b44166bfa8d 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamDashInsights.tsx
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamDashInsights_insights$key} from '~/__generated__/TeamDashInsights_insights.graphql'
-import MostUsedEmojisCard from './MostUsedEmojisCard'
 import MeetingEngagementCard from './MeetingEngagementCard'
+import MostUsedEmojisCard from './MostUsedEmojisCard'
 import TopRetroTemplatesCard from './TopRetroTemplatesCard'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx
index 6e9922db025..7dbec07dc73 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TeamInsightsCard.tsx
@@ -1,15 +1,14 @@
+import {Info as InfoIcon, ThumbDown, ThumbUp} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
+import clsx from 'clsx'
 import React, {ReactNode, useState} from 'react'
 import {useFragment} from 'react-relay'
-import SimpleTooltip from '../../../../components/SimpleTooltip'
-import {Info as InfoIcon} from '@mui/icons-material'
-import {ThumbUp, ThumbDown} from '@mui/icons-material'
+import {TeamInsightsCard_insights$key} from '../../../../__generated__/TeamInsightsCard_insights.graphql'
 import FlatButton from '../../../../components/FlatButton'
-import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
+import SimpleTooltip from '../../../../components/SimpleTooltip'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
-import {TeamInsightsCard_insights$key} from '../../../../__generated__/TeamInsightsCard_insights.graphql'
 import TeamInsightsId from '../../../../shared/gqlIds/TeamInsightsId'
-import clsx from 'clsx'
+import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 
 interface Props {
   title: string
diff --git a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
index 68aff4dab59..76ebc65219e 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashInsights/TopRetroTemplatesCard.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {useHistory} from 'react-router'
 import {TopRetroTemplatesCard_insights$key} from '~/__generated__/TopRetroTemplatesCard_insights.graphql'
 import SimpleTooltip from '../../../../components/SimpleTooltip'
-import TeamInsightsCard from './TeamInsightsCard'
 import plural from '../../../../utils/plural'
-import {useHistory} from 'react-router'
+import TeamInsightsCard from './TeamInsightsCard'
 
 interface Props {
   teamInsightsRef: TopRetroTemplatesCard_insights$key
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
index 9d1cb8125de..49165b16447 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDashMain.tsx
@@ -2,16 +2,16 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {Route, Switch} from 'react-router-dom'
 import {TeamDashMainQuery} from '~/__generated__/TeamDashMainQuery.graphql'
 import StartMeetingFAB from '../../../../components/StartMeetingFAB'
 import useDocumentTitle from '../../../../hooks/useDocumentTitle'
+import getTeamIdFromPathname from '../../../../utils/getTeamIdFromPathname'
 import TeamTasksHeaderContainer from '../../containers/TeamTasksHeader/TeamTasksHeaderContainer'
-import TeamDrawer from './TeamDrawer'
-import TeamDashTasksTab from '../TeamDashTasksTab/TeamDashTasksTab'
 import TeamDashActivityTab from '../TeamDashActivityTab/TeamDashActivityTab'
 import TeamDashIntegrationsTab from '../TeamDashIntegrationsTab/TeamDashIntegrationsTab'
-import {Route, Switch} from 'react-router-dom'
-import getTeamIdFromPathname from '../../../../utils/getTeamIdFromPathname'
+import TeamDashTasksTab from '../TeamDashTasksTab/TeamDashTasksTab'
+import TeamDrawer from './TeamDrawer'
 
 const AbsoluteFab = styled(StartMeetingFAB)({
   position: 'absolute'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx
index 185b8a86c8d..629d63eb193 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMain/TeamDrawer.tsx
@@ -2,9 +2,9 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
 import {useFragment} from 'react-relay'
-import LabelHeading from '~/components/LabelHeading/LabelHeading'
 import {TeamDrawer_viewer$key} from '~/__generated__/TeamDrawer_viewer.graphql'
 import {TeamDrawer as TeamDrawerType} from '~/__generated__/ToggleTeamDrawerMutation.graphql'
+import LabelHeading from '~/components/LabelHeading/LabelHeading'
 import MassInvitationTokenLinkRoot from '../../../../components/MassInvitationTokenLinkRoot'
 import ResponsiveDashSidebar from '../../../../components/ResponsiveDashSidebar'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
diff --git a/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx b/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx
index bdf90931725..e689777851d 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashMainRoot.tsx
@@ -1,12 +1,12 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import useRouter from '../../../hooks/useRouter'
+import setPreferredTeamId from '~/utils/relay/setPreferredTeamId'
 import teamDashMainQuery, {
   TeamDashMainQuery
 } from '../../../__generated__/TeamDashMainQuery.graphql'
-import TeamDashMain from './TeamDashMain/TeamDashMain'
-import setPreferredTeamId from '~/utils/relay/setPreferredTeamId'
 import useAtmosphere from '../../../hooks/useAtmosphere'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import useRouter from '../../../hooks/useRouter'
+import TeamDashMain from './TeamDashMain/TeamDashMain'
 
 const TeamDashMainRoot = () => {
   const {match} = useRouter<{teamId: string}>()
diff --git a/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx b/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx
index beecd407edd..0b10307db31 100644
--- a/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamDashTasksTab/TeamDashTasksTab.tsx
@@ -2,14 +2,14 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {TeamDashTasksTab_viewer$key} from '~/__generated__/TeamDashTasksTab_viewer.graphql'
-import TeamColumnsContainer from '../../containers/TeamColumns/TeamColumnsContainer'
 import DashFilterToggle from '~/components/DashFilterToggle/DashFilterToggle'
 import DashNavControl from '../../../../components/DashNavControl/DashNavControl'
-import useRouter from '../../../../hooks/useRouter'
-import useMenu from '../../../../hooks/useMenu'
+import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader'
 import {MenuPosition} from '../../../../hooks/useCoords'
+import useMenu from '../../../../hooks/useMenu'
+import useRouter from '../../../../hooks/useRouter'
 import lazyPreload from '../../../../utils/lazyPreload'
-import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader'
+import TeamColumnsContainer from '../../containers/TeamColumns/TeamColumnsContainer'
 
 const TeamDashTeamMemberMenu = lazyPreload(
   () =>
diff --git a/packages/client/modules/teamDashboard/components/TeamRoot.tsx b/packages/client/modules/teamDashboard/components/TeamRoot.tsx
index 91f30abec73..4a76301379b 100644
--- a/packages/client/modules/teamDashboard/components/TeamRoot.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamRoot.tsx
@@ -1,9 +1,9 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import useRouter from '../../../hooks/useRouter'
 import teamContainerQuery, {
   TeamContainerQuery
 } from '../../../__generated__/TeamContainerQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import useRouter from '../../../hooks/useRouter'
 import TeamContainer from '../containers/Team/TeamContainer'
 
 const TeamRoot = () => {
diff --git a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
index 62ffb8f934f..e59561f09fc 100644
--- a/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamSettings/TeamSettings.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {TeamSettingsQuery} from '../../../../__generated__/TeamSettingsQuery.graphql'
 import Panel from '../../../../components/Panel/Panel'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import Row from '../../../../components/Row/Row'
@@ -9,7 +10,6 @@ import useDocumentTitle from '../../../../hooks/useDocumentTitle'
 import useRouter from '../../../../hooks/useRouter'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {Layout, TierLabel} from '../../../../types/constEnums'
-import {TeamSettingsQuery} from '../../../../__generated__/TeamSettingsQuery.graphql'
 import ArchiveTeam from '../ArchiveTeam/ArchiveTeam'
 
 const TeamSettingsLayout = styled('div')({
diff --git a/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx b/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx
index 99442780b81..4e5150bd2b2 100644
--- a/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx
+++ b/packages/client/modules/teamDashboard/components/TeamSettingsRoot.tsx
@@ -1,10 +1,10 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import {LoaderSize} from '../../../types/constEnums'
-import {Loader} from '../../../utils/relay/renderLoader'
 import teamSettingsQuery, {
   TeamSettingsQuery
 } from '../../../__generated__/TeamSettingsQuery.graphql'
+import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
+import {LoaderSize} from '../../../types/constEnums'
+import {Loader} from '../../../utils/relay/renderLoader'
 import TeamSettings from './TeamSettings/TeamSettings'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx b/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx
index 0017042dde4..bff4ca38f97 100644
--- a/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx
+++ b/packages/client/modules/teamDashboard/components/UnpaidTeamModal/UnpaidTeamModal.tsx
@@ -1,7 +1,9 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
+import {UpgradeCTALocationEnumType} from 'parabol-server/graphql/types/UpgradeCTALocationEnum'
 import React, {useEffect} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {UnpaidTeamModalQuery} from '../../../../__generated__/UnpaidTeamModalQuery.graphql'
 import DashModal from '../../../../components/Dashboard/DashModal'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
@@ -9,11 +11,9 @@ import IconLabel from '../../../../components/IconLabel'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useRouter from '../../../../hooks/useRouter'
-import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {ExternalLinks, Threshold} from '../../../../types/constEnums'
-import {UpgradeCTALocationEnumType} from 'parabol-server/graphql/types/UpgradeCTALocationEnum'
-import {UnpaidTeamModalQuery} from '../../../../__generated__/UnpaidTeamModalQuery.graphql'
+import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 
 const StyledButton = styled(PrimaryButton)({
   margin: '1.5rem auto 0'
diff --git a/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx b/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx
index 49bc74e5923..de50dd49dcf 100644
--- a/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx
+++ b/packages/client/modules/teamDashboard/containers/Team/TeamContainer.tsx
@@ -4,8 +4,8 @@ import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Route} from 'react-router'
 import {matchPath, Switch} from 'react-router-dom'
 import ErrorBoundary from '~/components/ErrorBoundary'
-import useRouter from '../../../../hooks/useRouter'
 import {TeamContainerQuery} from '../../../../__generated__/TeamContainerQuery.graphql'
+import useRouter from '../../../../hooks/useRouter'
 import Team from '../../components/Team/Team'
 
 const TeamDashMain = lazy(
diff --git a/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx b/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx
index 05543bb0b0b..72ff4bc1337 100644
--- a/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx
+++ b/packages/client/modules/teamDashboard/containers/TeamColumns/TeamColumnsContainer.tsx
@@ -2,10 +2,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import getSafeRegex from '~/utils/getSafeRegex'
+import {TeamColumnsContainer_viewer$key} from '../../../../__generated__/TeamColumnsContainer_viewer.graphql'
 import TaskColumns from '../../../../components/TaskColumns/TaskColumns'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import toTeamMemberId from '../../../../utils/relay/toTeamMemberId'
-import {TeamColumnsContainer_viewer$key} from '../../../../__generated__/TeamColumnsContainer_viewer.graphql'
 
 interface Props {
   viewer: TeamColumnsContainer_viewer$key
diff --git a/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx b/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx
index 89739d6e260..27f62051f16 100644
--- a/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx
+++ b/packages/client/modules/teamDashboard/containers/TeamIntegrationsRoot/TeamIntegrationsRoot.tsx
@@ -1,8 +1,8 @@
 import React, {Suspense} from 'react'
-import {useQueryLoaderNowWithRetry} from '../../../../hooks/useQueryLoaderNow'
 import providerListQuery, {
   ProviderListQuery
 } from '../../../../__generated__/ProviderListQuery.graphql'
+import {useQueryLoaderNowWithRetry} from '../../../../hooks/useQueryLoaderNow'
 import ProviderList from '../../components/ProviderList/ProviderList'
 
 interface Props {
diff --git a/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx b/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx
index c20d68e87e9..bf71e5944e9 100644
--- a/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx
+++ b/packages/client/modules/teamDashboard/containers/TeamTasksHeader/TeamTasksHeaderContainer.tsx
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect} from 'react'
 import {useFragment} from 'react-relay'
-import filterTeamMember from '~/utils/relay/filterTeamMember'
 import {TeamTasksHeaderContainer_team$key} from '~/__generated__/TeamTasksHeaderContainer_team.graphql'
+import filterTeamMember from '~/utils/relay/filterTeamMember'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import TeamTasksHeader from '../../components/TeamDashHeader/TeamDashHeader'
 
diff --git a/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx b/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx
index c0604bb530f..c7abd8412ad 100644
--- a/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx
+++ b/packages/client/modules/teamDashboard/containers/UnpaidTeamModal/UnpaidTeamModalRoot.tsx
@@ -1,9 +1,9 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
-import {Loader} from '../../../../utils/relay/renderLoader'
 import unpaidTeamModalQuery, {
   UnpaidTeamModalQuery
 } from '../../../../__generated__/UnpaidTeamModalQuery.graphql'
+import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
+import {Loader} from '../../../../utils/relay/renderLoader'
 import UnpaidTeamModal from '../../components/UnpaidTeamModal/UnpaidTeamModal'
 
 interface Props {
diff --git a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx
index d9670495c89..05f9f708770 100644
--- a/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx
+++ b/packages/client/modules/userDashboard/components/CreditCardModal/CreditCardForm.tsx
@@ -5,10 +5,10 @@ import PrimaryButton from '../../../../components/PrimaryButton'
 import UpgradeCreditCardFormField from '../../../../components/UpgradeCreditCardFormField'
 import UpgradeCreditCardNumberFormField from '../../../../components/UpgradeCreditCardNumberFormField'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
+import useClientSideTrack from '../../../../hooks/useClientSideTrack'
 import useForm from '../../../../hooks/useForm'
 import useMutationProps from '../../../../hooks/useMutationProps'
 import useScript from '../../../../hooks/useScript'
-import useClientSideTrack from '../../../../hooks/useClientSideTrack'
 import OldUpdateCreditCardMutation from '../../../../mutations/OldUpdateCreditCardMutation'
 import OldUpgradeToTeamTierMutation from '../../../../mutations/OldUpgradeToTeamTierMutation'
 import {CompletedHandler} from '../../../../types/relayMutations'
diff --git a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
index a080b21e446..4348f8099bb 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
@@ -1,8 +1,8 @@
-import React from 'react'
-import {Dayjs} from 'dayjs'
-import {LocalizationProvider} from '@mui/x-date-pickers/LocalizationProvider'
-import {AdapterDayjs} from '@mui/x-date-pickers/AdapterDayjs'
 import {DatePicker, TimePicker} from '@mui/x-date-pickers'
+import {AdapterDayjs} from '@mui/x-date-pickers/AdapterDayjs'
+import {LocalizationProvider} from '@mui/x-date-pickers/LocalizationProvider'
+import {Dayjs} from 'dayjs'
+import React from 'react'
 import {PALETTE} from '../../../../styles/paletteV3'
 
 const customStyles = {
diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
index 40c3c047ffc..21b77a164ab 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
@@ -1,27 +1,27 @@
 import styled from '@emotion/styled'
+import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import dayjs from 'dayjs'
 import React, {useEffect, useState} from 'react'
+import {useFragment} from 'react-relay'
+import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
+import {CreateGcalEventInput} from '../../../../__generated__/StartRetrospectiveMutation.graphql'
+import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
+import Checkbox from '../../../../components/Checkbox'
+import DialogContainer from '../../../../components/DialogContainer'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
-import {DialogActions} from '../../../../ui/Dialog/DialogActions'
+import BasicTextArea from '../../../../components/InputField/BasicTextArea'
+import PlainButton from '../../../../components/PlainButton/PlainButton'
 import PrimaryButton from '../../../../components/PrimaryButton'
-import {PALETTE} from '../../../../styles/paletteV3'
-import DateTimePickers from './DateTimePickers'
-import Checkbox from '../../../../components/Checkbox'
+import StyledError from '../../../../components/StyledError'
 import useForm from '../../../../hooks/useForm'
-import Legitity from '../../../../validation/Legitity'
-import {CreateGcalEventInput} from '../../../../__generated__/StartRetrospectiveMutation.graphql'
-import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
-import BasicTextArea from '../../../../components/InputField/BasicTextArea'
+import {PALETTE} from '../../../../styles/paletteV3'
+import {DialogActions} from '../../../../ui/Dialog/DialogActions'
 import parseEmailAddressList from '../../../../utils/parseEmailAddressList'
-import {useFragment} from 'react-relay'
-import StyledError from '../../../../components/StyledError'
-import DialogContainer from '../../../../components/DialogContainer'
-import {Close} from '@mui/icons-material'
-import PlainButton from '../../../../components/PlainButton/PlainButton'
+import Legitity from '../../../../validation/Legitity'
+import DateTimePickers from './DateTimePickers'
 import VideoConferencing from './VideoConferencing'
-import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
 
 const Wrapper = styled('div')({
   display: 'flex',
diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
index de4c3c70be1..ce464d188e3 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
@@ -2,15 +2,15 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import dayjs from 'dayjs'
 import React, {useEffect, useState} from 'react'
-import DateTimePickers from './DateTimePickers'
-import Checkbox from '../../../../components/Checkbox'
+import {useFragment} from 'react-relay'
 import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
+import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
+import Checkbox from '../../../../components/Checkbox'
 import BasicTextArea from '../../../../components/InputField/BasicTextArea'
-import parseEmailAddressList from '../../../../utils/parseEmailAddressList'
-import {useFragment} from 'react-relay'
 import StyledError from '../../../../components/StyledError'
+import parseEmailAddressList from '../../../../utils/parseEmailAddressList'
+import DateTimePickers from './DateTimePickers'
 import VideoConferencing from './VideoConferencing'
-import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
 
 const ErrorMessage = styled(StyledError)({
   textAlign: 'left',
diff --git a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx
index 2c86796ee9f..f941de9d740 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencing.tsx
@@ -1,14 +1,14 @@
-import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown'
 import {Close} from '@mui/icons-material'
+import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown'
 import React from 'react'
+import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
+import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo'
+import RaisedButton from '../../../../components/RaisedButton'
+import ZoomProviderLogo from '../../../../components/ZoomProviderLogo'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
-import VideoConferencingMenu from './VideoConferencingMenu'
-import RaisedButton from '../../../../components/RaisedButton'
 import {Elevation} from '../../../../styles/elevation'
-import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo'
-import ZoomProviderLogo from '../../../../components/ZoomProviderLogo'
-import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
+import VideoConferencingMenu from './VideoConferencingMenu'
 
 type Props = {
   videoType: GcalVideoTypeEnum | null
diff --git a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx
index 403ecc966c2..8f6f67e68bb 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/VideoConferencingMenu.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
+import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
+import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
-import {MenuProps} from '../../../../hooks/useMenu'
-import GoogleMeetProviderLogo from '../../../../components/GoogleMeetProviderLogo'
 import ZoomProviderLogo from '../../../../components/ZoomProviderLogo'
-import {GcalVideoTypeEnum} from '../../../../__generated__/StartTeamPromptMutation.graphql'
+import {MenuProps} from '../../../../hooks/useMenu'
 
 type Props = {
   menuProps: MenuProps
diff --git a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx
index b357811a1e1..3a71858359a 100644
--- a/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx
+++ b/packages/client/modules/userDashboard/components/OrgAuthentication/OrgAuthentication.tsx
@@ -1,11 +1,11 @@
-import graphql from 'babel-plugin-relay/macro'
 import styled from '@emotion/styled'
-import {ElementWidth} from '../../../../types/constEnums'
+import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {OrgAuthenticationQuery} from '../../../../__generated__/OrgAuthenticationQuery.graphql'
 import DialogTitle from '../../../../components/DialogTitle'
 import Panel from '../../../../components/Panel/Panel'
+import {ElementWidth} from '../../../../types/constEnums'
 import OrgAuthenticationMetadata from './OrgAuthenticationMetadata'
 import OrgAuthenticationSSOFrame from './OrgAuthenticationSSOFrame'
 import OrgAuthenticationSignOnUrl from './OrgAuthenticationSignOnUrl'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx
index c7e12b65530..a70094f3c44 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingForm.tsx
@@ -1,22 +1,22 @@
-import React, {useState} from 'react'
 import styled from '@emotion/styled'
 import {
-  CardNumberElement,
-  CardExpiryElement,
   CardCvcElement,
-  useStripe,
-  useElements
+  CardExpiryElement,
+  CardNumberElement,
+  useElements,
+  useStripe
 } from '@stripe/react-stripe-js'
+import {StripeElementChangeEvent} from '@stripe/stripe-js'
+import React, {useState} from 'react'
+import {CreateStripeSubscriptionMutation$data} from '../../../../__generated__/CreateStripeSubscriptionMutation.graphql'
+import Ellipsis from '../../../../components/Ellipsis/Ellipsis'
 import PrimaryButton from '../../../../components/PrimaryButton'
-import {PALETTE} from '../../../../styles/paletteV3'
+import StyledError from '../../../../components/StyledError'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useMutationProps from '../../../../hooks/useMutationProps'
-import StyledError from '../../../../components/StyledError'
-import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
-import {StripeElementChangeEvent} from '@stripe/stripe-js'
 import CreateStripeSubscriptionMutation from '../../../../mutations/CreateStripeSubscriptionMutation'
-import {CreateStripeSubscriptionMutation$data} from '../../../../__generated__/CreateStripeSubscriptionMutation.graphql'
-import Ellipsis from '../../../../components/Ellipsis/Ellipsis'
+import {PALETTE} from '../../../../styles/paletteV3'
+import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 
 const ButtonBlock = styled('div')({
   display: 'flex',
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx
index 193c1e74ed2..935b199cf86 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/BillingLeaders.tsx
@@ -1,19 +1,19 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
-import BillingLeader from './BillingLeader'
+import {useFragment} from 'react-relay'
+import {BillingLeaders_organization$key} from '../../../../__generated__/BillingLeaders_organization.graphql'
+import FlatButton from '../../../../components/FlatButton'
+import IconLabel from '../../../../components/IconLabel'
 import Panel from '../../../../components/Panel/Panel'
 import Row from '../../../../components/Row/Row'
+import RowInfo from '../../../../components/Row/RowInfo'
+import RowInfoHeader from '../../../../components/Row/RowInfoHeader'
+import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {ElementWidth} from '../../../../types/constEnums'
-import RowInfoHeading from '../../../../components/Row/RowInfoHeading'
-import RowInfoHeader from '../../../../components/Row/RowInfoHeader'
-import FlatButton from '../../../../components/FlatButton'
-import RowInfo from '../../../../components/Row/RowInfo'
-import {useFragment} from 'react-relay'
-import {BillingLeaders_organization$key} from '../../../../__generated__/BillingLeaders_organization.graphql'
-import IconLabel from '../../../../components/IconLabel'
 import plural from '../../../../utils/plural'
+import BillingLeader from './BillingLeader'
 import NewBillingLeaderInput from './NewBillingLeaderInput'
 
 const StyledPanel = styled(Panel)({
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx b/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx
index 93020f9a2a3..3f00b0790a7 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/DowngradeModal.tsx
@@ -1,26 +1,25 @@
 import styled from '@emotion/styled'
-import {Error as ErrorIcon} from '@mui/icons-material'
-import {Close} from '@mui/icons-material'
+import {Close, Error as ErrorIcon} from '@mui/icons-material'
 import {Checkbox} from '@mui/material'
+import graphql from 'babel-plugin-relay/macro'
 import React, {useState} from 'react'
+import {useFragment} from 'react-relay'
+import {ReadableReasonToDowngradeEnum} from '../../../../../server/graphql/types/ReasonToDowngrade'
+import {DowngradeModal_organization$key} from '../../../../__generated__/DowngradeModal_organization.graphql'
 import DialogContainer from '../../../../components/DialogContainer'
 import DialogContent from '../../../../components/DialogContent'
 import DialogTitle from '../../../../components/DialogTitle'
 import PlainButton from '../../../../components/PlainButton/PlainButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
+import useMutationProps from '../../../../hooks/useMutationProps'
+import DowngradeToStarterMutation from '../../../../mutations/DowngradeToStarterMutation'
 import {PALETTE} from '../../../../styles/paletteV3'
+import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
 import {
+  TeamBenefits,
   readableReasonsToDowngrade,
-  reasonsToDowngradeLookup,
-  TeamBenefits
+  reasonsToDowngradeLookup
 } from '../../../../utils/constants'
-import DowngradeToStarterMutation from '../../../../mutations/DowngradeToStarterMutation'
-import {useFragment} from 'react-relay'
-import graphql from 'babel-plugin-relay/macro'
-import useMutationProps from '../../../../hooks/useMutationProps'
-import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
-import {DowngradeModal_organization$key} from '../../../../__generated__/DowngradeModal_organization.graphql'
-import {ReadableReasonToDowngradeEnum} from '../../../../../server/graphql/types/ReasonToDowngrade'
 
 const StyledDialogContainer = styled(DialogContainer)({
   padding: 8
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx
index 42dfb47317b..0d7bf3a8acc 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/NewBillingLeaderInput.tsx
@@ -3,15 +3,15 @@ import {Person} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useEffect, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {NewBillingLeaderInput_organization$key} from '~/__generated__/NewBillingLeaderInput_organization.graphql'
 import {MenuPosition} from '~/hooks/useCoords'
 import useMenu from '~/hooks/useMenu'
 import {PALETTE} from '~/styles/paletteV3'
-import {NewBillingLeaderInput_organization$key} from '~/__generated__/NewBillingLeaderInput_organization.graphql'
 import StyledError from '../../../../components/StyledError'
 import useForm from '../../../../hooks/useForm'
 import {PortalStatus} from '../../../../hooks/usePortal'
-import NewBillingLeaderMenu from './NewBillingLeaderMenu'
 import {ElementWidth} from '../../../../types/constEnums'
+import NewBillingLeaderMenu from './NewBillingLeaderMenu'
 
 const StyledIcon = styled(Person)({
   color: PALETTE.SKY_500,
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx
index 998048c07d5..4a8eafe5035 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingDangerZone.tsx
@@ -3,8 +3,8 @@ import {Email as EmailIcon} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import ArchiveOrganization from '~/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization'
 import {OrgBillingDangerZone_organization$key} from '~/__generated__/OrgBillingDangerZone_organization.graphql'
+import ArchiveOrganization from '~/modules/teamDashboard/components/ArchiveTeam/ArchiveOrganization'
 import Panel from '../../../../components/Panel/Panel'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {ElementWidth, Layout} from '../../../../types/constEnums'
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx
index bacc91f9508..cc13cdee052 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgBillingInvoices.tsx
@@ -3,10 +3,10 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {usePaginationFragment} from 'react-relay'
 import {OrgBillingInvoices_query$key} from '~/__generated__/OrgBillingInvoices_query.graphql'
+import {OrgBillingInvoicesPaginationQuery} from '../../../../__generated__/OrgBillingInvoicesPaginationQuery.graphql'
 import Panel from '../../../../components/Panel/Panel'
 import SecondaryButton from '../../../../components/SecondaryButton'
 import {ElementWidth, Layout} from '../../../../types/constEnums'
-import {OrgBillingInvoicesPaginationQuery} from '../../../../__generated__/OrgBillingInvoicesPaginationQuery.graphql'
 import InvoiceRow from '../InvoiceRow/InvoiceRow'
 
 const StyledPanel = styled(Panel)<{isWide: boolean}>(({isWide}) => ({
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
index aa6101a8847..af763e72a3c 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx
@@ -1,13 +1,13 @@
-import React, {useState} from 'react'
+import styled from '@emotion/styled'
 import {Info} from '@mui/icons-material'
-import {Elevation} from '../../../../styles/elevation'
-import BaseButton from '../../../../components/BaseButton'
-import {Radius} from '../../../../types/constEnums'
-import {PALETTE} from '../../../../styles/paletteV3'
+import React, {useState} from 'react'
 import {TierEnum} from '../../../../__generated__/OrganizationSubscription.graphql'
-import styled from '@emotion/styled'
-import useTooltip from '../../../../hooks/useTooltip'
+import BaseButton from '../../../../components/BaseButton'
 import {MenuPosition} from '../../../../hooks/useCoords'
+import useTooltip from '../../../../hooks/useTooltip'
+import {Elevation} from '../../../../styles/elevation'
+import {PALETTE} from '../../../../styles/paletteV3'
+import {Radius} from '../../../../types/constEnums'
 
 const PlanTitle = styled('h6')({
   color: PALETTE.SLATE_700,
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx
index 7b8ef509728..39766aa6e5e 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawer.tsx
@@ -1,20 +1,20 @@
-import React from 'react'
 import styled from '@emotion/styled'
+import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
 import {OrgPlanDrawer_organization$key} from '../../../../__generated__/OrgPlanDrawer_organization.graphql'
-import ResponsiveDashSidebar from '../../../../components/ResponsiveDashSidebar'
-import {Close} from '@mui/icons-material'
-import {PALETTE} from '../../../../styles/paletteV3'
-import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../../../../types/constEnums'
+import Confetti from '../../../../components/Confetti'
 import LabelHeading from '../../../../components/LabelHeading/LabelHeading'
-import {desktopSidebarShadow} from '../../../../styles/elevation'
-import useBreakpoint from '../../../../hooks/useBreakpoint'
 import PlainButton from '../../../../components/PlainButton/PlainButton'
+import ResponsiveDashSidebar from '../../../../components/ResponsiveDashSidebar'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
+import useBreakpoint from '../../../../hooks/useBreakpoint'
+import {desktopSidebarShadow} from '../../../../styles/elevation'
+import {PALETTE} from '../../../../styles/paletteV3'
 import {ICON_SIZE} from '../../../../styles/typographyV2'
+import {BezierCurve, Breakpoint, DiscussionThreadEnum, ZIndex} from '../../../../types/constEnums'
 import OrgPlanDrawerContent from './OrgPlanDrawerContent'
-import Confetti from '../../../../components/Confetti'
 
 const DrawerHeader = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx
index d545d2b2dc5..dfd3bbe1089 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlanDrawerContent.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
 import styled from '@emotion/styled'
+import React from 'react'
+import {TierEnum} from '../../../../__generated__/DowngradeToStarterMutation.graphql'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {EnterpriseBenefits, TeamBenefits} from '../../../../utils/constants'
 import {upperFirst} from '../../../../utils/upperFirst'
-import {TierEnum} from '../../../../__generated__/DowngradeToStarterMutation.graphql'
 
 const List = styled('div')({
   display: 'flex',
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
index 2b419f3ea4d..42f3fbfb619 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlans.tsx
@@ -2,21 +2,21 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
-import Panel from '../../../../components/Panel/Panel'
-import Row from '../../../../components/Row/Row'
+import useBreakpoint from '~/hooks/useBreakpoint'
+import {Breakpoint} from '~/types/constEnums'
 import {OrgPlans_organization$key} from '../../../../__generated__/OrgPlans_organization.graphql'
-import {ElementWidth} from '../../../../types/constEnums'
 import {TierEnum} from '../../../../__generated__/OrganizationSubscription.graphql'
-import OrgStats from './OrgStats'
+import LimitExceededWarning from '../../../../components/LimitExceededWarning'
+import Panel from '../../../../components/Panel/Panel'
+import Row from '../../../../components/Row/Row'
+import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useModal from '../../../../hooks/useModal'
-import DowngradeModal from './DowngradeModal'
-import {EnterpriseBenefits, StarterBenefits, TeamBenefits} from '../../../../utils/constants'
+import {ElementWidth} from '../../../../types/constEnums'
 import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
-import useAtmosphere from '../../../../hooks/useAtmosphere'
-import LimitExceededWarning from '../../../../components/LimitExceededWarning'
-import {Breakpoint} from '~/types/constEnums'
-import useBreakpoint from '~/hooks/useBreakpoint'
+import {EnterpriseBenefits, StarterBenefits, TeamBenefits} from '../../../../utils/constants'
+import DowngradeModal from './DowngradeModal'
 import OrgPlan from './OrgPlan'
+import OrgStats from './OrgStats'
 
 const StyledPanel = styled(Panel)({
   maxWidth: ElementWidth.PANEL_WIDTH,
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx
index dab1cf3309e..bb00f1fecae 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBilling.tsx
@@ -1,17 +1,17 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense, useState} from 'react'
 import {PreloadedQuery, useFragment, usePreloadedQuery, useRefetchableFragment} from 'react-relay'
-import {OrgPlansAndBilling_organization$key} from '../../../../__generated__/OrgPlansAndBilling_organization.graphql'
-import PaymentDetails from './PaymentDetails'
-import BillingLeaders from './BillingLeaders'
-import OrgPlans from './OrgPlans'
-import OrgPlansAndBillingHeading from './OrgPlansAndBillingHeading'
-import OrgPlanDrawer from './OrgPlanDrawer'
-import OrgBillingInvoices from './OrgBillingInvoices'
 import {OrgPlansAndBillingQuery} from '../../../../__generated__/OrgPlansAndBillingQuery.graphql'
 import {OrgPlansAndBillingRefetchQuery} from '../../../../__generated__/OrgPlansAndBillingRefetchQuery.graphql'
+import {OrgPlansAndBilling_organization$key} from '../../../../__generated__/OrgPlansAndBilling_organization.graphql'
 import {OrgPlansAndBilling_query$key} from '../../../../__generated__/OrgPlansAndBilling_query.graphql'
+import BillingLeaders from './BillingLeaders'
 import OrgBillingCreditCardInfo from './OrgBillingCreditCardInfo'
+import OrgBillingInvoices from './OrgBillingInvoices'
+import OrgPlanDrawer from './OrgPlanDrawer'
+import OrgPlans from './OrgPlans'
+import OrgPlansAndBillingHeading from './OrgPlansAndBillingHeading'
+import PaymentDetails from './PaymentDetails'
 
 type Props = {
   organizationRef: OrgPlansAndBilling_organization$key
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx
index 04bec647405..c2f874e8e62 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingHeading.tsx
@@ -3,12 +3,12 @@ import {Article} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {commitLocalUpdate, useFragment} from 'react-relay'
+import {OrgPlansAndBillingHeading_organization$key} from '../../../../__generated__/OrgPlansAndBillingHeading_organization.graphql'
 import PlainButton from '../../../../components/PlainButton/PlainButton'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {ElementWidth} from '../../../../types/constEnums'
 import {upperFirst} from '../../../../utils/upperFirst'
-import {OrgPlansAndBillingHeading_organization$key} from '../../../../__generated__/OrgPlansAndBillingHeading_organization.graphql'
 
 const Wrapper = styled('div')({
   alignItems: 'center',
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx
index 8c3c14768f1..a3ef216c0ac 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlansAndBillingRoot.tsx
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import orgPlansAndBillingQuery, {
   OrgPlansAndBillingQuery
 } from '../../../../__generated__/OrgPlansAndBillingQuery.graphql'
 import {OrgPlansAndBillingRoot_organization$key} from '../../../../__generated__/OrgPlansAndBillingRoot_organization.graphql'
+import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import OrgPlansAndBilling from './OrgPlansAndBilling'
 
 interface Props {
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx
index ce3f65d979a..2daf9322716 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgStats.tsx
@@ -3,11 +3,11 @@ import {Info} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {OrgStats_organization$key} from '../../../../__generated__/OrgStats_organization.graphql'
 import {tooltipTextLookup} from '../../../../components/InsightsDomainPanel'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useTooltip from '../../../../hooks/useTooltip'
 import {PALETTE} from '../../../../styles/paletteV3'
-import {OrgStats_organization$key} from '../../../../__generated__/OrgStats_organization.graphql'
 
 const StatBlocks = styled('div')({
   display: 'flex',
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
index ceab6eb6e09..56da27a707a 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/Organization.tsx
@@ -2,6 +2,7 @@ import graphql from 'babel-plugin-relay/macro'
 import React, {lazy} from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
 import {Redirect, Route, Switch, useRouteMatch} from 'react-router'
+import {OrganizationQuery} from '../../../../__generated__/OrganizationQuery.graphql'
 import {
   AUTHENTICATION_PAGE,
   BILLING_PAGE,
@@ -9,9 +10,8 @@ import {
   ORG_SETTINGS_PAGE,
   TEAMS_PAGE
 } from '../../../../utils/constants'
-import {OrganizationQuery} from '../../../../__generated__/OrganizationQuery.graphql'
-import OrgNav from '../Organization/OrgNav'
 import OrgTeams from '../OrgTeams/OrgTeams'
+import OrgNav from '../Organization/OrgNav'
 
 const OrgPlansAndBillingRoot = lazy(
   () => import(/* webpackChunkName: 'OrgBillingRoot' */ './OrgPlansAndBillingRoot')
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx b/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx
index 068e34d98cf..643649acff4 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/PaymentDetails.tsx
@@ -1,18 +1,18 @@
 import styled from '@emotion/styled'
-import {PaymentDetails_organization$key} from '../../../../__generated__/PaymentDetails_organization.graphql'
-import graphql from 'babel-plugin-relay/macro'
-import {useFragment} from 'react-relay'
 import {Divider} from '@mui/material'
 import {Elements} from '@stripe/react-stripe-js'
 import {loadStripe} from '@stripe/stripe-js'
+import graphql from 'babel-plugin-relay/macro'
 import React, {useRef} from 'react'
+import {useFragment} from 'react-relay'
+import {PaymentDetails_organization$key} from '../../../../__generated__/PaymentDetails_organization.graphql'
 import Panel from '../../../../components/Panel/Panel'
 import Row from '../../../../components/Row/Row'
+import useScrollIntoView from '../../../../hooks/useScrollIntoVIew'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {ElementWidth} from '../../../../types/constEnums'
-import BillingForm from './BillingForm'
 import {MONTHLY_PRICE} from '../../../../utils/constants'
-import useScrollIntoView from '../../../../hooks/useScrollIntoVIew'
+import BillingForm from './BillingForm'
 
 const StyledPanel = styled(Panel)({
   maxWidth: ElementWidth.PANEL_WIDTH
diff --git a/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx b/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx
index 80bd46bb6f5..be005030d6c 100644
--- a/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx
+++ b/packages/client/modules/userDashboard/components/OrgBilling/UpdatePayment.tsx
@@ -6,16 +6,16 @@ import {
   useElements,
   useStripe
 } from '@stripe/react-stripe-js'
+import {StripeElementChangeEvent} from '@stripe/stripe-js'
 import React, {useState} from 'react'
+import {UpdateCreditCardMutation$data} from '../../../../__generated__/UpdateCreditCardMutation.graphql'
 import PrimaryButton from '../../../../components/PrimaryButton'
 import SecondaryButton from '../../../../components/SecondaryButton'
-import {PALETTE} from '../../../../styles/paletteV3'
-import UpdateCreditCardMutation from '../../../../mutations/UpdateCreditCardMutation'
+import StyledError from '../../../../components/StyledError'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import useMutationProps from '../../../../hooks/useMutationProps'
-import StyledError from '../../../../components/StyledError'
-import {UpdateCreditCardMutation$data} from '../../../../__generated__/UpdateCreditCardMutation.graphql'
-import {StripeElementChangeEvent} from '@stripe/stripe-js'
+import UpdateCreditCardMutation from '../../../../mutations/UpdateCreditCardMutation'
+import {PALETTE} from '../../../../styles/paletteV3'
 
 const UpgradeButton = styled(PrimaryButton)<{disabled: boolean}>(({disabled}) => ({
   background: disabled ? PALETTE.SLATE_200 : PALETTE.SKY_500,
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
index 7526eb55775..7c9731c18af 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMemberMenu.tsx
@@ -1,13 +1,13 @@
 import styled from '@emotion/styled'
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
-import useAtmosphere from '~/hooks/useAtmosphere'
+import React from 'react'
 import {useFragment} from 'react-relay'
-import {MenuProps} from '../../../../hooks/useMenu'
+import useAtmosphere from '~/hooks/useAtmosphere'
+import {OrgTeamMemberMenu_teamMember$key} from '../../../../__generated__/OrgTeamMemberMenu_teamMember.graphql'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
 import MenuItemLabel from '../../../../components/MenuItemLabel'
-import {OrgTeamMemberMenu_teamMember$key} from '../../../../__generated__/OrgTeamMemberMenu_teamMember.graphql'
+import {MenuProps} from '../../../../hooks/useMenu'
 
 interface OrgTeamMemberMenuProps {
   isLead: boolean
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
index 602a4b48ee5..76781ca966c 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembers.tsx
@@ -1,17 +1,17 @@
-import React from 'react'
-import graphql from 'babel-plugin-relay/macro'
 import {ArrowBack} from '@mui/icons-material'
+import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {OrgTeamMembersQuery} from '../../../../__generated__/OrgTeamMembersQuery.graphql'
-import {OrgTeamMembersRow} from './OrgTeamMembersRow'
-import {Button} from '../../../../ui/Button/Button'
 import {Link} from 'react-router-dom'
-import {ORGANIZATIONS} from '../../../../utils/constants'
+import {OrgTeamMembersQuery} from '../../../../__generated__/OrgTeamMembersQuery.graphql'
+import DeleteTeamDialog from '../../../../components/DeleteTeamDialog'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
-import {OrgTeamMembersMenu} from './OrgTeamMembersMenu'
+import {Button} from '../../../../ui/Button/Button'
 import {useDialogState} from '../../../../ui/Dialog/useDialogState'
-import DeleteTeamDialog from '../../../../components/DeleteTeamDialog'
+import {ORGANIZATIONS} from '../../../../utils/constants'
+import {OrgTeamMembersMenu} from './OrgTeamMembersMenu'
+import {OrgTeamMembersRow} from './OrgTeamMembersRow'
 
 interface Props {
   queryRef: PreloadedQuery<OrgTeamMembersQuery>
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
index bc53031bfc8..80a22e31ee2 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersMenu.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
-import {MenuProps} from '../../../../hooks/useMenu'
 import Menu from '../../../../components/Menu'
 import MenuItem from '../../../../components/MenuItem'
+import {MenuProps} from '../../../../hooks/useMenu'
 
 interface OrgTeamMembersMenuProps {
   menuProps: MenuProps
diff --git a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
index c0c959d084c..ec85d790003 100644
--- a/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeamMembers/OrgTeamMembersRoot.tsx
@@ -1,10 +1,10 @@
 import React, {Suspense} from 'react'
 import orgTeamMembersQuery, {OrgTeamMembersQuery} from '~/__generated__/OrgTeamMembersQuery.graphql'
 import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
+import useRouter from '../../../../hooks/useRouter'
 import {LoaderSize} from '../../../../types/constEnums'
 import {Loader} from '../../../../utils/relay/renderLoader'
 import {OrgTeamMembers} from './OrgTeamMembers'
-import useRouter from '../../../../hooks/useRouter'
 
 const OrgTeamMembersRoot = () => {
   const {match} = useRouter<{teamId: string}>()
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
index 3f544d7dd27..6bcd5cda9ad 100644
--- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeams.tsx
@@ -1,12 +1,12 @@
-import React from 'react'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {useFragment} from 'react-relay'
-import OrgTeamsRow from './OrgTeamsRow'
 import {OrgTeams_organization$key} from '../../../../__generated__/OrgTeams_organization.graphql'
 import AddTeamDialogRoot from '../../../../components/AddTeamDialogRoot'
 import {Button} from '../../../../ui/Button/Button'
 import {useDialogState} from '../../../../ui/Dialog/useDialogState'
 import plural from '../../../../utils/plural'
+import OrgTeamsRow from './OrgTeamsRow'
 
 type Props = {
   organizationRef: OrgTeams_organization$key
diff --git a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
index d6da2e5e6c6..e2ea7697f82 100644
--- a/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
+++ b/packages/client/modules/userDashboard/components/OrgTeams/OrgTeamsRow.tsx
@@ -1,11 +1,11 @@
-import React from 'react'
-import {Link} from 'react-router-dom'
+import {ChevronRight} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
+import React from 'react'
 import {useFragment} from 'react-relay'
-import {ChevronRight} from '@mui/icons-material'
+import {Link} from 'react-router-dom'
 
-import plural from '../../../../utils/plural'
 import {OrgTeamsRow_team$key} from '../../../../__generated__/OrgTeamsRow_team.graphql'
+import plural from '../../../../utils/plural'
 
 type Props = {
   teamRef: OrgTeamsRow_team$key
diff --git a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
index 2d92fae6d53..ab2ebbbe9ab 100644
--- a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
+++ b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
@@ -4,9 +4,9 @@ import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
+import {OrgNav_organization$key} from '../../../../__generated__/OrgNav_organization.graphql'
 import {PALETTE} from '../../../../styles/paletteV3'
 import {ElementWidth} from '../../../../types/constEnums'
-import {OrgNav_organization$key} from '../../../../__generated__/OrgNav_organization.graphql'
 
 const Wrapper = styled('div')({
   display: 'flex',
diff --git a/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx b/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx
index a324f885835..a652e9aab41 100644
--- a/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx
+++ b/packages/client/modules/userDashboard/components/Organizations/Organizations.tsx
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {OrganizationsQuery} from '../../../../__generated__/OrganizationsQuery.graphql'
 import LinkButton from '../../../../components/LinkButton'
 import Panel from '../../../../components/Panel/Panel'
 import SettingsWrapper from '../../../../components/Settings/SettingsWrapper'
 import useDocumentTitle from '../../../../hooks/useDocumentTitle'
 import useRouter from '../../../../hooks/useRouter'
-import {OrganizationsQuery} from '../../../../__generated__/OrganizationsQuery.graphql'
 import EmptyOrgsCallOut from '../EmptyOrgsCallOut/EmptyOrgsCallOut'
 import OrganizationRow from '../OrganizationRow/OrganizationRow'
 import UserSettingsWrapper from '../UserSettingsWrapper/UserSettingsWrapper'
diff --git a/packages/client/modules/userDashboard/components/UserProfile.tsx b/packages/client/modules/userDashboard/components/UserProfile.tsx
index 0a7e0d7b96d..e1252b7e82f 100644
--- a/packages/client/modules/userDashboard/components/UserProfile.tsx
+++ b/packages/client/modules/userDashboard/components/UserProfile.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
+import {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql'
 import DeleteAccount from '../../../components/DeleteAccount'
 import EmailNotifications from '../../../components/EmailNotifications'
 import Panel from '../../../components/Panel/Panel'
@@ -9,7 +10,6 @@ import PasswordResetLink from '../../../components/PasswordResetLink'
 import useDocumentTitle from '../../../hooks/useDocumentTitle'
 import {PALETTE} from '../../../styles/paletteV3'
 import {AuthIdentityTypeEnum, Layout} from '../../../types/constEnums'
-import {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql'
 import UserSettingsForm from './UserSettingsForm/UserSettingsForm'
 import UserSettingsWrapper from './UserSettingsWrapper/UserSettingsWrapper'
 
diff --git a/packages/client/modules/userDashboard/components/UserProfileRoot.tsx b/packages/client/modules/userDashboard/components/UserProfileRoot.tsx
index a02029a13e9..3a473107b08 100644
--- a/packages/client/modules/userDashboard/components/UserProfileRoot.tsx
+++ b/packages/client/modules/userDashboard/components/UserProfileRoot.tsx
@@ -1,9 +1,9 @@
 import React, {Suspense} from 'react'
 import {RouteComponentProps, withRouter} from 'react-router-dom'
+import userProfileQuery, {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql'
 import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
 import useSubscription from '../../../hooks/useSubscription'
 import NotificationSubscription from '../../../subscriptions/NotificationSubscription'
-import userProfileQuery, {UserProfileQuery} from '../../../__generated__/UserProfileQuery.graphql'
 import UserProfile from './UserProfile'
 
 interface Props extends RouteComponentProps<{teamId: string}> {}
diff --git a/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx b/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx
index e4a1db28093..b5825124913 100644
--- a/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx
+++ b/packages/client/modules/userDashboard/components/UserTasksHeader/UserTasksHeader.tsx
@@ -2,6 +2,10 @@ import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
 import React, {useMemo, useRef} from 'react'
 import {useFragment} from 'react-relay'
+import {
+  UserTasksHeader_viewer$data,
+  UserTasksHeader_viewer$key
+} from '~/__generated__/UserTasksHeader_viewer.graphql'
 import Checkbox from '~/components/Checkbox'
 import LinkButton from '~/components/LinkButton'
 import useRouter from '~/hooks/useRouter'
@@ -11,13 +15,9 @@ import {Breakpoint, FilterLabels} from '~/types/constEnums'
 import constructFilterQueryParamURL from '~/utils/constructFilterQueryParamURL'
 import makeMinWidthMediaQuery from '~/utils/makeMinWidthMediaQuery'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
-import {
-  UserTasksHeader_viewer$data,
-  UserTasksHeader_viewer$key
-} from '~/__generated__/UserTasksHeader_viewer.graphql'
+import DashFilterToggle from '../../../../components/DashFilterToggle/DashFilterToggle'
 import DashSectionControls from '../../../../components/Dashboard/DashSectionControls'
 import DashSectionHeader from '../../../../components/Dashboard/DashSectionHeader'
-import DashFilterToggle from '../../../../components/DashFilterToggle/DashFilterToggle'
 import useAtmosphere from '../../../../hooks/useAtmosphere'
 import {MenuPosition} from '../../../../hooks/useCoords'
 import useMenu from '../../../../hooks/useMenu'
diff --git a/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx b/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx
index 37dda9781cd..893d4082eaa 100644
--- a/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/OrgBilling/OrgBillingRoot.tsx
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import React, {Suspense} from 'react'
 import {useFragment} from 'react-relay'
-import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import orgBillingQuery, {OrgBillingQuery} from '../../../../__generated__/OrgBillingQuery.graphql'
 import {OrgBillingRoot_organization$key} from '../../../../__generated__/OrgBillingRoot_organization.graphql'
+import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
 import OrgBilling from '../../components/OrgBilling/OrgBilling'
 
 interface Props {
diff --git a/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx b/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx
index 28f34aa970b..994ee399c4e 100644
--- a/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/Organization/OrganizationRoot.tsx
@@ -1,10 +1,10 @@
 import React, {Suspense} from 'react'
 import {RouteComponentProps} from 'react-router'
-import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
-import {Loader} from '../../../../utils/relay/renderLoader'
 import organizationQuery, {
   OrganizationQuery
 } from '../../../../__generated__/OrganizationQuery.graphql'
+import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
+import {Loader} from '../../../../utils/relay/renderLoader'
 import Organization from '../../components/OrgBilling/Organization'
 
 interface Props extends RouteComponentProps<{orgId: string}> {}
diff --git a/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx b/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx
index 15dc366b6cb..614fa4d17cb 100644
--- a/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx
+++ b/packages/client/modules/userDashboard/containers/Organizations/OrganizationsRoot.tsx
@@ -1,10 +1,10 @@
 import React, {Suspense} from 'react'
-import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
-import {LoaderSize} from '../../../../types/constEnums'
-import {Loader} from '../../../../utils/relay/renderLoader'
 import organizationsQuery, {
   OrganizationsQuery
 } from '../../../../__generated__/OrganizationsQuery.graphql'
+import useQueryLoaderNow from '../../../../hooks/useQueryLoaderNow'
+import {LoaderSize} from '../../../../types/constEnums'
+import {Loader} from '../../../../utils/relay/renderLoader'
 import Organizations from '../../components/Organizations/Organizations'
 
 const OrganizationsRoot = () => {
diff --git a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
index 72aebf89936..807d484a5ca 100644
--- a/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
+++ b/packages/client/modules/userDashboard/containers/UserColumns/UserColumnsContainer.tsx
@@ -3,9 +3,9 @@ import React, {useMemo} from 'react'
 import {useFragment} from 'react-relay'
 import toTeamMemberId from '~/utils/relay/toTeamMemberId'
 import {useQueryParameterParser} from '~/utils/useQueryParameterParser'
+import {UserColumnsContainer_viewer$key} from '../../../../__generated__/UserColumnsContainer_viewer.graphql'
 import TaskColumns from '../../../../components/TaskColumns/TaskColumns'
 import getSafeRegex from '../../../../utils/getSafeRegex'
-import {UserColumnsContainer_viewer$key} from '../../../../__generated__/UserColumnsContainer_viewer.graphql'
 
 interface Props {
   viewerRef: UserColumnsContainer_viewer$key
diff --git a/packages/client/mutations/AcceptTeamInvitationMutation.ts b/packages/client/mutations/AcceptTeamInvitationMutation.ts
index fc92e2fa0e3..d34825bfd41 100644
--- a/packages/client/mutations/AcceptTeamInvitationMutation.ts
+++ b/packages/client/mutations/AcceptTeamInvitationMutation.ts
@@ -1,8 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {InvitationTokenError, LOCKED_MESSAGE} from '~/types/constEnums'
 import {AcceptTeamInvitationMutation_notification$data} from '~/__generated__/AcceptTeamInvitationMutation_notification.graphql'
+import {InvitationTokenError, LOCKED_MESSAGE} from '~/types/constEnums'
 import Atmosphere from '../Atmosphere'
+import {AcceptTeamInvitationMutation as TAcceptTeamInvitationMutation} from '../__generated__/AcceptTeamInvitationMutation.graphql'
+import {AcceptTeamInvitationMutation_team$data} from '../__generated__/AcceptTeamInvitationMutation_team.graphql'
 import {
   HistoryMaybeLocalHandler,
   OnNextHandler,
@@ -11,8 +13,6 @@ import {
 } from '../types/relayMutations'
 import fromTeamMemberId from '../utils/relay/fromTeamMemberId'
 import getGraphQLError from '../utils/relay/getGraphQLError'
-import {AcceptTeamInvitationMutation as TAcceptTeamInvitationMutation} from '../__generated__/AcceptTeamInvitationMutation.graphql'
-import {AcceptTeamInvitationMutation_team$data} from '../__generated__/AcceptTeamInvitationMutation_team.graphql'
 import handleAddOrganization from './handlers/handleAddOrganization'
 import handleAddTeamMembers from './handlers/handleAddTeamMembers'
 import handleAddTeams from './handlers/handleAddTeams'
diff --git a/packages/client/mutations/AddAgendaItemMutation.ts b/packages/client/mutations/AddAgendaItemMutation.ts
index 13cc776b0a6..22d6d480c1e 100644
--- a/packages/client/mutations/AddAgendaItemMutation.ts
+++ b/packages/client/mutations/AddAgendaItemMutation.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {AddAgendaItemMutation as TAddAgendaItemMutation} from '../__generated__/AddAgendaItemMutation.graphql'
+import {AddAgendaItemMutation_team$data} from '../__generated__/AddAgendaItemMutation_team.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import clientTempId from '../utils/relay/clientTempId'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {AddAgendaItemMutation as TAddAgendaItemMutation} from '../__generated__/AddAgendaItemMutation.graphql'
-import {AddAgendaItemMutation_team$data} from '../__generated__/AddAgendaItemMutation_team.graphql'
 import handleAddAgendaItems from './handlers/handleAddAgendaItems'
 graphql`
   fragment AddAgendaItemMutation_team on AddAgendaItemPayload {
diff --git a/packages/client/mutations/AddAtlassianAuthMutation.ts b/packages/client/mutations/AddAtlassianAuthMutation.ts
index 358b7441f75..16a1ddfe904 100644
--- a/packages/client/mutations/AddAtlassianAuthMutation.ts
+++ b/packages/client/mutations/AddAtlassianAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {AddAtlassianAuthMutation as TAddAtlassianAuthMutation} from '../__generated__/AddAtlassianAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment AddAtlassianAuthMutation_team on AddAtlassianAuthPayload {
diff --git a/packages/client/mutations/AddCommentMutation.ts b/packages/client/mutations/AddCommentMutation.ts
index 0547a88de2d..b55d6f1a0bb 100644
--- a/packages/client/mutations/AddCommentMutation.ts
+++ b/packages/client/mutations/AddCommentMutation.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {AddCommentMutation_meeting$data} from '~/__generated__/AddCommentMutation_meeting.graphql'
 import makeEmptyStr from '~/utils/draftjs/makeEmptyStr'
 import addNodeToArray from '~/utils/relay/addNodeToArray'
 import createProxyRecord from '~/utils/relay/createProxyRecord'
-import {AddCommentMutation_meeting$data} from '~/__generated__/AddCommentMutation_meeting.graphql'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {AddCommentMutation as TAddCommentMutation} from '../__generated__/AddCommentMutation.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import getDiscussionThreadConn from './connections/getDiscussionThreadConn'
 import safePutNodeInConn from './handlers/safePutNodeInConn'
 
diff --git a/packages/client/mutations/AddGitHubAuthMutation.ts b/packages/client/mutations/AddGitHubAuthMutation.ts
index 3b3cf2cde77..8045830f6fa 100644
--- a/packages/client/mutations/AddGitHubAuthMutation.ts
+++ b/packages/client/mutations/AddGitHubAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {AddGitHubAuthMutation as TAddGitHubAuthMutation} from '../__generated__/AddGitHubAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment AddGitHubAuthMutation_team on AddGitHubAuthPayload {
diff --git a/packages/client/mutations/AddIntegrationProviderMutation.ts b/packages/client/mutations/AddIntegrationProviderMutation.ts
index 07f401e4766..3e4d831de08 100644
--- a/packages/client/mutations/AddIntegrationProviderMutation.ts
+++ b/packages/client/mutations/AddIntegrationProviderMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {AddIntegrationProviderMutation as TAddIntegrationProviderMutation} from '../__generated__/AddIntegrationProviderMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment AddIntegrationProviderMutation_team on AddIntegrationProviderSuccess {
diff --git a/packages/client/mutations/AddOrgMutation.ts b/packages/client/mutations/AddOrgMutation.ts
index af80c053890..2b19332a808 100644
--- a/packages/client/mutations/AddOrgMutation.ts
+++ b/packages/client/mutations/AddOrgMutation.ts
@@ -1,5 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {AddOrgMutation as TAddOrgMutation} from '../__generated__/AddOrgMutation.graphql'
+import {AddOrgMutation_notification$data} from '../__generated__/AddOrgMutation_notification.graphql'
+import {AddOrgMutation_organization$data} from '../__generated__/AddOrgMutation_organization.graphql'
 import {
   HistoryLocalHandler,
   OnNextHandler,
@@ -7,9 +10,6 @@ import {
   StandardMutation
 } from '../types/relayMutations'
 import getGraphQLError from '../utils/relay/getGraphQLError'
-import {AddOrgMutation as TAddOrgMutation} from '../__generated__/AddOrgMutation.graphql'
-import {AddOrgMutation_notification$data} from '../__generated__/AddOrgMutation_notification.graphql'
-import {AddOrgMutation_organization$data} from '../__generated__/AddOrgMutation_organization.graphql'
 import handleAddOrganization from './handlers/handleAddOrganization'
 import handleAddTeams from './handlers/handleAddTeams'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
diff --git a/packages/client/mutations/AddPokerTemplateDimensionMutation.ts b/packages/client/mutations/AddPokerTemplateDimensionMutation.ts
index 6f71fee7fae..5eb276afcd2 100644
--- a/packages/client/mutations/AddPokerTemplateDimensionMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateDimensionMutation.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {SprintPokerDefaults} from '~/types/constEnums'
-import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
-import createProxyRecord from '../utils/relay/createProxyRecord'
 import {AddPokerTemplateDimensionMutation as TAddPokerTemplateDimensionMutation} from '../__generated__/AddPokerTemplateDimensionMutation.graphql'
 import {AddPokerTemplateDimensionMutation_dimension$data} from '../__generated__/AddPokerTemplateDimensionMutation_dimension.graphql'
+import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
+import createProxyRecord from '../utils/relay/createProxyRecord'
 import handleAddPokerTemplateDimension from './handlers/handleAddPokerTemplateDimension'
 
 interface Handlers extends BaseLocalHandlers {
diff --git a/packages/client/mutations/AddPokerTemplateMutation.ts b/packages/client/mutations/AddPokerTemplateMutation.ts
index 7de55a43760..cf2d9fce175 100644
--- a/packages/client/mutations/AddPokerTemplateMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateMutation.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {SprintPokerDefaults} from '~/types/constEnums'
+import {AddPokerTemplateMutation as TAddPokerTemplateMutation} from '../__generated__/AddPokerTemplateMutation.graphql'
+import {AddPokerTemplateMutation_team$data} from '../__generated__/AddPokerTemplateMutation_team.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import createProxyRecord from '../utils/relay/createProxyRecord'
 import {setActiveTemplateInRelayStore} from '../utils/relay/setActiveTemplate'
-import {AddPokerTemplateMutation as TAddPokerTemplateMutation} from '../__generated__/AddPokerTemplateMutation.graphql'
-import {AddPokerTemplateMutation_team$data} from '../__generated__/AddPokerTemplateMutation_team.graphql'
 import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate'
 
 graphql`
diff --git a/packages/client/mutations/AddPokerTemplateScaleMutation.ts b/packages/client/mutations/AddPokerTemplateScaleMutation.ts
index 38f14db5187..c45932bc919 100644
--- a/packages/client/mutations/AddPokerTemplateScaleMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateScaleMutation.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {AddPokerTemplateScaleMutation as TAddPokerTemplateScaleMutation} from '../__generated__/AddPokerTemplateScaleMutation.graphql'
+import {AddPokerTemplateScaleMutation_scale$data} from '../__generated__/AddPokerTemplateScaleMutation_scale.graphql'
 import {PALETTE} from '../styles/paletteV3'
 import {PokerCards} from '../types/constEnums'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {AddPokerTemplateScaleMutation as TAddPokerTemplateScaleMutation} from '../__generated__/AddPokerTemplateScaleMutation.graphql'
-import {AddPokerTemplateScaleMutation_scale$data} from '../__generated__/AddPokerTemplateScaleMutation_scale.graphql'
 import handleAddPokerTemplateScale from './handlers/handleAddPokerTemplateScale'
 
 graphql`
diff --git a/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts b/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts
index ca999c5d874..74c291f2748 100644
--- a/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateScaleValueMutation.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {AddPokerTemplateScaleValueMutation as TAddPokerTemplateScaleValueMutation} from '../__generated__/AddPokerTemplateScaleValueMutation.graphql'
 import {StandardMutation} from '../types/relayMutations'
 import dndNoise from '../utils/dndNoise'
 import addNodeToArray from '../utils/relay/addNodeToArray'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {AddPokerTemplateScaleValueMutation as TAddPokerTemplateScaleValueMutation} from '../__generated__/AddPokerTemplateScaleValueMutation.graphql'
 
 graphql`
   fragment AddPokerTemplateScaleValueMutation_scale on AddPokerTemplateScaleValuePayload {
diff --git a/packages/client/mutations/AddReactjiToReactableMutation.ts b/packages/client/mutations/AddReactjiToReactableMutation.ts
index 51ee83cfe0c..37fca00f436 100644
--- a/packages/client/mutations/AddReactjiToReactableMutation.ts
+++ b/packages/client/mutations/AddReactjiToReactableMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import createProxyRecord from '~/utils/relay/createProxyRecord'
-import {StandardMutation} from '../types/relayMutations'
 import {AddReactjiToReactableMutation as TAddReactjiToReactableMutation} from '../__generated__/AddReactjiToReactableMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 graphql`
diff --git a/packages/client/mutations/AddReflectTemplateMutation.ts b/packages/client/mutations/AddReflectTemplateMutation.ts
index 0b74c28760a..10ee982db9a 100644
--- a/packages/client/mutations/AddReflectTemplateMutation.ts
+++ b/packages/client/mutations/AddReflectTemplateMutation.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {AddReflectTemplateMutation as TAddReflectTemplateMutation} from '../__generated__/AddReflectTemplateMutation.graphql'
+import {AddReflectTemplateMutation_team$data} from '../__generated__/AddReflectTemplateMutation_team.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import createProxyRecord from '../utils/relay/createProxyRecord'
 import {setActiveTemplateInRelayStore} from '../utils/relay/setActiveTemplate'
-import {AddReflectTemplateMutation as TAddReflectTemplateMutation} from '../__generated__/AddReflectTemplateMutation.graphql'
-import {AddReflectTemplateMutation_team$data} from '../__generated__/AddReflectTemplateMutation_team.graphql'
 import handleAddMeetingTemplate from './handlers/handleAddMeetingTemplate'
 
 graphql`
diff --git a/packages/client/mutations/AddReflectTemplatePromptMutation.ts b/packages/client/mutations/AddReflectTemplatePromptMutation.ts
index b7025a5055e..9daa5ec6a5f 100644
--- a/packages/client/mutations/AddReflectTemplatePromptMutation.ts
+++ b/packages/client/mutations/AddReflectTemplatePromptMutation.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
-import createProxyRecord from '../utils/relay/createProxyRecord'
 import {AddReflectTemplatePromptMutation as TAddReflectTemplatePromptMutation} from '../__generated__/AddReflectTemplatePromptMutation.graphql'
 import {AddReflectTemplatePromptMutation_team$data} from '../__generated__/AddReflectTemplatePromptMutation_team.graphql'
+import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
+import createProxyRecord from '../utils/relay/createProxyRecord'
 import handleAddReflectTemplatePrompt from './handlers/handleAddReflectTemplatePrompt'
 
 interface Handlers extends BaseLocalHandlers {
diff --git a/packages/client/mutations/AddSlackAuthMutation.ts b/packages/client/mutations/AddSlackAuthMutation.ts
index 005cbf6b8ae..dd05181eb5a 100644
--- a/packages/client/mutations/AddSlackAuthMutation.ts
+++ b/packages/client/mutations/AddSlackAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {AddSlackAuthMutation as TAddSlackAuthMutation} from '../__generated__/AddSlackAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment AddSlackAuthMutation_team on AddSlackAuthPayload {
diff --git a/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts b/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts
index 056fd3a5242..fbf0847e219 100644
--- a/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts
+++ b/packages/client/mutations/AddTeamMemberIntegrationAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {AddTeamMemberIntegrationAuthMutation as TAddTeamMemberIntegrationAuthMutation} from '../__generated__/AddTeamMemberIntegrationAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 const mutation = graphql`
   mutation AddTeamMemberIntegrationAuthMutation(
diff --git a/packages/client/mutations/AddTeamMutation.ts b/packages/client/mutations/AddTeamMutation.ts
index a9d1a627da5..56578a67f61 100644
--- a/packages/client/mutations/AddTeamMutation.ts
+++ b/packages/client/mutations/AddTeamMutation.ts
@@ -1,5 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {AddTeamMutation as TAddTeamMutation} from '../__generated__/AddTeamMutation.graphql'
+import {AddTeamMutation_notification$data} from '../__generated__/AddTeamMutation_notification.graphql'
+import {AddTeamMutation_team$data} from '../__generated__/AddTeamMutation_team.graphql'
 import {
   HistoryLocalHandler,
   OnNextHandler,
@@ -8,9 +11,6 @@ import {
   StandardMutation
 } from '../types/relayMutations'
 import getGraphQLError from '../utils/relay/getGraphQLError'
-import {AddTeamMutation as TAddTeamMutation} from '../__generated__/AddTeamMutation.graphql'
-import {AddTeamMutation_notification$data} from '../__generated__/AddTeamMutation_notification.graphql'
-import {AddTeamMutation_team$data} from '../__generated__/AddTeamMutation_team.graphql'
 import handleAddTeams from './handlers/handleAddTeams'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
 
diff --git a/packages/client/mutations/AddTranscriptionBotMutation.ts b/packages/client/mutations/AddTranscriptionBotMutation.ts
index 3b5db21542a..873161adc59 100644
--- a/packages/client/mutations/AddTranscriptionBotMutation.ts
+++ b/packages/client/mutations/AddTranscriptionBotMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {AddTranscriptionBotMutation as TAddTranscriptionBotMutation} from '../__generated__/AddTranscriptionBotMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment AddTranscriptionBotMutation_meeting on AddTranscriptionBotSuccess {
diff --git a/packages/client/mutations/ArchiveOrganizationMutation.ts b/packages/client/mutations/ArchiveOrganizationMutation.ts
index c8cce46b029..55342e88b5b 100644
--- a/packages/client/mutations/ArchiveOrganizationMutation.ts
+++ b/packages/client/mutations/ArchiveOrganizationMutation.ts
@@ -1,5 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {ArchiveOrganizationMutation as TArchiveOrganizationMutation} from '../__generated__/ArchiveOrganizationMutation.graphql'
+import {ArchiveOrganizationMutation_organization$data} from '../__generated__/ArchiveOrganizationMutation_organization.graphql'
 import {
   HistoryLocalHandler,
   OnNextHandler,
@@ -10,8 +12,6 @@ import {
 import onMeetingRoute from '../utils/onMeetingRoute'
 import onTeamRoute from '../utils/onTeamRoute'
 import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray'
-import {ArchiveOrganizationMutation as TArchiveOrganizationMutation} from '../__generated__/ArchiveOrganizationMutation.graphql'
-import {ArchiveOrganizationMutation_organization$data} from '../__generated__/ArchiveOrganizationMutation_organization.graphql'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
 
 graphql`
diff --git a/packages/client/mutations/ArchiveTeamMutation.ts b/packages/client/mutations/ArchiveTeamMutation.ts
index 218fdd0c7c1..c06eae11d37 100644
--- a/packages/client/mutations/ArchiveTeamMutation.ts
+++ b/packages/client/mutations/ArchiveTeamMutation.ts
@@ -1,5 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {ArchiveTeamMutation as TArchiveTeamMutation} from '../__generated__/ArchiveTeamMutation.graphql'
+import {ArchiveTeamMutation_team$data} from '../__generated__/ArchiveTeamMutation_team.graphql'
 import {
   HistoryLocalHandler,
   OnNextHandler,
@@ -10,12 +12,10 @@ import {
 import onMeetingRoute from '../utils/onMeetingRoute'
 import onTeamRoute from '../utils/onTeamRoute'
 import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray'
-import {ArchiveTeamMutation as TArchiveTeamMutation} from '../__generated__/ArchiveTeamMutation.graphql'
-import {ArchiveTeamMutation_team$data} from '../__generated__/ArchiveTeamMutation_team.graphql'
+import SetNotificationStatusMutation from './SetNotificationStatusMutation'
 import handleAddNotifications from './handlers/handleAddNotifications'
 import handleRemoveReflectTemplate from './handlers/handleRemoveReflectTemplate'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
-import SetNotificationStatusMutation from './SetNotificationStatusMutation'
 
 graphql`
   fragment ArchiveTeamMutation_team on ArchiveTeamPayload {
diff --git a/packages/client/mutations/ArchiveTimelineEventMutation.ts b/packages/client/mutations/ArchiveTimelineEventMutation.ts
index d71bc8df62a..274f9805140 100644
--- a/packages/client/mutations/ArchiveTimelineEventMutation.ts
+++ b/packages/client/mutations/ArchiveTimelineEventMutation.ts
@@ -1,10 +1,10 @@
+import {ArchiveTimelineEventMutation_notification$data} from '__generated__/ArchiveTimelineEventMutation_notification.graphql'
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordSourceSelectorProxy} from 'relay-runtime'
-import {ArchiveTimelineEventMutation_notification$data} from '__generated__/ArchiveTimelineEventMutation_notification.graphql'
 import safeRemoveNodeFromConn from '~/utils/relay/safeRemoveNodeFromConn'
-import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import {ArchiveTimelineEventMutation as TArchiveTimelineEventMutation} from '../__generated__/ArchiveTimelineEventMutation.graphql'
+import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import getUserTimelineEventsConn from './connections/getUserTimelineEventsConn'
 
 graphql`
diff --git a/packages/client/mutations/AutogroupMutation.ts b/packages/client/mutations/AutogroupMutation.ts
index 18bbdf2a3ba..3a66969a2e1 100644
--- a/packages/client/mutations/AutogroupMutation.ts
+++ b/packages/client/mutations/AutogroupMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {AutogroupMutation as TAutogroupMutation} from '../__generated__/AutogroupMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment AutogroupMutation_meeting on AutogroupSuccess {
diff --git a/packages/client/mutations/BatchArchiveTasksMutation.ts b/packages/client/mutations/BatchArchiveTasksMutation.ts
index c7c9c8d7095..4963f72303f 100644
--- a/packages/client/mutations/BatchArchiveTasksMutation.ts
+++ b/packages/client/mutations/BatchArchiveTasksMutation.ts
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
+import {BatchArchiveTasksMutation_tasks$data} from '~/__generated__/BatchArchiveTasksMutation_tasks.graphql'
 import ITask from '../../server/database/types/Task'
 import {BatchArchiveTasksMutation as TBatchArchiveTasksMutation} from '../__generated__/BatchArchiveTasksMutation.graphql'
-import {BatchArchiveTasksMutation_tasks$data} from '~/__generated__/BatchArchiveTasksMutation_tasks.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import getTagsFromEntityMap from '../utils/draftjs/getTagsFromEntityMap'
-import handleUpsertTasks from './handlers/handleUpsertTasks'
 import handleRemoveTasks from './handlers/handleRemoveTasks'
+import handleUpsertTasks from './handlers/handleUpsertTasks'
 
 graphql`
   fragment BatchArchiveTasksMutation_tasks on BatchArchiveTasksSuccess {
diff --git a/packages/client/mutations/ChangeTaskTeamMutation.ts b/packages/client/mutations/ChangeTaskTeamMutation.ts
index 156a7f498cc..0e873a41947 100644
--- a/packages/client/mutations/ChangeTaskTeamMutation.ts
+++ b/packages/client/mutations/ChangeTaskTeamMutation.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {ChangeTaskTeamMutation_task$data} from '~/__generated__/ChangeTaskTeamMutation_task.graphql'
+import {ChangeTaskTeamMutation as TChangeTaskTeamMutation} from '../__generated__/ChangeTaskTeamMutation.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import getBaseRecord from '../utils/relay/getBaseRecord'
 import safeRemoveNodeFromUnknownConn from '../utils/relay/safeRemoveNodeFromUnknownConn'
 import updateProxyRecord from '../utils/relay/updateProxyRecord'
-import {ChangeTaskTeamMutation as TChangeTaskTeamMutation} from '../__generated__/ChangeTaskTeamMutation.graphql'
 import handleUpsertTasks from './handlers/handleUpsertTasks'
 
 graphql`
diff --git a/packages/client/mutations/CreateImposterTokenMutation.ts b/packages/client/mutations/CreateImposterTokenMutation.ts
index dda11a6d1a1..adf70b0d252 100644
--- a/packages/client/mutations/CreateImposterTokenMutation.ts
+++ b/packages/client/mutations/CreateImposterTokenMutation.ts
@@ -2,9 +2,9 @@ import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {LocalStorageKey} from '~/types/constEnums'
 import Atmosphere from '../Atmosphere'
+import {CreateImposterTokenMutation as ICreateImposterTokenMutation} from '../__generated__/CreateImposterTokenMutation.graphql'
 import {SimpleMutation} from '../types/relayMutations'
 import getGraphQLError from '../utils/relay/getGraphQLError'
-import {CreateImposterTokenMutation as ICreateImposterTokenMutation} from '../__generated__/CreateImposterTokenMutation.graphql'
 
 graphql`
   fragment CreateImposterTokenMutation_agendaItem on CreateImposterTokenPayload {
diff --git a/packages/client/mutations/CreateMassInvitationMutation.ts b/packages/client/mutations/CreateMassInvitationMutation.ts
index dc188b7d857..999a0a6490d 100644
--- a/packages/client/mutations/CreateMassInvitationMutation.ts
+++ b/packages/client/mutations/CreateMassInvitationMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {CreateMassInvitationMutation as TCreateMassInvitationMutation} from '../__generated__/CreateMassInvitationMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment CreateMassInvitationMutation_team on CreateMassInvitationSuccess {
diff --git a/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts b/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts
index 9fbaf3d6e16..be15c2c2b7e 100644
--- a/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts
+++ b/packages/client/mutations/CreateOAuth1AuthorizeUrlMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import Atmosphere from '../Atmosphere'
-import {OptionalHandlers, StandardMutation} from '../types/relayMutations'
 import {CreateOAuth1AuthorizeUrlMutation as TCreateOAuth1AuthorizeUrlMutation} from '../__generated__/CreateOAuth1AuthorizeUrlMutation.graphql'
+import {OptionalHandlers, StandardMutation} from '../types/relayMutations'
 
 const mutation = graphql`
   mutation CreateOAuth1AuthorizeUrlMutation($providerId: ID!, $teamId: ID!) {
diff --git a/packages/client/mutations/CreatePollMutation.ts b/packages/client/mutations/CreatePollMutation.ts
index 2d165d50e3c..58418a91d4a 100644
--- a/packages/client/mutations/CreatePollMutation.ts
+++ b/packages/client/mutations/CreatePollMutation.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {CreatePollMutation_meeting$data} from '~/__generated__/CreatePollMutation_meeting.graphql'
-import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {CreatePollMutation as TCreatePollMutation} from '../__generated__/CreatePollMutation.graphql'
 import {ThreadedPollBase_poll$data} from '../__generated__/ThreadedPollBase_poll.graphql'
+import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
 import getDiscussionThreadConn from './connections/getDiscussionThreadConn'
 import safePutNodeInConn from './handlers/safePutNodeInConn'
 
diff --git a/packages/client/mutations/CreateReflectionMutation.ts b/packages/client/mutations/CreateReflectionMutation.ts
index 03956f301f1..f4974284134 100644
--- a/packages/client/mutations/CreateReflectionMutation.ts
+++ b/packages/client/mutations/CreateReflectionMutation.ts
@@ -5,13 +5,13 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {CreateReflectionMutation_meeting$data} from '~/__generated__/CreateReflectionMutation_meeting.graphql'
+import {CreateReflectionMutation as TCreateReflectionMutation} from '../__generated__/CreateReflectionMutation.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import makeEmptyStr from '../utils/draftjs/makeEmptyStr'
 import clientTempId from '../utils/relay/clientTempId'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {CreateReflectionMutation as TCreateReflectionMutation} from '../__generated__/CreateReflectionMutation.graphql'
 import handleAddReflectionGroups from './handlers/handleAddReflectionGroups'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 graphql`
   fragment CreateReflectionMutation_meeting on CreateReflectionPayload {
diff --git a/packages/client/mutations/CreateStripeSubscriptionMutation.ts b/packages/client/mutations/CreateStripeSubscriptionMutation.ts
index 2868c24173a..09064ae2665 100644
--- a/packages/client/mutations/CreateStripeSubscriptionMutation.ts
+++ b/packages/client/mutations/CreateStripeSubscriptionMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {CreateStripeSubscriptionMutation as TCreateStripeSubscriptionMutation} from '../__generated__/CreateStripeSubscriptionMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment CreateStripeSubscriptionMutation_organization on CreateStripeSubscriptionSuccess {
diff --git a/packages/client/mutations/CreateTaskIntegrationMutation.ts b/packages/client/mutations/CreateTaskIntegrationMutation.ts
index 411ef942c1c..d87e8d15b2f 100644
--- a/packages/client/mutations/CreateTaskIntegrationMutation.ts
+++ b/packages/client/mutations/CreateTaskIntegrationMutation.ts
@@ -3,12 +3,12 @@ import {stateToHTML} from 'draft-js-export-html'
 import {commitMutation} from 'react-relay'
 import {RecordSourceSelectorProxy} from 'relay-runtime'
 import JiraProjectId from '~/shared/gqlIds/JiraProjectId'
+import {CreateTaskIntegrationMutation as TCreateTaskIntegrationMutation} from '../__generated__/CreateTaskIntegrationMutation.graphql'
 import {StandardMutation} from '../types/relayMutations'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import splitDraftContent from '../utils/draftjs/splitDraftContent'
 import getMeetingPathParams from '../utils/meetings/getMeetingPathParams'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {CreateTaskIntegrationMutation as TCreateTaskIntegrationMutation} from '../__generated__/CreateTaskIntegrationMutation.graphql'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 graphql`
   fragment CreateTaskIntegrationMutation_task on CreateTaskIntegrationPayload {
diff --git a/packages/client/mutations/CreateTaskMutation.ts b/packages/client/mutations/CreateTaskMutation.ts
index 256efc3f5f8..0ff880cdf4d 100644
--- a/packages/client/mutations/CreateTaskMutation.ts
+++ b/packages/client/mutations/CreateTaskMutation.ts
@@ -3,6 +3,9 @@ import {commitMutation} from 'react-relay'
 import AzureDevOpsProjectId from '~/shared/gqlIds/AzureDevOpsProjectId'
 import extractTextFromDraftString from '~/utils/draftjs/extractTextFromDraftString'
 import Atmosphere from '../Atmosphere'
+import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
+import {CreateTaskMutation_notification$data} from '../__generated__/CreateTaskMutation_notification.graphql'
+import {CreateTaskMutation_task$data} from '../__generated__/CreateTaskMutation_task.graphql'
 import GitHubIssueId from '../shared/gqlIds/GitHubIssueId'
 import JiraProjectId from '../shared/gqlIds/JiraProjectId'
 import {
@@ -16,9 +19,6 @@ import makeEmptyStr from '../utils/draftjs/makeEmptyStr'
 import clientTempId from '../utils/relay/clientTempId'
 import createProxyRecord from '../utils/relay/createProxyRecord'
 import getOptimisticTaskEditor from '../utils/relay/getOptimisticTaskEditor'
-import {CreateTaskMutation as TCreateTaskMutation} from '../__generated__/CreateTaskMutation.graphql'
-import {CreateTaskMutation_notification$data} from '../__generated__/CreateTaskMutation_notification.graphql'
-import {CreateTaskMutation_task$data} from '../__generated__/CreateTaskMutation_task.graphql'
 import handleAddNotifications from './handlers/handleAddNotifications'
 import handleAzureCreateIssue from './handlers/handleAzureCreateIssue'
 import handleEditTask from './handlers/handleEditTask'
diff --git a/packages/client/mutations/DeleteCommentMutation.ts b/packages/client/mutations/DeleteCommentMutation.ts
index e85b917f1fa..4eaee0f1d9a 100644
--- a/packages/client/mutations/DeleteCommentMutation.ts
+++ b/packages/client/mutations/DeleteCommentMutation.ts
@@ -1,12 +1,12 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
+import {DeleteCommentMutation_meeting$data} from '~/__generated__/DeleteCommentMutation_meeting.graphql'
 import convertToTaskContent from '~/utils/draftjs/convertToTaskContent'
 import safeRemoveNodeFromArray from '~/utils/relay/safeRemoveNodeFromArray'
 import safeRemoveNodeFromConn from '~/utils/relay/safeRemoveNodeFromConn'
-import {DeleteCommentMutation_meeting$data} from '~/__generated__/DeleteCommentMutation_meeting.graphql'
-import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import {DeleteCommentMutation as TDeleteCommentMutation} from '../__generated__/DeleteCommentMutation.graphql'
+import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import getDiscussionThreadConn from './connections/getDiscussionThreadConn'
 
 graphql`
diff --git a/packages/client/mutations/DeleteUserMutation.ts b/packages/client/mutations/DeleteUserMutation.ts
index 54ac02647ee..58add7a7157 100644
--- a/packages/client/mutations/DeleteUserMutation.ts
+++ b/packages/client/mutations/DeleteUserMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {DeleteUserMutation as TDeleteUserMutation} from '../__generated__/DeleteUserMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 const mutation = graphql`
   mutation DeleteUserMutation($userId: ID!, $reason: String) {
diff --git a/packages/client/mutations/DenyPushInvitationMutation.ts b/packages/client/mutations/DenyPushInvitationMutation.ts
index 4430f779e66..13dd77f70b9 100644
--- a/packages/client/mutations/DenyPushInvitationMutation.ts
+++ b/packages/client/mutations/DenyPushInvitationMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {OnNextHandler, SimpleMutation} from '../types/relayMutations'
 import {DenyPushInvitationMutation as TDenyPushInvitationMutation} from '../__generated__/DenyPushInvitationMutation.graphql'
 import {DenyPushInvitationMutation_team$data} from '../__generated__/DenyPushInvitationMutation_team.graphql'
+import {OnNextHandler, SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment DenyPushInvitationMutation_team on DenyPushInvitationPayload {
diff --git a/packages/client/mutations/DismissNewFeatureMutation.ts b/packages/client/mutations/DismissNewFeatureMutation.ts
index 184981c43db..4059256c690 100644
--- a/packages/client/mutations/DismissNewFeatureMutation.ts
+++ b/packages/client/mutations/DismissNewFeatureMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {DismissNewFeatureMutation as TDismissNewFeatureMutation} from '../__generated__/DismissNewFeatureMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 const mutation = graphql`
   mutation DismissNewFeatureMutation {
diff --git a/packages/client/mutations/DismissSuggestedActionMutation.ts b/packages/client/mutations/DismissSuggestedActionMutation.ts
index 9c05f1465f2..fb95e4ed36d 100644
--- a/packages/client/mutations/DismissSuggestedActionMutation.ts
+++ b/packages/client/mutations/DismissSuggestedActionMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {DismissSuggestedActionMutation as TDismissSuggestedActionMutation} from '../__generated__/DismissSuggestedActionMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
 
 const mutation = graphql`
diff --git a/packages/client/mutations/DowngradeToStarterMutation.ts b/packages/client/mutations/DowngradeToStarterMutation.ts
index b20a89ecf53..10e19e8ce7f 100644
--- a/packages/client/mutations/DowngradeToStarterMutation.ts
+++ b/packages/client/mutations/DowngradeToStarterMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {DowngradeToStarterMutation as TDowngradeToStarterMutation} from '../__generated__/DowngradeToStarterMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment DowngradeToStarterMutation_organization on DowngradeToStarterPayload {
diff --git a/packages/client/mutations/DragDiscussionTopicMutation.ts b/packages/client/mutations/DragDiscussionTopicMutation.ts
index c9692e16203..e4423f36414 100644
--- a/packages/client/mutations/DragDiscussionTopicMutation.ts
+++ b/packages/client/mutations/DragDiscussionTopicMutation.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {DragDiscussionTopicMutation_meeting$data} from '~/__generated__/DragDiscussionTopicMutation_meeting.graphql'
+import {DragDiscussionTopicMutation as IDragDiscussionTopicMutation} from '../__generated__/DragDiscussionTopicMutation.graphql'
 import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import {DISCUSS} from '../utils/constants'
-import {DragDiscussionTopicMutation as IDragDiscussionTopicMutation} from '../__generated__/DragDiscussionTopicMutation.graphql'
 import handleUpdateStageSort from './handlers/handleUpdateStageSort'
 
 graphql`
diff --git a/packages/client/mutations/DragEstimatingTaskMutation.ts b/packages/client/mutations/DragEstimatingTaskMutation.ts
index 5b11756552a..fd9403da94b 100644
--- a/packages/client/mutations/DragEstimatingTaskMutation.ts
+++ b/packages/client/mutations/DragEstimatingTaskMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {DragEstimatingTaskMutation as IDragEstimatingTaskMutation} from '../__generated__/DragEstimatingTaskMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment DragEstimatingTaskMutation_meeting on DragEstimatingTaskSuccess {
diff --git a/packages/client/mutations/EditCommentingMutation.ts b/packages/client/mutations/EditCommentingMutation.ts
index b1145ffe8d5..058d1b0258c 100644
--- a/packages/client/mutations/EditCommentingMutation.ts
+++ b/packages/client/mutations/EditCommentingMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {EditCommentingMutation as TEditCommentingMutation} from '../__generated__/EditCommentingMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment EditCommentingMutation_meeting on EditCommentingSuccess {
diff --git a/packages/client/mutations/EditReflectionMutation.ts b/packages/client/mutations/EditReflectionMutation.ts
index bc454756ba7..867989bdd7b 100644
--- a/packages/client/mutations/EditReflectionMutation.ts
+++ b/packages/client/mutations/EditReflectionMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {EditReflectionMutation_meeting$data} from '~/__generated__/EditReflectionMutation_meeting.graphql'
-import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import {EditReflectionMutation as TEditReflectionMutation} from '../__generated__/EditReflectionMutation.graphql'
+import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import handleEditReflection from './handlers/handleEditReflection'
 
 graphql`
diff --git a/packages/client/mutations/EditTaskMutation.ts b/packages/client/mutations/EditTaskMutation.ts
index 5f9ee7b5278..3cab5e4f868 100644
--- a/packages/client/mutations/EditTaskMutation.ts
+++ b/packages/client/mutations/EditTaskMutation.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {EditTaskMutation as TEditTaskMutation} from '../__generated__/EditTaskMutation.graphql'
+import {EditTaskMutation_task$data} from '../__generated__/EditTaskMutation_task.graphql'
 import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import getOptimisticTaskEditor from '../utils/relay/getOptimisticTaskEditor'
 import isTempId from '../utils/relay/isTempId'
-import {EditTaskMutation as TEditTaskMutation} from '../__generated__/EditTaskMutation.graphql'
-import {EditTaskMutation_task$data} from '../__generated__/EditTaskMutation_task.graphql'
 import handleEditTask from './handlers/handleEditTask'
 
 graphql`
diff --git a/packages/client/mutations/EmailPasswordResetMutation.ts b/packages/client/mutations/EmailPasswordResetMutation.ts
index 27d26cebe80..22277029f73 100644
--- a/packages/client/mutations/EmailPasswordResetMutation.ts
+++ b/packages/client/mutations/EmailPasswordResetMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {EmailPasswordResetMutation as TEmailPasswordResetMutation} from '../__generated__/EmailPasswordResetMutation.graphql'
 import {AuthenticationError} from '../types/constEnums'
 import {LocalHandlers, StandardMutation} from '../types/relayMutations'
-import {EmailPasswordResetMutation as TEmailPasswordResetMutation} from '../__generated__/EmailPasswordResetMutation.graphql'
 
 export enum ForgotPasswordResType {
   GOOGLE = 'goog',
diff --git a/packages/client/mutations/EndCheckInMutation.ts b/packages/client/mutations/EndCheckInMutation.ts
index 9b96beb70ec..656c1427468 100644
--- a/packages/client/mutations/EndCheckInMutation.ts
+++ b/packages/client/mutations/EndCheckInMutation.ts
@@ -1,9 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordProxy} from 'relay-runtime'
-import onMeetingRoute from '~/utils/onMeetingRoute'
 import {EndCheckInMutation_notification$data} from '~/__generated__/EndCheckInMutation_notification.graphql'
 import {EndCheckInMutation_team$data} from '~/__generated__/EndCheckInMutation_team.graphql'
+import onMeetingRoute from '~/utils/onMeetingRoute'
+import {EndCheckInMutation as TEndCheckInMutation} from '../__generated__/EndCheckInMutation.graphql'
 import {
   HistoryMaybeLocalHandler,
   OnNextHandler,
@@ -11,7 +12,6 @@ import {
   SharedUpdater,
   StandardMutation
 } from '../types/relayMutations'
-import {EndCheckInMutation as TEndCheckInMutation} from '../__generated__/EndCheckInMutation.graphql'
 import handleAddTimelineEvent from './handlers/handleAddTimelineEvent'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
 import handleRemoveTasks from './handlers/handleRemoveTasks'
diff --git a/packages/client/mutations/EndRetrospectiveMutation.ts b/packages/client/mutations/EndRetrospectiveMutation.ts
index afd7feafdc8..5d27418cdd1 100644
--- a/packages/client/mutations/EndRetrospectiveMutation.ts
+++ b/packages/client/mutations/EndRetrospectiveMutation.ts
@@ -1,9 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordProxy} from 'relay-runtime'
-import onMeetingRoute from '~/utils/onMeetingRoute'
 import {EndRetrospectiveMutation_notification$data} from '~/__generated__/EndRetrospectiveMutation_notification.graphql'
 import {EndRetrospectiveMutation_team$data} from '~/__generated__/EndRetrospectiveMutation_team.graphql'
+import onMeetingRoute from '~/utils/onMeetingRoute'
+import {EndRetrospectiveMutation as TEndRetrospectiveMutation} from '../__generated__/EndRetrospectiveMutation.graphql'
 import {RetroDemo} from '../types/constEnums'
 import {
   HistoryMaybeLocalHandler,
@@ -12,7 +13,6 @@ import {
   SharedUpdater,
   StandardMutation
 } from '../types/relayMutations'
-import {EndRetrospectiveMutation as TEndRetrospectiveMutation} from '../__generated__/EndRetrospectiveMutation.graphql'
 import handleAddTimelineEvent from './handlers/handleAddTimelineEvent'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
 import popEndMeetingToast from './toasts/popEndMeetingToast'
diff --git a/packages/client/mutations/EndSprintPokerMutation.ts b/packages/client/mutations/EndSprintPokerMutation.ts
index 3e132fd6273..74effc113a0 100644
--- a/packages/client/mutations/EndSprintPokerMutation.ts
+++ b/packages/client/mutations/EndSprintPokerMutation.ts
@@ -1,7 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import onMeetingRoute from '~/utils/onMeetingRoute'
 import {EndSprintPokerMutation_team$data} from '~/__generated__/EndSprintPokerMutation_team.graphql'
+import onMeetingRoute from '~/utils/onMeetingRoute'
+import {EndSprintPokerMutation as TEndSprintPokerMutation} from '../__generated__/EndSprintPokerMutation.graphql'
 import {
   HistoryMaybeLocalHandler,
   OnNextHandler,
@@ -9,7 +10,6 @@ import {
   SharedUpdater,
   StandardMutation
 } from '../types/relayMutations'
-import {EndSprintPokerMutation as TEndSprintPokerMutation} from '../__generated__/EndSprintPokerMutation.graphql'
 import handleRemoveTasks from './handlers/handleRemoveTasks'
 import popEndMeetingToast from './toasts/popEndMeetingToast'
 
diff --git a/packages/client/mutations/EndTeamPromptMutation.ts b/packages/client/mutations/EndTeamPromptMutation.ts
index c1b294a5f03..3b6597bd55e 100644
--- a/packages/client/mutations/EndTeamPromptMutation.ts
+++ b/packages/client/mutations/EndTeamPromptMutation.ts
@@ -1,8 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordProxy} from 'relay-runtime'
-import onMeetingRoute from '~/utils/onMeetingRoute'
 import {EndTeamPromptMutation_team$data} from '~/__generated__/EndTeamPromptMutation_team.graphql'
+import onMeetingRoute from '~/utils/onMeetingRoute'
+import {EndTeamPromptMutation as TEndTeamPromptMutation} from '../__generated__/EndTeamPromptMutation.graphql'
 import {
   HistoryMaybeLocalHandler,
   OnNextHandler,
@@ -10,7 +11,6 @@ import {
   SharedUpdater,
   StandardMutation
 } from '../types/relayMutations'
-import {EndTeamPromptMutation as TEndTeamPromptMutation} from '../__generated__/EndTeamPromptMutation.graphql'
 import handleAddTimelineEvent from './handlers/handleAddTimelineEvent'
 
 graphql`
diff --git a/packages/client/mutations/FlagReadyToAdvanceMutation.ts b/packages/client/mutations/FlagReadyToAdvanceMutation.ts
index 2b9fba68fcf..ed609eeb501 100644
--- a/packages/client/mutations/FlagReadyToAdvanceMutation.ts
+++ b/packages/client/mutations/FlagReadyToAdvanceMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {FlagReadyToAdvanceMutation as TFlagReadyToAdvanceMutation} from '../__generated__/FlagReadyToAdvanceMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment FlagReadyToAdvanceMutation_meeting on FlagReadyToAdvanceSuccess {
diff --git a/packages/client/mutations/GetTemplateSuggestionMutation.ts b/packages/client/mutations/GetTemplateSuggestionMutation.ts
index eda5c1812ff..fc1cfe1bd9e 100644
--- a/packages/client/mutations/GetTemplateSuggestionMutation.ts
+++ b/packages/client/mutations/GetTemplateSuggestionMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {GetTemplateSuggestionMutation as TGetTemplateSuggestionMutation} from '../__generated__/GetTemplateSuggestionMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment GetTemplateSuggestionMutation_viewer on GetTemplateSuggestionSuccess {
diff --git a/packages/client/mutations/InvalidateSessionsMutation.ts b/packages/client/mutations/InvalidateSessionsMutation.ts
index 975ef83253b..e3f9809c8e5 100644
--- a/packages/client/mutations/InvalidateSessionsMutation.ts
+++ b/packages/client/mutations/InvalidateSessionsMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {InvalidateSessionsMutation as TInvalidateSessionsMutation} from '../__generated__/InvalidateSessionsMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment InvalidateSessionsMutation_notification on InvalidateSessionsPayload {
diff --git a/packages/client/mutations/InviteToTeamMutation.ts b/packages/client/mutations/InviteToTeamMutation.ts
index eca0fc3187e..f662151ca52 100644
--- a/packages/client/mutations/InviteToTeamMutation.ts
+++ b/packages/client/mutations/InviteToTeamMutation.ts
@@ -1,6 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {matchPath} from 'react-router'
+import {InviteToTeamMutation as TInviteToTeamMutation} from '../__generated__/InviteToTeamMutation.graphql'
+import {InviteToTeamMutation_notification$data} from '../__generated__/InviteToTeamMutation_notification.graphql'
 import {
   LocalHandlers,
   OnNextHandler,
@@ -8,8 +10,6 @@ import {
   SharedUpdater,
   StandardMutation
 } from '../types/relayMutations'
-import {InviteToTeamMutation as TInviteToTeamMutation} from '../__generated__/InviteToTeamMutation.graphql'
-import {InviteToTeamMutation_notification$data} from '../__generated__/InviteToTeamMutation_notification.graphql'
 import AcceptTeamInvitationMutation from './AcceptTeamInvitationMutation'
 import handleAddNotifications from './handlers/handleAddNotifications'
 import handleRemoveSuggestedActions from './handlers/handleRemoveSuggestedActions'
diff --git a/packages/client/mutations/JoinMeetingMutation.ts b/packages/client/mutations/JoinMeetingMutation.ts
index e50db516eb1..66a2caff22e 100644
--- a/packages/client/mutations/JoinMeetingMutation.ts
+++ b/packages/client/mutations/JoinMeetingMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {JoinMeetingMutation as TJoinMeetingMutation} from '../__generated__/JoinMeetingMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment JoinMeetingMutation_meeting on JoinMeetingSuccess {
diff --git a/packages/client/mutations/LoginWithGoogleMutation.ts b/packages/client/mutations/LoginWithGoogleMutation.ts
index e020f7d72a9..b64e6b5ee5e 100644
--- a/packages/client/mutations/LoginWithGoogleMutation.ts
+++ b/packages/client/mutations/LoginWithGoogleMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {LoginWithGoogleMutation as TLoginWithGoogleMutation} from '../__generated__/LoginWithGoogleMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation'
 import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect'
 
diff --git a/packages/client/mutations/LoginWithMicrosoftMutation.ts b/packages/client/mutations/LoginWithMicrosoftMutation.ts
index 696d7fe0dfc..7293cffa73e 100644
--- a/packages/client/mutations/LoginWithMicrosoftMutation.ts
+++ b/packages/client/mutations/LoginWithMicrosoftMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {LoginWithMicrosoftMutation as TLoginWithMicrosoftMutation} from '../__generated__/LoginWithMicrosoftMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation'
 import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect'
 
diff --git a/packages/client/mutations/LoginWithPasswordMutation.ts b/packages/client/mutations/LoginWithPasswordMutation.ts
index 9efdfa4283e..af89a6cd827 100644
--- a/packages/client/mutations/LoginWithPasswordMutation.ts
+++ b/packages/client/mutations/LoginWithPasswordMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {LoginWithPasswordMutation as TLoginWithPasswordMutation} from '../__generated__/LoginWithPasswordMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation'
 import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect'
 
diff --git a/packages/client/mutations/MovePokerTemplateDimensionMutation.ts b/packages/client/mutations/MovePokerTemplateDimensionMutation.ts
index e29fddca74c..3e20d7d7e75 100644
--- a/packages/client/mutations/MovePokerTemplateDimensionMutation.ts
+++ b/packages/client/mutations/MovePokerTemplateDimensionMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {MovePokerTemplateDimensionMutation as TMovePokerTemplateDimensionMutation} from '~/__generated__/MovePokerTemplateDimensionMutation.graphql'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {MovePokerTemplateDimensionMutation_team$data} from '../__generated__/MovePokerTemplateDimensionMutation_team.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleMovePokerTemplateDimension from './handlers/handleMovePokerTemplateDimension'
 
 graphql`
diff --git a/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts b/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts
index 25ba330b30b..44951285b9a 100644
--- a/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts
+++ b/packages/client/mutations/MovePokerTemplateScaleValueMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {MovePokerTemplateScaleValueMutation as TMovePokerTemplateScaleValueMutation} from '../__generated__/MovePokerTemplateScaleValueMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment MovePokerTemplateScaleValueMutation_team on MovePokerTemplateScaleValueSuccess {
diff --git a/packages/client/mutations/MoveReflectTemplatePromptMutation.ts b/packages/client/mutations/MoveReflectTemplatePromptMutation.ts
index 8a5c288b64c..531d10357dc 100644
--- a/packages/client/mutations/MoveReflectTemplatePromptMutation.ts
+++ b/packages/client/mutations/MoveReflectTemplatePromptMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {MoveReflectTemplatePromptMutation as TMoveReflectTemplatePromptMutation} from '~/__generated__/MoveReflectTemplatePromptMutation.graphql'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {MoveReflectTemplatePromptMutation_team$data} from '../__generated__/MoveReflectTemplatePromptMutation_team.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleMoveTemplatePrompt from './handlers/handleMoveTemplatePrompt'
 interface Context {
   templateId: string
diff --git a/packages/client/mutations/NavigateMeetingMutation.ts b/packages/client/mutations/NavigateMeetingMutation.ts
index bad2b92505b..fff2549f231 100644
--- a/packages/client/mutations/NavigateMeetingMutation.ts
+++ b/packages/client/mutations/NavigateMeetingMutation.ts
@@ -6,6 +6,7 @@ import {
 } from '~/__generated__/NavigateMeetingMutation_meeting.graphql'
 import {NavigateMeetingMutation_team$data} from '~/__generated__/NavigateMeetingMutation_team.graphql'
 import {ReflectionGroup_reflectionGroup$data} from '~/__generated__/ReflectionGroup_reflectionGroup.graphql'
+import {NavigateMeetingMutation as TNavigateMeetingMutation} from '../__generated__/NavigateMeetingMutation.graphql'
 import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import {REFLECT, VOTE} from '../utils/constants'
 import isInterruptingChickenPhase from '../utils/isInterruptingChickenPhase'
@@ -13,7 +14,6 @@ import getBaseRecord from '../utils/relay/getBaseRecord'
 import safeProxy from '../utils/relay/safeProxy'
 import {setLocalStageAndPhase} from '../utils/relay/updateLocalStage'
 import {isViewerTypingInComment, isViewerTypingInTask} from '../utils/viewerTypingUtils'
-import {NavigateMeetingMutation as TNavigateMeetingMutation} from '../__generated__/NavigateMeetingMutation.graphql'
 import handleRemoveReflectionGroups from './handlers/handleRemoveReflectionGroups'
 
 graphql`
diff --git a/packages/client/mutations/OldUpdateCreditCardMutation.ts b/packages/client/mutations/OldUpdateCreditCardMutation.ts
index 6abc853dd5a..724321c1530 100644
--- a/packages/client/mutations/OldUpdateCreditCardMutation.ts
+++ b/packages/client/mutations/OldUpdateCreditCardMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {OldUpdateCreditCardMutation as TOldUpdateCreditCardMutation} from '../__generated__/OldUpdateCreditCardMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment OldUpdateCreditCardMutation_organization on OldUpdateCreditCardPayload {
diff --git a/packages/client/mutations/OldUpgradeToTeamTierMutation.ts b/packages/client/mutations/OldUpgradeToTeamTierMutation.ts
index 6b2e6e3a2d7..0dbbdbb2e51 100644
--- a/packages/client/mutations/OldUpgradeToTeamTierMutation.ts
+++ b/packages/client/mutations/OldUpgradeToTeamTierMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {OldUpgradeToTeamTierMutation as TOldUpgradeToTeamTierMutation} from '../__generated__/OldUpgradeToTeamTierMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment OldUpgradeToTeamTierMutation_organization on OldUpgradeToTeamTierPayload {
diff --git a/packages/client/mutations/PayLaterMutation.ts b/packages/client/mutations/PayLaterMutation.ts
index af3ced5ad59..5da2758c95a 100644
--- a/packages/client/mutations/PayLaterMutation.ts
+++ b/packages/client/mutations/PayLaterMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'relay-runtime'
-import {SimpleMutation} from '../types/relayMutations'
 import {PayLaterMutation as TPayLaterMutation} from '../__generated__/PayLaterMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment PayLaterMutation_organization on PayLaterPayload {
diff --git a/packages/client/mutations/PersistGitHubSearchQueryMutation.ts b/packages/client/mutations/PersistGitHubSearchQueryMutation.ts
index fa6c6338a29..f95b4000b63 100644
--- a/packages/client/mutations/PersistGitHubSearchQueryMutation.ts
+++ b/packages/client/mutations/PersistGitHubSearchQueryMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {PersistGitHubSearchQueryMutation as TPersistGitHubSearchQueryMutation} from '../__generated__/PersistGitHubSearchQueryMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment PersistGitHubSearchQueryMutation_notification on PersistGitHubSearchQuerySuccess {
diff --git a/packages/client/mutations/PersistJiraSearchQueryMutation.ts b/packages/client/mutations/PersistJiraSearchQueryMutation.ts
index 64a87afa577..c4331cf7e94 100644
--- a/packages/client/mutations/PersistJiraSearchQueryMutation.ts
+++ b/packages/client/mutations/PersistJiraSearchQueryMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {PersistJiraSearchQueryMutation as TPersistJiraSearchQueryMutation} from '../__generated__/PersistJiraSearchQueryMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment PersistJiraSearchQueryMutation_notification on PersistJiraSearchQuerySuccess {
diff --git a/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts b/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts
index e6676d8b867..cc4012b61aa 100644
--- a/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts
+++ b/packages/client/mutations/PersistJiraServerSearchQueryMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {PersistJiraServerSearchQueryMutation as TPersistJiraServerSearchQueryMutation} from '../__generated__/PersistJiraServerSearchQueryMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment PersistJiraServerSearchQueryMutation_notification on PersistIntegrationSearchQuerySuccess {
diff --git a/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts b/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts
index 0ac6e368f97..cfb6aa2cdfe 100644
--- a/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts
+++ b/packages/client/mutations/PokerAnnounceDeckHoverMutation.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordProxy} from 'relay-runtime'
-import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
-import createProxyRecord from '../utils/relay/createProxyRecord'
 import {PokerAnnounceDeckHoverMutation as TPokerAnnounceDeckHoverMutation} from '../__generated__/PokerAnnounceDeckHoverMutation.graphql'
 import {PokerAnnounceDeckHoverMutation_meeting$data} from '../__generated__/PokerAnnounceDeckHoverMutation_meeting.graphql'
 import {PokerMeeting_meeting$data} from '../__generated__/PokerMeeting_meeting.graphql'
+import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
+import createProxyRecord from '../utils/relay/createProxyRecord'
 
 // asking for the correct hoveringUsers array would be fine, except we know a user can existing in exactly 1 hoveringUsers array at a time
 // which means we have to iterate over each stage & remove it from all others (because mouseEnter/mouseLeave are not always reliable)
diff --git a/packages/client/mutations/PokerResetDimensionMutation.ts b/packages/client/mutations/PokerResetDimensionMutation.ts
index 1a0c238dabb..1939a0dd0f0 100644
--- a/packages/client/mutations/PokerResetDimensionMutation.ts
+++ b/packages/client/mutations/PokerResetDimensionMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {PokerResetDimensionMutation as TPokerResetDimensionMutation} from '../__generated__/PokerResetDimensionMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment PokerResetDimensionMutation_meeting on PokerResetDimensionSuccess {
diff --git a/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts b/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts
index b632f194b99..085309e7859 100644
--- a/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts
+++ b/packages/client/mutations/PromoteNewMeetingFacilitatorMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {OnNextHandler, SimpleMutation} from '../types/relayMutations'
 import {PromoteNewMeetingFacilitatorMutation as TPromoteNewMeetingFacilitatorMutation} from '../__generated__/PromoteNewMeetingFacilitatorMutation.graphql'
 import {PromoteNewMeetingFacilitatorMutation_meeting$data} from '../__generated__/PromoteNewMeetingFacilitatorMutation_meeting.graphql'
+import {OnNextHandler, SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment PromoteNewMeetingFacilitatorMutation_meeting on PromoteNewMeetingFacilitatorPayload {
diff --git a/packages/client/mutations/PromoteToTeamLeadMutation.ts b/packages/client/mutations/PromoteToTeamLeadMutation.ts
index af3325b1808..fba4d965c6e 100644
--- a/packages/client/mutations/PromoteToTeamLeadMutation.ts
+++ b/packages/client/mutations/PromoteToTeamLeadMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {PromoteToTeamLeadMutation as TPromoteToTeamLeadMutation} from '../__generated__/PromoteToTeamLeadMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 graphql`
   fragment PromoteToTeamLeadMutation_team on PromoteToTeamLeadPayload {
     team {
diff --git a/packages/client/mutations/PushInvitationMutation.ts b/packages/client/mutations/PushInvitationMutation.ts
index af7252d1625..b4dc41146e7 100644
--- a/packages/client/mutations/PushInvitationMutation.ts
+++ b/packages/client/mutations/PushInvitationMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {OnNextHandler, StandardMutation} from '../types/relayMutations'
 import {PushInvitationMutation as TPushInvitationMutation} from '../__generated__/PushInvitationMutation.graphql'
 import {PushInvitationMutation_team$data} from '../__generated__/PushInvitationMutation_team.graphql'
+import {OnNextHandler, StandardMutation} from '../types/relayMutations'
 import DenyPushInvitationMutation from './DenyPushInvitationMutation'
 import InviteToTeamMutation from './InviteToTeamMutation'
 
diff --git a/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts b/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts
index e4126838116..166f1202558 100644
--- a/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts
+++ b/packages/client/mutations/ReflectTemplatePromptUpdateDescriptionMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {ReflectTemplatePromptUpdateDescriptionMutation as TReflectTemplatePromptUpdateDescriptionMutation} from '../__generated__/ReflectTemplatePromptUpdateDescriptionMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment ReflectTemplatePromptUpdateDescriptionMutation_team on ReflectTemplatePromptUpdateDescriptionPayload {
diff --git a/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts b/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts
index abab45f0b58..254f8f6facf 100644
--- a/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts
+++ b/packages/client/mutations/ReflectTemplatePromptUpdateGroupColorMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {ReflectTemplatePromptUpdateGroupColorMutation as TReflectTemplatePromptUpdateGroupColorMutation} from '../__generated__/ReflectTemplatePromptUpdateGroupColorMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment ReflectTemplatePromptUpdateGroupColorMutation_team on ReflectTemplatePromptUpdateGroupColorPayload {
diff --git a/packages/client/mutations/RemoveAgendaItemMutation.ts b/packages/client/mutations/RemoveAgendaItemMutation.ts
index f698ac1200f..865e63319b9 100644
--- a/packages/client/mutations/RemoveAgendaItemMutation.ts
+++ b/packages/client/mutations/RemoveAgendaItemMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {RemoveAgendaItemMutation as TRemoveAgendaItemMutation} from '../__generated__/RemoveAgendaItemMutation.graphql'
 import {RemoveAgendaItemMutation_team$data} from '../__generated__/RemoveAgendaItemMutation_team.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleRemoveAgendaItems from './handlers/handleRemoveAgendaItems'
 graphql`
   fragment RemoveAgendaItemMutation_team on RemoveAgendaItemPayload {
diff --git a/packages/client/mutations/RemoveAtlassianAuthMutation.ts b/packages/client/mutations/RemoveAtlassianAuthMutation.ts
index 576a6425624..1a69d58234b 100644
--- a/packages/client/mutations/RemoveAtlassianAuthMutation.ts
+++ b/packages/client/mutations/RemoveAtlassianAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {RemoveAtlassianAuthMutation as TRemoveAtlassianAuthMutation} from '../__generated__/RemoveAtlassianAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RemoveAtlassianAuthMutation_team on RemoveAtlassianAuthPayload {
diff --git a/packages/client/mutations/RemoveGitHubAuthMutation.ts b/packages/client/mutations/RemoveGitHubAuthMutation.ts
index 1f212137fba..4e0a50c48ae 100644
--- a/packages/client/mutations/RemoveGitHubAuthMutation.ts
+++ b/packages/client/mutations/RemoveGitHubAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {RemoveGitHubAuthMutation as TRemoveGitHubAuthMutation} from '../__generated__/RemoveGitHubAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RemoveGitHubAuthMutation_team on RemoveGitHubAuthPayload {
diff --git a/packages/client/mutations/RemoveIntegrationProviderMutation.ts b/packages/client/mutations/RemoveIntegrationProviderMutation.ts
index b807ac2d615..26acc7035fe 100644
--- a/packages/client/mutations/RemoveIntegrationProviderMutation.ts
+++ b/packages/client/mutations/RemoveIntegrationProviderMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {RemoveIntegrationProviderMutation as TRemoveIntegrationProviderMutation} from '../__generated__/RemoveIntegrationProviderMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RemoveIntegrationProviderMutation_team on RemoveIntegrationProviderSuccess {
diff --git a/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts b/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts
index 6fe116b185c..14284935dcb 100644
--- a/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts
+++ b/packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {RemoveJiraServerSearchQueryMutation as TRemoveJiraServerSearchQueryMutation} from '../__generated__/RemoveJiraServerSearchQueryMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment RemoveJiraServerSearchQueryMutation_notification on RemoveIntegrationSearchQuerySuccess {
diff --git a/packages/client/mutations/RemoveOrgUserMutation.ts b/packages/client/mutations/RemoveOrgUserMutation.ts
index b16f85fb91e..13e86325497 100644
--- a/packages/client/mutations/RemoveOrgUserMutation.ts
+++ b/packages/client/mutations/RemoveOrgUserMutation.ts
@@ -2,6 +2,9 @@ import graphql from 'babel-plugin-relay/macro'
 import {commitLocalUpdate, commitMutation} from 'react-relay'
 import {RemoveOrgUserMutation as TRemoveOrgUserMutation} from '~/__generated__/RemoveOrgUserMutation.graphql'
 import {RemoveOrgUserMutation_team$data} from '~/__generated__/RemoveOrgUserMutation_team.graphql'
+import {RemoveOrgUserMutation_notification$data} from '../__generated__/RemoveOrgUserMutation_notification.graphql'
+import {RemoveOrgUserMutation_organization$data} from '../__generated__/RemoveOrgUserMutation_organization.graphql'
+import {RemoveOrgUserMutation_task$data} from '../__generated__/RemoveOrgUserMutation_task.graphql'
 import {
   HistoryLocalHandler,
   OnNextHandler,
@@ -14,12 +17,9 @@ import onExOrgRoute from '../utils/onExOrgRoute'
 import onMeetingRoute from '../utils/onMeetingRoute'
 import onTeamRoute from '../utils/onTeamRoute'
 import {setLocalStageAndPhase} from '../utils/relay/updateLocalStage'
-import {RemoveOrgUserMutation_notification$data} from '../__generated__/RemoveOrgUserMutation_notification.graphql'
-import {RemoveOrgUserMutation_organization$data} from '../__generated__/RemoveOrgUserMutation_organization.graphql'
-import {RemoveOrgUserMutation_task$data} from '../__generated__/RemoveOrgUserMutation_task.graphql'
 import handleAddNotifications from './handlers/handleAddNotifications'
-import handleRemoveOrganization from './handlers/handleRemoveOrganization'
 import handleRemoveOrgMembers from './handlers/handleRemoveOrgMembers'
+import handleRemoveOrganization from './handlers/handleRemoveOrganization'
 import handleRemoveTasks from './handlers/handleRemoveTasks'
 import handleRemoveTeamMembers from './handlers/handleRemoveTeamMembers'
 import handleRemoveTeams from './handlers/handleRemoveTeams'
diff --git a/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts b/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts
index cf95494111d..8b6117f7fb5 100644
--- a/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts
+++ b/packages/client/mutations/RemovePokerTemplateDimensionMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {RemovePokerTemplateDimensionMutation as IRemovePokerTemplateDimensionMutation} from '../__generated__/RemovePokerTemplateDimensionMutation.graphql'
 import {RemovePokerTemplateDimensionMutation_team$data} from '../__generated__/RemovePokerTemplateDimensionMutation_team.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleRemovePokerTemplateDimension from './handlers/handleRemovePokerTemplateDimension'
 
 graphql`
diff --git a/packages/client/mutations/RemovePokerTemplateMutation.ts b/packages/client/mutations/RemovePokerTemplateMutation.ts
index f6b47ee9dba..e463b7de7c0 100644
--- a/packages/client/mutations/RemovePokerTemplateMutation.ts
+++ b/packages/client/mutations/RemovePokerTemplateMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {RemovePokerTemplateMutation as TRemovePokerTemplateMutation} from '../__generated__/RemovePokerTemplateMutation.graphql'
 import {RemovePokerTemplateMutation_team$data} from '../__generated__/RemovePokerTemplateMutation_team.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleRemovePokerTemplate from './handlers/handleRemovePokerTemplate'
 
 graphql`
diff --git a/packages/client/mutations/RemovePokerTemplateScaleMutation.ts b/packages/client/mutations/RemovePokerTemplateScaleMutation.ts
index c88546ca0aa..fd17762e834 100644
--- a/packages/client/mutations/RemovePokerTemplateScaleMutation.ts
+++ b/packages/client/mutations/RemovePokerTemplateScaleMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {RemovePokerTemplateScaleMutation as IRemovePokerTemplateScaleMutation} from '../__generated__/RemovePokerTemplateScaleMutation.graphql'
 import {RemovePokerTemplateScaleMutation_scale$data} from '../__generated__/RemovePokerTemplateScaleMutation_scale.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleRemovePokerTemplateScale from './handlers/handleRemovePokerTemplateScale'
 
 graphql`
diff --git a/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts b/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts
index 94469cd3338..c99b6514b73 100644
--- a/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts
+++ b/packages/client/mutations/RemovePokerTemplateScaleValueMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import safeRemoveNodeFromArray from '~/utils/relay/safeRemoveNodeFromArray'
-import {StandardMutation} from '../types/relayMutations'
 import {RemovePokerTemplateScaleValueMutation as IRemovePokerTemplateScaleValueMutation} from '../__generated__/RemovePokerTemplateScaleValueMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RemovePokerTemplateScaleValueMutation_scale on RemovePokerTemplateScaleValuePayload {
diff --git a/packages/client/mutations/RemoveReflectTemplateMutation.ts b/packages/client/mutations/RemoveReflectTemplateMutation.ts
index ba887c5b66a..f82e6b3e99e 100644
--- a/packages/client/mutations/RemoveReflectTemplateMutation.ts
+++ b/packages/client/mutations/RemoveReflectTemplateMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {RemoveReflectTemplateMutation as TRemoveReflectTemplateMutation} from '../__generated__/RemoveReflectTemplateMutation.graphql'
 import {RemoveReflectTemplateMutation_team$data} from '../__generated__/RemoveReflectTemplateMutation_team.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleRemoveReflectTemplate from './handlers/handleRemoveReflectTemplate'
 
 graphql`
diff --git a/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts b/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts
index 393fed94e54..d822dc855e5 100644
--- a/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts
+++ b/packages/client/mutations/RemoveReflectTemplatePromptMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import {RemoveReflectTemplatePromptMutation as TRemoveReflectTemplatePromptMutation} from '../__generated__/RemoveReflectTemplatePromptMutation.graphql'
 import {RemoveReflectTemplatePromptMutation_team$data} from '../__generated__/RemoveReflectTemplatePromptMutation_team.graphql'
+import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import handleRemoveReflectTemplatePrompt from './handlers/handleRemoveReflectTemplatePrompt'
 
 graphql`
diff --git a/packages/client/mutations/RemoveReflectionMutation.ts b/packages/client/mutations/RemoveReflectionMutation.ts
index f3ec9118b47..23c09faa733 100644
--- a/packages/client/mutations/RemoveReflectionMutation.ts
+++ b/packages/client/mutations/RemoveReflectionMutation.ts
@@ -6,9 +6,9 @@ import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordSourceSelectorProxy} from 'relay-runtime'
 import {RemoveReflectionMutation_meeting$data} from '~/__generated__/RemoveReflectionMutation_meeting.graphql'
+import {RemoveReflectionMutation as TRemoveReflectionMutation} from '../__generated__/RemoveReflectionMutation.graphql'
 import {BaseLocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
 import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray'
-import {RemoveReflectionMutation as TRemoveReflectionMutation} from '../__generated__/RemoveReflectionMutation.graphql'
 import handleRemoveReflectionGroups from './handlers/handleRemoveReflectionGroups'
 
 graphql`
diff --git a/packages/client/mutations/RemoveSlackAuthMutation.ts b/packages/client/mutations/RemoveSlackAuthMutation.ts
index 5f72fb137e0..59f94e9e45a 100644
--- a/packages/client/mutations/RemoveSlackAuthMutation.ts
+++ b/packages/client/mutations/RemoveSlackAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {RemoveSlackAuthMutation as TRemoveSlackAuthMutation} from '../__generated__/RemoveSlackAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RemoveSlackAuthMutation_team on RemoveSlackAuthPayload {
diff --git a/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts b/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts
index 669209b41e2..fcec82fdcfc 100644
--- a/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts
+++ b/packages/client/mutations/RemoveTeamMemberIntegrationAuthMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {RemoveTeamMemberIntegrationAuthMutation as TRemoveTeamMemberIntegrationAuthMutation} from '../__generated__/RemoveTeamMemberIntegrationAuthMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RemoveTeamMemberIntegrationAuthMutation_team on RemoveTeamMemberIntegrationAuthSuccess {
diff --git a/packages/client/mutations/RemoveTeamMemberMutation.ts b/packages/client/mutations/RemoveTeamMemberMutation.ts
index f2a7362cae0..1acfef0e19f 100644
--- a/packages/client/mutations/RemoveTeamMemberMutation.ts
+++ b/packages/client/mutations/RemoveTeamMemberMutation.ts
@@ -1,5 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {RemoveTeamMemberMutation as TRemoveTeamMemberMutation} from '../__generated__/RemoveTeamMemberMutation.graphql'
+import {RemoveTeamMemberMutation_task$data} from '../__generated__/RemoveTeamMemberMutation_task.graphql'
+import {RemoveTeamMemberMutation_team$data} from '../__generated__/RemoveTeamMemberMutation_team.graphql'
 import {
   OnNextHandler,
   OnNextHistoryContext,
@@ -8,15 +11,12 @@ import {
 } from '../types/relayMutations'
 import onMeetingRoute from '../utils/onMeetingRoute'
 import onTeamRoute from '../utils/onTeamRoute'
-import {RemoveTeamMemberMutation as TRemoveTeamMemberMutation} from '../__generated__/RemoveTeamMemberMutation.graphql'
-import {RemoveTeamMemberMutation_task$data} from '../__generated__/RemoveTeamMemberMutation_task.graphql'
-import {RemoveTeamMemberMutation_team$data} from '../__generated__/RemoveTeamMemberMutation_team.graphql'
+import SetNotificationStatusMutation from './SetNotificationStatusMutation'
 import handleAddNotifications from './handlers/handleAddNotifications'
 import handleRemoveTasks from './handlers/handleRemoveTasks'
 import handleRemoveTeamMembers from './handlers/handleRemoveTeamMembers'
 import handleRemoveTeams from './handlers/handleRemoveTeams'
 import handleUpsertTasks from './handlers/handleUpsertTasks'
-import SetNotificationStatusMutation from './SetNotificationStatusMutation'
 
 graphql`
   fragment RemoveTeamMemberMutation_task on RemoveTeamMemberPayload {
diff --git a/packages/client/mutations/RenameMeetingMutation.ts b/packages/client/mutations/RenameMeetingMutation.ts
index f52e2231200..24497489eea 100644
--- a/packages/client/mutations/RenameMeetingMutation.ts
+++ b/packages/client/mutations/RenameMeetingMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {RenameMeetingMutation as TRenameMeetingMutation} from '../__generated__/RenameMeetingMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RenameMeetingMutation_team on RenameMeetingSuccess {
diff --git a/packages/client/mutations/RequestToJoinDomainMutation.ts b/packages/client/mutations/RequestToJoinDomainMutation.ts
index c0397785779..98fdc28ce47 100644
--- a/packages/client/mutations/RequestToJoinDomainMutation.ts
+++ b/packages/client/mutations/RequestToJoinDomainMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {SimpleMutation} from '../types/relayMutations'
 import {RequestToJoinDomainMutation as TRequestToJoinDomainMutation} from '../__generated__/RequestToJoinDomainMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 import promptToJoinOrgSuccessToast from './toasts/promptToJoinOrgSuccessToast'
 
 const mutation = graphql`
diff --git a/packages/client/mutations/ResetPasswordMutation.ts b/packages/client/mutations/ResetPasswordMutation.ts
index 4d61a5a25dc..4035b67f172 100644
--- a/packages/client/mutations/ResetPasswordMutation.ts
+++ b/packages/client/mutations/ResetPasswordMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import getValidRedirectParam from '~/utils/getValidRedirectParam'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {ResetPasswordMutation as TResetPasswordMutation} from '../__generated__/ResetPasswordMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 
 const mutation = graphql`
   mutation ResetPasswordMutation($newPassword: String!, $token: ID!) {
diff --git a/packages/client/mutations/ResetReflectionGroupsMutation.ts b/packages/client/mutations/ResetReflectionGroupsMutation.ts
index eb91e7998fb..66cc437e32e 100644
--- a/packages/client/mutations/ResetReflectionGroupsMutation.ts
+++ b/packages/client/mutations/ResetReflectionGroupsMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {ResetReflectionGroupsMutation as TResetReflectionGroupsMutation} from '../__generated__/ResetReflectionGroupsMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment ResetReflectionGroupsMutation_meeting on ResetReflectionGroupsSuccess {
diff --git a/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts b/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts
index 82625860e53..d547f4df8fb 100644
--- a/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts
+++ b/packages/client/mutations/ResetRetroMeetingToGroupStageMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import Atmosphere from '~/Atmosphere'
-import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import {ResetRetroMeetingToGroupStageMutation as TResetRetroMeetingToGroupStageMutation} from '../__generated__/ResetRetroMeetingToGroupStageMutation.graphql'
+import {SharedUpdater, SimpleMutation} from '../types/relayMutations'
 import getDiscussionThreadConn from './connections/getDiscussionThreadConn'
 
 graphql`
diff --git a/packages/client/mutations/RevealTeamHealthVotesMutation.ts b/packages/client/mutations/RevealTeamHealthVotesMutation.ts
index 5e39040b186..7e553f6bd75 100644
--- a/packages/client/mutations/RevealTeamHealthVotesMutation.ts
+++ b/packages/client/mutations/RevealTeamHealthVotesMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {RevealTeamHealthVotesMutation as TRevealTeamHealthVotesMutation} from '../__generated__/RevealTeamHealthVotesMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment RevealTeamHealthVotesMutation_meeting on RevealTeamHealthVotesSuccess {
diff --git a/packages/client/mutations/SelectTemplateMutation.ts b/packages/client/mutations/SelectTemplateMutation.ts
index 6b151a1e670..b81021c7ec9 100644
--- a/packages/client/mutations/SelectTemplateMutation.ts
+++ b/packages/client/mutations/SelectTemplateMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {SelectTemplateMutation as TSelectTemplateMutation} from '../__generated__/SelectTemplateMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment SelectTemplateMutation_team on SelectTemplatePayload {
diff --git a/packages/client/mutations/SetDefaultSlackChannelMutation.ts b/packages/client/mutations/SetDefaultSlackChannelMutation.ts
index 2d22c0823eb..7e216fdd129 100644
--- a/packages/client/mutations/SetDefaultSlackChannelMutation.ts
+++ b/packages/client/mutations/SetDefaultSlackChannelMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import toTeamMemberId from '~/utils/relay/toTeamMemberId'
-import {StandardMutation} from '../types/relayMutations'
 import {SetDefaultSlackChannelMutation as TSetDefaultSlackChannelMutation} from '../__generated__/SetDefaultSlackChannelMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment SetDefaultSlackChannelMutation_team on SetDefaultSlackChannelSuccess {
diff --git a/packages/client/mutations/SetMeetingSettingsMutation.ts b/packages/client/mutations/SetMeetingSettingsMutation.ts
index caa0bf0430e..222b65f08bd 100644
--- a/packages/client/mutations/SetMeetingSettingsMutation.ts
+++ b/packages/client/mutations/SetMeetingSettingsMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {SetMeetingSettingsMutation as TSetMeetingSettingsMutation} from '../__generated__/SetMeetingSettingsMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment SetMeetingSettingsMutation_team on SetMeetingSettingsPayload {
diff --git a/packages/client/mutations/SetOrgUserRoleMutation.ts b/packages/client/mutations/SetOrgUserRoleMutation.ts
index c0ed2771a85..9dd46ffe948 100644
--- a/packages/client/mutations/SetOrgUserRoleMutation.ts
+++ b/packages/client/mutations/SetOrgUserRoleMutation.ts
@@ -1,13 +1,13 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {SetOrgUserRoleMutation as TSetOrgUserRoleMutation} from '../__generated__/SetOrgUserRoleMutation.graphql'
+import {SetOrgUserRoleMutation_organization$data} from '../__generated__/SetOrgUserRoleMutation_organization.graphql'
 import {
   OnNextHandler,
   OnNextHistoryContext,
   SharedUpdater,
   StandardMutation
 } from '../types/relayMutations'
-import {SetOrgUserRoleMutation as TSetOrgUserRoleMutation} from '../__generated__/SetOrgUserRoleMutation.graphql'
-import {SetOrgUserRoleMutation_organization$data} from '../__generated__/SetOrgUserRoleMutation_organization.graphql'
 import handleAddNotifications from './handlers/handleAddNotifications'
 import handleAddOrganization from './handlers/handleAddOrganization'
 
diff --git a/packages/client/mutations/SetPhaseFocusMutation.ts b/packages/client/mutations/SetPhaseFocusMutation.ts
index d12333f0ec8..ab03ac82965 100644
--- a/packages/client/mutations/SetPhaseFocusMutation.ts
+++ b/packages/client/mutations/SetPhaseFocusMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {SetPhaseFocusMutation as TSetPhaseFocusMutation} from '../__generated__/SetPhaseFocusMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment SetPhaseFocusMutation_meeting on SetPhaseFocusPayload {
diff --git a/packages/client/mutations/SetPokerSpectateMutation.ts b/packages/client/mutations/SetPokerSpectateMutation.ts
index bd1a40aa536..41efac4cc1d 100644
--- a/packages/client/mutations/SetPokerSpectateMutation.ts
+++ b/packages/client/mutations/SetPokerSpectateMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {SetPokerSpectateMutation as TSetPokerSpectateMutation} from '../__generated__/SetPokerSpectateMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment SetPokerSpectateMutation_team on SetPokerSpectateSuccess {
diff --git a/packages/client/mutations/SetSlackNotificationMutation.ts b/packages/client/mutations/SetSlackNotificationMutation.ts
index fb0c5e734ca..436d5492586 100644
--- a/packages/client/mutations/SetSlackNotificationMutation.ts
+++ b/packages/client/mutations/SetSlackNotificationMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql'
 import {StandardMutation} from '../types/relayMutations'
 import toTeamMemberId from '../utils/relay/toTeamMemberId'
-import {SetSlackNotificationMutation as TSetSlackNotificationMutation} from '../__generated__/SetSlackNotificationMutation.graphql'
 
 graphql`
   fragment SetSlackNotificationMutation_team on SetSlackNotificationPayload {
diff --git a/packages/client/mutations/SetStageTimerMutation.ts b/packages/client/mutations/SetStageTimerMutation.ts
index 655e904d210..470c5753049 100644
--- a/packages/client/mutations/SetStageTimerMutation.ts
+++ b/packages/client/mutations/SetStageTimerMutation.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {SetStageTimerMutation_meeting$data} from '~/__generated__/SetStageTimerMutation_meeting.graphql'
+import {SetStageTimerMutation as _SetStageTimerMutation} from '../__generated__/SetStageTimerMutation.graphql'
 import {RelayDateHack, SharedUpdater, StandardMutation} from '../types/relayMutations'
 import LocalTimeHandler from '../utils/relay/LocalTimeHandler'
-import {SetStageTimerMutation as _SetStageTimerMutation} from '../__generated__/SetStageTimerMutation.graphql'
 
 graphql`
   fragment SetStageTimerMutation_meeting on SetStageTimerPayload {
diff --git a/packages/client/mutations/SetTaskEstimateMutation.ts b/packages/client/mutations/SetTaskEstimateMutation.ts
index 70279ab322e..952dd6797d7 100644
--- a/packages/client/mutations/SetTaskEstimateMutation.ts
+++ b/packages/client/mutations/SetTaskEstimateMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations'
 import {SetTaskEstimateMutation as TSetTaskEstimateMutation} from '../__generated__/SetTaskEstimateMutation.graphql'
+import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment SetTaskEstimateMutation_meeting on SetTaskEstimateSuccess {
diff --git a/packages/client/mutations/SetTaskHighlightMutation.ts b/packages/client/mutations/SetTaskHighlightMutation.ts
index eb3c79f19c5..61cd296ce34 100644
--- a/packages/client/mutations/SetTaskHighlightMutation.ts
+++ b/packages/client/mutations/SetTaskHighlightMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import Atmosphere from '../Atmosphere'
-import {SimpleMutation} from '../types/relayMutations'
 import {SetTaskHighlightMutation as TSetTaskHighlightMutation} from '../__generated__/SetTaskHighlightMutation.graphql'
+import {SimpleMutation} from '../types/relayMutations'
 
 graphql`
   fragment SetTaskHighlightMutation_meeting on SetTaskHighlightSuccess {
diff --git a/packages/client/mutations/SetTeamHealthVoteMutation.ts b/packages/client/mutations/SetTeamHealthVoteMutation.ts
index c9bc5e419bb..b580c5e5cba 100644
--- a/packages/client/mutations/SetTeamHealthVoteMutation.ts
+++ b/packages/client/mutations/SetTeamHealthVoteMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {SetTeamHealthVoteMutation as TSetTeamHealthVoteMutation} from '../__generated__/SetTeamHealthVoteMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment SetTeamHealthVoteMutation_meeting on SetTeamHealthVoteSuccess {
diff --git a/packages/client/mutations/SignUpWithPasswordMutation.ts b/packages/client/mutations/SignUpWithPasswordMutation.ts
index 307b71acaa1..427839cb2ef 100644
--- a/packages/client/mutations/SignUpWithPasswordMutation.ts
+++ b/packages/client/mutations/SignUpWithPasswordMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {SignUpWithPasswordMutation as TSignUpWithPasswordMutation} from '../__generated__/SignUpWithPasswordMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {handleAcceptTeamInvitationErrors} from './AcceptTeamInvitationMutation'
 import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect'
 
diff --git a/packages/client/mutations/StartCheckInMutation.ts b/packages/client/mutations/StartCheckInMutation.ts
index 337b72bb0b3..bb0347404e7 100644
--- a/packages/client/mutations/StartCheckInMutation.ts
+++ b/packages/client/mutations/StartCheckInMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {StartCheckInMutation as TStartCheckInMutation} from '../__generated__/StartCheckInMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment StartCheckInMutation_team on StartCheckInSuccess {
diff --git a/packages/client/mutations/StartDraggingReflectionMutation.ts b/packages/client/mutations/StartDraggingReflectionMutation.ts
index 970fb7477b6..c9934d253ab 100644
--- a/packages/client/mutations/StartDraggingReflectionMutation.ts
+++ b/packages/client/mutations/StartDraggingReflectionMutation.ts
@@ -4,9 +4,9 @@ import {matchPath} from 'react-router-dom'
 import {Disposable, RecordSourceProxy} from 'relay-runtime'
 import {StartDraggingReflectionMutation_meeting$data} from '~/__generated__/StartDraggingReflectionMutation_meeting.graphql'
 import Atmosphere from '../Atmosphere'
+import {StartDraggingReflectionMutation as TStartDraggingReflectionMutation} from '../__generated__/StartDraggingReflectionMutation.graphql'
 import {ClientRetroReflection} from '../types/clientSchema'
 import {LocalHandlers, SharedUpdater} from '../types/relayMutations'
-import {StartDraggingReflectionMutation as TStartDraggingReflectionMutation} from '../__generated__/StartDraggingReflectionMutation.graphql'
 
 graphql`
   fragment StartDraggingReflectionMutation_meeting on StartDraggingReflectionPayload {
diff --git a/packages/client/mutations/StartSprintPokerMutation.ts b/packages/client/mutations/StartSprintPokerMutation.ts
index d38ea338e2f..e078757582f 100644
--- a/packages/client/mutations/StartSprintPokerMutation.ts
+++ b/packages/client/mutations/StartSprintPokerMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {StartSprintPokerMutation as TStartSprintPokerMutation} from '../__generated__/StartSprintPokerMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment StartSprintPokerMutation_team on StartSprintPokerSuccess {
diff --git a/packages/client/mutations/StartTeamPromptMutation.ts b/packages/client/mutations/StartTeamPromptMutation.ts
index fb9a702af72..bc8821c3bd7 100644
--- a/packages/client/mutations/StartTeamPromptMutation.ts
+++ b/packages/client/mutations/StartTeamPromptMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {StartTeamPromptMutation as TStartTeamPromptMutation} from '../__generated__/StartTeamPromptMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment StartTeamPromptMutation_team on StartTeamPromptSuccess {
diff --git a/packages/client/mutations/ToggleSummaryEmailMutation.ts b/packages/client/mutations/ToggleSummaryEmailMutation.ts
index 6aac88ca70a..be0917cad79 100644
--- a/packages/client/mutations/ToggleSummaryEmailMutation.ts
+++ b/packages/client/mutations/ToggleSummaryEmailMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {ToggleSummaryEmailMutation as TToggleSummaryEmailMutation} from '../__generated__/ToggleSummaryEmailMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment ToggleSummaryEmailMutation_team on ToggleSummaryEmailSuccess {
diff --git a/packages/client/mutations/ToggleTeamDrawerMutation.ts b/packages/client/mutations/ToggleTeamDrawerMutation.ts
index a1aa0d2779f..4fd322f18f1 100644
--- a/packages/client/mutations/ToggleTeamDrawerMutation.ts
+++ b/packages/client/mutations/ToggleTeamDrawerMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {ToggleTeamDrawerMutation as TToggleTeamDrawerMutation} from '../__generated__/ToggleTeamDrawerMutation.graphql'
 import {StandardMutation} from '../types/relayMutations'
 import toTeamMemberId from '../utils/relay/toTeamMemberId'
-import {ToggleTeamDrawerMutation as TToggleTeamDrawerMutation} from '../__generated__/ToggleTeamDrawerMutation.graphql'
 
 graphql`
   fragment ToggleTeamDrawerMutation_teamMember on ToggleTeamDrawerSuccess {
diff --git a/packages/client/mutations/UpdateAgendaItemMutation.ts b/packages/client/mutations/UpdateAgendaItemMutation.ts
index 25baf6f926d..b5844c1d871 100644
--- a/packages/client/mutations/UpdateAgendaItemMutation.ts
+++ b/packages/client/mutations/UpdateAgendaItemMutation.ts
@@ -4,9 +4,9 @@ import {RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
 import {ActionMeeting_meeting$data} from '~/__generated__/ActionMeeting_meeting.graphql'
 import {AgendaItem_agendaItem$data} from '~/__generated__/AgendaItem_agendaItem.graphql'
 import {UpdateAgendaItemMutation_team$data} from '~/__generated__/UpdateAgendaItemMutation_team.graphql'
+import {UpdateAgendaItemMutation as TUpdateAgendaItemMutation} from '../__generated__/UpdateAgendaItemMutation.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import updateProxyRecord from '../utils/relay/updateProxyRecord'
-import {UpdateAgendaItemMutation as TUpdateAgendaItemMutation} from '../__generated__/UpdateAgendaItemMutation.graphql'
 import handleUpdateAgendaItems from './handlers/handleUpdateAgendaItems'
 
 graphql`
diff --git a/packages/client/mutations/UpdateAutoJoinMutation.ts b/packages/client/mutations/UpdateAutoJoinMutation.ts
index 766a53baff0..a3567bb9c0e 100644
--- a/packages/client/mutations/UpdateAutoJoinMutation.ts
+++ b/packages/client/mutations/UpdateAutoJoinMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateAutoJoinMutation as TUpdateAutoJoinMutation} from '../__generated__/UpdateAutoJoinMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateAutoJoinMutation_team on UpdateAutoJoinSuccess {
diff --git a/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts b/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts
index a75a0b25bc1..62c2c611aaa 100644
--- a/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts
+++ b/packages/client/mutations/UpdateAzureDevOpsDimensionFieldMutation.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {DiscriminateProxy} from '../types/generics'
-import {StandardMutation} from '../types/relayMutations'
-import createProxyRecord from '../utils/relay/createProxyRecord'
 import {AzureDevOpsFieldMenu_stage$data} from '../__generated__/AzureDevOpsFieldMenu_stage.graphql'
 import {PokerMeeting_meeting$data} from '../__generated__/PokerMeeting_meeting.graphql'
 import {UpdateAzureDevOpsDimensionFieldMutation as TUpdateAzureDevOpsDimensionFieldMutation} from '../__generated__/UpdateAzureDevOpsDimensionFieldMutation.graphql'
+import {DiscriminateProxy} from '../types/generics'
+import {StandardMutation} from '../types/relayMutations'
+import createProxyRecord from '../utils/relay/createProxyRecord'
 
 graphql`
   fragment UpdateAzureDevOpsDimensionFieldMutation_team on UpdateAzureDevOpsDimensionFieldSuccess {
diff --git a/packages/client/mutations/UpdateCommentContentMutation.ts b/packages/client/mutations/UpdateCommentContentMutation.ts
index 91377ca137b..d9148ea499c 100644
--- a/packages/client/mutations/UpdateCommentContentMutation.ts
+++ b/packages/client/mutations/UpdateCommentContentMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateCommentContentMutation as TUpdateCommentContentMutation} from '../__generated__/UpdateCommentContentMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateCommentContentMutation_meeting on UpdateCommentContentSuccess {
diff --git a/packages/client/mutations/UpdateCreditCardMutation.ts b/packages/client/mutations/UpdateCreditCardMutation.ts
index 0aaff96d7cc..fedd416029a 100644
--- a/packages/client/mutations/UpdateCreditCardMutation.ts
+++ b/packages/client/mutations/UpdateCreditCardMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateCreditCardMutation as TUpdateCreditCardMutation} from '../__generated__/UpdateCreditCardMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateCreditCardMutation_organization on UpdateCreditCardSuccess {
diff --git a/packages/client/mutations/UpdateFeatureFlagMutation.ts b/packages/client/mutations/UpdateFeatureFlagMutation.ts
index da6932b518e..cdb49794937 100644
--- a/packages/client/mutations/UpdateFeatureFlagMutation.ts
+++ b/packages/client/mutations/UpdateFeatureFlagMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateFeatureFlagMutation as TUpdateFeatureFlagMutation} from '../__generated__/UpdateFeatureFlagMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateFeatureFlagMutation_notification on UpdateFeatureFlagPayload {
diff --git a/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts b/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts
index c618dd95366..9429f5dfba2 100644
--- a/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts
+++ b/packages/client/mutations/UpdateGitHubDimensionFieldMutation.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {GitHubFieldMenu_stage$data} from '../__generated__/GitHubFieldMenu_stage.graphql'
+import {UpdateGitHubDimensionFieldMutation as TUpdateGitHubDimensionFieldMutation} from '../__generated__/UpdateGitHubDimensionFieldMutation.graphql'
 import {DiscriminateProxy} from '../types/generics'
 import {StandardMutation} from '../types/relayMutations'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {GitHubFieldMenu_stage$data} from '../__generated__/GitHubFieldMenu_stage.graphql'
-import {UpdateGitHubDimensionFieldMutation as TUpdateGitHubDimensionFieldMutation} from '../__generated__/UpdateGitHubDimensionFieldMutation.graphql'
 
 graphql`
   fragment UpdateGitHubDimensionFieldMutation_team on UpdateGitHubDimensionFieldSuccess {
diff --git a/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts b/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts
index 39828951845..19bcc503009 100644
--- a/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts
+++ b/packages/client/mutations/UpdateGitLabDimensionFieldMutation.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {GitLabFieldMenu_stage$data} from '../__generated__/GitLabFieldMenu_stage.graphql'
+import {UpdateGitLabDimensionFieldMutation as TUpdateGitLabDimensionFieldMutation} from '../__generated__/UpdateGitLabDimensionFieldMutation.graphql'
 import {DiscriminateProxy} from '../types/generics'
 import {StandardMutation} from '../types/relayMutations'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {GitLabFieldMenu_stage$data} from '../__generated__/GitLabFieldMenu_stage.graphql'
-import {UpdateGitLabDimensionFieldMutation as TUpdateGitLabDimensionFieldMutation} from '../__generated__/UpdateGitLabDimensionFieldMutation.graphql'
 
 graphql`
   fragment UpdateGitLabDimensionFieldMutation_team on UpdateGitLabDimensionFieldSuccess {
diff --git a/packages/client/mutations/UpdateIntegrationProviderMutation.ts b/packages/client/mutations/UpdateIntegrationProviderMutation.ts
index f019089fcaf..31ca200844c 100644
--- a/packages/client/mutations/UpdateIntegrationProviderMutation.ts
+++ b/packages/client/mutations/UpdateIntegrationProviderMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateIntegrationProviderMutation as TUpdateIntegrationProviderMutation} from '../__generated__/UpdateIntegrationProviderMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateIntegrationProviderMutation_team on UpdateIntegrationProviderSuccess {
diff --git a/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts b/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts
index b8cac7d804c..8eb2e1942ad 100644
--- a/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts
+++ b/packages/client/mutations/UpdateJiraDimensionFieldMutation.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {DiscriminateProxy} from '../types/generics'
-import {StandardMutation} from '../types/relayMutations'
-import createProxyRecord from '../utils/relay/createProxyRecord'
 import {JiraFieldMenu_stage$data} from '../__generated__/JiraFieldMenu_stage.graphql'
 import {PokerMeeting_meeting$data} from '../__generated__/PokerMeeting_meeting.graphql'
 import {UpdateJiraDimensionFieldMutation as TUpdateJiraDimensionFieldMutation} from '../__generated__/UpdateJiraDimensionFieldMutation.graphql'
+import {DiscriminateProxy} from '../types/generics'
+import {StandardMutation} from '../types/relayMutations'
+import createProxyRecord from '../utils/relay/createProxyRecord'
 
 graphql`
   fragment UpdateJiraDimensionFieldMutation_team on UpdateDimensionFieldSuccess {
diff --git a/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts b/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts
index 0367c606cfe..e8f34c1b20e 100644
--- a/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts
+++ b/packages/client/mutations/UpdateJiraServerDimensionFieldMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateJiraServerDimensionFieldMutation as TUpdateJiraServerDimensionFieldMutation} from '../__generated__/UpdateJiraServerDimensionFieldMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateJiraServerDimensionFieldMutation_team on UpdateDimensionFieldSuccess {
diff --git a/packages/client/mutations/UpdateMeetingPromptMutation.ts b/packages/client/mutations/UpdateMeetingPromptMutation.ts
index 357a3f76acb..4b991a81cd8 100644
--- a/packages/client/mutations/UpdateMeetingPromptMutation.ts
+++ b/packages/client/mutations/UpdateMeetingPromptMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateMeetingPromptMutation as TUpdateMeetingPromptMutation} from '../__generated__/UpdateMeetingPromptMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateMeetingPromptMutation_meeting on UpdateMeetingPromptSuccess {
diff --git a/packages/client/mutations/UpdateMeetingTemplateMutation.ts b/packages/client/mutations/UpdateMeetingTemplateMutation.ts
index c4dd1d6951b..af1dcb1c5ae 100644
--- a/packages/client/mutations/UpdateMeetingTemplateMutation.ts
+++ b/packages/client/mutations/UpdateMeetingTemplateMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateMeetingTemplateMutation as TUpdateMeetingTemplateMutation} from '../__generated__/UpdateMeetingTemplateMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateMeetingTemplateMutation_meeting on UpdateMeetingTemplateSuccess {
diff --git a/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts b/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts
index c7dc80a21e9..3fea65edfa8 100644
--- a/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts
+++ b/packages/client/mutations/UpdateNewCheckInQuestionMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {RecordProxy} from 'relay-runtime'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateNewCheckInQuestionMutation as TUpdateNewCheckInQuestionMutation} from '../__generated__/UpdateNewCheckInQuestionMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 graphql`
   fragment UpdateNewCheckInQuestionMutation_meeting on UpdateNewCheckInQuestionPayload {
     meeting {
diff --git a/packages/client/mutations/UpdateOrgMutation.ts b/packages/client/mutations/UpdateOrgMutation.ts
index abedff72678..de261d1ffd1 100644
--- a/packages/client/mutations/UpdateOrgMutation.ts
+++ b/packages/client/mutations/UpdateOrgMutation.ts
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {Disposable} from 'relay-runtime'
 import Atmosphere from '../Atmosphere'
-import {LocalHandlers} from '../types/relayMutations'
 import {UpdateOrgMutation as TUpdateOrgMutation} from '../__generated__/UpdateOrgMutation.graphql'
+import {LocalHandlers} from '../types/relayMutations'
 graphql`
   fragment UpdateOrgMutation_organization on UpdateOrgPayload {
     organization {
diff --git a/packages/client/mutations/UpdatePokerScopeMutation.ts b/packages/client/mutations/UpdatePokerScopeMutation.ts
index 0fdc0774c64..6f641fdcaa3 100644
--- a/packages/client/mutations/UpdatePokerScopeMutation.ts
+++ b/packages/client/mutations/UpdatePokerScopeMutation.ts
@@ -3,17 +3,17 @@ import {stateToHTML} from 'draft-js-export-html'
 import {commitMutation} from 'react-relay'
 import GitLabIssueId from '~/shared/gqlIds/GitLabIssueId'
 //import AzureDevOpsIssueId from '~/shared/gqlIds/AzureDevOpsIssueId'
+import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql'
 import GitHubIssueId from '../shared/gqlIds/GitHubIssueId'
 import JiraIssueId from '../shared/gqlIds/JiraIssueId'
 import {PALETTE} from '../styles/paletteV3'
 import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations'
+import SendClientSideEvent from '../utils/SendClientSideEvent'
 import convertToTaskContent from '../utils/draftjs/convertToTaskContent'
 import splitDraftContent from '../utils/draftjs/splitDraftContent'
 import getSearchQueryFromMeeting from '../utils/getSearchQueryFromMeeting'
 import clientTempId from '../utils/relay/clientTempId'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {UpdatePokerScopeMutation as TUpdatePokerScopeMutation} from '../__generated__/UpdatePokerScopeMutation.graphql'
-import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 graphql`
   fragment UpdatePokerScopeMutation_meeting on UpdatePokerScopeSuccess {
diff --git a/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts b/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts
index 80cdf5cf9c7..f7b1318bffc 100644
--- a/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts
+++ b/packages/client/mutations/UpdatePokerTemplateDimensionScaleMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdatePokerTemplateDimensionScaleMutation as TUpdatePokerTemplateDimensionScaleMutation} from '../__generated__/UpdatePokerTemplateDimensionScaleMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdatePokerTemplateDimensionScaleMutation_dimension on UpdatePokerTemplateDimensionScalePayload {
diff --git a/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts b/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts
index b2bbbc0e407..9051af89991 100644
--- a/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts
+++ b/packages/client/mutations/UpdatePokerTemplateScaleValueMutation.ts
@@ -3,8 +3,8 @@ import {commitMutation} from 'react-relay'
 import addNodeToArray from '~/utils/relay/addNodeToArray'
 import createProxyRecord from '~/utils/relay/createProxyRecord'
 import safeRemoveNodeFromArray from '~/utils/relay/safeRemoveNodeFromArray'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdatePokerTemplateScaleValueMutation as TUpdatePokerTemplateScaleValueMutation} from '../__generated__/UpdatePokerTemplateScaleValueMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdatePokerTemplateScaleValueMutation_scale on UpdatePokerTemplateScaleValuePayload {
diff --git a/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts b/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts
index bedbcb69f5e..e71c59146c8 100644
--- a/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts
+++ b/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts
@@ -1,6 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
+import {UpdatePokerTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdatePokerTemplateScopeMutation.graphql'
+import {
+  SharingScopeEnum,
+  UpdatePokerTemplateScopeMutation_organization$data
+} from '../__generated__/UpdatePokerTemplateScopeMutation_organization.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import addNodeToArray from '../utils/relay/addNodeToArray'
 import getBaseRecord from '../utils/relay/getBaseRecord'
@@ -9,11 +14,6 @@ import getNodeById from '../utils/relay/getNodeById'
 import {insertEdgeAfter} from '../utils/relay/insertEdge'
 import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray'
 import safeRemoveNodeFromConn from '../utils/relay/safeRemoveNodeFromConn'
-import {UpdatePokerTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdatePokerTemplateScopeMutation.graphql'
-import {
-  SharingScopeEnum,
-  UpdatePokerTemplateScopeMutation_organization$data
-} from '../__generated__/UpdatePokerTemplateScopeMutation_organization.graphql'
 import getPokerTemplateOrgConn from './connections/getPokerTemplateOrgConn'
 
 graphql`
diff --git a/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts b/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts
index ebb091d94c6..af0168c01ea 100644
--- a/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts
+++ b/packages/client/mutations/UpdateRecurrenceSettingsMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateRecurrenceSettingsMutation as TUpdateRecurrenceSettingsMutation} from '../__generated__/UpdateRecurrenceSettingsMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateRecurrenceSettingsMutation_team on UpdateRecurrenceSettingsSuccess {
diff --git a/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts b/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts
index 815a8dea119..a82aea83e11 100644
--- a/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts
+++ b/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts
@@ -1,6 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
+import {UpdateReflectTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdateReflectTemplateScopeMutation.graphql'
+import {
+  SharingScopeEnum,
+  UpdateReflectTemplateScopeMutation_organization$data
+} from '../__generated__/UpdateReflectTemplateScopeMutation_organization.graphql'
 import {SharedUpdater, StandardMutation} from '../types/relayMutations'
 import addNodeToArray from '../utils/relay/addNodeToArray'
 import getBaseRecord from '../utils/relay/getBaseRecord'
@@ -9,11 +14,6 @@ import getNodeById from '../utils/relay/getNodeById'
 import {insertEdgeAfter} from '../utils/relay/insertEdge'
 import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray'
 import safeRemoveNodeFromConn from '../utils/relay/safeRemoveNodeFromConn'
-import {UpdateReflectTemplateScopeMutation as TUpdateTemplateScopeMutation} from '../__generated__/UpdateReflectTemplateScopeMutation.graphql'
-import {
-  SharingScopeEnum,
-  UpdateReflectTemplateScopeMutation_organization$data
-} from '../__generated__/UpdateReflectTemplateScopeMutation_organization.graphql'
 import getReflectTemplateOrgConn from './connections/getReflectTemplateOrgConn'
 
 graphql`
diff --git a/packages/client/mutations/UpdateReflectionContentMutation.ts b/packages/client/mutations/UpdateReflectionContentMutation.ts
index baaed306e67..6905ae3ca67 100644
--- a/packages/client/mutations/UpdateReflectionContentMutation.ts
+++ b/packages/client/mutations/UpdateReflectionContentMutation.ts
@@ -4,9 +4,9 @@
  */
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {UpdateReflectionContentMutation as TUpdateReflectionContentMutation} from '../__generated__/UpdateReflectionContentMutation.graphql'
 import {StandardMutation} from '../types/relayMutations'
 import updateProxyRecord from '../utils/relay/updateProxyRecord'
-import {UpdateReflectionContentMutation as TUpdateReflectionContentMutation} from '../__generated__/UpdateReflectionContentMutation.graphql'
 
 graphql`
   fragment UpdateReflectionContentMutation_meeting on UpdateReflectionContentPayload {
diff --git a/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts b/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts
index fa773ae7f39..c126140ff5c 100644
--- a/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts
+++ b/packages/client/mutations/UpdateReflectionGroupTitleMutation.ts
@@ -4,9 +4,9 @@
  */
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {UpdateReflectionGroupTitleMutation as TUpdateReflectionGroupTitleMutation} from '../__generated__/UpdateReflectionGroupTitleMutation.graphql'
 import {StandardMutation} from '../types/relayMutations'
 import updateProxyRecord from '../utils/relay/updateProxyRecord'
-import {UpdateReflectionGroupTitleMutation as TUpdateReflectionGroupTitleMutation} from '../__generated__/UpdateReflectionGroupTitleMutation.graphql'
 
 graphql`
   fragment UpdateReflectionGroupTitleMutation_meeting on UpdateReflectionGroupTitlePayload {
diff --git a/packages/client/mutations/UpdateRetroMaxVotesMutation.ts b/packages/client/mutations/UpdateRetroMaxVotesMutation.ts
index 53581c252f7..f54961aa5ea 100644
--- a/packages/client/mutations/UpdateRetroMaxVotesMutation.ts
+++ b/packages/client/mutations/UpdateRetroMaxVotesMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateRetroMaxVotesMutation as TUpdateRetroMaxVotesMutation} from '../__generated__/UpdateRetroMaxVotesMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateRetroMaxVotesMutation_meeting on UpdateRetroMaxVotesSuccess {
diff --git a/packages/client/mutations/UpdateTaskDueDateMutation.ts b/packages/client/mutations/UpdateTaskDueDateMutation.ts
index d86181b26f8..db2a85246cd 100644
--- a/packages/client/mutations/UpdateTaskDueDateMutation.ts
+++ b/packages/client/mutations/UpdateTaskDueDateMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {UpdateTaskDueDateMutation as TUpdateTaskDueDateMutation} from '../__generated__/UpdateTaskDueDateMutation.graphql'
 import {WithFieldsAsType} from '../types/generics'
 import {StandardMutation} from '../types/relayMutations'
-import {UpdateTaskDueDateMutation as TUpdateTaskDueDateMutation} from '../__generated__/UpdateTaskDueDateMutation.graphql'
 graphql`
   fragment UpdateTaskDueDateMutation_task on UpdateTaskDueDatePayload {
     task {
diff --git a/packages/client/mutations/UpdateTaskMutation.ts b/packages/client/mutations/UpdateTaskMutation.ts
index da27db53267..d66706865bd 100644
--- a/packages/client/mutations/UpdateTaskMutation.ts
+++ b/packages/client/mutations/UpdateTaskMutation.ts
@@ -1,6 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import ITask from '../../server/database/types/Task'
+import {UpdateTaskMutation as TUpdateTaskMutation} from '../__generated__/UpdateTaskMutation.graphql'
+import {UpdateTaskMutation_task$data} from '../__generated__/UpdateTaskMutation_task.graphql'
 import {
   OnNextHandler,
   OnNextHistoryContext,
@@ -11,8 +13,6 @@ import {
 import extractTextFromDraftString from '../utils/draftjs/extractTextFromDraftString'
 import getTagsFromEntityMap from '../utils/draftjs/getTagsFromEntityMap'
 import updateProxyRecord from '../utils/relay/updateProxyRecord'
-import {UpdateTaskMutation as TUpdateTaskMutation} from '../__generated__/UpdateTaskMutation.graphql'
-import {UpdateTaskMutation_task$data} from '../__generated__/UpdateTaskMutation_task.graphql'
 import handleAddNotifications from './handlers/handleAddNotifications'
 import handleRemoveTasks from './handlers/handleRemoveTasks'
 import handleUpsertTasks from './handlers/handleUpsertTasks'
diff --git a/packages/client/mutations/UpdateTeamNameMutation.ts b/packages/client/mutations/UpdateTeamNameMutation.ts
index e6f35e64fa8..5e5647e7b6d 100644
--- a/packages/client/mutations/UpdateTeamNameMutation.ts
+++ b/packages/client/mutations/UpdateTeamNameMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateTeamNameMutation as TUpdateTeamNameMutation} from '../__generated__/UpdateTeamNameMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 graphql`
   fragment UpdateTeamNameMutation_team on UpdateTeamNamePayload {
     team {
diff --git a/packages/client/mutations/UpdateTemplateCategoryMutation.ts b/packages/client/mutations/UpdateTemplateCategoryMutation.ts
index 5f1ffeca163..b60539161db 100644
--- a/packages/client/mutations/UpdateTemplateCategoryMutation.ts
+++ b/packages/client/mutations/UpdateTemplateCategoryMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
+import {useMutation} from 'react-relay'
 import {UpdateTemplateCategoryMutation as TUpdateTemplateCategoryMutation} from '../__generated__/UpdateTemplateCategoryMutation.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
-import {useMutation} from 'react-relay'
 
 graphql`
   fragment UpdateTemplateCategoryMutation_team on UpdateTemplateCategorySuccess {
diff --git a/packages/client/mutations/UpdateUserProfileMutation.ts b/packages/client/mutations/UpdateUserProfileMutation.ts
index 94713656ea0..19ad11c7e9e 100644
--- a/packages/client/mutations/UpdateUserProfileMutation.ts
+++ b/packages/client/mutations/UpdateUserProfileMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import {StandardMutation} from '../types/relayMutations'
 import {UpdateUserProfileMutation as TUpdateUserProfileMutation} from '../__generated__/UpdateUserProfileMutation.graphql'
+import {StandardMutation} from '../types/relayMutations'
 
 graphql`
   fragment UpdateUserProfileMutation_team on UpdateUserProfilePayload {
diff --git a/packages/client/mutations/UploadOrgImageMutation.ts b/packages/client/mutations/UploadOrgImageMutation.ts
index b6933a2011d..8cea80903bc 100644
--- a/packages/client/mutations/UploadOrgImageMutation.ts
+++ b/packages/client/mutations/UploadOrgImageMutation.ts
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {UploadableMap} from 'relay-runtime'
 import Atmosphere from '../Atmosphere'
-import {BaseLocalHandlers} from '../types/relayMutations'
 import {UploadOrgImageMutation as TUploadOrgImageMutation} from '../__generated__/UploadOrgImageMutation.graphql'
+import {BaseLocalHandlers} from '../types/relayMutations'
 
 const mutation = graphql`
   mutation UploadOrgImageMutation($file: File!, $orgId: ID!) {
diff --git a/packages/client/mutations/UploadUserImageMutation.ts b/packages/client/mutations/UploadUserImageMutation.ts
index 47472de1ac1..b4f99663692 100644
--- a/packages/client/mutations/UploadUserImageMutation.ts
+++ b/packages/client/mutations/UploadUserImageMutation.ts
@@ -2,8 +2,8 @@ import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {UploadableMap} from 'relay-runtime'
 import Atmosphere from '../Atmosphere'
-import {BaseLocalHandlers} from '../types/relayMutations'
 import {UploadUserImageMutation as TUploadUserImageMutation} from '../__generated__/UploadUserImageMutation.graphql'
+import {BaseLocalHandlers} from '../types/relayMutations'
 const mutation = graphql`
   mutation UploadUserImageMutation($file: File!) {
     uploadUserImage(file: $file) {
diff --git a/packages/client/mutations/UpsertTeamPromptResponseMutation.ts b/packages/client/mutations/UpsertTeamPromptResponseMutation.ts
index 46e757d24a1..6abc25f0660 100644
--- a/packages/client/mutations/UpsertTeamPromptResponseMutation.ts
+++ b/packages/client/mutations/UpsertTeamPromptResponseMutation.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
-import clientTempId from '~/utils/relay/clientTempId'
 import {UpsertTeamPromptResponseMutation_meeting$data} from '~/__generated__/UpsertTeamPromptResponseMutation_meeting.graphql'
-import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
+import clientTempId from '~/utils/relay/clientTempId'
 import {UpsertTeamPromptResponseMutation as TUpsertTeamPromptResponseMutation} from '../__generated__/UpsertTeamPromptResponseMutation.graphql'
+import {LocalHandlers, SharedUpdater, StandardMutation} from '../types/relayMutations'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 graphql`
diff --git a/packages/client/mutations/VerifyEmailMutation.ts b/packages/client/mutations/VerifyEmailMutation.ts
index 1e62d1eeb56..4c8e45c56b2 100644
--- a/packages/client/mutations/VerifyEmailMutation.ts
+++ b/packages/client/mutations/VerifyEmailMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
 import {handleSuccessfulLogin} from '~/utils/handleSuccessfulLogin'
-import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import {VerifyEmailMutation as TSignUpWithPasswordMutation} from '../__generated__/VerifyEmailMutation.graphql'
+import {HistoryLocalHandler, StandardMutation} from '../types/relayMutations'
 import handleAuthenticationRedirect from './handlers/handleAuthenticationRedirect'
 
 const mutation = graphql`
diff --git a/packages/client/mutations/VoteForPokerStoryMutation.ts b/packages/client/mutations/VoteForPokerStoryMutation.ts
index 46e50e9f855..7de326578aa 100644
--- a/packages/client/mutations/VoteForPokerStoryMutation.ts
+++ b/packages/client/mutations/VoteForPokerStoryMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {VoteForPokerStoryMutation as TVoteForPokerStoryMutation} from '../__generated__/VoteForPokerStoryMutation.graphql'
 import {StandardMutation} from '../types/relayMutations'
 import createProxyRecord from '../utils/relay/createProxyRecord'
-import {VoteForPokerStoryMutation as TVoteForPokerStoryMutation} from '../__generated__/VoteForPokerStoryMutation.graphql'
 
 graphql`
   fragment VoteForPokerStoryMutation_meeting on VoteForPokerStorySuccess {
diff --git a/packages/client/mutations/VoteForReflectionGroupMutation.ts b/packages/client/mutations/VoteForReflectionGroupMutation.ts
index cc8fa18e466..c1fb252dac6 100644
--- a/packages/client/mutations/VoteForReflectionGroupMutation.ts
+++ b/packages/client/mutations/VoteForReflectionGroupMutation.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {commitMutation} from 'react-relay'
+import {VoteForReflectionGroupMutation as TVoteForReflectionGroupMutation} from '../__generated__/VoteForReflectionGroupMutation.graphql'
 import {BaseLocalHandlers, StandardMutation} from '../types/relayMutations'
 import toTeamMemberId from '../utils/relay/toTeamMemberId'
-import {VoteForReflectionGroupMutation as TVoteForReflectionGroupMutation} from '../__generated__/VoteForReflectionGroupMutation.graphql'
 
 graphql`
   fragment VoteForReflectionGroupMutation_meeting on VoteForReflectionGroupPayload {
diff --git a/packages/client/mutations/handlers/handleAuthenticationRedirect.ts b/packages/client/mutations/handlers/handleAuthenticationRedirect.ts
index aa826aa1527..b053f82e39b 100644
--- a/packages/client/mutations/handlers/handleAuthenticationRedirect.ts
+++ b/packages/client/mutations/handlers/handleAuthenticationRedirect.ts
@@ -1,7 +1,7 @@
 import {AcceptTeamInvitationMutationReply$data} from '~/__generated__/AcceptTeamInvitationMutationReply.graphql'
 import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations'
-import getValidRedirectParam from '../../utils/getValidRedirectParam'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
+import getValidRedirectParam from '../../utils/getValidRedirectParam'
 
 interface OnNextMeetingId extends OnNextHistoryContext {
   meetingId?: string | null
diff --git a/packages/client/mutations/handlers/handleAzureCreateIssue.ts b/packages/client/mutations/handlers/handleAzureCreateIssue.ts
index da956a0f372..76de16b0d9b 100644
--- a/packages/client/mutations/handlers/handleAzureCreateIssue.ts
+++ b/packages/client/mutations/handlers/handleAzureCreateIssue.ts
@@ -1,7 +1,7 @@
 import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
 import SearchQueryId from '~/shared/gqlIds/SearchQueryId'
-import toTeamMemberId from '../../utils/relay/toTeamMemberId'
 import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql'
+import toTeamMemberId from '../../utils/relay/toTeamMemberId'
 import getAzureWorkItemsConn from '../connections/getAzureWorkItemsConn'
 
 const handleAzureCreateIssue = (
diff --git a/packages/client/mutations/handlers/handleGitHubCreateIssue.ts b/packages/client/mutations/handlers/handleGitHubCreateIssue.ts
index f8e303d82e7..6b7798b5e98 100644
--- a/packages/client/mutations/handlers/handleGitHubCreateIssue.ts
+++ b/packages/client/mutations/handlers/handleGitHubCreateIssue.ts
@@ -1,7 +1,7 @@
 import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
+import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql'
 import SearchQueryId from '../../shared/gqlIds/SearchQueryId'
 import toTeamMemberId from '../../utils/relay/toTeamMemberId'
-import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql'
 import getGitHubIssuesConn from '../connections/getGitHubIssuesConn'
 
 const handleGitHubCreateIssue = (
diff --git a/packages/client/mutations/handlers/handleGitLabCreateIssue.ts b/packages/client/mutations/handlers/handleGitLabCreateIssue.ts
index de102c4ddb0..52be3940f9f 100644
--- a/packages/client/mutations/handlers/handleGitLabCreateIssue.ts
+++ b/packages/client/mutations/handlers/handleGitLabCreateIssue.ts
@@ -1,8 +1,8 @@
 import {ConnectionHandler, RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
 import {gitlabIssueArgs} from '~/components/GitLabScopingSearchResultsRoot'
 import SearchQueryId from '~/shared/gqlIds/SearchQueryId'
-import toTeamMemberId from '../../utils/relay/toTeamMemberId'
 import {CreateTaskMutation} from '../../__generated__/CreateTaskMutation.graphql'
+import toTeamMemberId from '../../utils/relay/toTeamMemberId'
 import getGitLabProjectsIssuesConn from '../connections/getGitLabProjectsIssuesConn'
 
 const handleGitLabCreateIssue = (
diff --git a/packages/client/mutations/handlers/handleRemoveTasks.ts b/packages/client/mutations/handlers/handleRemoveTasks.ts
index fb8846bc7ee..3c517948455 100644
--- a/packages/client/mutations/handlers/handleRemoveTasks.ts
+++ b/packages/client/mutations/handlers/handleRemoveTasks.ts
@@ -1,6 +1,6 @@
 import {RecordSourceSelectorProxy} from 'relay-runtime'
-import getDiscussionThreadConn from '~/mutations/connections/getDiscussionThreadConn'
 import {handleRemoveReply} from '~/mutations/DeleteCommentMutation'
+import getDiscussionThreadConn from '~/mutations/connections/getDiscussionThreadConn'
 import {parseQueryParams} from '~/utils/useQueryParameterParser'
 import ITask from '../../../server/database/types/Task'
 import IUser from '../../../server/database/types/User'
diff --git a/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts b/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts
index c5c34b12f88..2bcb384b748 100644
--- a/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts
+++ b/packages/client/mutations/toasts/mapDiscussionMentionedToToast.ts
@@ -1,11 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
+import {mapDiscussionMentionedToToast_notification$data} from '../../__generated__/mapDiscussionMentionedToToast_notification.graphql'
 import {Snack} from '../../components/Snackbar'
 import {OnNextHistoryContext} from '../../types/relayMutations'
+import findStageById from '../../utils/meetings/findStageById'
 import fromStageIdToUrl from '../../utils/meetings/fromStageIdToUrl'
-import {mapDiscussionMentionedToToast_notification$data} from '../../__generated__/mapDiscussionMentionedToToast_notification.graphql'
-import makeNotificationToastKey from './makeNotificationToastKey'
 import getMeetingPathParams from '../../utils/meetings/getMeetingPathParams'
-import findStageById from '../../utils/meetings/findStageById'
+import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
   fragment mapDiscussionMentionedToToast_notification on NotifyDiscussionMentioned {
diff --git a/packages/client/mutations/toasts/mapKudosReceivedToToast.ts b/packages/client/mutations/toasts/mapKudosReceivedToToast.ts
index 6a625382649..d8876a5cfe8 100644
--- a/packages/client/mutations/toasts/mapKudosReceivedToToast.ts
+++ b/packages/client/mutations/toasts/mapKudosReceivedToToast.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
-import {Snack} from '../../components/Snackbar'
 import {mapKudosReceivedToToast_notification$data} from '../../__generated__/mapKudosReceivedToToast_notification.graphql'
-import makeNotificationToastKey from './makeNotificationToastKey'
+import {Snack} from '../../components/Snackbar'
 import {OnNextHistoryContext} from '../../types/relayMutations'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
+import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
   fragment mapKudosReceivedToToast_notification on NotifyKudosReceived {
diff --git a/packages/client/mutations/toasts/mapMentionedToToast.ts b/packages/client/mutations/toasts/mapMentionedToToast.ts
index e748ffda0c8..3962f9adf6d 100644
--- a/packages/client/mutations/toasts/mapMentionedToToast.ts
+++ b/packages/client/mutations/toasts/mapMentionedToToast.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
+import {mapMentionedToToast_notification$data} from '../../__generated__/mapMentionedToToast_notification.graphql'
 import {Snack} from '../../components/Snackbar'
 import {OnNextHistoryContext} from '../../types/relayMutations'
-import {mapMentionedToToast_notification$data} from '../../__generated__/mapMentionedToToast_notification.graphql'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import makeNotificationToastKey from './makeNotificationToastKey'
 
diff --git a/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts b/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts
index 30d18d6cf98..a26b19ebd82 100644
--- a/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts
+++ b/packages/client/mutations/toasts/mapPromptToJoinOrgToToast.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
+import {mapPromptToJoinOrgToToast_notification$data} from '../../__generated__/mapPromptToJoinOrgToToast_notification.graphql'
 import {Snack} from '../../components/Snackbar'
 import {OnNextHistoryContext} from '../../types/relayMutations'
-import {mapPromptToJoinOrgToToast_notification$data} from '../../__generated__/mapPromptToJoinOrgToToast_notification.graphql'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
-import makeNotificationToastKey from './makeNotificationToastKey'
 import RequestToJoinDomainMutation from '../RequestToJoinDomainMutation'
+import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
   fragment mapPromptToJoinOrgToToast_notification on NotifyPromptToJoinOrg {
diff --git a/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts b/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts
index c0cc0aead4b..8474e4e8af4 100644
--- a/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts
+++ b/packages/client/mutations/toasts/mapRequestToJoinOrgToToast.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
-import {Snack} from '../../components/Snackbar'
 import {mapRequestToJoinOrgToToast_notification$data} from '../../__generated__/mapRequestToJoinOrgToToast_notification.graphql'
-import makeNotificationToastKey from './makeNotificationToastKey'
+import {Snack} from '../../components/Snackbar'
 import {OnNextHistoryContext} from '../../types/relayMutations'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
+import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
   fragment mapRequestToJoinOrgToToast_notification on NotifyRequestToJoinOrg {
diff --git a/packages/client/mutations/toasts/mapResponseMentionedToToast.ts b/packages/client/mutations/toasts/mapResponseMentionedToToast.ts
index b9d2e5cecd1..ccf6199d1ef 100644
--- a/packages/client/mutations/toasts/mapResponseMentionedToToast.ts
+++ b/packages/client/mutations/toasts/mapResponseMentionedToToast.ts
@@ -1,9 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
+import {mapResponseMentionedToToast_notification$data} from '../../__generated__/mapResponseMentionedToToast_notification.graphql'
 import {Snack} from '../../components/Snackbar'
 import {OnNextHistoryContext} from '../../types/relayMutations'
-import {mapResponseMentionedToToast_notification$data} from '../../__generated__/mapResponseMentionedToToast_notification.graphql'
-import makeNotificationToastKey from './makeNotificationToastKey'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
+import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
   fragment mapResponseMentionedToToast_notification on NotifyResponseMentioned {
diff --git a/packages/client/mutations/toasts/mapResponseRepliedToToast.ts b/packages/client/mutations/toasts/mapResponseRepliedToToast.ts
index 8eeb5a01cae..c682d08ff5d 100644
--- a/packages/client/mutations/toasts/mapResponseRepliedToToast.ts
+++ b/packages/client/mutations/toasts/mapResponseRepliedToToast.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
+import {mapResponseRepliedToToast_notification$data} from '../../__generated__/mapResponseRepliedToToast_notification.graphql'
 import {Snack} from '../../components/Snackbar'
 import {OnNextHistoryContext} from '../../types/relayMutations'
-import {mapResponseRepliedToToast_notification$data} from '../../__generated__/mapResponseRepliedToToast_notification.graphql'
 import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
diff --git a/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts b/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts
index 28aa4d5d319..9166fa9be3e 100644
--- a/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts
+++ b/packages/client/mutations/toasts/mapTeamsLimitExceededToToast.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
+import {mapTeamsLimitExceededToToast_notification$data} from '../../__generated__/mapTeamsLimitExceededToToast_notification.graphql'
 import {Snack} from '../../components/Snackbar'
+import {Threshold} from '../../types/constEnums'
 import {OnNextHistoryContext} from '../../types/relayMutations'
-import {mapTeamsLimitExceededToToast_notification$data} from '../../__generated__/mapTeamsLimitExceededToToast_notification.graphql'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import makeNotificationToastKey from './makeNotificationToastKey'
-import {Threshold} from '../../types/constEnums'
 
 graphql`
   fragment mapTeamsLimitExceededToToast_notification on NotifyTeamsLimitExceeded {
diff --git a/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts b/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts
index 4413aac1422..38a168518a7 100644
--- a/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts
+++ b/packages/client/mutations/toasts/mapTeamsLimitReminderToToast.ts
@@ -1,10 +1,10 @@
 import graphql from 'babel-plugin-relay/macro'
+import {mapTeamsLimitReminderToToast_notification$data} from '../../__generated__/mapTeamsLimitReminderToToast_notification.graphql'
 import {Snack} from '../../components/Snackbar'
 import {Threshold} from '../../types/constEnums'
 import {OnNextHistoryContext} from '../../types/relayMutations'
-import makeDateString from '../../utils/makeDateString'
-import {mapTeamsLimitReminderToToast_notification$data} from '../../__generated__/mapTeamsLimitReminderToToast_notification.graphql'
 import SendClientSideEvent from '../../utils/SendClientSideEvent'
+import makeDateString from '../../utils/makeDateString'
 import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
diff --git a/packages/client/mutations/toasts/popInvolvementToast.ts b/packages/client/mutations/toasts/popInvolvementToast.ts
index 2fe2547f8fd..afa92e3acf3 100644
--- a/packages/client/mutations/toasts/popInvolvementToast.ts
+++ b/packages/client/mutations/toasts/popInvolvementToast.ts
@@ -1,7 +1,7 @@
 import {matchPath} from 'react-router-dom'
+import {TaskInvolves_notification$data} from '../../__generated__/TaskInvolves_notification.graphql'
 import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations'
 import {MENTIONEE} from '../../utils/constants'
-import {TaskInvolves_notification$data} from '../../__generated__/TaskInvolves_notification.graphql'
 
 const popInvolvementToast: OnNextHandler<TaskInvolves_notification$data, OnNextHistoryContext> = (
   notification,
diff --git a/packages/client/mutations/toasts/popNotificationToast.ts b/packages/client/mutations/toasts/popNotificationToast.ts
index 8db3441c8e1..9668d92814d 100644
--- a/packages/client/mutations/toasts/popNotificationToast.ts
+++ b/packages/client/mutations/toasts/popNotificationToast.ts
@@ -1,20 +1,20 @@
 import graphql from 'babel-plugin-relay/macro'
-import {Snack} from '../../components/Snackbar'
-import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations'
 import {
   NotificationEnum,
   popNotificationToast_notification$data
 } from '../../__generated__/popNotificationToast_notification.graphql'
+import {Snack} from '../../components/Snackbar'
+import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations'
 import SetNotificationStatusMutation from '../SetNotificationStatusMutation'
 import mapDiscussionMentionedToToast from './mapDiscussionMentionedToToast'
-import mapResponseMentionedToToast from './mapResponseMentionedToToast'
+import mapKudosReceivedToToast from './mapKudosReceivedToToast'
 import mapMentionedToToast from './mapMentionedToToast'
+import mapPromptToJoinOrgToToast from './mapPromptToJoinOrgToToast'
+import mapRequestToJoinOrgToToast from './mapRequestToJoinOrgToToast'
+import mapResponseMentionedToToast from './mapResponseMentionedToToast'
 import mapResponseRepliedToToast from './mapResponseRepliedToToast'
 import mapTeamsLimitExceededToToast from './mapTeamsLimitExceededToToast'
 import mapTeamsLimitReminderToToast from './mapTeamsLimitReminderToToast'
-import mapPromptToJoinOrgToToast from './mapPromptToJoinOrgToToast'
-import mapRequestToJoinOrgToToast from './mapRequestToJoinOrgToToast'
-import mapKudosReceivedToToast from './mapKudosReceivedToToast'
 
 const typePicker: Partial<
   Record<NotificationEnum, (notification: any, context: OnNextHistoryContext) => Snack | null>
diff --git a/packages/client/mutations/toasts/updateNotificationToast.ts b/packages/client/mutations/toasts/updateNotificationToast.ts
index 62b90b6f328..41fca219089 100644
--- a/packages/client/mutations/toasts/updateNotificationToast.ts
+++ b/packages/client/mutations/toasts/updateNotificationToast.ts
@@ -1,6 +1,6 @@
 import graphql from 'babel-plugin-relay/macro'
-import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations'
 import {updateNotificationToast_notification$data} from '../../__generated__/updateNotificationToast_notification.graphql'
+import {OnNextHandler, OnNextHistoryContext} from '../../types/relayMutations'
 import makeNotificationToastKey from './makeNotificationToastKey'
 
 graphql`
diff --git a/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts b/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts
index b44b0dc64cc..f87398a7c34 100644
--- a/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts
+++ b/packages/client/mutations/useAcceptRequestToJoinDomainMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {useMutation, UseMutationConfig} from 'react-relay'
-import useAtmosphere from '../hooks/useAtmosphere'
 import {useAcceptRequestToJoinDomainMutation as TAcceptRequestToJoinDomainMutation} from '../__generated__/useAcceptRequestToJoinDomainMutation.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
 import SendClientSideEvent from '../utils/SendClientSideEvent'
 
 graphql`
diff --git a/packages/client/mutations/useShareTopicMutation.ts b/packages/client/mutations/useShareTopicMutation.ts
index fd7b36a201a..d41f44ef6f4 100644
--- a/packages/client/mutations/useShareTopicMutation.ts
+++ b/packages/client/mutations/useShareTopicMutation.ts
@@ -1,7 +1,7 @@
 import graphql from 'babel-plugin-relay/macro'
 import {useMutation, UseMutationConfig} from 'react-relay'
-import useAtmosphere from '../hooks/useAtmosphere'
 import {useShareTopicMutation as TAcceptRequestToJoinDomainMutation} from '../__generated__/useShareTopicMutation.graphql'
+import useAtmosphere from '../hooks/useAtmosphere'
 
 graphql`
   fragment useShareTopicMutation_meeting on ShareTopicSuccess {
diff --git a/packages/client/subscriptions/MeetingSubscription.ts b/packages/client/subscriptions/MeetingSubscription.ts
index d6f30e0a0f1..5b9ad76bf15 100644
--- a/packages/client/subscriptions/MeetingSubscription.ts
+++ b/packages/client/subscriptions/MeetingSubscription.ts
@@ -1,14 +1,14 @@
 import graphql from 'babel-plugin-relay/macro'
 import {RouterProps} from 'react-router'
 import {requestSubscription} from 'relay-runtime'
+import {
+  MeetingSubscription$variables,
+  MeetingSubscription as TMeetingSubscription
+} from '~/__generated__/MeetingSubscription.graphql'
 import {addCommentMeetingUpdater} from '~/mutations/AddCommentMutation'
 import {createPollMeetingUpdater} from '~/mutations/CreatePollMutation'
 import {deleteCommentMeetingUpdater} from '~/mutations/DeleteCommentMutation'
 import {upsertTeamPromptResponseUpdater} from '~/mutations/UpsertTeamPromptResponseMutation'
-import {
-  MeetingSubscription as TMeetingSubscription,
-  MeetingSubscription$variables
-} from '~/__generated__/MeetingSubscription.graphql'
 import Atmosphere from '../Atmosphere'
 import {createReflectionMeetingUpdater} from '../mutations/CreateReflectionMutation'
 import {dragDiscussionTopicMeetingUpdater} from '../mutations/DragDiscussionTopicMutation'
diff --git a/packages/client/subscriptions/OrganizationSubscription.ts b/packages/client/subscriptions/OrganizationSubscription.ts
index e2453c22589..5efdb9825b6 100644
--- a/packages/client/subscriptions/OrganizationSubscription.ts
+++ b/packages/client/subscriptions/OrganizationSubscription.ts
@@ -1,14 +1,14 @@
 import graphql from 'babel-plugin-relay/macro'
 import {RouterProps} from 'react-router'
 import {requestSubscription} from 'relay-runtime'
+import {
+  OrganizationSubscription$variables,
+  OrganizationSubscription as TOrganizationSubscription
+} from '~/__generated__/OrganizationSubscription.graphql'
 import {
   archiveOrganizationOrganizationOnNext,
   archiveOrganizationOrganizationUpdater
 } from '~/mutations/ArchiveOrganizationMutation'
-import {
-  OrganizationSubscription as TOrganizationSubscription,
-  OrganizationSubscription$variables
-} from '~/__generated__/OrganizationSubscription.graphql'
 import Atmosphere from '../Atmosphere'
 import {addOrgMutationOrganizationUpdater} from '../mutations/AddOrgMutation'
 import {
@@ -20,9 +20,9 @@ import {
   setOrgUserRoleAddedOrganizationUpdater
 } from '../mutations/SetOrgUserRoleMutation'
 import {updateTemplateScopeOrganizationUpdater} from '../mutations/UpdateReflectTemplateScopeMutation'
+import upgradeToTeamTierSuccessUpdater from '../mutations/handlers/upgradeToTeamTierSuccessUpdater'
 import subscriptionOnNext from './subscriptionOnNext'
 import subscriptionUpdater from './subscriptionUpdater'
-import upgradeToTeamTierSuccessUpdater from '../mutations/handlers/upgradeToTeamTierSuccessUpdater'
 
 const subscription = graphql`
   subscription OrganizationSubscription {
diff --git a/packages/client/subscriptions/TeamSubscription.ts b/packages/client/subscriptions/TeamSubscription.ts
index 10e14740d4c..ec2ff7aa1e6 100644
--- a/packages/client/subscriptions/TeamSubscription.ts
+++ b/packages/client/subscriptions/TeamSubscription.ts
@@ -17,9 +17,12 @@ import {
   acceptTeamInvitationTeamUpdater
 } from '../mutations/AcceptTeamInvitationMutation'
 import {addAgendaItemUpdater} from '../mutations/AddAgendaItemMutation'
+import {addPokerTemplateTeamUpdater} from '../mutations/AddPokerTemplateMutation'
+import {addReflectTemplateTeamUpdater} from '../mutations/AddReflectTemplateMutation'
 import {addReflectTemplatePromptTeamUpdater} from '../mutations/AddReflectTemplatePromptMutation'
 import {addTeamTeamUpdater} from '../mutations/AddTeamMutation'
 import {archiveTeamTeamOnNext, archiveTeamTeamUpdater} from '../mutations/ArchiveTeamMutation'
+import {batchArchiveTasksTaskUpdater} from '../mutations/BatchArchiveTasksMutation'
 import {denyPushInvitationTeamOnNext} from '../mutations/DenyPushInvitationMutation'
 import {
   endSprintPokerTeamOnNext,
@@ -38,9 +41,6 @@ import {
 import {updateAgendaItemUpdater} from '../mutations/UpdateAgendaItemMutation'
 import subscriptionOnNext from './subscriptionOnNext'
 import subscriptionUpdater from './subscriptionUpdater'
-import {batchArchiveTasksTaskUpdater} from '../mutations/BatchArchiveTasksMutation'
-import {addReflectTemplateTeamUpdater} from '../mutations/AddReflectTemplateMutation'
-import {addPokerTemplateTeamUpdater} from '../mutations/AddPokerTemplateMutation'
 
 const subscription = graphql`
   subscription TeamSubscription {
diff --git a/packages/client/ui/AlertDialog/AlertDialogAction.tsx b/packages/client/ui/AlertDialog/AlertDialogAction.tsx
index 75b93fb02a9..59f4f9d0e76 100644
--- a/packages/client/ui/AlertDialog/AlertDialogAction.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogAction.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 import clsx from 'clsx'
+import * as React from 'react'
 
 const AlertDialogAction = React.forwardRef<
   HTMLButtonElement,
diff --git a/packages/client/ui/AlertDialog/AlertDialogCancel.tsx b/packages/client/ui/AlertDialog/AlertDialogCancel.tsx
index 201ca648679..e6dad77019d 100644
--- a/packages/client/ui/AlertDialog/AlertDialogCancel.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogCancel.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 import clsx from 'clsx'
+import * as React from 'react'
 
 const AlertDialogCancel = React.forwardRef<
   HTMLButtonElement,
diff --git a/packages/client/ui/AlertDialog/AlertDialogDescription.tsx b/packages/client/ui/AlertDialog/AlertDialogDescription.tsx
index 7c940b02fec..ea8bfaa59b0 100644
--- a/packages/client/ui/AlertDialog/AlertDialogDescription.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogDescription.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 import clsx from 'clsx'
+import * as React from 'react'
 
 const AlertDialogDescription = React.forwardRef<
   HTMLParagraphElement,
diff --git a/packages/client/ui/AlertDialog/AlertDialogFooter.tsx b/packages/client/ui/AlertDialog/AlertDialogFooter.tsx
index 0148d9a8c39..86e208f97cb 100644
--- a/packages/client/ui/AlertDialog/AlertDialogFooter.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogFooter.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
 import clsx from 'clsx'
+import * as React from 'react'
 
 const AlertDialogFooter = ({className, ...props}: React.HTMLAttributes<HTMLDivElement>) => (
   <div
diff --git a/packages/client/ui/AlertDialog/AlertDialogHeader.tsx b/packages/client/ui/AlertDialog/AlertDialogHeader.tsx
index 869b09ccfc3..73d74092d7a 100644
--- a/packages/client/ui/AlertDialog/AlertDialogHeader.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogHeader.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
 import clsx from 'clsx'
+import * as React from 'react'
 
 const AlertDialogHeader = ({className, ...props}: React.HTMLAttributes<HTMLDivElement>) => (
   <div className={clsx('flex flex-col space-y-2 text-center sm:text-left', className)} {...props} />
diff --git a/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx b/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx
index e867c7ed363..4d528210517 100644
--- a/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogOverlay.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 import clsx from 'clsx'
+import * as React from 'react'
 
 export const AlertDialogOverlay = React.forwardRef<
   HTMLDivElement,
diff --git a/packages/client/ui/AlertDialog/AlertDialogTitle.tsx b/packages/client/ui/AlertDialog/AlertDialogTitle.tsx
index c7c14e011c5..cd4c9a9b0a8 100644
--- a/packages/client/ui/AlertDialog/AlertDialogTitle.tsx
+++ b/packages/client/ui/AlertDialog/AlertDialogTitle.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 import clsx from 'clsx'
+import * as React from 'react'
 
 const AlertDialogTitle = React.forwardRef<
   HTMLHeadingElement,
diff --git a/packages/client/ui/Avatar/AvatarFallback.tsx b/packages/client/ui/Avatar/AvatarFallback.tsx
index 482648102a8..ac2676858d4 100644
--- a/packages/client/ui/Avatar/AvatarFallback.tsx
+++ b/packages/client/ui/Avatar/AvatarFallback.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
 import * as AvatarPrimitive from '@radix-ui/react-avatar'
 import clsx from 'clsx'
+import React from 'react'
 
 export const AvatarFallback = React.forwardRef<
   HTMLSpanElement,
diff --git a/packages/client/ui/Avatar/AvatarImage.tsx b/packages/client/ui/Avatar/AvatarImage.tsx
index 66f41abad5d..19a90bc1f90 100644
--- a/packages/client/ui/Avatar/AvatarImage.tsx
+++ b/packages/client/ui/Avatar/AvatarImage.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
 import * as AvatarPrimitive from '@radix-ui/react-avatar'
 import clsx from 'clsx'
+import React from 'react'
 
 export const AvatarImage = React.forwardRef<
   HTMLImageElement,
diff --git a/packages/client/ui/Button/Button.tsx b/packages/client/ui/Button/Button.tsx
index 90554dc662e..e214959b5c7 100644
--- a/packages/client/ui/Button/Button.tsx
+++ b/packages/client/ui/Button/Button.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
 import {Slot} from '@radix-ui/react-slot'
 import clsx from 'clsx'
+import React from 'react'
 
 type Variant = 'primary' | 'secondary' | 'destructive' | 'ghost' | 'link' | 'outline'
 type Size = 'sm' | 'md' | 'lg' | 'default'
diff --git a/packages/client/ui/Chip/Chip.tsx b/packages/client/ui/Chip/Chip.tsx
index c24ccad0d69..bfa9da0bc61 100644
--- a/packages/client/ui/Chip/Chip.tsx
+++ b/packages/client/ui/Chip/Chip.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
 import {Close} from '@mui/icons-material'
+import React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 interface Props {
diff --git a/packages/client/ui/Dialog/Dialog.tsx b/packages/client/ui/Dialog/Dialog.tsx
index 00bffaab0af..633e5e7c74f 100644
--- a/packages/client/ui/Dialog/Dialog.tsx
+++ b/packages/client/ui/Dialog/Dialog.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
 import * as RadixDialog from '@radix-ui/react-dialog'
+import * as React from 'react'
 
 interface DialogProps extends React.ComponentPropsWithoutRef<typeof RadixDialog.Root> {
   isOpen: boolean
diff --git a/packages/client/ui/Dialog/DialogClose.tsx b/packages/client/ui/Dialog/DialogClose.tsx
index 83318e88fa8..8bae02bfc67 100644
--- a/packages/client/ui/Dialog/DialogClose.tsx
+++ b/packages/client/ui/Dialog/DialogClose.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
 import {Close} from '@mui/icons-material'
 import * as RadixDialog from '@radix-ui/react-dialog'
+import React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 export const DialogClose = React.forwardRef<
diff --git a/packages/client/ui/Dialog/DialogContent.tsx b/packages/client/ui/Dialog/DialogContent.tsx
index 16ef6ab553e..5453413e534 100644
--- a/packages/client/ui/Dialog/DialogContent.tsx
+++ b/packages/client/ui/Dialog/DialogContent.tsx
@@ -1,8 +1,8 @@
-import * as React from 'react'
 import * as RadixDialog from '@radix-ui/react-dialog'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
-import {DialogOverlay} from './DialogOverlay'
 import {DialogClose} from './DialogClose'
+import {DialogOverlay} from './DialogOverlay'
 
 export const DialogContent = React.forwardRef<
   HTMLDivElement,
diff --git a/packages/client/ui/Dialog/DialogDescription.tsx b/packages/client/ui/Dialog/DialogDescription.tsx
index 1420013ed2f..ce44221669d 100644
--- a/packages/client/ui/Dialog/DialogDescription.tsx
+++ b/packages/client/ui/Dialog/DialogDescription.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
 import * as RadixDialog from '@radix-ui/react-dialog'
+import React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 export const DialogDescription = React.forwardRef<
diff --git a/packages/client/ui/Dialog/DialogOverlay.tsx b/packages/client/ui/Dialog/DialogOverlay.tsx
index bfafa2578e9..031db3627d5 100644
--- a/packages/client/ui/Dialog/DialogOverlay.tsx
+++ b/packages/client/ui/Dialog/DialogOverlay.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
 import * as RadixDialog from '@radix-ui/react-dialog'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 export const DialogOverlay = React.forwardRef<
diff --git a/packages/client/ui/Dialog/DialogTitle.tsx b/packages/client/ui/Dialog/DialogTitle.tsx
index c35a6165cac..ecd9e9ba621 100644
--- a/packages/client/ui/Dialog/DialogTitle.tsx
+++ b/packages/client/ui/Dialog/DialogTitle.tsx
@@ -1,5 +1,5 @@
-import React from 'react'
 import * as RadixDialog from '@radix-ui/react-dialog'
+import React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 export const DialogTitle = React.forwardRef<
diff --git a/packages/client/ui/Select/SelectContent.tsx b/packages/client/ui/Select/SelectContent.tsx
index bfe3b247b03..3d58796aa2f 100644
--- a/packages/client/ui/Select/SelectContent.tsx
+++ b/packages/client/ui/Select/SelectContent.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
 import * as RadixSelect from '@radix-ui/react-select'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 export const SelectContent = React.forwardRef<
diff --git a/packages/client/ui/Select/SelectItem.tsx b/packages/client/ui/Select/SelectItem.tsx
index d36b21a108b..c836364266b 100644
--- a/packages/client/ui/Select/SelectItem.tsx
+++ b/packages/client/ui/Select/SelectItem.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
-import * as RadixSelect from '@radix-ui/react-select'
 import {Check} from '@mui/icons-material'
+import * as RadixSelect from '@radix-ui/react-select'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 
 interface SelectItemProps extends React.ComponentPropsWithoutRef<typeof RadixSelect.Item> {
diff --git a/packages/client/ui/Select/SelectTrigger.tsx b/packages/client/ui/Select/SelectTrigger.tsx
index 63fd744086e..5f8b32fe013 100644
--- a/packages/client/ui/Select/SelectTrigger.tsx
+++ b/packages/client/ui/Select/SelectTrigger.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
-import * as RadixSelect from '@radix-ui/react-select'
 import {KeyboardArrowDown} from '@mui/icons-material'
+import * as RadixSelect from '@radix-ui/react-select'
+import * as React from 'react'
 import {twMerge} from 'tailwind-merge'
 import {Loader} from '../../utils/relay/renderLoader'
 
diff --git a/packages/client/utils/GcalClientManager.ts b/packages/client/utils/GcalClientManager.ts
index f35760b850d..f8588255344 100644
--- a/packages/client/utils/GcalClientManager.ts
+++ b/packages/client/utils/GcalClientManager.ts
@@ -1,8 +1,8 @@
+import Atmosphere from '../Atmosphere'
 import {MenuMutationProps} from '../hooks/useMutationProps'
 import AddTeamMemberIntegrationAuthMutation from '../mutations/AddTeamMemberIntegrationAuthMutation'
 import getOAuthPopupFeatures from './getOAuthPopupFeatures'
 import makeHref from './makeHref'
-import Atmosphere from '../Atmosphere'
 
 class GcalClientManager {
   static SCOPES = 'https://www.googleapis.com/auth/calendar.events'
diff --git a/packages/client/utils/SendClientSideEvent.ts b/packages/client/utils/SendClientSideEvent.ts
index 7995473b1fd..d0fc5301c0d 100644
--- a/packages/client/utils/SendClientSideEvent.ts
+++ b/packages/client/utils/SendClientSideEvent.ts
@@ -1,5 +1,5 @@
-import Atmosphere from '../Atmosphere'
 import * as amplitude from '@amplitude/analytics-browser'
+import Atmosphere from '../Atmosphere'
 
 const SendClientSideEvent = (
   atmosphere: Atmosphere,
diff --git a/packages/client/utils/date/relativeDate.ts b/packages/client/utils/date/relativeDate.ts
index 659f0af9380..155c121012c 100644
--- a/packages/client/utils/date/relativeDate.ts
+++ b/packages/client/utils/date/relativeDate.ts
@@ -3,8 +3,8 @@
 // capitalized J in just now
 // set my own defaults
 
-import plural from '../plural'
 import humanizeDuration from 'humanize-duration'
+import plural from '../plural'
 
 const SECOND = 1000
 const MIN = SECOND * 60
diff --git a/packages/client/utils/getTeamHealthVoteColor.ts b/packages/client/utils/getTeamHealthVoteColor.ts
index ad347969a8d..fd660535aba 100644
--- a/packages/client/utils/getTeamHealthVoteColor.ts
+++ b/packages/client/utils/getTeamHealthVoteColor.ts
@@ -1,5 +1,5 @@
-import blendColors from './blendColors'
 import {PALETTE} from '../styles/paletteV3'
+import blendColors from './blendColors'
 
 function getTeamHealthVoteColor(allVotes: readonly number[], vote: number) {
   const minVote = Math.min(...allVotes)
diff --git a/packages/client/utils/handleSuccessfulLogin.ts b/packages/client/utils/handleSuccessfulLogin.ts
index 7fc42f3b26e..1c17d50b719 100644
--- a/packages/client/utils/handleSuccessfulLogin.ts
+++ b/packages/client/utils/handleSuccessfulLogin.ts
@@ -1,7 +1,7 @@
+import ReactGA from 'react-ga4'
 import {LocalStorageKey} from '~/types/constEnums'
-import safeIdentify from './safeIdentify'
 import {handleSuccessfulLogin_UserLogInPayload$data} from '../__generated__/handleSuccessfulLogin_UserLogInPayload.graphql'
-import ReactGA from 'react-ga4'
+import safeIdentify from './safeIdentify'
 
 import graphql from 'babel-plugin-relay/macro'
 graphql`
diff --git a/packages/client/utils/relay/setActiveTemplate.ts b/packages/client/utils/relay/setActiveTemplate.ts
index 8fd4231d171..45a577a0403 100644
--- a/packages/client/utils/relay/setActiveTemplate.ts
+++ b/packages/client/utils/relay/setActiveTemplate.ts
@@ -32,4 +32,4 @@ const setActiveTemplate = (
   })
 }
 
-export {setActiveTemplateInRelayStore, setActiveTemplate}
+export {setActiveTemplate, setActiveTemplateInRelayStore}
diff --git a/packages/client/utils/useTemplateDescription.ts b/packages/client/utils/useTemplateDescription.ts
index 302dfaaabfe..6f17000e918 100644
--- a/packages/client/utils/useTemplateDescription.ts
+++ b/packages/client/utils/useTemplateDescription.ts
@@ -1,8 +1,8 @@
 import graphql from 'babel-plugin-relay/macro'
 import {readInlineData} from 'react-relay'
+import {TierEnum} from '../__generated__/OrganizationSubscription.graphql'
 import {useTemplateDescription_template$key} from '../__generated__/useTemplateDescription_template.graphql'
 import {useTemplateDescription_viewer$key} from '../__generated__/useTemplateDescription_viewer.graphql'
-import {TierEnum} from '../__generated__/OrganizationSubscription.graphql'
 import relativeDate from './date/relativeDate'
 
 const useTemplateDescription = (
diff --git a/packages/server/__tests__/setup.ts b/packages/server/__tests__/setup.ts
index e5f40d8b93b..4a4860682ff 100644
--- a/packages/server/__tests__/setup.ts
+++ b/packages/server/__tests__/setup.ts
@@ -1,5 +1,5 @@
-import {drainRethink} from './common'
 import * as matchers from 'jest-extended'
+import {drainRethink} from './common'
 expect.extend(matchers)
 
 afterAll(() => {
diff --git a/packages/server/billing/helpers/adjustUserCount.ts b/packages/server/billing/helpers/adjustUserCount.ts
index 15c440c2834..42618bd4261 100644
--- a/packages/server/billing/helpers/adjustUserCount.ts
+++ b/packages/server/billing/helpers/adjustUserCount.ts
@@ -3,18 +3,18 @@ import getRethink from '../../database/rethinkDriver'
 import {RDatum} from '../../database/stricterR'
 import Organization from '../../database/types/Organization'
 import OrganizationUser from '../../database/types/OrganizationUser'
+import {DataLoaderWorker} from '../../graphql/graphql'
 import insertOrgUserAudit from '../../postgres/helpers/insertOrgUserAudit'
 import {OrganizationUserAuditEventTypeEnum} from '../../postgres/queries/generated/insertOrgUserAuditQuery'
+import {getUserById} from '../../postgres/queries/getUsersByIds'
 import updateUser from '../../postgres/queries/updateUser'
 import IUser from '../../postgres/types/IUser'
+import {Logger} from '../../utils/Logger'
 import {analytics} from '../../utils/analytics/analytics'
 import getActiveDomainForOrgId from '../../utils/getActiveDomainForOrgId'
 import getDomainFromEmail from '../../utils/getDomainFromEmail'
 import handleEnterpriseOrgQuantityChanges from './handleEnterpriseOrgQuantityChanges'
 import handleTeamOrgQuantityChanges from './handleTeamOrgQuantityChanges'
-import {getUserById} from '../../postgres/queries/getUsersByIds'
-import {DataLoaderWorker} from '../../graphql/graphql'
-import {Logger} from '../../utils/Logger'
 
 const maybeUpdateOrganizationActiveDomain = async (
   orgId: string,
diff --git a/packages/server/billing/helpers/generateInvoice.ts b/packages/server/billing/helpers/generateInvoice.ts
index 8a94adaffea..3785a7d6303 100644
--- a/packages/server/billing/helpers/generateInvoice.ts
+++ b/packages/server/billing/helpers/generateInvoice.ts
@@ -1,6 +1,7 @@
 import {InvoiceItemType} from 'parabol-client/types/constEnums'
 import Stripe from 'stripe'
 import getRethink from '../../database/rethinkDriver'
+import {RDatum} from '../../database/stricterR'
 import Coupon from '../../database/types/Coupon'
 import Invoice, {InvoiceStatusEnum} from '../../database/types/Invoice'
 import {InvoiceLineItemEnum} from '../../database/types/InvoiceLineItem'
@@ -15,7 +16,6 @@ import isValid from '../../graphql/isValid'
 import {fromEpochSeconds} from '../../utils/epochTime'
 import sendToSentry from '../../utils/sendToSentry'
 import {getStripeManager} from '../../utils/stripe'
-import {RDatum} from '../../database/stricterR'
 
 interface InvoicesByStartTime {
   [start: string]: {
diff --git a/packages/server/billing/helpers/removeTeamsLimitObjects.ts b/packages/server/billing/helpers/removeTeamsLimitObjects.ts
index 2f112a11077..3b24d5c45c6 100644
--- a/packages/server/billing/helpers/removeTeamsLimitObjects.ts
+++ b/packages/server/billing/helpers/removeTeamsLimitObjects.ts
@@ -1,8 +1,8 @@
-import getKysely from '../../postgres/getKysely'
 import {r} from 'rethinkdb-ts'
 import {RValue} from '../../database/stricterR'
 import {DataLoaderWorker} from '../../graphql/graphql'
 import updateNotification from '../../graphql/public/mutations/helpers/updateNotification'
+import getKysely from '../../postgres/getKysely'
 
 const removeTeamsLimitObjects = async (orgId: string, dataLoader: DataLoaderWorker) => {
   const removeJobTypes = ['LOCK_ORGANIZATION', 'WARN_ORGANIZATION'] as const
diff --git a/packages/server/billing/helpers/updateSubscriptionQuantity.ts b/packages/server/billing/helpers/updateSubscriptionQuantity.ts
index ebb43a8d637..25917b13e58 100644
--- a/packages/server/billing/helpers/updateSubscriptionQuantity.ts
+++ b/packages/server/billing/helpers/updateSubscriptionQuantity.ts
@@ -1,8 +1,8 @@
 import getRethink from '../../database/rethinkDriver'
-import {getStripeManager} from '../../utils/stripe'
 import insertStripeQuantityMismatchLogging from '../../postgres/queries/insertStripeQuantityMismatchLogging'
-import sendToSentry from '../../utils/sendToSentry'
 import RedisLockQueue from '../../utils/RedisLockQueue'
+import sendToSentry from '../../utils/sendToSentry'
+import {getStripeManager} from '../../utils/stripe'
 
 /**
  * Check and update if necessary the subscription quantity
diff --git a/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts b/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts
index 139a64260a3..730ea2e689d 100644
--- a/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts
+++ b/packages/server/database/migrations/20220602164119-fixRetroTemplates.ts
@@ -1,8 +1,8 @@
 import {
   down as faultyDown,
+  up as faultyUp,
   reflectPrompts,
-  templates,
-  up as faultyUp
+  templates
 } from './20220124600507-addMoreRetroTemplates'
 
 const fixedReflectPrompts = reflectPrompts.map((prompt) => ({
diff --git a/packages/server/database/rethinkDriver.ts b/packages/server/database/rethinkDriver.ts
index 370482933b2..e030375d971 100644
--- a/packages/server/database/rethinkDriver.ts
+++ b/packages/server/database/rethinkDriver.ts
@@ -4,8 +4,8 @@ import SlackAuth from '../database/types/SlackAuth'
 import SlackNotification from '../database/types/SlackNotification'
 import TeamInvitation from '../database/types/TeamInvitation'
 import TeamMember from '../database/types/TeamMember'
-import {ScheduledJobUnion} from '../types/custom'
 import {AnyMeeting, AnyMeetingSettings, AnyMeetingTeamMember} from '../postgres/types/Meeting'
+import {ScheduledJobUnion} from '../types/custom'
 import getRethinkConfig from './getRethinkConfig'
 import {R} from './stricterR'
 import AgendaItem from './types/AgendaItem'
@@ -18,10 +18,11 @@ import MassInvitation from './types/MassInvitation'
 import MeetingTemplate from './types/MeetingTemplate'
 import NotificationKickedOut from './types/NotificationKickedOut'
 import NotificationMeetingStageTimeLimitEnd from './types/NotificationMeetingStageTimeLimitEnd'
+import NotificationMentioned from './types/NotificationMentioned'
 import NotificationPaymentRejected from './types/NotificationPaymentRejected'
 import NotificationPromoteToBillingLeader from './types/NotificationPromoteToBillingLeader'
 import NotificationResponseMentioned from './types/NotificationResponseMentioned'
-import NotificationMentioned from './types/NotificationMentioned'
+import NotificationResponseReplied from './types/NotificationResponseReplied'
 import NotificationTaskInvolves from './types/NotificationTaskInvolves'
 import NotificationTeamArchived from './types/NotificationTeamArchived'
 import NotificationTeamInvitation from './types/NotificationTeamInvitation'
@@ -41,7 +42,6 @@ import TemplateDimension from './types/TemplateDimension'
 import TemplateScale from './types/TemplateScale'
 import TimelineEvent from './types/TimelineEvent'
 import User from './types/User'
-import NotificationResponseReplied from './types/NotificationResponseReplied'
 
 export type RethinkSchema = {
   AgendaItem: {
diff --git a/packages/server/database/types/TeamHealthPhase.ts b/packages/server/database/types/TeamHealthPhase.ts
index 6155cfbf64f..1ba920b0c38 100644
--- a/packages/server/database/types/TeamHealthPhase.ts
+++ b/packages/server/database/types/TeamHealthPhase.ts
@@ -1,5 +1,5 @@
-import TeamHealthStage from './TeamHealthStage'
 import GenericMeetingPhase from './GenericMeetingPhase'
+import TeamHealthStage from './TeamHealthStage'
 
 interface Input {
   stages: [TeamHealthStage, ...TeamHealthStage[]]
diff --git a/packages/server/database/types/scheduleTeamLimitsJobs.ts b/packages/server/database/types/scheduleTeamLimitsJobs.ts
index 427d328e608..8c518efd469 100644
--- a/packages/server/database/types/scheduleTeamLimitsJobs.ts
+++ b/packages/server/database/types/scheduleTeamLimitsJobs.ts
@@ -1,6 +1,6 @@
 import ms from 'ms'
-import getKysely from '../../postgres/getKysely'
 import {Threshold} from '../../../client/types/constEnums'
+import getKysely from '../../postgres/getKysely'
 import ScheduledTeamLimitsJob from './ScheduledTeamLimitsJob'
 
 const scheduleTeamLimitsJobs = async (scheduledLockAt: Date, orgId: string) => {
diff --git a/packages/server/dataloader/RedisCache.ts b/packages/server/dataloader/RedisCache.ts
index 2a2d57b82ec..2a2d01f08a3 100644
--- a/packages/server/dataloader/RedisCache.ts
+++ b/packages/server/dataloader/RedisCache.ts
@@ -3,9 +3,9 @@ import ms from 'ms'
 import {Unpromise} from 'parabol-client/types/generics'
 import {DBType} from '../database/rethinkDriver'
 import RedisInstance from '../utils/RedisInstance'
+import RethinkDBCache, {RWrite} from './RethinkDBCache'
 import customRedisQueries from './customRedisQueries'
 import hydrateRedisDoc from './hydrateRedisDoc'
-import RethinkDBCache, {RWrite} from './RethinkDBCache'
 export type RedisType = {
   [P in keyof typeof customRedisQueries]: Unpromise<ReturnType<(typeof customRedisQueries)[P]>>[0]
 }
diff --git a/packages/server/dataloader/atlassianLoaders.ts b/packages/server/dataloader/atlassianLoaders.ts
index de3358bb0e2..c44347a5405 100644
--- a/packages/server/dataloader/atlassianLoaders.ts
+++ b/packages/server/dataloader/atlassianLoaders.ts
@@ -13,14 +13,14 @@ import getJiraDimensionFieldMap, {
 } from '../postgres/queries/getJiraDimensionFieldMap'
 import insertTaskEstimate from '../postgres/queries/insertTaskEstimate'
 import upsertAtlassianAuths from '../postgres/queries/upsertAtlassianAuths'
-import {hasDefaultEstimationField, isValidEstimationField} from '../utils/atlassian/jiraFields'
-import {downloadAndCacheImages, updateJiraImageUrls} from '../utils/atlassian/jiraImages'
-import {getIssue} from '../utils/atlassian/jiraIssues'
 import AtlassianServerManager, {
-  JiraGetIssueRes,
   JiraGQLFields,
+  JiraGetIssueRes,
   JiraProject
 } from '../utils/AtlassianServerManager'
+import {hasDefaultEstimationField, isValidEstimationField} from '../utils/atlassian/jiraFields'
+import {downloadAndCacheImages, updateJiraImageUrls} from '../utils/atlassian/jiraImages'
+import {getIssue} from '../utils/atlassian/jiraIssues'
 import publish from '../utils/publish'
 import sendToSentry from '../utils/sendToSentry'
 import RootDataLoader from './RootDataLoader'
diff --git a/packages/server/dataloader/azureDevOpsLoaders.ts b/packages/server/dataloader/azureDevOpsLoaders.ts
index 7892bce6f13..87d3c968903 100644
--- a/packages/server/dataloader/azureDevOpsLoaders.ts
+++ b/packages/server/dataloader/azureDevOpsLoaders.ts
@@ -6,7 +6,6 @@ import {IntegrationProviderAzureDevOps} from '../postgres/queries/getIntegration
 import insertTaskEstimate from '../postgres/queries/insertTaskEstimate'
 import removeTeamMemberIntegrationAuthQuery from '../postgres/queries/removeTeamMemberIntegrationAuth'
 import upsertTeamMemberIntegrationAuth from '../postgres/queries/upsertTeamMemberIntegrationAuth'
-import {getInstanceId} from '../utils/azureDevOps/azureDevOpsFieldTypeToId'
 import AzureDevOpsServerManager, {
   ProjectRes,
   Resource,
@@ -14,6 +13,7 @@ import AzureDevOpsServerManager, {
   WorkItem
 } from '../utils/AzureDevOpsServerManager'
 import {Logger} from '../utils/Logger'
+import {getInstanceId} from '../utils/azureDevOps/azureDevOpsFieldTypeToId'
 import sendToSentry from '../utils/sendToSentry'
 import RootDataLoader from './RootDataLoader'
 
diff --git a/packages/server/dataloader/foreignKeyLoaderMaker.ts b/packages/server/dataloader/foreignKeyLoaderMaker.ts
index e21ec3a9f2d..19c91cadfd1 100644
--- a/packages/server/dataloader/foreignKeyLoaderMaker.ts
+++ b/packages/server/dataloader/foreignKeyLoaderMaker.ts
@@ -1,7 +1,7 @@
 import DataLoader from 'dataloader'
-import * as primaryKeyLoaderMakers from './primaryKeyLoaderMakers'
 import RootDataLoader from './RootDataLoader'
 import UpdatableCacheDataLoader from './UpdatableCacheDataLoader'
+import * as primaryKeyLoaderMakers from './primaryKeyLoaderMakers'
 
 type LoaderMakers = typeof primaryKeyLoaderMakers
 type LoaderKeys = keyof LoaderMakers
diff --git a/packages/server/dataloader/primaryKeyLoaderMakers.ts b/packages/server/dataloader/primaryKeyLoaderMakers.ts
index 06ebe30bd0f..09f2b463024 100644
--- a/packages/server/dataloader/primaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/primaryKeyLoaderMakers.ts
@@ -1,15 +1,15 @@
+import getKysely from '../postgres/getKysely'
 import {getDiscussionsByIds} from '../postgres/queries/getDiscussionsByIds'
 import {getDomainJoinRequestsByIds} from '../postgres/queries/getDomainJoinRequestsByIds'
+import {getKudosesByIds} from '../postgres/queries/getKudosesByIds'
 import getMeetingSeriesByIds from '../postgres/queries/getMeetingSeriesByIds'
+import getMeetingTemplatesByIds from '../postgres/queries/getMeetingTemplatesByIds'
 import {getTeamPromptResponsesByIds} from '../postgres/queries/getTeamPromptResponsesByIds'
 import getTeamsByIds from '../postgres/queries/getTeamsByIds'
 import getTemplateRefsByIds from '../postgres/queries/getTemplateRefsByIds'
 import getTemplateScaleRefsByIds from '../postgres/queries/getTemplateScaleRefsByIds'
 import {getUsersByIds} from '../postgres/queries/getUsersByIds'
-import {getKudosesByIds} from '../postgres/queries/getKudosesByIds'
-import getMeetingTemplatesByIds from '../postgres/queries/getMeetingTemplatesByIds'
 import {primaryKeyLoaderMaker} from './primaryKeyLoaderMaker'
-import getKysely from '../postgres/getKysely'
 
 export const users = primaryKeyLoaderMaker(getUsersByIds)
 export const teams = primaryKeyLoaderMaker(getTeamsByIds)
diff --git a/packages/server/dataloader/rethinkPrimaryKeyLoader.ts b/packages/server/dataloader/rethinkPrimaryKeyLoader.ts
index fd3320d038c..e6373123a6a 100644
--- a/packages/server/dataloader/rethinkPrimaryKeyLoader.ts
+++ b/packages/server/dataloader/rethinkPrimaryKeyLoader.ts
@@ -1,7 +1,7 @@
 import DataLoader from 'dataloader'
 import getRethink, {DBType} from '../database/rethinkDriver'
-import normalizeResults from './normalizeResults'
 import UpdatableCacheDataLoader from './UpdatableCacheDataLoader'
+import normalizeResults from './normalizeResults'
 
 const rethinkPrimaryKeyLoader = <T extends keyof DBType>(
   options: DataLoader.Options<string, DBType[T]>,
diff --git a/packages/server/email/MailManagerDebug.ts b/packages/server/email/MailManagerDebug.ts
index 3ca089c510b..cce05a074c4 100644
--- a/packages/server/email/MailManagerDebug.ts
+++ b/packages/server/email/MailManagerDebug.ts
@@ -1,5 +1,5 @@
-import MailManager, {MailManagerOptions} from './MailManager'
 import fs from 'fs'
+import MailManager, {MailManagerOptions} from './MailManager'
 
 export default class MailManagerDebug extends MailManager {
   async sendEmail(options: MailManagerOptions) {
diff --git a/packages/server/email/newMeetingSummaryEmailCreator.tsx b/packages/server/email/newMeetingSummaryEmailCreator.tsx
index 924da4852ba..8387534b811 100644
--- a/packages/server/email/newMeetingSummaryEmailCreator.tsx
+++ b/packages/server/email/newMeetingSummaryEmailCreator.tsx
@@ -4,9 +4,9 @@ import React from 'react'
 import appOrigin from '../appOrigin'
 import AuthToken from '../database/types/AuthToken'
 import {GQLContext} from '../graphql/graphql'
+import ServerEnvironment from './ServerEnvironment'
 import emailTemplate from './emailTemplate'
 import renderSSRElement from './renderSSRElement'
-import ServerEnvironment from './ServerEnvironment'
 
 interface Props {
   meetingId: string
diff --git a/packages/server/email/notificationSummaryCreator.tsx b/packages/server/email/notificationSummaryCreator.tsx
index fe225d4b795..07b7d170bda 100644
--- a/packages/server/email/notificationSummaryCreator.tsx
+++ b/packages/server/email/notificationSummaryCreator.tsx
@@ -4,9 +4,9 @@ import {ContactInfo, ExternalLinks} from 'parabol-client/types/constEnums'
 import makeAppURL from 'parabol-client/utils/makeAppURL'
 import plural from 'parabol-client/utils/plural'
 import React from 'react'
+import ServerEnvironment from './ServerEnvironment'
 import emailTemplate from './emailTemplate'
 import renderSSRElement from './renderSSRElement'
-import ServerEnvironment from './ServerEnvironment'
 
 type TextSummaryProps = Omit<NotificationSummaryProps, 'notificationRefs'>
 const textOnlySummary = (props: TextSummaryProps) => {
diff --git a/packages/server/fileStorage/getFileStoreManager.ts b/packages/server/fileStorage/getFileStoreManager.ts
index 0a641b54bf0..00c92e32f02 100644
--- a/packages/server/fileStorage/getFileStoreManager.ts
+++ b/packages/server/fileStorage/getFileStoreManager.ts
@@ -1,7 +1,7 @@
 import FileStoreManager from './FileStoreManager'
+import GCSManager from './GCSManager'
 import LocalFileSystemManager from './LocalFileStoreManager'
 import S3Manager from './S3FileStoreManager'
-import GCSManager from './GCSManager'
 
 let fileStoreManager: FileStoreManager
 const managers = {
diff --git a/packages/server/graphql/ResponseStream.ts b/packages/server/graphql/ResponseStream.ts
index 124ae8bf2d7..0f4fa374df7 100644
--- a/packages/server/graphql/ResponseStream.ts
+++ b/packages/server/graphql/ResponseStream.ts
@@ -1,8 +1,8 @@
 import {ExecutionResult} from 'graphql'
+import SubscriptionIterator from '../utils/SubscriptionIterator'
 import {getUserId} from '../utils/authorization'
 import getGraphQLExecutor from '../utils/getGraphQLExecutor'
 import sendToSentry from '../utils/sendToSentry'
-import SubscriptionIterator from '../utils/SubscriptionIterator'
 import {SubscribeRequest} from './subscribeGraphQL'
 
 export default class ResponseStream implements AsyncIterableIterator<ExecutionResult> {
diff --git a/packages/server/graphql/mutations/addAgendaItem.ts b/packages/server/graphql/mutations/addAgendaItem.ts
index 57be904cac5..c9200d89215 100644
--- a/packages/server/graphql/mutations/addAgendaItem.ts
+++ b/packages/server/graphql/mutations/addAgendaItem.ts
@@ -4,6 +4,7 @@ import makeAgendaItemSchema from 'parabol-client/validation/makeAgendaItemSchema
 import getRethink from '../../database/rethinkDriver'
 import AgendaItem, {AgendaItemInput} from '../../database/types/AgendaItem'
 import generateUID from '../../generateUID'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
@@ -11,7 +12,6 @@ import AddAgendaItemPayload from '../types/AddAgendaItemPayload'
 import CreateAgendaItemInput, {CreateAgendaItemInputType} from '../types/CreateAgendaItemInput'
 import {GQLContext} from './../graphql'
 import addAgendaItemToActiveActionMeeting from './helpers/addAgendaItemToActiveActionMeeting'
-import {analytics} from '../../utils/analytics/analytics'
 
 export default {
   type: AddAgendaItemPayload,
diff --git a/packages/server/graphql/mutations/addAtlassianAuth.ts b/packages/server/graphql/mutations/addAtlassianAuth.ts
index 9761d9232a1..99e394c02b7 100644
--- a/packages/server/graphql/mutations/addAtlassianAuth.ts
+++ b/packages/server/graphql/mutations/addAtlassianAuth.ts
@@ -2,8 +2,8 @@ import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getAtlassianAuthsByUserId from '../../postgres/queries/getAtlassianAuthsByUserId'
 import upsertAtlassianAuths from '../../postgres/queries/upsertAtlassianAuths'
-import {analytics} from '../../utils/analytics/analytics'
 import AtlassianServerManager from '../../utils/AtlassianServerManager'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
diff --git a/packages/server/graphql/mutations/addGitHubAuth.ts b/packages/server/graphql/mutations/addGitHubAuth.ts
index 1581610c0db..668a2afed59 100644
--- a/packages/server/graphql/mutations/addGitHubAuth.ts
+++ b/packages/server/graphql/mutations/addGitHubAuth.ts
@@ -1,11 +1,11 @@
 import {GraphQLID, GraphQLNonNull, GraphQLResolveInfo} from 'graphql'
 import upsertGitHubAuth from '../../postgres/queries/upsertGitHubAuth'
 import {GetProfileQuery} from '../../types/githubTypes'
+import GitHubServerManager from '../../utils/GitHubServerManager'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import getGitHubRequest from '../../utils/getGitHubRequest'
 import getProfile from '../../utils/githubQueries/getProfile.graphql'
-import GitHubServerManager from '../../utils/GitHubServerManager'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import updateRepoIntegrationsCacheByPerms from '../queries/helpers/updateRepoIntegrationsCacheByPerms'
diff --git a/packages/server/graphql/mutations/addOrg.ts b/packages/server/graphql/mutations/addOrg.ts
index 1eb69d12f86..d3c9ca3df03 100644
--- a/packages/server/graphql/mutations/addOrg.ts
+++ b/packages/server/graphql/mutations/addOrg.ts
@@ -4,6 +4,7 @@ import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
 import AuthToken from '../../database/types/AuthToken'
 import generateUID from '../../generateUID'
 import removeSuggestedAction from '../../safeMutations/removeSuggestedAction'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId} from '../../utils/authorization'
 import encodeAuthToken from '../../utils/encodeAuthToken'
 import publish from '../../utils/publish'
@@ -16,7 +17,6 @@ import addOrgValidation from './helpers/addOrgValidation'
 import createNewOrg from './helpers/createNewOrg'
 import createTeamAndLeader from './helpers/createTeamAndLeader'
 import inviteToTeamHelper from './helpers/inviteToTeamHelper'
-import {analytics} from '../../utils/analytics/analytics'
 
 export default {
   type: new GraphQLNonNull(AddOrgPayload),
diff --git a/packages/server/graphql/mutations/addPokerTemplateScale.ts b/packages/server/graphql/mutations/addPokerTemplateScale.ts
index 305437f3bbf..fdb38242b46 100644
--- a/packages/server/graphql/mutations/addPokerTemplateScale.ts
+++ b/packages/server/graphql/mutations/addPokerTemplateScale.ts
@@ -4,12 +4,12 @@ import dndNoise from 'parabol-client/utils/dndNoise'
 import getRethink from '../../database/rethinkDriver'
 import {RDatum} from '../../database/stricterR'
 import TemplateScale from '../../database/types/TemplateScale'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import AddPokerTemplateScalePayload from '../types/AddPokerTemplateScalePayload'
-import {analytics} from '../../utils/analytics/analytics'
 
 const addPokerTemplateScale = {
   description: 'Add a new scale for the poker template',
diff --git a/packages/server/graphql/mutations/addSlackAuth.ts b/packages/server/graphql/mutations/addSlackAuth.ts
index ce97036cba9..5c6110e0840 100644
--- a/packages/server/graphql/mutations/addSlackAuth.ts
+++ b/packages/server/graphql/mutations/addSlackAuth.ts
@@ -3,10 +3,10 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
 import SlackAuth from '../../database/types/SlackAuth'
 import SlackNotification, {SlackNotificationEvent} from '../../database/types/SlackNotification'
+import SlackServerManager from '../../utils/SlackServerManager'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
-import SlackServerManager from '../../utils/SlackServerManager'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import AddSlackAuthPayload from '../types/AddSlackAuthPayload'
diff --git a/packages/server/graphql/mutations/addTeam.ts b/packages/server/graphql/mutations/addTeam.ts
index c38f5b16227..132926cd46c 100644
--- a/packages/server/graphql/mutations/addTeam.ts
+++ b/packages/server/graphql/mutations/addTeam.ts
@@ -5,6 +5,7 @@ import AuthToken from '../../database/types/AuthToken'
 import generateUID from '../../generateUID'
 import getTeamsByOrgIds from '../../postgres/queries/getTeamsByOrgIds'
 import removeSuggestedAction from '../../safeMutations/removeSuggestedAction'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isUserInOrg} from '../../utils/authorization'
 import encodeAuthToken from '../../utils/encodeAuthToken'
 import publish from '../../utils/publish'
@@ -14,11 +15,10 @@ import rateLimit from '../rateLimit'
 import AddTeamPayload from '../types/AddTeamPayload'
 import GraphQLEmailType from '../types/GraphQLEmailType'
 import NewTeamInput, {NewTeamInputType} from '../types/NewTeamInput'
+import {getFeatureTier} from '../types/helpers/getFeatureTier'
 import addTeamValidation from './helpers/addTeamValidation'
 import createTeamAndLeader from './helpers/createTeamAndLeader'
 import inviteToTeamHelper from './helpers/inviteToTeamHelper'
-import {analytics} from '../../utils/analytics/analytics'
-import {getFeatureTier} from '../types/helpers/getFeatureTier'
 
 export default {
   type: new GraphQLNonNull(AddTeamPayload),
diff --git a/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts b/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts
index bf997c37b62..52a20bdd1ca 100644
--- a/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts
+++ b/packages/server/graphql/mutations/addTeamMemberIntegrationAuth.ts
@@ -1,15 +1,15 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import IntegrationProviderId from '~/shared/gqlIds/IntegrationProviderId'
-import GitLabOAuth2Manager from '../../integrations/gitlab/GitLabOAuth2Manager'
 import GcalOAuth2Manager from '../../integrations/gcal/GcalOAuth2Manager'
+import GitLabOAuth2Manager from '../../integrations/gitlab/GitLabOAuth2Manager'
 import JiraServerOAuth1Manager, {
   OAuth1Auth
 } from '../../integrations/jiraServer/JiraServerOAuth1Manager'
 import {IntegrationProviderAzureDevOps} from '../../postgres/queries/getIntegrationProvidersByIds'
 import upsertTeamMemberIntegrationAuth from '../../postgres/queries/upsertTeamMemberIntegrationAuth'
+import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
-import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import updateRepoIntegrationsCacheByPerms from '../queries/helpers/updateRepoIntegrationsCacheByPerms'
diff --git a/packages/server/graphql/mutations/archiveOrganization.ts b/packages/server/graphql/mutations/archiveOrganization.ts
index 2e52d148fc3..474d9d45fc4 100644
--- a/packages/server/graphql/mutations/archiveOrganization.ts
+++ b/packages/server/graphql/mutations/archiveOrganization.ts
@@ -6,13 +6,13 @@ import Team from '../../database/types/Team'
 import User from '../../database/types/User'
 import IUser from '../../postgres/types/IUser'
 import safeArchiveTeam from '../../safeMutations/safeArchiveTeam'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isSuperUser, isUserBillingLeader} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import isValid from '../isValid'
 import ArchiveOrganizationPayload from '../types/ArchiveOrganizationPayload'
-import {analytics} from '../../utils/analytics/analytics'
 
 export default {
   type: new GraphQLNonNull(ArchiveOrganizationPayload),
diff --git a/packages/server/graphql/mutations/archiveTeam.ts b/packages/server/graphql/mutations/archiveTeam.ts
index 217195001e8..39970cd9f80 100644
--- a/packages/server/graphql/mutations/archiveTeam.ts
+++ b/packages/server/graphql/mutations/archiveTeam.ts
@@ -5,11 +5,11 @@ import getRethink from '../../database/rethinkDriver'
 import NotificationTeamArchived from '../../database/types/NotificationTeamArchived'
 import removeMeetingTemplatesForTeam from '../../postgres/queries/removeMeetingTemplatesForTeam'
 import safeArchiveTeam from '../../safeMutations/safeArchiveTeam'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isSuperUser, isTeamLead} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
-import {analytics} from '../../utils/analytics/analytics'
 
 export default {
   type: new GraphQLNonNull(
diff --git a/packages/server/graphql/mutations/createPoll.ts b/packages/server/graphql/mutations/createPoll.ts
index 16e33f35a6a..ef920a51cfc 100644
--- a/packages/server/graphql/mutations/createPoll.ts
+++ b/packages/server/graphql/mutations/createPoll.ts
@@ -2,12 +2,12 @@ import {GraphQLNonNull} from 'graphql'
 import MeetingMemberId from 'parabol-client/shared/gqlIds/MeetingMemberId'
 import {Polls, SubscriptionChannel} from 'parabol-client/types/constEnums'
 import insertPollWithOptions from '../../postgres/queries/insertPollWithOptions'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import {GQLContext} from '../graphql'
 import CreatePollInput from '../types/CreatePollInput'
 import CreatePollPayload from '../types/CreatePollPayload'
-import {analytics} from '../../utils/analytics/analytics'
 
 type PollOptionsInputVariables = {
   title: string
diff --git a/packages/server/graphql/mutations/createReflection.ts b/packages/server/graphql/mutations/createReflection.ts
index d53e529d6f9..f9a7fd64760 100644
--- a/packages/server/graphql/mutations/createReflection.ts
+++ b/packages/server/graphql/mutations/createReflection.ts
@@ -1,3 +1,4 @@
+import {RawDraftContentState} from 'draft-js'
 import {GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import extractTextFromDraftString from 'parabol-client/utils/draftjs/extractTextFromDraftString'
@@ -10,17 +11,16 @@ import Reflection from '../../database/types/Reflection'
 import ReflectionGroup from '../../database/types/ReflectionGroup'
 import generateUID from '../../generateUID'
 import getKysely from '../../postgres/getKysely'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import CreateReflectionInput, {CreateReflectionInputType} from '../types/CreateReflectionInput'
 import CreateReflectionPayload from '../types/CreateReflectionPayload'
+import {getFeatureTier} from '../types/helpers/getFeatureTier'
 import getReflectionEntities from './helpers/getReflectionEntities'
 import getReflectionSentimentScore from './helpers/getReflectionSentimentScore'
-import {analytics} from '../../utils/analytics/analytics'
-import {getFeatureTier} from '../types/helpers/getFeatureTier'
-import {RawDraftContentState} from 'draft-js'
 
 export default {
   type: CreateReflectionPayload,
diff --git a/packages/server/graphql/mutations/downgradeToStarter.ts b/packages/server/graphql/mutations/downgradeToStarter.ts
index 1121cddf4e0..90f948e3d0c 100644
--- a/packages/server/graphql/mutations/downgradeToStarter.ts
+++ b/packages/server/graphql/mutations/downgradeToStarter.ts
@@ -5,9 +5,9 @@ import {getUserId, isSuperUser, isUserBillingLeader} from '../../utils/authoriza
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
+import {ReasonToDowngradeEnum as TReasonToDowngradeEnum} from '../public/resolverTypes'
 import DowngradeToStarterPayload from '../types/DowngradeToStarterPayload'
 import ReasonToDowngradeEnum from '../types/ReasonToDowngrade'
-import {ReasonToDowngradeEnum as TReasonToDowngradeEnum} from '../public/resolverTypes'
 import resolveDowngradeToStarter from './helpers/resolveDowngradeToStarter'
 
 export default {
diff --git a/packages/server/graphql/mutations/endCheckIn.ts b/packages/server/graphql/mutations/endCheckIn.ts
index c22425619d9..38b63ef12d0 100644
--- a/packages/server/graphql/mutations/endCheckIn.ts
+++ b/packages/server/graphql/mutations/endCheckIn.ts
@@ -13,10 +13,10 @@ import TimelineEventCheckinComplete from '../../database/types/TimelineEventChec
 import generateUID from '../../generateUID'
 import archiveTasksForDB from '../../safeMutations/archiveTasksForDB'
 import removeSuggestedAction from '../../safeMutations/removeSuggestedAction'
+import {Logger} from '../../utils/Logger'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import getPhase from '../../utils/getPhase'
-import {Logger} from '../../utils/Logger'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {DataLoaderWorker, GQLContext} from '../graphql'
diff --git a/packages/server/graphql/mutations/endSprintPoker.ts b/packages/server/graphql/mutations/endSprintPoker.ts
index 21d18816b99..14fa0fbb449 100644
--- a/packages/server/graphql/mutations/endSprintPoker.ts
+++ b/packages/server/graphql/mutations/endSprintPoker.ts
@@ -7,6 +7,7 @@ import getRethink from '../../database/rethinkDriver'
 import Meeting from '../../database/types/Meeting'
 import MeetingPoker from '../../database/types/MeetingPoker'
 import TimelineEventPokerComplete from '../../database/types/TimelineEventPokerComplete'
+import {Logger} from '../../utils/Logger'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isSuperUser, isTeamMember} from '../../utils/authorization'
 import getPhase from '../../utils/getPhase'
@@ -15,12 +16,11 @@ import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import EndSprintPokerPayload from '../types/EndSprintPokerPayload'
-import gatherInsights from './helpers/gatherInsights'
 import sendNewMeetingSummary from './helpers/endMeeting/sendNewMeetingSummary'
+import gatherInsights from './helpers/gatherInsights'
 import {IntegrationNotifier} from './helpers/notifications/IntegrationNotifier'
 import removeEmptyTasks from './helpers/removeEmptyTasks'
 import updateTeamInsights from './helpers/updateTeamInsights'
-import {Logger} from '../../utils/Logger'
 
 export default {
   type: new GraphQLNonNull(EndSprintPokerPayload),
diff --git a/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts b/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts
index 030d4a30446..dc2a59eaea4 100644
--- a/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts
+++ b/packages/server/graphql/mutations/helpers/activatePrevSlackAuth.ts
@@ -1,8 +1,8 @@
 import ms from 'ms'
 import getRethink from '../../../database/rethinkDriver'
+import {Logger} from '../../../utils/Logger'
 import SlackServerManager from '../../../utils/SlackServerManager'
 import {upsertNotifications} from '../addSlackAuth'
-import {Logger} from '../../../utils/Logger'
 
 const activatePrevSlackAuth = async (userId: string, teamId: string) => {
   const r = await getRethink()
diff --git a/packages/server/graphql/mutations/helpers/attemptLogin.ts b/packages/server/graphql/mutations/helpers/attemptLogin.ts
index 9afe4f20641..99a605ca815 100644
--- a/packages/server/graphql/mutations/helpers/attemptLogin.ts
+++ b/packages/server/graphql/mutations/helpers/attemptLogin.ts
@@ -4,10 +4,10 @@ import ms from 'ms'
 import {AuthenticationError, Threshold} from 'parabol-client/types/constEnums'
 import sleep from 'parabol-client/utils/sleep'
 import {AuthIdentityTypeEnum} from '../../../../client/types/constEnums'
-import getKysely from '../../../postgres/getKysely'
 import AuthIdentityLocal from '../../../database/types/AuthIdentityLocal'
 import AuthToken from '../../../database/types/AuthToken'
 import FailedAuthRequest from '../../../database/types/FailedAuthRequest'
+import getKysely from '../../../postgres/getKysely'
 import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
 
 const logFailedLogin = async (ip: string, email: string) => {
diff --git a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
index 278c71930b7..a631100aa35 100644
--- a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
+++ b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
@@ -6,18 +6,18 @@ import SuggestedActionTryTheDemo from '../../../database/types/SuggestedActionTr
 import TimelineEventJoinedParabol from '../../../database/types/TimelineEventJoinedParabol'
 import User from '../../../database/types/User'
 import generateUID from '../../../generateUID'
+import getUsersbyDomain from '../../../postgres/queries/getUsersByDomain'
 import insertUser from '../../../postgres/queries/insertUser'
 import IUser from '../../../postgres/types/IUser'
+import acceptTeamInvitation from '../../../safeMutations/acceptTeamInvitation'
 import {analytics} from '../../../utils/analytics/analytics'
-import addSeedTasks from './addSeedTasks'
-import createNewOrg from './createNewOrg'
-import createTeamAndLeader from './createTeamAndLeader'
-import getUsersbyDomain from '../../../postgres/queries/getUsersByDomain'
+import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail'
 import sendPromptToJoinOrg from '../../../utils/sendPromptToJoinOrg'
 import {DataLoaderWorker} from '../../graphql'
-import acceptTeamInvitation from '../../../safeMutations/acceptTeamInvitation'
 import isValid from '../../isValid'
-import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail'
+import addSeedTasks from './addSeedTasks'
+import createNewOrg from './createNewOrg'
+import createTeamAndLeader from './createTeamAndLeader'
 
 const bootstrapNewUser = async (
   newUser: User,
diff --git a/packages/server/graphql/mutations/helpers/createGcalEvent.ts b/packages/server/graphql/mutations/helpers/createGcalEvent.ts
index 4382ca7dedd..575fc9e4cdd 100644
--- a/packages/server/graphql/mutations/helpers/createGcalEvent.ts
+++ b/packages/server/graphql/mutations/helpers/createGcalEvent.ts
@@ -1,11 +1,11 @@
 import {google} from 'googleapis'
+import {pick} from 'lodash'
 import makeAppURL from 'parabol-client/utils/makeAppURL'
+import {RRule} from 'rrule'
 import appOrigin from '../../../appOrigin'
-import {DataLoaderWorker} from '../../graphql'
 import standardError from '../../../utils/standardError'
+import {DataLoaderWorker} from '../../graphql'
 import {CreateGcalEventInput, StandardMutationError} from '../../public/resolverTypes'
-import {RRule} from 'rrule'
-import {pick} from 'lodash'
 
 const emailRemindMinsBeforeMeeting = 24 * 60
 const popupRemindMinsBeforeMeeting = 10
diff --git a/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts b/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts
index 31567d1a6d2..5ac8998e8a3 100644
--- a/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts
+++ b/packages/server/graphql/mutations/helpers/createNewMeetingPhases.ts
@@ -26,8 +26,8 @@ import UpdatesPhase from '../../../database/types/UpdatesPhase'
 import UpdatesStage from '../../../database/types/UpdatesStage'
 import insertDiscussions from '../../../postgres/queries/insertDiscussions'
 import {MeetingTypeEnum} from '../../../postgres/types/Meeting'
-import {DataLoaderWorker} from '../../graphql'
 import isPhaseAvailable from '../../../utils/isPhaseAvailable'
+import {DataLoaderWorker} from '../../graphql'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
 export const primePhases = (phases: GenericMeetingPhase[], startIndex = 0) => {
diff --git a/packages/server/graphql/mutations/helpers/gatherInsights.ts b/packages/server/graphql/mutations/helpers/gatherInsights.ts
index b0301d0467b..159a7f75533 100644
--- a/packages/server/graphql/mutations/helpers/gatherInsights.ts
+++ b/packages/server/graphql/mutations/helpers/gatherInsights.ts
@@ -1,7 +1,7 @@
 import Meeting from '../../../database/types/Meeting'
 import {DataLoaderWorker} from '../../graphql'
-import collectReactjis from './collectReactjis'
 import calculateEngagement from './calculateEngagement'
+import collectReactjis from './collectReactjis'
 
 const gatherInsights = async (meeting: Meeting, dataLoader: DataLoaderWorker) => {
   const [usedReactjis, engagement] = await Promise.all([
diff --git a/packages/server/graphql/mutations/helpers/generateGroups.ts b/packages/server/graphql/mutations/helpers/generateGroups.ts
index adee86de361..77d7ab7e1f4 100644
--- a/packages/server/graphql/mutations/helpers/generateGroups.ts
+++ b/packages/server/graphql/mutations/helpers/generateGroups.ts
@@ -1,12 +1,12 @@
+import {SubscriptionChannel} from '../../../../client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
+import {AutogroupReflectionGroupType} from '../../../database/types/MeetingRetrospective'
 import Reflection from '../../../database/types/Reflection'
+import {Logger} from '../../../utils/Logger'
 import OpenAIServerManager from '../../../utils/OpenAIServerManager'
-import {DataLoaderWorker} from '../../graphql'
-import {AutogroupReflectionGroupType} from '../../../database/types/MeetingRetrospective'
-import {SubscriptionChannel} from '../../../../client/types/constEnums'
-import publish from '../../../utils/publish'
 import {analytics} from '../../../utils/analytics/analytics'
-import {Logger} from '../../../utils/Logger'
+import publish from '../../../utils/publish'
+import {DataLoaderWorker} from '../../graphql'
 
 const generateGroups = async (
   reflections: Reflection[],
diff --git a/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts b/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts
index ac299af4d0a..ac20e9b106c 100644
--- a/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts
+++ b/packages/server/graphql/mutations/helpers/generateStandupMeetingSummary.ts
@@ -1,8 +1,8 @@
+import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt'
+import {getTeamPromptResponsesByMeetingId} from '../../../postgres/queries/getTeamPromptResponsesByMeetingIds'
 import OpenAIServerManager from '../../../utils/OpenAIServerManager'
 import {DataLoaderWorker} from '../../graphql'
 import canAccessAISummary from './canAccessAISummary'
-import {getTeamPromptResponsesByMeetingId} from '../../../postgres/queries/getTeamPromptResponsesByMeetingIds'
-import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt'
 
 const generateStandupMeetingSummary = async (
   meeting: MeetingTeamPrompt,
diff --git a/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts b/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts
index de2bdf41696..7db3ccbce4e 100644
--- a/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts
+++ b/packages/server/graphql/mutations/helpers/getCCFromCustomer.ts
@@ -1,7 +1,7 @@
 import Stripe from 'stripe'
+import {Logger} from '../../../utils/Logger'
 import {getStripeManager} from '../../../utils/stripe'
 import {stripeCardToDBCard} from './stripeCardToDBCard'
-import {Logger} from '../../../utils/Logger'
 
 export default async function getCCFromCustomer(
   customer: Stripe.Customer | Stripe.DeletedCustomer
diff --git a/packages/server/graphql/mutations/helpers/getReflectionEntities.ts b/packages/server/graphql/mutations/helpers/getReflectionEntities.ts
index 90163f1c7e6..ab6ab948928 100644
--- a/packages/server/graphql/mutations/helpers/getReflectionEntities.ts
+++ b/packages/server/graphql/mutations/helpers/getReflectionEntities.ts
@@ -1,7 +1,7 @@
 import getGoogleLanguageManager from '../../../getGoogleLanguageManager'
-import manageGoogleNLPErrorResponse from './manageGoogleNLPErrorResponse'
 import addLemmaToEntities from './autoGroup/addLemmaToEntities'
 import sanitizeAnalyzedEntitiesResponse from './autoGroup/sanitizeAnalyzedEntititesResponse'
+import manageGoogleNLPErrorResponse from './manageGoogleNLPErrorResponse'
 
 const getReflectionEntities = async (plaintextContent: string) => {
   if (!plaintextContent) return []
diff --git a/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts b/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts
index 053ca0f381f..423e3d980c2 100644
--- a/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts
+++ b/packages/server/graphql/mutations/helpers/inviteToTeamHelper.ts
@@ -1,27 +1,27 @@
-import appOrigin from '../../../appOrigin'
+import crypto from 'crypto'
+import util from 'util'
 import {SubscriptionChannel, Threshold} from '../../../../client/types/constEnums'
+import {EMAIL_CORS_OPTIONS} from '../../../../client/types/cors'
+import makeAppURL from '../../../../client/utils/makeAppURL'
 import {isNotNull} from '../../../../client/utils/predicates'
+import appOrigin from '../../../appOrigin'
 import getRethink from '../../../database/rethinkDriver'
 import NotificationTeamInvitation from '../../../database/types/NotificationTeamInvitation'
 import TeamInvitation from '../../../database/types/TeamInvitation'
+import getMailManager from '../../../email/getMailManager'
 import teamInviteEmailCreator from '../../../email/teamInviteEmailCreator'
 import {getUsersByEmails} from '../../../postgres/queries/getUsersByEmails'
 import removeSuggestedAction from '../../../safeMutations/removeSuggestedAction'
+import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId} from '../../../utils/authorization'
 import getBestInvitationMeeting from '../../../utils/getBestInvitationMeeting'
 import getDomainFromEmail from '../../../utils/getDomainFromEmail'
-import standardError from '../../../utils/standardError'
-import {GQLContext} from '../../graphql'
-import getIsEmailApprovedByOrg from '../../public/mutations/helpers/getIsEmailApprovedByOrg'
-import makeAppURL from '../../../../client/utils/makeAppURL'
-import {EMAIL_CORS_OPTIONS} from '../../../../client/types/cors'
-import getMailManager from '../../../email/getMailManager'
-import {analytics} from '../../../utils/analytics/analytics'
-import util from 'util'
-import crypto from 'crypto'
 import publish from '../../../utils/publish'
 import sendToSentry from '../../../utils/sendToSentry'
+import standardError from '../../../utils/standardError'
+import {GQLContext} from '../../graphql'
 import isValid from '../../isValid'
+import getIsEmailApprovedByOrg from '../../public/mutations/helpers/getIsEmailApprovedByOrg'
 
 const randomBytes = util.promisify(crypto.randomBytes)
 
diff --git a/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts b/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts
index 86d94599a49..452791fb341 100644
--- a/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts
+++ b/packages/server/graphql/mutations/helpers/notifications/MSTeamsNotifier.ts
@@ -7,15 +7,15 @@ import Meeting from '../../../../database/types/Meeting'
 import {SlackNotificationEventEnum as EventEnum} from '../../../../database/types/SlackNotification'
 import {IntegrationProviderMSTeams} from '../../../../postgres/queries/getIntegrationProvidersByIds'
 import {Team} from '../../../../postgres/queries/getTeamsByIds'
+import IUser from '../../../../postgres/types/IUser'
 import {MeetingTypeEnum} from '../../../../postgres/types/Meeting'
 import MSTeamsServerManager from '../../../../utils/MSTeamsServerManager'
+import {analytics} from '../../../../utils/analytics/analytics'
 import sendToSentry from '../../../../utils/sendToSentry'
 import {DataLoaderWorker} from '../../../graphql'
-import getSummaryText from './getSummaryText'
 import {NotificationIntegrationHelper} from './NotificationIntegrationHelper'
 import {createNotifier} from './Notifier'
-import {analytics} from '../../../../utils/analytics/analytics'
-import IUser from '../../../../postgres/types/IUser'
+import getSummaryText from './getSummaryText'
 
 const notifyMSTeams = async (
   event: EventEnum,
diff --git a/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts b/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts
index e7d039c3a60..6aac7f2a0c3 100644
--- a/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts
+++ b/packages/server/graphql/mutations/helpers/notifications/MattermostNotifier.ts
@@ -8,11 +8,15 @@ import Meeting from '../../../../database/types/Meeting'
 import {SlackNotificationEventEnum as EventEnum} from '../../../../database/types/SlackNotification'
 import {IntegrationProviderMattermost} from '../../../../postgres/queries/getIntegrationProvidersByIds'
 import {Team} from '../../../../postgres/queries/getTeamsByIds'
+import IUser from '../../../../postgres/types/IUser'
 import {MeetingTypeEnum} from '../../../../postgres/types/Meeting'
-import {toEpochSeconds} from '../../../../utils/epochTime'
 import MattermostServerManager from '../../../../utils/MattermostServerManager'
+import {analytics} from '../../../../utils/analytics/analytics'
+import {toEpochSeconds} from '../../../../utils/epochTime'
 import sendToSentry from '../../../../utils/sendToSentry'
 import {DataLoaderWorker} from '../../../graphql'
+import {NotificationIntegrationHelper} from './NotificationIntegrationHelper'
+import {createNotifier} from './Notifier'
 import getSummaryText from './getSummaryText'
 import {
   Field,
@@ -20,10 +24,6 @@ import {
   makeHackedButtonPairFields,
   makeHackedFieldButtonValue
 } from './makeMattermostAttachments'
-import {NotificationIntegrationHelper} from './NotificationIntegrationHelper'
-import {createNotifier} from './Notifier'
-import {analytics} from '../../../../utils/analytics/analytics'
-import IUser from '../../../../postgres/types/IUser'
 
 const notifyMattermost = async (
   event: EventEnum,
diff --git a/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts b/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts
index d2b5bf1688a..089ca295826 100644
--- a/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts
+++ b/packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts
@@ -3,28 +3,28 @@ import formatWeekday from 'parabol-client/utils/date/formatWeekday'
 import makeAppURL from 'parabol-client/utils/makeAppURL'
 import findStageById from 'parabol-client/utils/meetings/findStageById'
 import {phaseLabelLookup} from 'parabol-client/utils/meetings/lookups'
+import {ErrorResponse, PostMessageResponse} from '../../../../../client/utils/SlackManager'
 import appOrigin from '../../../../appOrigin'
 import getRethink, {RethinkSchema} from '../../../../database/rethinkDriver'
 import Meeting from '../../../../database/types/Meeting'
+import SlackAuth from '../../../../database/types/SlackAuth'
 import {SlackNotificationEvent} from '../../../../database/types/SlackNotification'
 import {SlackNotificationAuth} from '../../../../dataloader/integrationAuthLoaders'
+import {TeamPromptResponse} from '../../../../postgres/queries/getTeamPromptResponsesByIds'
+import {getTeamPromptResponsesByMeetingId} from '../../../../postgres/queries/getTeamPromptResponsesByMeetingIds'
 import {Team} from '../../../../postgres/queries/getTeamsByIds'
+import User from '../../../../postgres/types/IUser'
 import {AnyMeeting, MeetingTypeEnum} from '../../../../postgres/types/Meeting'
+import SlackServerManager from '../../../../utils/SlackServerManager'
+import {analytics} from '../../../../utils/analytics/analytics'
 import {toEpochSeconds} from '../../../../utils/epochTime'
 import sendToSentry from '../../../../utils/sendToSentry'
-import SlackServerManager from '../../../../utils/SlackServerManager'
+import {convertToMarkdown} from '../../../../utils/tiptap/convertToMarkdown'
 import {DataLoaderWorker} from '../../../graphql'
-import getSummaryText from './getSummaryText'
-import {makeButtons, makeHeader, makeSection, makeSections} from './makeSlackBlocks'
 import {NotificationIntegrationHelper} from './NotificationIntegrationHelper'
 import {createNotifier} from './Notifier'
-import SlackAuth from '../../../../database/types/SlackAuth'
-import {getTeamPromptResponsesByMeetingId} from '../../../../postgres/queries/getTeamPromptResponsesByMeetingIds'
-import {ErrorResponse, PostMessageResponse} from '../../../../../client/utils/SlackManager'
-import {TeamPromptResponse} from '../../../../postgres/queries/getTeamPromptResponsesByIds'
-import User from '../../../../postgres/types/IUser'
-import {convertToMarkdown} from '../../../../utils/tiptap/convertToMarkdown'
-import {analytics} from '../../../../utils/analytics/analytics'
+import getSummaryText from './getSummaryText'
+import {makeButtons, makeHeader, makeSection, makeSections} from './makeSlackBlocks'
 
 type SlackNotification = {
   title: string
diff --git a/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts b/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts
index 980388956fa..d3522fce222 100644
--- a/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts
+++ b/packages/server/graphql/mutations/helpers/notifications/getSummaryText.ts
@@ -5,8 +5,8 @@ import {isMeetingAction} from '../../../../database/types/MeetingAction'
 import {isMeetingPoker} from '../../../../database/types/MeetingPoker'
 import {isMeetingRetrospective} from '../../../../database/types/MeetingRetrospective'
 import {isMeetingTeamPrompt} from '../../../../database/types/MeetingTeamPrompt'
-import sendToSentry from '../../../../utils/sendToSentry'
 import {getTeamPromptResponsesByMeetingId} from '../../../../postgres/queries/getTeamPromptResponsesByMeetingIds'
+import sendToSentry from '../../../../utils/sendToSentry'
 
 const getSummaryText = async (meeting: Meeting) => {
   if (isMeetingRetrospective(meeting)) {
diff --git a/packages/server/graphql/mutations/helpers/removeFromOrg.ts b/packages/server/graphql/mutations/helpers/removeFromOrg.ts
index 98db329798f..945fc3d4a83 100644
--- a/packages/server/graphql/mutations/helpers/removeFromOrg.ts
+++ b/packages/server/graphql/mutations/helpers/removeFromOrg.ts
@@ -1,14 +1,14 @@
 import {InvoiceItemType} from 'parabol-client/types/constEnums'
 import adjustUserCount from '../../../billing/helpers/adjustUserCount'
 import getRethink from '../../../database/rethinkDriver'
+import {RDatum} from '../../../database/stricterR'
 import OrganizationUser from '../../../database/types/OrganizationUser'
 import getTeamsByOrgIds from '../../../postgres/queries/getTeamsByOrgIds'
+import {Logger} from '../../../utils/Logger'
 import setUserTierForUserIds from '../../../utils/setUserTierForUserIds'
 import {DataLoaderWorker} from '../../graphql'
 import removeTeamMember from './removeTeamMember'
 import resolveDowngradeToStarter from './resolveDowngradeToStarter'
-import {RDatum} from '../../../database/stricterR'
-import {Logger} from '../../../utils/Logger'
 
 const removeFromOrg = async (
   userId: string,
diff --git a/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts b/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts
index b4931f9ca3b..475480467e1 100644
--- a/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts
+++ b/packages/server/graphql/mutations/helpers/removeScheduledJobs.ts
@@ -1,6 +1,6 @@
 import {Updateable} from 'kysely'
-import {DB} from '../../../postgres/pg'
 import getKysely from '../../../postgres/getKysely'
+import {DB} from '../../../postgres/pg'
 
 type FilterType = Omit<Updateable<DB['ScheduledJob']>, 'runAt'>
 
diff --git a/packages/server/graphql/mutations/helpers/removeTeamMember.ts b/packages/server/graphql/mutations/helpers/removeTeamMember.ts
index 48a57e211f1..3be41b574a0 100644
--- a/packages/server/graphql/mutations/helpers/removeTeamMember.ts
+++ b/packages/server/graphql/mutations/helpers/removeTeamMember.ts
@@ -10,11 +10,11 @@ import UpdatesStage from '../../../database/types/UpdatesStage'
 import removeUserTms from '../../../postgres/queries/removeUserTms'
 import updateTeamByTeamId from '../../../postgres/queries/updateTeamByTeamId'
 import archiveTasksForDB from '../../../safeMutations/archiveTasksForDB'
+import errorFilter from '../../errorFilter'
 import {DataLoaderWorker} from '../../graphql'
 import removeSlackAuths from './removeSlackAuths'
 import removeStagesFromMeetings from './removeStagesFromMeetings'
 import removeUserFromMeetingStages from './removeUserFromMeetingStages'
-import errorFilter from '../../errorFilter'
 
 interface Options {
   evictorUserId?: string
diff --git a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
index e8e6f1b6cb5..7688a32979f 100644
--- a/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
+++ b/packages/server/graphql/mutations/helpers/safeEndTeamPrompt.ts
@@ -4,17 +4,17 @@ import getRethink, {ParabolR} from '../../../database/rethinkDriver'
 import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt'
 import TimelineEventTeamPromptComplete from '../../../database/types/TimelineEventTeamPromptComplete'
 import {getTeamPromptResponsesByMeetingId} from '../../../postgres/queries/getTeamPromptResponsesByMeetingIds'
+import {Logger} from '../../../utils/Logger'
 import {analytics} from '../../../utils/analytics/analytics'
 import publish, {SubOptions} from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
 import {InternalContext} from '../../graphql'
 import sendNewMeetingSummary from './endMeeting/sendNewMeetingSummary'
-import {IntegrationNotifier} from './notifications/IntegrationNotifier'
-import updateTeamInsights from './updateTeamInsights'
+import gatherInsights from './gatherInsights'
 import generateStandupMeetingSummary from './generateStandupMeetingSummary'
+import {IntegrationNotifier} from './notifications/IntegrationNotifier'
 import updateQualAIMeetingsCount from './updateQualAIMeetingsCount'
-import gatherInsights from './gatherInsights'
-import {Logger} from '../../../utils/Logger'
+import updateTeamInsights from './updateTeamInsights'
 
 const summarizeTeamPrompt = async (meeting: MeetingTeamPrompt, context: InternalContext) => {
   const {dataLoader} = context
diff --git a/packages/server/graphql/mutations/helpers/validateScaleValue.ts b/packages/server/graphql/mutations/helpers/validateScaleValue.ts
index 8fee2d80ad7..908c19fb3d1 100644
--- a/packages/server/graphql/mutations/helpers/validateScaleValue.ts
+++ b/packages/server/graphql/mutations/helpers/validateScaleValue.ts
@@ -1,7 +1,7 @@
+import toArray from 'lodash.toarray'
 import palettePickerOptions from '../../../../client/styles/palettePickerOptions'
 import {Threshold} from '../../../../client/types/constEnums'
 import TemplateScaleValue from '../../../database/types/TemplateScaleValue'
-import toArray from 'lodash.toarray'
 
 const validateColorValue = (color: string) => {
   const validHexes = palettePickerOptions.map(({hex}) => hex)
diff --git a/packages/server/graphql/mutations/joinMeeting.ts b/packages/server/graphql/mutations/joinMeeting.ts
index 4454425cef3..6528c0e37db 100644
--- a/packages/server/graphql/mutations/joinMeeting.ts
+++ b/packages/server/graphql/mutations/joinMeeting.ts
@@ -1,8 +1,8 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import toTeamMemberId from '../../../client/utils/relay/toTeamMemberId'
-import getRethink from '../../database/rethinkDriver'
 import rMapIf from '../../database/rMapIf'
+import getRethink from '../../database/rethinkDriver'
 import ActionMeetingMember from '../../database/types/ActionMeetingMember'
 import CheckInStage from '../../database/types/CheckInStage'
 import {NewMeetingPhaseTypeEnum} from '../../database/types/GenericMeetingPhase'
diff --git a/packages/server/graphql/mutations/moveTeamToOrg.ts b/packages/server/graphql/mutations/moveTeamToOrg.ts
index 7fa25b2b41d..18196676f41 100644
--- a/packages/server/graphql/mutations/moveTeamToOrg.ts
+++ b/packages/server/graphql/mutations/moveTeamToOrg.ts
@@ -4,16 +4,16 @@ import adjustUserCount from '../../billing/helpers/adjustUserCount'
 import getRethink from '../../database/rethinkDriver'
 import {RDatum} from '../../database/stricterR'
 import Notification from '../../database/types/Notification'
+import getKysely from '../../postgres/getKysely'
 import getTeamsByIds from '../../postgres/queries/getTeamsByIds'
 import updateMeetingTemplateOrgId from '../../postgres/queries/updateMeetingTemplateOrgId'
 import updateTeamByTeamId from '../../postgres/queries/updateTeamByTeamId'
 import safeArchiveEmptyStarterOrganization from '../../safeMutations/safeArchiveEmptyStarterOrganization'
+import {Logger} from '../../utils/Logger'
 import {getUserId, isSuperUser} from '../../utils/authorization'
 import standardError from '../../utils/standardError'
 import {DataLoaderWorker, GQLContext} from '../graphql'
 import isValid from '../isValid'
-import getKysely from '../../postgres/getKysely'
-import {Logger} from '../../utils/Logger'
 
 const MAX_NUM_TEAMS = 40
 
diff --git a/packages/server/graphql/mutations/navigateMeeting.ts b/packages/server/graphql/mutations/navigateMeeting.ts
index 70340fa2401..be704dedc4a 100644
--- a/packages/server/graphql/mutations/navigateMeeting.ts
+++ b/packages/server/graphql/mutations/navigateMeeting.ts
@@ -4,6 +4,7 @@ import findStageById from 'parabol-client/utils/meetings/findStageById'
 import startStage_ from 'parabol-client/utils/startStage_'
 import unlockNextStages from 'parabol-client/utils/unlockNextStages'
 import getRethink from '../../database/rethinkDriver'
+import {Logger} from '../../utils/Logger'
 import {getUserId} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
@@ -11,7 +12,6 @@ import {GQLContext} from '../graphql'
 import NavigateMeetingPayload from '../types/NavigateMeetingPayload'
 import handleCompletedStage from './helpers/handleCompletedStage'
 import removeScheduledJobs from './helpers/removeScheduledJobs'
-import {Logger} from '../../utils/Logger'
 
 export default {
   type: new GraphQLNonNull(NavigateMeetingPayload),
diff --git a/packages/server/graphql/mutations/payLater.ts b/packages/server/graphql/mutations/payLater.ts
index c61b9dc4b00..54af091b0d2 100644
--- a/packages/server/graphql/mutations/payLater.ts
+++ b/packages/server/graphql/mutations/payLater.ts
@@ -4,12 +4,12 @@ import getRethink from '../../database/rethinkDriver'
 import {RValue} from '../../database/stricterR'
 import getPg from '../../postgres/getPg'
 import {incrementUserPayLaterClickCountQuery} from '../../postgres/queries/generated/incrementUserPayLaterClickCountQuery'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import PayLaterPayload from '../types/PayLaterPayload'
-import {analytics} from '../../utils/analytics/analytics'
 
 export default {
   type: new GraphQLNonNull(PayLaterPayload),
diff --git a/packages/server/graphql/mutations/resetPassword.ts b/packages/server/graphql/mutations/resetPassword.ts
index bc221f06279..d90523d3cfc 100644
--- a/packages/server/graphql/mutations/resetPassword.ts
+++ b/packages/server/graphql/mutations/resetPassword.ts
@@ -2,11 +2,11 @@ import bcrypt from 'bcryptjs'
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {Security, Threshold} from 'parabol-client/types/constEnums'
 import {AuthIdentityTypeEnum} from '../../../client/types/constEnums'
-import getKysely from '../../postgres/getKysely'
 import getRethink from '../../database/rethinkDriver'
 import AuthIdentityLocal from '../../database/types/AuthIdentityLocal'
 import AuthToken from '../../database/types/AuthToken'
 import PasswordResetRequest from '../../database/types/PasswordResetRequest'
+import getKysely from '../../postgres/getKysely'
 import {getUserByEmail} from '../../postgres/queries/getUsersByEmails'
 import updateUser from '../../postgres/queries/updateUser'
 import blacklistJWT from '../../utils/blacklistJWT'
diff --git a/packages/server/graphql/mutations/selectTemplate.ts b/packages/server/graphql/mutations/selectTemplate.ts
index 4d0ee10f092..abb775409f5 100644
--- a/packages/server/graphql/mutations/selectTemplate.ts
+++ b/packages/server/graphql/mutations/selectTemplate.ts
@@ -2,13 +2,13 @@ import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
 import MeetingTemplate from '../../database/types/MeetingTemplate'
+import {Logger} from '../../utils/Logger'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import SelectTemplatePayload from '../types/SelectTemplatePayload'
 import {getFeatureTier} from '../types/helpers/getFeatureTier'
-import {Logger} from '../../utils/Logger'
 
 const selectTemplate = {
   description: 'Set the selected template for the upcoming retro meeting',
diff --git a/packages/server/graphql/mutations/setDefaultSlackChannel.ts b/packages/server/graphql/mutations/setDefaultSlackChannel.ts
index 4920730cd68..d33709c3bdc 100644
--- a/packages/server/graphql/mutations/setDefaultSlackChannel.ts
+++ b/packages/server/graphql/mutations/setDefaultSlackChannel.ts
@@ -1,7 +1,7 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import getRethink from '../../database/rethinkDriver'
-import {getUserId, isTeamMember} from '../../utils/authorization'
 import SlackServerManager from '../../utils/SlackServerManager'
+import {getUserId, isTeamMember} from '../../utils/authorization'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import SetDefaultSlackChannelPayload from '../types/SetDefaultSlackChannelPayload'
diff --git a/packages/server/graphql/mutations/setStageTimer.ts b/packages/server/graphql/mutations/setStageTimer.ts
index 40901c6baa0..79c8bfc1593 100644
--- a/packages/server/graphql/mutations/setStageTimer.ts
+++ b/packages/server/graphql/mutations/setStageTimer.ts
@@ -1,9 +1,10 @@
 import {GraphQLFloat, GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import findStageById from 'parabol-client/utils/meetings/findStageById'
-import getKysely from '../../postgres/getKysely'
 import getRethink from '../../database/rethinkDriver'
 import ScheduledJobMeetingStageTimeLimit from '../../database/types/ScheduledJobMetingStageTimeLimit'
+import getKysely from '../../postgres/getKysely'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
@@ -12,7 +13,6 @@ import GraphQLISO8601Type from '../types/GraphQLISO8601Type'
 import SetStageTimerPayload from '../types/SetStageTimerPayload'
 import {IntegrationNotifier} from './helpers/notifications/IntegrationNotifier'
 import removeScheduledJobs from './helpers/removeScheduledJobs'
-import {analytics} from '../../utils/analytics/analytics'
 
 const BAD_CLOCK_THRESH = 2000
 const AVG_PING = 150
diff --git a/packages/server/graphql/mutations/setTaskEstimate.ts b/packages/server/graphql/mutations/setTaskEstimate.ts
index 06cdae4586a..08c2fa49895 100644
--- a/packages/server/graphql/mutations/setTaskEstimate.ts
+++ b/packages/server/graphql/mutations/setTaskEstimate.ts
@@ -10,11 +10,11 @@ import {IntegrationProviderJiraServer} from '../../postgres/queries/getIntegrati
 import insertTaskEstimate from '../../postgres/queries/insertTaskEstimate'
 import updateJiraDimensionFieldMap from '../../postgres/queries/updateJiraDimensionFieldMap'
 import upsertJiraDimensionFieldMap from '../../postgres/queries/upsertJiraDimensionFieldMap'
-import {analytics} from '../../utils/analytics/analytics'
 import AtlassianServerManager from '../../utils/AtlassianServerManager'
+import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import {fieldTypeToId} from '../../utils/azureDevOps/azureDevOpsFieldTypeToId'
-import AzureDevOpsServerManager from '../../utils/AzureDevOpsServerManager'
 import getPhase from '../../utils/getPhase'
 import makeScoreJiraComment from '../../utils/makeScoreJiraComment'
 import publish from '../../utils/publish'
diff --git a/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts b/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts
index 7e27ad66e14..b8a5fd2245c 100644
--- a/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts
+++ b/packages/server/graphql/mutations/updateAzureDevOpsDimensionField.ts
@@ -4,8 +4,8 @@ import MeetingPoker from '../../database/types/MeetingPoker'
 import upsertAzureDevOpsDimensionFieldMap, {
   AzureDevOpsFieldMapProps
 } from '../../postgres/queries/upsertAzureDevOpsDimensionFieldMap'
-import {isTeamMember} from '../../utils/authorization'
 import {Logger} from '../../utils/Logger'
+import {isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import {GQLContext} from '../graphql'
 import UpdateAzureDevOpsDimensionFieldPayload from '../types/UpdateAzureDevOpsDimensionFieldPayload'
diff --git a/packages/server/graphql/mutations/updateGitHubDimensionField.ts b/packages/server/graphql/mutations/updateGitHubDimensionField.ts
index 703f9e601e9..ded249edf3f 100644
--- a/packages/server/graphql/mutations/updateGitHubDimensionField.ts
+++ b/packages/server/graphql/mutations/updateGitHubDimensionField.ts
@@ -2,8 +2,8 @@ import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import MeetingPoker from '../../database/types/MeetingPoker'
 import upsertGitHubDimensionFieldMap from '../../postgres/queries/upsertGitHubDimensionFieldMap'
-import {isTeamMember} from '../../utils/authorization'
 import {Logger} from '../../utils/Logger'
+import {isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import {GQLContext} from '../graphql'
 import UpdateGitHubDimensionFieldPayload from '../types/UpdateGitHubDimensionFieldPayload'
diff --git a/packages/server/graphql/mutations/updateIntegrationProvider.ts b/packages/server/graphql/mutations/updateIntegrationProvider.ts
index 85220aa8fc3..10e5981cda9 100644
--- a/packages/server/graphql/mutations/updateIntegrationProvider.ts
+++ b/packages/server/graphql/mutations/updateIntegrationProvider.ts
@@ -9,8 +9,8 @@ import UpdateIntegrationProviderInput, {
   IUpdateIntegrationProviderInput
 } from '../types/UpdateIntegrationProviderInput'
 import UpdateIntegrationProviderPayload from '../types/UpdateIntegrationProviderPayload'
-import {MattermostNotifier} from './helpers/notifications/MattermostNotifier'
 import {MSTeamsNotifier} from './helpers/notifications/MSTeamsNotifier'
+import {MattermostNotifier} from './helpers/notifications/MattermostNotifier'
 
 const updateIntegrationProvider = {
   name: 'UpdateIntegrationProvider',
diff --git a/packages/server/graphql/mutations/updatePokerScope.ts b/packages/server/graphql/mutations/updatePokerScope.ts
index 2e2df35844d..0300d2f9832 100644
--- a/packages/server/graphql/mutations/updatePokerScope.ts
+++ b/packages/server/graphql/mutations/updatePokerScope.ts
@@ -7,11 +7,11 @@ import EstimateStage from '../../database/types/EstimateStage'
 import MeetingPoker from '../../database/types/MeetingPoker'
 import {TaskServiceEnum} from '../../database/types/Task'
 import insertDiscussions, {InputDiscussions} from '../../postgres/queries/insertDiscussions'
+import RedisLockQueue from '../../utils/RedisLockQueue'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import getPhase from '../../utils/getPhase'
 import getRedis from '../../utils/getRedis'
 import publish from '../../utils/publish'
-import RedisLockQueue from '../../utils/RedisLockQueue'
 import {GQLContext} from '../graphql'
 import UpdatePokerScopeItemInput from '../types/UpdatePokerScopeItemInput'
 import UpdatePokerScopePayload from '../types/UpdatePokerScopePayload'
diff --git a/packages/server/graphql/mutations/updateReflectionContent.ts b/packages/server/graphql/mutations/updateReflectionContent.ts
index 7d4d35ef948..349bf654dba 100644
--- a/packages/server/graphql/mutations/updateReflectionContent.ts
+++ b/packages/server/graphql/mutations/updateReflectionContent.ts
@@ -12,10 +12,10 @@ import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import UpdateReflectionContentPayload from '../types/UpdateReflectionContentPayload'
+import {getFeatureTier} from '../types/helpers/getFeatureTier'
 import getReflectionEntities from './helpers/getReflectionEntities'
 import getReflectionSentimentScore from './helpers/getReflectionSentimentScore'
 import updateSmartGroupTitle from './helpers/updateReflectionLocation/updateSmartGroupTitle'
-import {getFeatureTier} from '../types/helpers/getFeatureTier'
 
 export default {
   type: UpdateReflectionContentPayload,
diff --git a/packages/server/graphql/mutations/updateReflectionGroupTitle.ts b/packages/server/graphql/mutations/updateReflectionGroupTitle.ts
index 244b997ee8b..24e612d8615 100644
--- a/packages/server/graphql/mutations/updateReflectionGroupTitle.ts
+++ b/packages/server/graphql/mutations/updateReflectionGroupTitle.ts
@@ -4,12 +4,12 @@ import isPhaseComplete from 'parabol-client/utils/meetings/isPhaseComplete'
 import stringSimilarity from 'string-similarity'
 import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import UpdateReflectionGroupTitlePayload from '../types/UpdateReflectionGroupTitlePayload'
-import {analytics} from '../../utils/analytics/analytics'
 
 type UpdateReflectionGroupTitleMutationVariables = {
   title: string
diff --git a/packages/server/graphql/mutations/updateTaskDueDate.ts b/packages/server/graphql/mutations/updateTaskDueDate.ts
index 1eea50b817b..40b3a2e85c0 100644
--- a/packages/server/graphql/mutations/updateTaskDueDate.ts
+++ b/packages/server/graphql/mutations/updateTaskDueDate.ts
@@ -2,13 +2,13 @@ import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import isValidDate from 'parabol-client/utils/isValidDate'
 import getRethink from '../../database/rethinkDriver'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import GraphQLISO8601Type from '../types/GraphQLISO8601Type'
 import UpdateTaskDueDatePayload from '../types/UpdateTaskDueDatePayload'
 import {GQLContext} from './../graphql'
-import {analytics} from '../../utils/analytics/analytics'
 
 export default {
   type: UpdateTaskDueDatePayload,
diff --git a/packages/server/graphql/mutations/updateTeamName.ts b/packages/server/graphql/mutations/updateTeamName.ts
index 834c7d59318..708ae917889 100644
--- a/packages/server/graphql/mutations/updateTeamName.ts
+++ b/packages/server/graphql/mutations/updateTeamName.ts
@@ -8,8 +8,8 @@ import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
-import UpdatedTeamInput, {UpdatedTeamInputType} from '../types/UpdatedTeamInput'
 import UpdateTeamNamePayload from '../types/UpdateTeamNamePayload'
+import UpdatedTeamInput, {UpdatedTeamInputType} from '../types/UpdatedTeamInput'
 
 export default {
   type: UpdateTeamNamePayload,
diff --git a/packages/server/graphql/mutations/updateTemplateScope.ts b/packages/server/graphql/mutations/updateTemplateScope.ts
index ab9b8c3e229..65eae40746b 100644
--- a/packages/server/graphql/mutations/updateTemplateScope.ts
+++ b/packages/server/graphql/mutations/updateTemplateScope.ts
@@ -10,12 +10,12 @@ import TemplateDimension from '../../database/types/TemplateDimension'
 import insertMeetingTemplate from '../../postgres/queries/insertMeetingTemplate'
 import removeMeetingTemplate from '../../postgres/queries/removeMeetingTemplate'
 import updateMeetingTemplateScope from '../../postgres/queries/updateMeetingTemplateScope'
+import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import {GQLContext} from '../graphql'
 import SharingScopeEnum, {SharingScopeEnumType} from '../types/SharingScopeEnum'
 import UpdateTemplateScopePayload from '../types/UpdateTemplateScopePayload'
-import {analytics} from '../../utils/analytics/analytics'
 
 const updateTemplateScope = {
   type: new GraphQLNonNull(UpdateTemplateScopePayload),
diff --git a/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts b/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts
index 81abbf3294d..b96280c075a 100644
--- a/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts
+++ b/packages/server/graphql/nestedSchema/nestGitLabEndpoint.ts
@@ -3,8 +3,8 @@ import nestGraphQLEndpoint from 'nest-graphql-endpoint/lib/nestGraphQLEndpoint'
 import {
   EndpointExecutionResult,
   Executor,
-  NestedSource,
-  NestGraphQLEndpointParams
+  NestGraphQLEndpointParams,
+  NestedSource
 } from 'nest-graphql-endpoint/lib/types'
 
 const defaultExecutor: Executor<{
diff --git a/packages/server/graphql/private/mutations/autopauseUsers.ts b/packages/server/graphql/private/mutations/autopauseUsers.ts
index ba8e3439b0b..3dbbc4742f4 100644
--- a/packages/server/graphql/private/mutations/autopauseUsers.ts
+++ b/packages/server/graphql/private/mutations/autopauseUsers.ts
@@ -2,8 +2,8 @@ import {InvoiceItemType, Threshold} from 'parabol-client/types/constEnums'
 import adjustUserCount from '../../../billing/helpers/adjustUserCount'
 import getRethink from '../../../database/rethinkDriver'
 import getUserIdsToPause from '../../../postgres/queries/getUserIdsToPause'
-import {MutationResolvers} from '../resolverTypes'
 import {Logger} from '../../../utils/Logger'
+import {MutationResolvers} from '../resolverTypes'
 
 const autopauseUsers: MutationResolvers['autopauseUsers'] = async (
   _source,
diff --git a/packages/server/graphql/private/mutations/connectSocket.ts b/packages/server/graphql/private/mutations/connectSocket.ts
index 4461a506f27..002b6d67001 100644
--- a/packages/server/graphql/private/mutations/connectSocket.ts
+++ b/packages/server/graphql/private/mutations/connectSocket.ts
@@ -2,11 +2,11 @@ import {InvoiceItemType, SubscriptionChannel} from 'parabol-client/types/constEn
 import adjustUserCount from '../../../billing/helpers/adjustUserCount'
 import getRethink from '../../../database/rethinkDriver'
 import updateUser from '../../../postgres/queries/updateUser'
+import {Logger} from '../../../utils/Logger'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId} from '../../../utils/authorization'
 import getListeningUserIds, {RedisCommand} from '../../../utils/getListeningUserIds'
 import getRedis from '../../../utils/getRedis'
-import {Logger} from '../../../utils/Logger'
 import publish from '../../../utils/publish'
 import {MutationResolvers} from '../resolverTypes'
 
diff --git a/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts b/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts
index 96d3958a624..aa0ea60f306 100644
--- a/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts
+++ b/packages/server/graphql/private/mutations/draftEnterpriseInvoice.ts
@@ -1,4 +1,6 @@
+import removeTeamsLimitObjects from '../../../billing/helpers/removeTeamsLimitObjects'
 import getRethink from '../../../database/rethinkDriver'
+import getKysely from '../../../postgres/getKysely'
 import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
 import IUser from '../../../postgres/types/IUser'
 import {analytics} from '../../../utils/analytics/analytics'
@@ -10,8 +12,6 @@ import {DataLoaderWorker} from '../../graphql'
 import isValid from '../../isValid'
 import hideConversionModal from '../../mutations/helpers/hideConversionModal'
 import {MutationResolvers} from '../resolverTypes'
-import removeTeamsLimitObjects from '../../../billing/helpers/removeTeamsLimitObjects'
-import getKysely from '../../../postgres/getKysely'
 
 const getBillingLeaderUser = async (
   email: string | null | undefined,
diff --git a/packages/server/graphql/private/mutations/processRecurrence.ts b/packages/server/graphql/private/mutations/processRecurrence.ts
index 5a010f81f80..3ad56318f20 100644
--- a/packages/server/graphql/private/mutations/processRecurrence.ts
+++ b/packages/server/graphql/private/mutations/processRecurrence.ts
@@ -1,8 +1,12 @@
 import ms from 'ms'
+import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from 'parabol-client/shared/rruleUtil'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import {getRRuleDateFromJSDate, getJSDateFromRRuleDate} from 'parabol-client/shared/rruleUtil'
 import {RRule} from 'rrule'
 import getRethink from '../../../database/rethinkDriver'
+import MeetingRetrospective, {
+  isMeetingRetrospective
+} from '../../../database/types/MeetingRetrospective'
+import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective'
 import MeetingTeamPrompt, {isMeetingTeamPrompt} from '../../../database/types/MeetingTeamPrompt'
 import {getActiveMeetingSeries} from '../../../postgres/queries/getActiveMeetingSeries'
 import {MeetingSeries} from '../../../postgres/types/MeetingSeries'
@@ -10,18 +14,14 @@ import {analytics} from '../../../utils/analytics/analytics'
 import publish, {SubOptions} from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
 import {DataLoaderWorker} from '../../graphql'
+import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle'
 import isStartMeetingLocked from '../../mutations/helpers/isStartMeetingLocked'
 import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
+import safeCreateRetrospective from '../../mutations/helpers/safeCreateRetrospective'
 import safeCreateTeamPrompt, {DEFAULT_PROMPT} from '../../mutations/helpers/safeCreateTeamPrompt'
+import safeEndRetrospective from '../../mutations/helpers/safeEndRetrospective'
 import safeEndTeamPrompt from '../../mutations/helpers/safeEndTeamPrompt'
 import {MutationResolvers} from '../resolverTypes'
-import MeetingRetrospective, {
-  isMeetingRetrospective
-} from '../../../database/types/MeetingRetrospective'
-import safeEndRetrospective from '../../mutations/helpers/safeEndRetrospective'
-import safeCreateRetrospective from '../../mutations/helpers/safeCreateRetrospective'
-import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective'
-import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle'
 
 const startRecurringMeeting = async (
   meetingSeries: MeetingSeries,
diff --git a/packages/server/graphql/private/mutations/runScheduledJobs.ts b/packages/server/graphql/private/mutations/runScheduledJobs.ts
index 5317aff0147..2b1c3b70575 100644
--- a/packages/server/graphql/private/mutations/runScheduledJobs.ts
+++ b/packages/server/graphql/private/mutations/runScheduledJobs.ts
@@ -1,17 +1,17 @@
 import {Selectable} from 'kysely'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getKysely from '../../../postgres/getKysely'
-import {DB} from '../../../postgres/pg'
 import getRethink from '../../../database/rethinkDriver'
 import NotificationMeetingStageTimeLimitEnd from '../../../database/types/NotificationMeetingStageTimeLimitEnd'
-import processTeamsLimitsJob from '../../../database/types/processTeamsLimitsJob'
 import ScheduledJobMeetingStageTimeLimit from '../../../database/types/ScheduledJobMetingStageTimeLimit'
 import ScheduledTeamLimitsJob from '../../../database/types/ScheduledTeamLimitsJob'
+import processTeamsLimitsJob from '../../../database/types/processTeamsLimitsJob'
+import getKysely from '../../../postgres/getKysely'
+import {DB} from '../../../postgres/pg'
+import {Logger} from '../../../utils/Logger'
 import publish from '../../../utils/publish'
 import {DataLoaderWorker} from '../../graphql'
 import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
 import {MutationResolvers} from '../resolverTypes'
-import {Logger} from '../../../utils/Logger'
 
 const processMeetingStageTimeLimits = async (
   job: ScheduledJobMeetingStageTimeLimit,
diff --git a/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts b/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts
index aa1dbe161b4..d320cd90028 100644
--- a/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts
+++ b/packages/server/graphql/private/mutations/sendBatchNotificationEmails.ts
@@ -3,9 +3,9 @@ import appOrigin from '../../../appOrigin'
 import getRethink from '../../../database/rethinkDriver'
 import {RValue} from '../../../database/stricterR'
 import AuthToken from '../../../database/types/AuthToken'
+import ServerEnvironment from '../../../email/ServerEnvironment'
 import getMailManager from '../../../email/getMailManager'
 import notificationSummaryCreator from '../../../email/notificationSummaryCreator'
-import ServerEnvironment from '../../../email/ServerEnvironment'
 import isValid from '../../isValid'
 import {MutationResolvers} from '../resolverTypes'
 
diff --git a/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts b/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts
index 4b4008eec0a..01642c464df 100644
--- a/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts
+++ b/packages/server/graphql/private/mutations/sendUpcomingInvoiceEmails.ts
@@ -6,8 +6,8 @@ import {Threshold} from '../../../../client/types/constEnums'
 import appOrigin from '../../../appOrigin'
 import getRethink from '../../../database/rethinkDriver'
 import {RDatum, RValue} from '../../../database/stricterR'
-import getMailManager from '../../../email/getMailManager'
 import UpcomingInvoiceEmailTemplate from '../../../email/UpcomingInvoiceEmailTemplate'
+import getMailManager from '../../../email/getMailManager'
 import IUser from '../../../postgres/types/IUser'
 import {MutationResolvers} from '../resolverTypes'
 
diff --git a/packages/server/graphql/private/mutations/stripeFailPayment.ts b/packages/server/graphql/private/mutations/stripeFailPayment.ts
index d954385b8f9..64495a4b3b9 100644
--- a/packages/server/graphql/private/mutations/stripeFailPayment.ts
+++ b/packages/server/graphql/private/mutations/stripeFailPayment.ts
@@ -2,12 +2,12 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import Stripe from 'stripe'
 import terminateSubscription from '../../../billing/helpers/terminateSubscription'
 import getRethink from '../../../database/rethinkDriver'
+import {RDatum} from '../../../database/stricterR'
 import NotificationPaymentRejected from '../../../database/types/NotificationPaymentRejected'
 import {isSuperUser} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import {getStripeManager} from '../../../utils/stripe'
 import {MutationResolvers} from '../resolverTypes'
-import {RDatum} from '../../../database/stricterR'
 
 export type StripeFailPaymentPayloadSource =
   | {
diff --git a/packages/server/graphql/private/mutations/upgradeToTeamTier.ts b/packages/server/graphql/private/mutations/upgradeToTeamTier.ts
index 704bd434896..d1abdb80e42 100644
--- a/packages/server/graphql/private/mutations/upgradeToTeamTier.ts
+++ b/packages/server/graphql/private/mutations/upgradeToTeamTier.ts
@@ -1,6 +1,7 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import removeTeamsLimitObjects from '../../../billing/helpers/removeTeamsLimitObjects'
 import getRethink from '../../../database/rethinkDriver'
+import getKysely from '../../../postgres/getKysely'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
@@ -11,7 +12,6 @@ import {getStripeManager} from '../../../utils/stripe'
 import getCCFromCustomer from '../../mutations/helpers/getCCFromCustomer'
 import hideConversionModal from '../../mutations/helpers/hideConversionModal'
 import {MutationResolvers} from '../resolverTypes'
-import getKysely from '../../../postgres/getKysely'
 
 // included here to codegen has access to it
 export type UpgradeToTeamTierSuccessSource = {
diff --git a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
index ea12206cdd5..db1ea25044e 100644
--- a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
+++ b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
@@ -1,20 +1,20 @@
-import {getUserId} from '../../../utils/authorization'
-import {MutationResolvers} from '../resolverTypes'
-import getKysely from '../../../postgres/getKysely'
-import standardError from '../../../utils/standardError'
-import getRethink from '../../../database/rethinkDriver'
-import getTeamsByIds from '../../../postgres/queries/getTeamsByIds'
-import RedisLock from '../../../utils/RedisLock'
-import insertNewTeamMember from '../../../safeMutations/insertNewTeamMember'
-import addTeamIdToTMS from '../../../safeMutations/addTeamIdToTMS'
-import adjustUserCount from '../../../billing/helpers/adjustUserCount'
+import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId'
 import {InvoiceItemType, SubscriptionChannel} from 'parabol-client/types/constEnums'
-import setUserTierForUserIds from '../../../utils/setUserTierForUserIds'
-import publish from '../../../utils/publish'
 import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
-import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId'
+import adjustUserCount from '../../../billing/helpers/adjustUserCount'
+import getRethink from '../../../database/rethinkDriver'
+import getKysely from '../../../postgres/getKysely'
+import getTeamsByIds from '../../../postgres/queries/getTeamsByIds'
 import {getUserById} from '../../../postgres/queries/getUsersByIds'
+import addTeamIdToTMS from '../../../safeMutations/addTeamIdToTMS'
+import insertNewTeamMember from '../../../safeMutations/insertNewTeamMember'
 import {Logger} from '../../../utils/Logger'
+import RedisLock from '../../../utils/RedisLock'
+import {getUserId} from '../../../utils/authorization'
+import publish from '../../../utils/publish'
+import setUserTierForUserIds from '../../../utils/setUserTierForUserIds'
+import standardError from '../../../utils/standardError'
+import {MutationResolvers} from '../resolverTypes'
 
 // TODO (EXPERIMENT: prompt-to-join-org): some parts are borrowed from acceptTeamInvitation, create generic functions
 const acceptRequestToJoinDomain: MutationResolvers['acceptRequestToJoinDomain'] = async (
diff --git a/packages/server/graphql/public/mutations/acceptTeamInvitation.ts b/packages/server/graphql/public/mutations/acceptTeamInvitation.ts
index e80c7d63de5..34f06d3943d 100644
--- a/packages/server/graphql/public/mutations/acceptTeamInvitation.ts
+++ b/packages/server/graphql/public/mutations/acceptTeamInvitation.ts
@@ -6,11 +6,11 @@ import {
 } from '../../../../client/types/constEnums'
 import AuthToken from '../../../database/types/AuthToken'
 import acceptTeamInvitationSafe from '../../../safeMutations/acceptTeamInvitation'
+import RedisLock from '../../../utils/RedisLock'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
 import encodeAuthToken from '../../../utils/encodeAuthToken'
 import publish from '../../../utils/publish'
-import RedisLock from '../../../utils/RedisLock'
 import activatePrevSlackAuth from '../../mutations/helpers/activatePrevSlackAuth'
 import handleInvitationToken from '../../mutations/helpers/handleInvitationToken'
 import {MutationResolvers} from '../resolverTypes'
diff --git a/packages/server/graphql/public/mutations/addPokerTemplate.ts b/packages/server/graphql/public/mutations/addPokerTemplate.ts
index 2141a7e5833..1da1a915a99 100644
--- a/packages/server/graphql/public/mutations/addPokerTemplate.ts
+++ b/packages/server/graphql/public/mutations/addPokerTemplate.ts
@@ -2,14 +2,14 @@ import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/con
 import getRethink from '../../../database/rethinkDriver'
 import PokerTemplate from '../../../database/types/PokerTemplate'
 import TemplateDimension from '../../../database/types/TemplateDimension'
+import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining'
 import insertMeetingTemplate from '../../../postgres/queries/insertMeetingTemplate'
+import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isTeamMember, isUserInOrg} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
 import getTemplateIllustrationUrl from '../../mutations/helpers/getTemplateIllustrationUrl'
-import {analytics} from '../../../utils/analytics/analytics'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
-import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining'
 import {MutationResolvers} from '../resolverTypes'
 
 const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async (
diff --git a/packages/server/graphql/public/mutations/addReflectTemplate.ts b/packages/server/graphql/public/mutations/addReflectTemplate.ts
index b2c5c7479a4..586a6e57f05 100644
--- a/packages/server/graphql/public/mutations/addReflectTemplate.ts
+++ b/packages/server/graphql/public/mutations/addReflectTemplate.ts
@@ -1,17 +1,17 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
+import {PALETTE} from '../../../../client/styles/paletteV3'
 import getRethink from '../../../database/rethinkDriver'
+import ReflectTemplate from '../../../database/types/ReflectTemplate'
+import RetrospectivePrompt from '../../../database/types/RetrospectivePrompt'
+import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining'
 import insertMeetingTemplate from '../../../postgres/queries/insertMeetingTemplate'
+import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isTeamMember, isUserInOrg} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
-import {analytics} from '../../../utils/analytics/analytics'
+import makeRetroTemplates from '../../mutations/helpers/makeRetroTemplates'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
-import decrementFreeTemplatesRemaining from '../../../postgres/queries/decrementFreeTemplatesRemaining'
 import {MutationResolvers} from '../resolverTypes'
-import ReflectTemplate from '../../../database/types/ReflectTemplate'
-import {PALETTE} from '../../../../client/styles/paletteV3'
-import makeRetroTemplates from '../../mutations/helpers/makeRetroTemplates'
-import RetrospectivePrompt from '../../../database/types/RetrospectivePrompt'
 
 const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/batchArchiveTasks.ts b/packages/server/graphql/public/mutations/batchArchiveTasks.ts
index 26c622d1646..66345e4f2fc 100644
--- a/packages/server/graphql/public/mutations/batchArchiveTasks.ts
+++ b/packages/server/graphql/public/mutations/batchArchiveTasks.ts
@@ -3,10 +3,10 @@ import {getUserId} from '../../../utils/authorization'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import publish from '../../../utils/publish'
 
-import {MutationResolvers} from '../resolverTypes'
-import isValid from '../../isValid'
-import archiveTasksForDB from '../../../safeMutations/archiveTasksForDB'
 import Task from '../../../database/types/Task'
+import archiveTasksForDB from '../../../safeMutations/archiveTasksForDB'
+import isValid from '../../isValid'
+import {MutationResolvers} from '../resolverTypes'
 
 const batchArchiveTasks: MutationResolvers['batchArchiveTasks'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts b/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts
index b7d0cb9bede..9bdff492939 100644
--- a/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts
+++ b/packages/server/graphql/public/mutations/helpers/__tests__/getKudosUserIdsFromJson.test.ts
@@ -1,5 +1,5 @@
-import {getKudosUserIdsFromJson} from '../getKudosUserIdsFromJson'
 import {JSONContent} from '@tiptap/core'
+import {getKudosUserIdsFromJson} from '../getKudosUserIdsFromJson'
 
 describe('findMentionsByEmoji', () => {
   let doc: JSONContent
diff --git a/packages/server/graphql/public/mutations/loginWithPassword.ts b/packages/server/graphql/public/mutations/loginWithPassword.ts
index ad5096c868d..32fbd0e0332 100644
--- a/packages/server/graphql/public/mutations/loginWithPassword.ts
+++ b/packages/server/graphql/public/mutations/loginWithPassword.ts
@@ -1,7 +1,7 @@
 import {AuthenticationError} from 'parabol-client/types/constEnums'
 import encodeAuthToken from '../../../utils/encodeAuthToken'
-import {MutationResolvers} from '../resolverTypes'
 import attemptLogin from '../../mutations/helpers/attemptLogin'
+import {MutationResolvers} from '../resolverTypes'
 
 const loginWithPassword: MutationResolvers['loginWithPassword'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts b/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts
index 03072962dd2..18149f77431 100644
--- a/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts
+++ b/packages/server/graphql/public/mutations/modifyCheckInQuestion.ts
@@ -3,11 +3,11 @@ import {getUserId, isTeamMember} from '../../../utils/authorization'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import publish from '../../../utils/publish'
 
-import {MutationResolvers} from '../resolverTypes'
 import getRethink from '../../../database/rethinkDriver'
-import standardError from '../../../utils/standardError'
 import OpenAIServerManager from '../../../utils/OpenAIServerManager'
 import {analytics} from '../../../utils/analytics/analytics'
+import standardError from '../../../utils/standardError'
+import {MutationResolvers} from '../resolverTypes'
 
 const modifyCheckInQuestion: MutationResolvers['modifyCheckInQuestion'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/requestToJoinDomain.ts b/packages/server/graphql/public/mutations/requestToJoinDomain.ts
index 0dcd6150fe8..cbcfd9cd095 100644
--- a/packages/server/graphql/public/mutations/requestToJoinDomain.ts
+++ b/packages/server/graphql/public/mutations/requestToJoinDomain.ts
@@ -1,14 +1,14 @@
 import ms from 'ms'
-import {getUserId} from '../../../utils/authorization'
-import {MutationResolvers} from '../resolverTypes'
-import getKysely from '../../../postgres/getKysely'
-import {getEligibleOrgIdsByDomain} from '../../../utils/isRequestToJoinDomainAllowed'
-import getTeamIdsByOrgIds from '../../../postgres/queries/getTeamIdsByOrgIds'
 import getRethink from '../../../database/rethinkDriver'
 import NotificationRequestToJoinOrg from '../../../database/types/NotificationRequestToJoinOrg'
-import publishNotification from './helpers/publishNotification'
+import getKysely from '../../../postgres/getKysely'
+import getTeamIdsByOrgIds from '../../../postgres/queries/getTeamIdsByOrgIds'
+import {getUserId} from '../../../utils/authorization'
 import getDomainFromEmail from '../../../utils/getDomainFromEmail'
+import {getEligibleOrgIdsByDomain} from '../../../utils/isRequestToJoinDomainAllowed'
 import standardError from '../../../utils/standardError'
+import {MutationResolvers} from '../resolverTypes'
+import publishNotification from './helpers/publishNotification'
 
 const REQUEST_EXPIRATION_DAYS = 30
 
diff --git a/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts b/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts
index d444d4cdf4d..f87cb915ba3 100644
--- a/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts
+++ b/packages/server/graphql/public/mutations/revealTeamHealthVotes.ts
@@ -1,9 +1,9 @@
-import {MutationResolvers} from '../resolverTypes'
+import {SubscriptionChannel} from 'parabol-client/types/constEnums'
+import updateStage from '../../../database/updateStage'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
 import getPhase from '../../../utils/getPhase'
 import publish from '../../../utils/publish'
-import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import updateStage from '../../../database/updateStage'
+import {MutationResolvers} from '../resolverTypes'
 
 const revealTeamHealthVotes: MutationResolvers['revealTeamHealthVotes'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/setOrgUserRole.ts b/packages/server/graphql/public/mutations/setOrgUserRole.ts
index 61f605cb442..404eafc82e9 100644
--- a/packages/server/graphql/public/mutations/setOrgUserRole.ts
+++ b/packages/server/graphql/public/mutations/setOrgUserRole.ts
@@ -1,12 +1,12 @@
-import {MutationResolvers} from '../resolverTypes'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
+import {RDatum} from '../../../database/stricterR'
 import NotificationPromoteToBillingLeader from '../../../database/types/NotificationPromoteToBillingLeader'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isSuperUser, isUserBillingLeader} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
-import {RDatum} from '../../../database/stricterR'
+import {MutationResolvers} from '../resolverTypes'
 
 const addNotifications = async (orgId: string, userId: string) => {
   const r = await getRethink()
diff --git a/packages/server/graphql/public/mutations/setTeamHealthVote.ts b/packages/server/graphql/public/mutations/setTeamHealthVote.ts
index 896ed0b45e1..bdd323875e9 100644
--- a/packages/server/graphql/public/mutations/setTeamHealthVote.ts
+++ b/packages/server/graphql/public/mutations/setTeamHealthVote.ts
@@ -1,12 +1,12 @@
-import {MutationResolvers} from '../resolverTypes'
-import {getUserId, isTeamMember} from '../../../utils/authorization'
+import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
+import {RValue} from '../../../database/stricterR'
+import TeamHealthVote from '../../../database/types/TeamHealthVote'
+import updateStage from '../../../database/updateStage'
+import {getUserId, isTeamMember} from '../../../utils/authorization'
 import getPhase from '../../../utils/getPhase'
 import publish from '../../../utils/publish'
-import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import updateStage from '../../../database/updateStage'
-import TeamHealthVote from '../../../database/types/TeamHealthVote'
-import {RValue} from '../../../database/stricterR'
+import {MutationResolvers} from '../resolverTypes'
 
 const upsertVote = async (meetingId: string, stageId: string, newVote: TeamHealthVote) => {
   const r = await getRethink()
diff --git a/packages/server/graphql/public/mutations/shareTopic.ts b/packages/server/graphql/public/mutations/shareTopic.ts
index ce7929ff67a..f8ab1e3f4c5 100644
--- a/packages/server/graphql/public/mutations/shareTopic.ts
+++ b/packages/server/graphql/public/mutations/shareTopic.ts
@@ -1,9 +1,9 @@
+import DiscussStage from '../../../database/types/DiscussStage'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
+import getPhase from '../../../utils/getPhase'
 import standardError from '../../../utils/standardError'
 import {SlackNotifier} from '../../mutations/helpers/notifications/SlackNotifier'
 import {MutationResolvers} from '../resolverTypes'
-import DiscussStage from '../../../database/types/DiscussStage'
-import getPhase from '../../../utils/getPhase'
 
 const shareTopic: MutationResolvers['shareTopic'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/signUpWithPassword.ts b/packages/server/graphql/public/mutations/signUpWithPassword.ts
index 0bb1ae2ddd6..fa7486a05f0 100644
--- a/packages/server/graphql/public/mutations/signUpWithPassword.ts
+++ b/packages/server/graphql/public/mutations/signUpWithPassword.ts
@@ -1,5 +1,6 @@
 import bcrypt from 'bcryptjs'
 import {AuthenticationError, Security} from 'parabol-client/types/constEnums'
+import {URLSearchParams} from 'url'
 import getRethink from '../../../database/rethinkDriver'
 import {RValue} from '../../../database/stricterR'
 import createEmailVerification from '../../../email/createEmailVerification'
@@ -10,7 +11,6 @@ import isEmailVerificationRequired from '../../../utils/isEmailVerificationRequi
 import attemptLogin from '../../mutations/helpers/attemptLogin'
 import bootstrapNewUser from '../../mutations/helpers/bootstrapNewUser'
 import {MutationResolvers} from '../resolverTypes'
-import {URLSearchParams} from 'url'
 
 const signUpWithPassword: MutationResolvers['signUpWithPassword'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/startRetrospective.ts b/packages/server/graphql/public/mutations/startRetrospective.ts
index 266664368c1..cc240ec1fb4 100644
--- a/packages/server/graphql/public/mutations/startRetrospective.ts
+++ b/packages/server/graphql/public/mutations/startRetrospective.ts
@@ -2,6 +2,7 @@ import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
 import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective'
 import RetroMeetingMember from '../../../database/types/RetroMeetingMember'
+import getKysely from '../../../postgres/getKysely'
 import updateMeetingTemplateLastUsedAt from '../../../postgres/queries/updateMeetingTemplateLastUsedAt'
 import updateTeamByTeamId from '../../../postgres/queries/updateTeamByTeamId'
 import {MeetingTypeEnum} from '../../../postgres/types/Meeting'
@@ -9,14 +10,13 @@ import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
-import {MutationResolvers} from '../resolverTypes'
 import createGcalEvent from '../../mutations/helpers/createGcalEvent'
+import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle'
 import isStartMeetingLocked from '../../mutations/helpers/isStartMeetingLocked'
 import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
-import {startNewMeetingSeries} from './updateRecurrenceSettings'
 import safeCreateRetrospective from '../../mutations/helpers/safeCreateRetrospective'
-import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle'
-import getKysely from '../../../postgres/getKysely'
+import {MutationResolvers} from '../resolverTypes'
+import {startNewMeetingSeries} from './updateRecurrenceSettings'
 
 const startRetrospective: MutationResolvers['startRetrospective'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/startTeamPrompt.ts b/packages/server/graphql/public/mutations/startTeamPrompt.ts
index d1c657ac421..75dcd21b975 100644
--- a/packages/server/graphql/public/mutations/startTeamPrompt.ts
+++ b/packages/server/graphql/public/mutations/startTeamPrompt.ts
@@ -1,18 +1,18 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
 import updateTeamByTeamId from '../../../postgres/queries/updateTeamByTeamId'
+import RedisLockQueue from '../../../utils/RedisLockQueue'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
-import RedisLockQueue from '../../../utils/RedisLockQueue'
 import standardError from '../../../utils/standardError'
+import createGcalEvent from '../../mutations/helpers/createGcalEvent'
+import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle'
 import isStartMeetingLocked from '../../mutations/helpers/isStartMeetingLocked'
 import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
 import safeCreateTeamPrompt from '../../mutations/helpers/safeCreateTeamPrompt'
 import {MutationResolvers} from '../resolverTypes'
 import {startNewMeetingSeries} from './updateRecurrenceSettings'
-import createGcalEvent from '../../mutations/helpers/createGcalEvent'
-import {createMeetingSeriesTitle} from '../../mutations/helpers/createMeetingSeriesTitle'
 
 const MEETING_START_DELAY_MS = 3000
 
diff --git a/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts b/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts
index 88ca97eb167..63540c4507b 100644
--- a/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts
+++ b/packages/server/graphql/public/mutations/updateGitLabDimensionField.ts
@@ -1,8 +1,8 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import MeetingPoker from '../../../database/types/MeetingPoker'
 import upsertGitLabDimensionFieldMap from '../../../postgres/queries/upsertGitLabDimensionFieldMap'
-import {isTeamMember} from '../../../utils/authorization'
 import {Logger} from '../../../utils/Logger'
+import {isTeamMember} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import {MutationResolvers} from '../resolverTypes'
 import {getUserId} from './../../../utils/authorization'
diff --git a/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts b/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts
index daee90b7d61..bbcc52b08ad 100644
--- a/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts
+++ b/packages/server/graphql/public/mutations/updateRecurrenceSettings.ts
@@ -1,18 +1,18 @@
+import {getJSDateFromRRuleDate, getRRuleDateFromJSDate} from 'parabol-client/shared/rruleUtil'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import {getRRuleDateFromJSDate, getJSDateFromRRuleDate} from 'parabol-client/shared/rruleUtil'
 import {RRule} from 'rrule'
 import getRethink from '../../../database/rethinkDriver'
 import {insertMeetingSeries as insertMeetingSeriesQuery} from '../../../postgres/queries/insertMeetingSeries'
 import restartMeetingSeries from '../../../postgres/queries/restartMeetingSeries'
 import updateMeetingSeriesQuery from '../../../postgres/queries/updateMeetingSeries'
+import {MeetingTypeEnum} from '../../../postgres/types/Meeting'
 import {MeetingSeries} from '../../../postgres/types/MeetingSeries'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
-import {MutationResolvers} from '../resolverTypes'
-import {MeetingTypeEnum} from '../../../postgres/types/Meeting'
 import {updateGcalSeries} from '../../mutations/helpers/createGcalEvent'
+import {MutationResolvers} from '../resolverTypes'
 
 export const startNewMeetingSeries = async (
   meeting: {
diff --git a/packages/server/graphql/public/mutations/updateTemplateCategory.ts b/packages/server/graphql/public/mutations/updateTemplateCategory.ts
index 384a88d0b64..1601d0d7d67 100644
--- a/packages/server/graphql/public/mutations/updateTemplateCategory.ts
+++ b/packages/server/graphql/public/mutations/updateTemplateCategory.ts
@@ -1,8 +1,8 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
+import {CategoryID, MAIN_CATEGORIES} from '../../../../client/components/ActivityLibrary/Categories'
 import getKysely from '../../../postgres/getKysely'
 import publish from '../../../utils/publish'
 import {MutationResolvers} from '../resolverTypes'
-import {CategoryID, MAIN_CATEGORIES} from '../../../../client/components/ActivityLibrary/Categories'
 
 const updateTemplateCategory: MutationResolvers['updateTemplateCategory'] = async (
   _source,
diff --git a/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts b/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts
index 2a242bc8b1e..131fe934498 100644
--- a/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts
+++ b/packages/server/graphql/public/mutations/upsertTeamPromptResponse.ts
@@ -2,18 +2,18 @@ import {generateText, JSONContent} from '@tiptap/core'
 import {createEditorExtensions} from 'parabol-client/components/promptResponse/tiptapConfig'
 import TeamPromptResponseId from 'parabol-client/shared/gqlIds/TeamPromptResponseId'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
+import getKysely from '../../../postgres/getKysely'
 import {TeamPromptResponse} from '../../../postgres/queries/getTeamPromptResponsesByIds'
 import {upsertTeamPromptResponse as upsertTeamPromptResponseQuery} from '../../../postgres/queries/upsertTeamPromptResponses'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
+import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
 import {MutationResolvers} from '../resolverTypes'
+import {getKudosUserIdsFromJson} from './helpers/getKudosUserIdsFromJson'
 import publishNotification from './helpers/publishNotification'
 import createTeamPromptMentionNotifications from './helpers/publishTeamPromptMentions'
-import {IntegrationNotifier} from '../../mutations/helpers/notifications/IntegrationNotifier'
-import {getKudosUserIdsFromJson} from './helpers/getKudosUserIdsFromJson'
-import getKysely from '../../../postgres/getKysely'
 
 const upsertTeamPromptResponse: MutationResolvers['upsertTeamPromptResponse'] = async (
   _source,
diff --git a/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts b/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts
index 3b9b61ac5a6..92627987433 100644
--- a/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts
+++ b/packages/server/graphql/public/types/AddReactjiToReactableSuccess.ts
@@ -1,5 +1,5 @@
-import {ReactableEnumType} from '../../types/ReactableEnum'
 import {AddReactjiToReactableSuccessResolvers} from '../../public/resolverTypes'
+import {ReactableEnumType} from '../../types/ReactableEnum'
 
 export type AddReactjiToReactableSuccessSource = {
   reactableId: string
diff --git a/packages/server/graphql/public/types/CreateGcalEventInput.ts b/packages/server/graphql/public/types/CreateGcalEventInput.ts
index 2c94760f20b..49172372bd2 100644
--- a/packages/server/graphql/public/types/CreateGcalEventInput.ts
+++ b/packages/server/graphql/public/types/CreateGcalEventInput.ts
@@ -1,9 +1,9 @@
 import {
   GraphQLInputObjectType,
-  GraphQLNonNull,
-  GraphQLString,
   GraphQLInt,
-  GraphQLList
+  GraphQLList,
+  GraphQLNonNull,
+  GraphQLString
 } from 'graphql'
 import GcalVideoTypeEnum from '../../types/GcalVideoTypeEnum'
 import GraphQLEmailType from '../../types/GraphQLEmailType'
diff --git a/packages/server/graphql/public/types/DomainJoinRequest.ts b/packages/server/graphql/public/types/DomainJoinRequest.ts
index ff1747017cc..ffe93556170 100644
--- a/packages/server/graphql/public/types/DomainJoinRequest.ts
+++ b/packages/server/graphql/public/types/DomainJoinRequest.ts
@@ -1,9 +1,9 @@
-import {DomainJoinRequestResolvers} from '../resolverTypes'
-import {getUserId} from '../../../utils/authorization'
 import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId'
-import {GQLContext} from '../../graphql'
 import getRethink from '../../../database/rethinkDriver'
+import {getUserId} from '../../../utils/authorization'
+import {GQLContext} from '../../graphql'
 import isValid from '../../isValid'
+import {DomainJoinRequestResolvers} from '../resolverTypes'
 
 const DomainJoinRequest: DomainJoinRequestResolvers = {
   id: ({id}) => {
diff --git a/packages/server/graphql/public/types/GcalIntegration.ts b/packages/server/graphql/public/types/GcalIntegration.ts
index 767554460de..1b97feff85c 100644
--- a/packages/server/graphql/public/types/GcalIntegration.ts
+++ b/packages/server/graphql/public/types/GcalIntegration.ts
@@ -1,6 +1,6 @@
 import {google} from 'googleapis'
-import {GcalIntegrationResolvers} from '../resolverTypes'
 import appOrigin from '../../../appOrigin'
+import {GcalIntegrationResolvers} from '../resolverTypes'
 
 export type GcalIntegrationSource = {
   teamId: string
diff --git a/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts b/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts
index 8df3020ace9..935795650b7 100644
--- a/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts
+++ b/packages/server/graphql/public/types/NotifyRequestToJoinOrg.ts
@@ -1,5 +1,5 @@
-import {NotifyRequestToJoinOrgResolvers} from '../resolverTypes'
 import DomainJoinRequestId from 'parabol-client/shared/gqlIds/DomainJoinRequestId'
+import {NotifyRequestToJoinOrgResolvers} from '../resolverTypes'
 
 const NotifyRequestToJoinOrg: NotifyRequestToJoinOrgResolvers = {
   __isTypeOf: ({type}) => type === 'REQUEST_TO_JOIN_ORG',
diff --git a/packages/server/graphql/public/types/Organization.ts b/packages/server/graphql/public/types/Organization.ts
index b1164b14f7e..5089fd86dd5 100644
--- a/packages/server/graphql/public/types/Organization.ts
+++ b/packages/server/graphql/public/types/Organization.ts
@@ -1,6 +1,6 @@
 import {isSuperUser} from '../../../utils/authorization'
-import {OrganizationResolvers} from '../resolverTypes'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
+import {OrganizationResolvers} from '../resolverTypes'
 
 const Organization: OrganizationResolvers = {
   approvedDomains: async ({id: orgId}, _args, {dataLoader}) => {
diff --git a/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts b/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts
index 2679a89ecd9..e15430efc9d 100644
--- a/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts
+++ b/packages/server/graphql/public/types/ResetReflectionGroupsSuccess.ts
@@ -1,5 +1,5 @@
-import {ResetReflectionGroupsSuccessResolvers} from '../resolverTypes'
 import MeetingRetrospective from '../../../database/types/MeetingRetrospective'
+import {ResetReflectionGroupsSuccessResolvers} from '../resolverTypes'
 
 export type ResetReflectionGroupsSuccessSource = {
   meetingId: string
diff --git a/packages/server/graphql/public/types/RetrospectiveMeeting.ts b/packages/server/graphql/public/types/RetrospectiveMeeting.ts
index b259c84409d..a4ad2df6f03 100644
--- a/packages/server/graphql/public/types/RetrospectiveMeeting.ts
+++ b/packages/server/graphql/public/types/RetrospectiveMeeting.ts
@@ -1,4 +1,5 @@
 import toTeamMemberId from '../../../../client/utils/relay/toTeamMemberId'
+import ReflectionGroupType from '../../../database/types/ReflectionGroup'
 import RetroMeetingMember from '../../../database/types/RetroMeetingMember'
 import {getUserId} from '../../../utils/authorization'
 import filterTasksByMeeting from '../../../utils/filterTasksByMeeting'
@@ -6,7 +7,6 @@ import getPhase from '../../../utils/getPhase'
 import {GQLContext} from '../../graphql'
 import {resolveForSU} from '../../resolvers'
 import {RetrospectiveMeetingResolvers} from '../resolverTypes'
-import ReflectionGroupType from '../../../database/types/ReflectionGroup'
 
 const RetrospectiveMeeting: RetrospectiveMeetingResolvers = {
   autoGroupThreshold: resolveForSU('autoGroupThreshold'),
diff --git a/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts b/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts
index a85a29d033d..53169f52620 100644
--- a/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts
+++ b/packages/server/graphql/public/types/SetOrgUserRoleSuccess.ts
@@ -1,6 +1,6 @@
-import {SetOrgUserRoleSuccessResolvers} from '../resolverTypes'
 import {getUserId} from '../../../utils/authorization'
 import errorFilter from '../../errorFilter'
+import {SetOrgUserRoleSuccessResolvers} from '../resolverTypes'
 
 export type SetOrgUserRoleSuccessSource = {
   orgId: string
diff --git a/packages/server/graphql/public/types/Team.ts b/packages/server/graphql/public/types/Team.ts
index dc48f0d36d6..1e27132dda9 100644
--- a/packages/server/graphql/public/types/Team.ts
+++ b/packages/server/graphql/public/types/Team.ts
@@ -1,8 +1,8 @@
-import {TeamResolvers} from '../resolverTypes'
 import TeamInsightsId from 'parabol-client/shared/gqlIds/TeamInsightsId'
 import toTeamMemberId from '../../../../client/utils/relay/toTeamMemberId'
 import {getUserId, isTeamMember} from '../../../utils/authorization'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
+import {TeamResolvers} from '../resolverTypes'
 
 const Team: TeamResolvers = {
   insights: async (
diff --git a/packages/server/graphql/public/types/TeamHealthPhase.ts b/packages/server/graphql/public/types/TeamHealthPhase.ts
index 88b98e00852..f0592eefc29 100644
--- a/packages/server/graphql/public/types/TeamHealthPhase.ts
+++ b/packages/server/graphql/public/types/TeamHealthPhase.ts
@@ -1,5 +1,5 @@
-import {TeamHealthPhaseResolvers} from '../resolverTypes'
 import TeamHealthPhaseDB from '../../../database/types/TeamHealthPhase'
+import {TeamHealthPhaseResolvers} from '../resolverTypes'
 
 export type TeamHealthPhaseSource = TeamHealthPhaseDB & {
   meetingId: string
diff --git a/packages/server/graphql/public/types/TeamHealthStage.ts b/packages/server/graphql/public/types/TeamHealthStage.ts
index f98202ae131..87ec98c008f 100644
--- a/packages/server/graphql/public/types/TeamHealthStage.ts
+++ b/packages/server/graphql/public/types/TeamHealthStage.ts
@@ -1,8 +1,8 @@
-import {TeamHealthStageResolvers} from '../resolverTypes'
-import {getUserId} from '../../../utils/authorization'
 import TeamHealthStageDB from '../../../database/types/TeamHealthStage'
-import isValid from '../../isValid'
 import {Logger} from '../../../utils/Logger'
+import {getUserId} from '../../../utils/authorization'
+import isValid from '../../isValid'
+import {TeamHealthStageResolvers} from '../resolverTypes'
 
 export type TeamHealthStageSource = TeamHealthStageDB & {
   meetingId: string
diff --git a/packages/server/graphql/public/types/TeamPromptMeeting.ts b/packages/server/graphql/public/types/TeamPromptMeeting.ts
index 4b25a52749f..7ed7800f420 100644
--- a/packages/server/graphql/public/types/TeamPromptMeeting.ts
+++ b/packages/server/graphql/public/types/TeamPromptMeeting.ts
@@ -1,9 +1,9 @@
-import {TeamPromptMeetingResolvers} from '../resolverTypes'
 import getRethink from '../../../database/rethinkDriver'
+import {RValue} from '../../../database/stricterR'
 import MeetingTeamPrompt from '../../../database/types/MeetingTeamPrompt'
 import {getUserId} from '../../../utils/authorization'
 import filterTasksByMeeting from '../../../utils/filterTasksByMeeting'
-import {RValue} from '../../../database/stricterR'
+import {TeamPromptMeetingResolvers} from '../resolverTypes'
 
 const TeamPromptMeeting: TeamPromptMeetingResolvers = {
   prevMeeting: async ({meetingSeriesId, createdAt}, _args, {dataLoader}) => {
diff --git a/packages/server/graphql/public/types/TopRetroTemplate.ts b/packages/server/graphql/public/types/TopRetroTemplate.ts
index d799679b4f8..4892a09bde5 100644
--- a/packages/server/graphql/public/types/TopRetroTemplate.ts
+++ b/packages/server/graphql/public/types/TopRetroTemplate.ts
@@ -1,6 +1,6 @@
-import {TopRetroTemplateResolvers} from '../resolverTypes'
 import TopRetroTemplateId from 'parabol-client/shared/gqlIds/TopRetroTemplateId'
 import ReflectTemplate from '../../../database/types/ReflectTemplate'
+import {TopRetroTemplateResolvers} from '../resolverTypes'
 
 export type TopRetroTemplateSource = {
   teamId: string
diff --git a/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts b/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts
index 283b97c5e18..425879111b9 100644
--- a/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts
+++ b/packages/server/graphql/public/types/UpsertTeamPromptResponseSuccess.ts
@@ -1,5 +1,5 @@
-import {UpsertTeamPromptResponseSuccessResolvers} from '../resolverTypes'
 import isValid from '../../../graphql/isValid'
+import {UpsertTeamPromptResponseSuccessResolvers} from '../resolverTypes'
 
 export type UpsertTeamPromptResponseSuccessSource = {
   teamPromptResponseId: string
diff --git a/packages/server/graphql/public/types/User.ts b/packages/server/graphql/public/types/User.ts
index f46afe30511..7570e7b9f8c 100644
--- a/packages/server/graphql/public/types/User.ts
+++ b/packages/server/graphql/public/types/User.ts
@@ -15,14 +15,14 @@ import {
   isUserBillingLeader
 } from '../../../utils/authorization'
 import getDomainFromEmail from '../../../utils/getDomainFromEmail'
+import {getSSOMetadataFromURL} from '../../../utils/getSSOMetadataFromURL'
 import sendToSentry from '../../../utils/sendToSentry'
 import standardError from '../../../utils/standardError'
 import {getStripeManager} from '../../../utils/stripe'
 import connectionFromTemplateArray from '../../queries/helpers/connectionFromTemplateArray'
+import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 import getSignOnURL from '../mutations/helpers/SAMLHelpers/getSignOnURL'
 import {UserResolvers} from '../resolverTypes'
-import {getSSOMetadataFromURL} from '../../../utils/getSSOMetadataFromURL'
-import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
 declare const __PRODUCTION__: string
 
diff --git a/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts b/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts
index efd0cf91dca..0108e303221 100644
--- a/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts
+++ b/packages/server/graphql/public/types/helpers/getActiveTeamCountByTeamIds.ts
@@ -1,6 +1,6 @@
+import {Threshold} from '~/types/constEnums'
 import getRethink from '../../../../database/rethinkDriver'
 import {RDatum, RValue} from '../../../../database/stricterR'
-import {Threshold} from '~/types/constEnums'
 // Uncomment for easier testing
 //import { ThresholdTest as Threshold } from "~/types/constEnums";
 
diff --git a/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts b/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts
index 14b951248c0..573608d7b1b 100644
--- a/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts
+++ b/packages/server/graphql/queries/helpers/fetchGitHubRepos.ts
@@ -1,10 +1,10 @@
 import {GraphQLResolveInfo} from 'graphql'
 import {GetRepositoriesQuery} from '../../../types/githubTypes'
+import {Logger} from '../../../utils/Logger'
 import getGitHubRequest from '../../../utils/getGitHubRequest'
 import getRepositories from '../../../utils/githubQueries/getRepositories.graphql'
 import {DataLoaderWorker} from '../../graphql'
 import {GQLContext} from './../../graphql'
-import {Logger} from '../../../utils/Logger'
 
 export interface GitHubRepo {
   id: string
diff --git a/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts b/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts
index 72da38eddb3..fe5e17d5a0d 100644
--- a/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts
+++ b/packages/server/graphql/queries/helpers/fetchGitLabProjects.ts
@@ -1,8 +1,8 @@
 import {GraphQLResolveInfo} from 'graphql'
 import {isNotNull} from 'parabol-client/utils/predicates'
 import GitLabServerManager from '../../../integrations/gitlab/GitLabServerManager'
-import {GQLContext} from '../../graphql'
 import {Logger} from '../../../utils/Logger'
+import {GQLContext} from '../../graphql'
 
 const fetchGitLabProjects = async (
   teamId: string,
diff --git a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts
index 55c0051c6f1..84bff7ba4a3 100644
--- a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts
+++ b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts
@@ -1,11 +1,11 @@
 import dayjs from 'dayjs'
 import Stripe from 'stripe'
+import Invoice from '../../../database/types/Invoice'
+import Organization from '../../../database/types/Organization'
 import {fromEpochSeconds} from '../../../utils/epochTime'
 import getUpcomingInvoiceId from '../../../utils/getUpcomingInvoiceId'
 import {getStripeManager} from '../../../utils/stripe'
 import StripeManager from '../../../utils/stripe/StripeManager'
-import Invoice from '../../../database/types/Invoice'
-import Organization from '../../../database/types/Organization'
 
 export default async function makeUpcomingInvoice(
   org: Organization,
diff --git a/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts b/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts
index 4924d2459ce..a1abb0db8f9 100644
--- a/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts
+++ b/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts
@@ -1,8 +1,8 @@
 import getRethink from '../../../database/rethinkDriver'
 import MeetingSettingsPoker from '../../../database/types/MeetingSettingsPoker'
 import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective'
-import {GQLContext} from '../../graphql'
 import {getUserId} from '../../../utils/authorization'
+import {GQLContext} from '../../graphql'
 import isValid from '../../isValid'
 import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
diff --git a/packages/server/graphql/rootMutation.ts b/packages/server/graphql/rootMutation.ts
index fe3ff00f0cf..608dad1c1ec 100644
--- a/packages/server/graphql/rootMutation.ts
+++ b/packages/server/graphql/rootMutation.ts
@@ -74,9 +74,9 @@ import removePokerTemplate from './mutations/removePokerTemplate'
 import removePokerTemplateDimension from './mutations/removePokerTemplateDimension'
 import removePokerTemplateScale from './mutations/removePokerTemplateScale'
 import removePokerTemplateScaleValue from './mutations/removePokerTemplateScaleValue'
-import removeReflection from './mutations/removeReflection'
 import removeReflectTemplate from './mutations/removeReflectTemplate'
 import removeReflectTemplatePrompt from './mutations/removeReflectTemplatePrompt'
+import removeReflection from './mutations/removeReflection'
 import removeSlackAuth from './mutations/removeSlackAuth'
 import removeTeamMember from './mutations/removeTeamMember'
 import removeTeamMemberIntegrationAuth from './mutations/removeTeamMemberIntegrationAuth'
diff --git a/packages/server/graphql/rootTypes.ts b/packages/server/graphql/rootTypes.ts
index 823f80ef4a6..b676deb4ce1 100644
--- a/packages/server/graphql/rootTypes.ts
+++ b/packages/server/graphql/rootTypes.ts
@@ -2,8 +2,8 @@ import ActionMeetingMember from './types/ActionMeetingMember'
 import ActionMeetingSettings from './types/ActionMeetingSettings'
 import AgendaItemsPhase from './types/AgendaItemsPhase'
 import AuthIdentityGoogle from './types/AuthIdentityGoogle'
-import AuthIdentityMicrosoft from './types/AuthIdentityMicrosoft'
 import AuthIdentityLocal from './types/AuthIdentityLocal'
+import AuthIdentityMicrosoft from './types/AuthIdentityMicrosoft'
 import AzureDevOpsWorkItem from './types/AzureDevOpsWorkItem'
 import CheckInPhase from './types/CheckInPhase'
 import Comment from './types/Comment'
diff --git a/packages/server/graphql/traceGraphQL.ts b/packages/server/graphql/traceGraphQL.ts
index c59a4b80d51..01eb2a4a138 100644
--- a/packages/server/graphql/traceGraphQL.ts
+++ b/packages/server/graphql/traceGraphQL.ts
@@ -11,10 +11,10 @@ import {
   GraphQLNamedType,
   GraphQLResolveInfo,
   GraphQLSchema,
-  isObjectType,
-  OperationDefinitionNode
+  OperationDefinitionNode,
+  isObjectType
 } from 'graphql'
-import {CompiledQuery, compileQuery, CompilerOptions, isCompiledQuery} from 'graphql-jit'
+import {CompiledQuery, CompilerOptions, compileQuery, isCompiledQuery} from 'graphql-jit'
 import {Path} from 'graphql/jsutils/Path'
 
 interface ExecutionArgs {
diff --git a/packages/server/graphql/types/AddIntegrationProviderPayload.ts b/packages/server/graphql/types/AddIntegrationProviderPayload.ts
index ea7bfe15246..76112c4a678 100644
--- a/packages/server/graphql/types/AddIntegrationProviderPayload.ts
+++ b/packages/server/graphql/types/AddIntegrationProviderPayload.ts
@@ -1,8 +1,8 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import IntegrationProvider from './IntegrationProvider'
-import makeMutationPayload from './makeMutationPayload'
 import Team from './Team'
+import makeMutationPayload from './makeMutationPayload'
 
 export const AddIntegrationProviderSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'AddIntegrationProviderSuccess',
diff --git a/packages/server/graphql/types/AddReactjiToReflectionPayload.ts b/packages/server/graphql/types/AddReactjiToReflectionPayload.ts
index a25e801ea09..b80d82f2b28 100644
--- a/packages/server/graphql/types/AddReactjiToReflectionPayload.ts
+++ b/packages/server/graphql/types/AddReactjiToReflectionPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import RetroReflection from './RetroReflection'
+import makeMutationPayload from './makeMutationPayload'
 
 export const AddReactjiToReflectionSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'AddReactjiToReflectionSuccess',
diff --git a/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts b/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts
index 3632cc2f228..49055213f36 100644
--- a/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts
+++ b/packages/server/graphql/types/AddTeamMemberIntegrationAuthPayload.ts
@@ -2,10 +2,10 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import toTeamMemberId from '../../../client/utils/relay/toTeamMemberId'
 import {GQLContext} from '../graphql'
 import IntegrationProviderServiceEnum from './IntegrationProviderServiceEnum'
-import makeMutationPayload from './makeMutationPayload'
 import TeamMember from './TeamMember'
 import TeamMemberIntegrationAuth from './TeamMemberIntegrationAuth'
 import User from './User'
+import makeMutationPayload from './makeMutationPayload'
 
 export const AddTeamMemberIntegrationAuthSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'AddTeamMemberIntegrationAuthSuccess',
diff --git a/packages/server/graphql/types/ArchiveTimelineEventPayload.ts b/packages/server/graphql/types/ArchiveTimelineEventPayload.ts
index 72e547dcfcb..ba1d1714e54 100644
--- a/packages/server/graphql/types/ArchiveTimelineEventPayload.ts
+++ b/packages/server/graphql/types/ArchiveTimelineEventPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import TimelineEvent from './TimelineEvent'
+import makeMutationPayload from './makeMutationPayload'
 
 export const ArchiveTimelineEventSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'ArchiveTimelineEventSuccess',
diff --git a/packages/server/graphql/types/AuthIdentity.ts b/packages/server/graphql/types/AuthIdentity.ts
index 632915d32aa..c8bc5515de1 100644
--- a/packages/server/graphql/types/AuthIdentity.ts
+++ b/packages/server/graphql/types/AuthIdentity.ts
@@ -1,8 +1,8 @@
 import {GraphQLBoolean, GraphQLInterfaceType, GraphQLNonNull} from 'graphql'
 import {AuthIdentityTypeEnum as EAuthIdentityTypeEnum} from '../../../client/types/constEnums'
-import AuthIdentityMicrosoft from './AuthIdentityMicrosoft'
 import AuthIdentityGoogle from './AuthIdentityGoogle'
 import AuthIdentityLocal from './AuthIdentityLocal'
+import AuthIdentityMicrosoft from './AuthIdentityMicrosoft'
 import AuthIdentityTypeEnum from './AuthIdentityTypeEnum'
 
 export const authStrategyFields = () => ({
diff --git a/packages/server/graphql/types/CreateMassInvitationPayload.ts b/packages/server/graphql/types/CreateMassInvitationPayload.ts
index ac6c2aab8e4..5bbf5a49119 100644
--- a/packages/server/graphql/types/CreateMassInvitationPayload.ts
+++ b/packages/server/graphql/types/CreateMassInvitationPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import Team from './Team'
+import makeMutationPayload from './makeMutationPayload'
 
 const CreateMassInvitationSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'CreateMassInvitationSuccess',
diff --git a/packages/server/graphql/types/Discussion.ts b/packages/server/graphql/types/Discussion.ts
index 51812036548..556401ba1cc 100644
--- a/packages/server/graphql/types/Discussion.ts
+++ b/packages/server/graphql/types/Discussion.ts
@@ -21,9 +21,9 @@ import resolveThreadableConnection from '../resolvers/resolveThreadableConnectio
 import DiscussionTopicTypeEnum from './DiscussionTopicTypeEnum'
 import GraphQLISO8601Type from './GraphQLISO8601Type'
 import NewMeetingStage from './NewMeetingStage'
+import Team from './Team'
 import {ThreadableConnection} from './Threadable'
 import User from './User'
-import Team from './Team'
 
 const Discussion = new GraphQLObjectType<any, GQLContext>({
   name: 'Discussion',
diff --git a/packages/server/graphql/types/DragEstimatingTaskPayload.ts b/packages/server/graphql/types/DragEstimatingTaskPayload.ts
index effd453e464..c09556af20a 100644
--- a/packages/server/graphql/types/DragEstimatingTaskPayload.ts
+++ b/packages/server/graphql/types/DragEstimatingTaskPayload.ts
@@ -4,8 +4,8 @@ import getPhase from '../../utils/getPhase'
 import {GQLContext} from '../graphql'
 import {augmentDBStage} from '../resolvers'
 import EstimateStage from './EstimateStage'
-import makeMutationPayload from './makeMutationPayload'
 import PokerMeeting from './PokerMeeting'
+import makeMutationPayload from './makeMutationPayload'
 
 export const DragEstimatingTaskSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'DragEstimatingTaskSuccess',
diff --git a/packages/server/graphql/types/EndCheckInPayload.ts b/packages/server/graphql/types/EndCheckInPayload.ts
index 52e22061575..82a922729aa 100644
--- a/packages/server/graphql/types/EndCheckInPayload.ts
+++ b/packages/server/graphql/types/EndCheckInPayload.ts
@@ -5,10 +5,10 @@ import errorFilter from '../errorFilter'
 import {GQLContext} from '../graphql'
 import {resolveNewMeeting} from '../resolvers'
 import ActionMeeting from './ActionMeeting'
-import makeMutationPayload from './makeMutationPayload'
 import Task from './Task'
 import Team from './Team'
 import TimelineEvent from './TimelineEvent'
+import makeMutationPayload from './makeMutationPayload'
 
 export const EndCheckInSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'EndCheckInSuccess',
diff --git a/packages/server/graphql/types/EndRetrospectivePayload.ts b/packages/server/graphql/types/EndRetrospectivePayload.ts
index f211368b675..a53fd7527e2 100644
--- a/packages/server/graphql/types/EndRetrospectivePayload.ts
+++ b/packages/server/graphql/types/EndRetrospectivePayload.ts
@@ -1,10 +1,10 @@
 import {GraphQLBoolean, GraphQLID, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import {resolveNewMeeting} from '../resolvers'
-import makeMutationPayload from './makeMutationPayload'
 import RetrospectiveMeeting from './RetrospectiveMeeting'
 import Team from './Team'
 import TimelineEvent from './TimelineEvent'
+import makeMutationPayload from './makeMutationPayload'
 
 export const EndRetrospectiveSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'EndRetrospectiveSuccess',
diff --git a/packages/server/graphql/types/EndSprintPokerPayload.ts b/packages/server/graphql/types/EndSprintPokerPayload.ts
index 1775053eb3b..09affd88b37 100644
--- a/packages/server/graphql/types/EndSprintPokerPayload.ts
+++ b/packages/server/graphql/types/EndSprintPokerPayload.ts
@@ -1,8 +1,8 @@
 import {GraphQLBoolean, GraphQLID, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import PokerMeeting from './PokerMeeting'
 import Team from './Team'
+import makeMutationPayload from './makeMutationPayload'
 
 export const EndSprintPokerSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'EndSprintPokerSuccess',
diff --git a/packages/server/graphql/types/EndTeamPromptPayload.ts b/packages/server/graphql/types/EndTeamPromptPayload.ts
index 5a354b506b2..4f1abefa0d6 100644
--- a/packages/server/graphql/types/EndTeamPromptPayload.ts
+++ b/packages/server/graphql/types/EndTeamPromptPayload.ts
@@ -1,10 +1,10 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import {resolveNewMeeting, resolveTeam} from '../resolvers'
-import makeMutationPayload from './makeMutationPayload'
 import Team from './Team'
 import TeamPromptMeeting from './TeamPromptMeeting'
 import TimelineEvent from './TimelineEvent'
+import makeMutationPayload from './makeMutationPayload'
 
 export const EndTeamPromptSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'EndTeamPromptSuccess',
diff --git a/packages/server/graphql/types/FlagReadyToAdvancePayload.ts b/packages/server/graphql/types/FlagReadyToAdvancePayload.ts
index 03685b59536..fbb129308e6 100644
--- a/packages/server/graphql/types/FlagReadyToAdvancePayload.ts
+++ b/packages/server/graphql/types/FlagReadyToAdvancePayload.ts
@@ -1,9 +1,9 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import {resolveGQLStageFromId} from '../resolvers'
-import makeMutationPayload from './makeMutationPayload'
 import NewMeeting from './NewMeeting'
 import NewMeetingStage from './NewMeetingStage'
+import makeMutationPayload from './makeMutationPayload'
 
 export const FlagReadyToAdvanceSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'FlagReadyToAdvanceSuccess',
diff --git a/packages/server/graphql/types/JiraRemoteProject.ts b/packages/server/graphql/types/JiraRemoteProject.ts
index f7c55c7a021..5bd90a6a384 100644
--- a/packages/server/graphql/types/JiraRemoteProject.ts
+++ b/packages/server/graphql/types/JiraRemoteProject.ts
@@ -1,11 +1,11 @@
 import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLObjectType, GraphQLString} from 'graphql'
 import JiraProjectId from 'parabol-client/shared/gqlIds/JiraProjectId'
+import AtlassianServerManager, {JiraProject} from '../../utils/AtlassianServerManager'
 import {
   createImageUrlHash,
   createParabolImageUrl,
   downloadAndCacheImage
 } from '../../utils/atlassian/jiraImages'
-import AtlassianServerManager, {JiraProject} from '../../utils/AtlassianServerManager'
 import {GQLContext} from '../graphql'
 import IntegrationProviderServiceEnum from './IntegrationProviderServiceEnum'
 import JiraRemoteAvatarUrls from './JiraRemoteAvatarUrls'
diff --git a/packages/server/graphql/types/JoinMeetingPayload.ts b/packages/server/graphql/types/JoinMeetingPayload.ts
index cc0642faf63..31a21ad9348 100644
--- a/packages/server/graphql/types/JoinMeetingPayload.ts
+++ b/packages/server/graphql/types/JoinMeetingPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import NewMeeting from './NewMeeting'
+import makeMutationPayload from './makeMutationPayload'
 
 export const JoinMeetingSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'JoinMeetingSuccess',
diff --git a/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts b/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts
index db40f5c9a98..0bda1d6646d 100644
--- a/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts
+++ b/packages/server/graphql/types/MovePokerTemplateScaleValuePayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import TemplateScale from './TemplateScale'
+import makeMutationPayload from './makeMutationPayload'
 
 export const MovePokerTemplateScaleValueSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'MovePokerTemplateScaleValueSuccess',
diff --git a/packages/server/graphql/types/NewMeetingStage.ts b/packages/server/graphql/types/NewMeetingStage.ts
index 0247e4ebbf2..b7095aca79d 100644
--- a/packages/server/graphql/types/NewMeetingStage.ts
+++ b/packages/server/graphql/types/NewMeetingStage.ts
@@ -10,8 +10,8 @@ import AuthToken from '../../database/types/AuthToken'
 import GenericMeetingPhase, {
   NewMeetingPhaseTypeEnum as NewMeetingPhaseTypeEnumType
 } from '../../database/types/GenericMeetingPhase'
-import {getUserId} from '../../utils/authorization'
 import {Logger} from '../../utils/Logger'
+import {getUserId} from '../../utils/authorization'
 import {GQLContext} from '../graphql'
 import GraphQLISO8601Type from './GraphQLISO8601Type'
 import NewMeeting from './NewMeeting'
diff --git a/packages/server/graphql/types/Organization.ts b/packages/server/graphql/types/Organization.ts
index 2e51054649d..fcb1f77fb40 100644
--- a/packages/server/graphql/types/Organization.ts
+++ b/packages/server/graphql/types/Organization.ts
@@ -19,8 +19,8 @@ import {resolveForBillingLeaders} from '../resolvers'
 import CreditCard from './CreditCard'
 import GraphQLISO8601Type from './GraphQLISO8601Type'
 import GraphQLURLType from './GraphQLURLType'
-import OrganizationUser, {OrganizationUserConnection} from './OrganizationUser'
 import OrgUserCount from './OrgUserCount'
+import OrganizationUser, {OrganizationUserConnection} from './OrganizationUser'
 import Team from './Team'
 
 const Organization: GraphQLObjectType<any, GQLContext> = new GraphQLObjectType<any, GQLContext>({
diff --git a/packages/server/graphql/types/OrganizationUser.ts b/packages/server/graphql/types/OrganizationUser.ts
index 3940c23fc9f..942a57530a3 100644
--- a/packages/server/graphql/types/OrganizationUser.ts
+++ b/packages/server/graphql/types/OrganizationUser.ts
@@ -3,8 +3,8 @@ import connectionDefinitions from '../connectionDefinitions'
 import {GQLContext} from '../graphql'
 import {resolveOrganization} from '../resolvers'
 import GraphQLISO8601Type from './GraphQLISO8601Type'
-import Organization from './Organization'
 import OrgUserRole from './OrgUserRole'
+import Organization from './Organization'
 import User from './User'
 
 const OrganizationUser = new GraphQLObjectType<any, GQLContext>({
diff --git a/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts b/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts
index 89abcd96667..cc39fa4c017 100644
--- a/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts
+++ b/packages/server/graphql/types/PokerAnnounceDeckHoverPayload.ts
@@ -2,8 +2,8 @@ import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'grap
 import {GQLContext} from '../graphql'
 import resolveStage from '../resolvers/resolveStage'
 import EstimateStage from './EstimateStage'
-import makeMutationPayload from './makeMutationPayload'
 import User from './User'
+import makeMutationPayload from './makeMutationPayload'
 
 export const PokerAnnounceDeckHoverSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'PokerAnnounceDeckHoverSuccess',
diff --git a/packages/server/graphql/types/PokerMeeting.ts b/packages/server/graphql/types/PokerMeeting.ts
index fd0116d26f2..bbea73c760f 100644
--- a/packages/server/graphql/types/PokerMeeting.ts
+++ b/packages/server/graphql/types/PokerMeeting.ts
@@ -1,7 +1,7 @@
 import {GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
-import {getUserId} from '../../utils/authorization'
 import {Logger} from '../../utils/Logger'
+import {getUserId} from '../../utils/authorization'
 import {GQLContext} from '../graphql'
 import NewMeeting from './NewMeeting'
 import PokerMeetingMember from './PokerMeetingMember'
diff --git a/packages/server/graphql/types/PokerMeetingSettings.ts b/packages/server/graphql/types/PokerMeetingSettings.ts
index 5f7b576fdab..00e0d260ceb 100644
--- a/packages/server/graphql/types/PokerMeetingSettings.ts
+++ b/packages/server/graphql/types/PokerMeetingSettings.ts
@@ -1,13 +1,13 @@
 import {GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import MeetingTemplate from '../../database/types/MeetingTemplate'
 import db from '../../db'
+import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore'
 import {GQLContext} from '../graphql'
 import connectionFromTemplateArray from '../queries/helpers/connectionFromTemplateArray'
 import getScoredTemplates from '../queries/helpers/getScoredTemplates'
 import resolveSelectedTemplate from '../queries/helpers/resolveSelectedTemplate'
 import PokerTemplate, {PokerTemplateConnection} from './PokerTemplate'
 import TeamMeetingSettings, {teamMeetingSettingsFields} from './TeamMeetingSettings'
-import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore'
 
 const PokerMeetingSettings = new GraphQLObjectType<any, GQLContext>({
   name: 'PokerMeetingSettings',
diff --git a/packages/server/graphql/types/Reactable.ts b/packages/server/graphql/types/Reactable.ts
index 812f5e40aec..fd0e4d1254c 100644
--- a/packages/server/graphql/types/Reactable.ts
+++ b/packages/server/graphql/types/Reactable.ts
@@ -1,7 +1,7 @@
 import {GraphQLID, GraphQLInterfaceType, GraphQLList, GraphQLNonNull} from 'graphql'
 import resolveReactjis from '../resolvers/resolveReactjis'
-import getReactableType from './getReactableType'
 import Reactji from './Reactji'
+import getReactableType from './getReactableType'
 
 export const reactableFields = () => ({
   id: {
diff --git a/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts b/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts
index e637f793fa3..2d2ec6f67e8 100644
--- a/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts
+++ b/packages/server/graphql/types/RemoveIntegrationProviderPayload.ts
@@ -1,9 +1,9 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import toTeamMemberId from '../../../client/utils/relay/toTeamMemberId'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import TeamMember from './TeamMember'
 import User from './User'
+import makeMutationPayload from './makeMutationPayload'
 
 export const RemoveIntegrationProviderSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'RemoveIntegrationProviderSuccess',
diff --git a/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts b/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts
index b505072fe74..ec145084377 100644
--- a/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts
+++ b/packages/server/graphql/types/RemoveTeamMemberIntegrationAuthPayload.ts
@@ -1,9 +1,9 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import TeamMember from './TeamMember'
 import User from './User'
+import makeMutationPayload from './makeMutationPayload'
 
 export const RemoveTeamMemberIntegrationAuthSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'RemoveTeamMemberIntegrationAuthSuccess',
diff --git a/packages/server/graphql/types/RenameMeetingPayload.ts b/packages/server/graphql/types/RenameMeetingPayload.ts
index 7026d600f0b..929a267d005 100644
--- a/packages/server/graphql/types/RenameMeetingPayload.ts
+++ b/packages/server/graphql/types/RenameMeetingPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import NewMeeting from './NewMeeting'
+import makeMutationPayload from './makeMutationPayload'
 
 export const RenameMeetingSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'RenameMeetingSuccess',
diff --git a/packages/server/graphql/types/RetrospectiveMeetingSettings.ts b/packages/server/graphql/types/RetrospectiveMeetingSettings.ts
index ca7dedb27e0..7bd54c7b3b0 100644
--- a/packages/server/graphql/types/RetrospectiveMeetingSettings.ts
+++ b/packages/server/graphql/types/RetrospectiveMeetingSettings.ts
@@ -9,13 +9,13 @@ import {
 } from 'graphql'
 import db from '../../db'
 import {MeetingTypeEnum} from '../../postgres/types/Meeting'
+import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore'
 import {GQLContext} from '../graphql'
 import connectionFromTemplateArray from '../queries/helpers/connectionFromTemplateArray'
 import getScoredTemplates from '../queries/helpers/getScoredTemplates'
 import resolveSelectedTemplate from '../queries/helpers/resolveSelectedTemplate'
 import ReflectTemplate, {ReflectTemplateConnection} from './ReflectTemplate'
 import TeamMeetingSettings, {teamMeetingSettingsFields} from './TeamMeetingSettings'
-import {ORG_HOTNESS_FACTOR, TEAM_HOTNESS_FACTOR} from '../../utils/getTemplateScore'
 
 const RetrospectiveMeetingSettings: GraphQLObjectType<any, GQLContext> = new GraphQLObjectType<
   any,
diff --git a/packages/server/graphql/types/SetAppLocationPayload.ts b/packages/server/graphql/types/SetAppLocationPayload.ts
index 2cbfcd96f78..c6edafa58fd 100644
--- a/packages/server/graphql/types/SetAppLocationPayload.ts
+++ b/packages/server/graphql/types/SetAppLocationPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import User from './User'
+import makeMutationPayload from './makeMutationPayload'
 
 export const SetAppLocationSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'SetAppLocationSuccess',
diff --git a/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts b/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts
index afe20dc6050..81381afe1bf 100644
--- a/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts
+++ b/packages/server/graphql/types/SetDefaultSlackChannelPayload.ts
@@ -1,8 +1,8 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import TeamMember from './TeamMember'
+import makeMutationPayload from './makeMutationPayload'
 
 export const SetDefaultSlackChannelSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'SetDefaultSlackChannelSuccess',
diff --git a/packages/server/graphql/types/SetPokerSpectatePayload.ts b/packages/server/graphql/types/SetPokerSpectatePayload.ts
index a296393e194..6041b4f59ba 100644
--- a/packages/server/graphql/types/SetPokerSpectatePayload.ts
+++ b/packages/server/graphql/types/SetPokerSpectatePayload.ts
@@ -4,8 +4,8 @@ import EstimateStageDB from '../../database/types/EstimateStage'
 import {GQLContext} from '../graphql'
 import {augmentDBStage} from '../resolvers'
 import EstimateStage from './EstimateStage'
-import makeMutationPayload from './makeMutationPayload'
 import PokerMeetingMember from './PokerMeetingMember'
+import makeMutationPayload from './makeMutationPayload'
 
 export const SetPokerSpectateSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'SetPokerSpectateSuccess',
diff --git a/packages/server/graphql/types/SetTaskEstimatePayload.ts b/packages/server/graphql/types/SetTaskEstimatePayload.ts
index 50bd2ca67a2..e185bb865ff 100644
--- a/packages/server/graphql/types/SetTaskEstimatePayload.ts
+++ b/packages/server/graphql/types/SetTaskEstimatePayload.ts
@@ -2,8 +2,8 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import resolveStage from '../resolvers/resolveStage'
 import EstimateStage from './EstimateStage'
-import makeMutationPayload from './makeMutationPayload'
 import Task from './Task'
+import makeMutationPayload from './makeMutationPayload'
 
 export const SetTaskEstimateSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'SetTaskEstimateSuccess',
diff --git a/packages/server/graphql/types/SetTaskHighlightPayload.ts b/packages/server/graphql/types/SetTaskHighlightPayload.ts
index 73f657141ef..27e1ed7f8b3 100644
--- a/packages/server/graphql/types/SetTaskHighlightPayload.ts
+++ b/packages/server/graphql/types/SetTaskHighlightPayload.ts
@@ -1,8 +1,8 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
 import {resolveTask} from '../resolvers'
-import makeMutationPayload from './makeMutationPayload'
 import Task from './Task'
+import makeMutationPayload from './makeMutationPayload'
 
 export const SetTaskHighlightSuccess = new GraphQLObjectType<
   {taskId: string; meetingId: string},
diff --git a/packages/server/graphql/types/StartSprintPokerPayload.ts b/packages/server/graphql/types/StartSprintPokerPayload.ts
index 0c19e1aa4eb..9a8cd9911ab 100644
--- a/packages/server/graphql/types/StartSprintPokerPayload.ts
+++ b/packages/server/graphql/types/StartSprintPokerPayload.ts
@@ -1,8 +1,8 @@
 import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import PokerMeeting from './PokerMeeting'
 import Team from './Team'
+import makeMutationPayload from './makeMutationPayload'
 
 export const StartSprintPokerSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'StartSprintPokerSuccess',
diff --git a/packages/server/graphql/types/TeamMeetingSettings.ts b/packages/server/graphql/types/TeamMeetingSettings.ts
index 326e43b1f37..963babf8df2 100644
--- a/packages/server/graphql/types/TeamMeetingSettings.ts
+++ b/packages/server/graphql/types/TeamMeetingSettings.ts
@@ -1,6 +1,8 @@
 import {GraphQLID, GraphQLInterfaceType, GraphQLList, GraphQLNonNull} from 'graphql'
-import {MeetingTypeEnum as TMeetingTypeEnum} from '../../postgres/types/Meeting'
 import {NewMeetingPhaseTypeEnum as TNewMeetingPhaseTypeEnum} from '../../database/types/GenericMeetingPhase'
+import {MeetingTypeEnum as TMeetingTypeEnum} from '../../postgres/types/Meeting'
+import isPhaseAvailable from '../../utils/isPhaseAvailable'
+import {GQLContext} from '../graphql'
 import {resolveTeam} from '../resolvers'
 import ActionMeetingSettings from './ActionMeetingSettings'
 import MeetingTypeEnum from './MeetingTypeEnum'
@@ -9,8 +11,6 @@ import PokerMeetingSettings from './PokerMeetingSettings'
 import RetrospectiveMeetingSettings from './RetrospectiveMeetingSettings'
 import Team from './Team'
 import TeamPromptMeetingSettings from './TeamPromptMeetingSettings'
-import isPhaseAvailable from '../../utils/isPhaseAvailable'
-import {GQLContext} from '../graphql'
 import {getFeatureTier} from './helpers/getFeatureTier'
 
 export const teamMeetingSettingsFields = () => ({
diff --git a/packages/server/graphql/types/TeamMemberIntegrations.ts b/packages/server/graphql/types/TeamMemberIntegrations.ts
index ed712fe3983..a6ed6a58348 100644
--- a/packages/server/graphql/types/TeamMemberIntegrations.ts
+++ b/packages/server/graphql/types/TeamMemberIntegrations.ts
@@ -7,8 +7,8 @@ import AzureDevOpsIntegration from './AzureDevOpsIntegration'
 import GitHubIntegration from './GitHubIntegration'
 import GitLabIntegration from './GitLabIntegration'
 import JiraServerIntegration from './JiraServerIntegration'
-import MattermostIntegration from './MattermostIntegration'
 import MSTeamsIntegration from './MSTeamsIntegration'
+import MattermostIntegration from './MattermostIntegration'
 import SlackIntegration from './SlackIntegration'
 
 const TeamMemberIntegrations = new GraphQLObjectType<{teamId: string; userId: string}, GQLContext>({
diff --git a/packages/server/graphql/types/ToggleTeamDrawerPayload.ts b/packages/server/graphql/types/ToggleTeamDrawerPayload.ts
index b048ff54829..5ce7e4940c9 100644
--- a/packages/server/graphql/types/ToggleTeamDrawerPayload.ts
+++ b/packages/server/graphql/types/ToggleTeamDrawerPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import TeamMember from './TeamMember'
+import makeMutationPayload from './makeMutationPayload'
 
 export const ToggleTeamDrawerSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'ToggleTeamDrawerSuccess',
diff --git a/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts b/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts
index 5f639625d4a..76631ea867a 100644
--- a/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts
+++ b/packages/server/graphql/types/UpdateAzureDevOpsDimensionFieldPayload.ts
@@ -1,8 +1,8 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import PokerMeeting from './PokerMeeting'
 import Team from './Team'
+import makeMutationPayload from './makeMutationPayload'
 
 export const UpdateAzureDevOpsDimensionFieldSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'UpdateAzureDevOpsDimensionFieldSuccess',
diff --git a/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts b/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts
index 6d878db5465..3026990f945 100644
--- a/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts
+++ b/packages/server/graphql/types/UpdateGitHubDimensionFieldPayload.ts
@@ -1,8 +1,8 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import PokerMeeting from './PokerMeeting'
 import Team from './Team'
+import makeMutationPayload from './makeMutationPayload'
 export const UpdateGitHubDimensionFieldSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'UpdateGitHubDimensionFieldSuccess',
   fields: () => ({
diff --git a/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts b/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts
index a09b6f05f6d..e64dd289b7b 100644
--- a/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts
+++ b/packages/server/graphql/types/UpdateIntegrationProviderPayload.ts
@@ -2,9 +2,9 @@ import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId'
 import {GQLContext} from '../graphql'
 import IntegrationProvider from './IntegrationProvider'
-import makeMutationPayload from './makeMutationPayload'
 import TeamMember from './TeamMember'
 import User from './User'
+import makeMutationPayload from './makeMutationPayload'
 
 export const UpdateIntegrationProviderSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'UpdateIntegrationProviderSuccess',
diff --git a/packages/server/graphql/types/UpdatePokerScopePayload.ts b/packages/server/graphql/types/UpdatePokerScopePayload.ts
index e4cebcc9f35..9c438469d94 100644
--- a/packages/server/graphql/types/UpdatePokerScopePayload.ts
+++ b/packages/server/graphql/types/UpdatePokerScopePayload.ts
@@ -3,8 +3,8 @@ import getPhase from '../../utils/getPhase'
 import {GQLContext} from '../graphql'
 import {resolveGQLStagesFromPhase} from '../resolvers'
 import EstimateStage from './EstimateStage'
-import makeMutationPayload from './makeMutationPayload'
 import PokerMeeting from './PokerMeeting'
+import makeMutationPayload from './makeMutationPayload'
 
 export const UpdatePokerScopeSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'UpdatePokerScopeSuccess',
diff --git a/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts b/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts
index b5a55d27b1b..28b4c01bcf7 100644
--- a/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts
+++ b/packages/server/graphql/types/UpdateRetroMaxVotesPayload.ts
@@ -1,7 +1,7 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import RetrospectiveMeeting from './RetrospectiveMeeting'
+import makeMutationPayload from './makeMutationPayload'
 
 export const UpdateRetroMaxVotesSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'UpdateRetroMaxVotesSuccess',
diff --git a/packages/server/graphql/types/UpdateTemplateScopePayload.ts b/packages/server/graphql/types/UpdateTemplateScopePayload.ts
index 7ce8af9808d..3ecee75c24f 100644
--- a/packages/server/graphql/types/UpdateTemplateScopePayload.ts
+++ b/packages/server/graphql/types/UpdateTemplateScopePayload.ts
@@ -1,9 +1,9 @@
 import {GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {MeetingTypeEnum} from '../../postgres/types/Meeting'
 import {GQLContext} from '../graphql'
-import makeMutationPayload from './makeMutationPayload'
 import MeetingTemplate from './MeetingTemplate'
 import TeamMeetingSettings from './TeamMeetingSettings'
+import makeMutationPayload from './makeMutationPayload'
 
 export const UpdateTemplateScopeSuccess = new GraphQLObjectType<any, GQLContext>({
   name: 'UpdateTemplateScopeSuccess',
diff --git a/packages/server/graphql/types/User.ts b/packages/server/graphql/types/User.ts
index 2a3a679dc85..623d77917d8 100644
--- a/packages/server/graphql/types/User.ts
+++ b/packages/server/graphql/types/User.ts
@@ -16,11 +16,13 @@ import {
 } from '../../../client/utils/constants'
 import groupReflections from '../../../client/utils/smartGroup/groupReflections'
 import getRethink from '../../database/rethinkDriver'
+import {RDatum} from '../../database/stricterR'
 import MeetingMemberType from '../../database/types/MeetingMember'
 import OrganizationType from '../../database/types/Organization'
 import OrganizationUserType from '../../database/types/OrganizationUser'
 import Reflection from '../../database/types/Reflection'
 import SuggestedActionType from '../../database/types/SuggestedAction'
+import TimelineEvent from '../../database/types/TimelineEvent'
 import {getUserId, isSuperUser, isTeamMember} from '../../utils/authorization'
 import getMonthlyStreak from '../../utils/getMonthlyStreak'
 import getRedis from '../../utils/getRedis'
@@ -46,8 +48,6 @@ import TeamInvitationPayload from './TeamInvitationPayload'
 import TeamMember from './TeamMember'
 import {TimelineEventConnection} from './TimelineEvent'
 import TimelineEventTypeEnum from './TimelineEventTypeEnum'
-import TimelineEvent from '../../database/types/TimelineEvent'
-import {RDatum} from '../../database/stricterR'
 
 const User: GraphQLObjectType<any, GQLContext> = new GraphQLObjectType<any, GQLContext>({
   name: 'User',
diff --git a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
index 479bc9304f6..152c5c99793 100644
--- a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
+++ b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
@@ -4,7 +4,7 @@ import * as crypto from 'crypto'
 import * as _stringify from 'fast-json-stable-stringify'
 import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate'
 import {Client} from 'pg'
-import {r, RValue} from 'rethinkdb-ts'
+import {RValue, r} from 'rethinkdb-ts'
 import {parse} from 'url'
 import MeetingPoker from '../../database/types/MeetingPoker'
 import TemplateDimension from '../../database/types/TemplateDimension'
diff --git a/packages/server/postgres/migrations/1614361628531_github-auth.ts b/packages/server/postgres/migrations/1614361628531_github-auth.ts
index 96a109cdcbe..fb3a8d92bf8 100644
--- a/packages/server/postgres/migrations/1614361628531_github-auth.ts
+++ b/packages/server/postgres/migrations/1614361628531_github-auth.ts
@@ -1,6 +1,6 @@
 import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate'
 import {Client} from 'pg'
-import {r, RValue} from 'rethinkdb-ts'
+import {RValue, r} from 'rethinkdb-ts'
 import {parse} from 'url'
 import {insertGitHubAuthsQuery} from '../generatedMigrationHelpers'
 import getPgConfig from '../getPgConfig'
diff --git a/packages/server/postgres/migrations/1623102903842_discuss.ts b/packages/server/postgres/migrations/1623102903842_discuss.ts
index 2cb0f8a59a9..2e663ce7050 100644
--- a/packages/server/postgres/migrations/1623102903842_discuss.ts
+++ b/packages/server/postgres/migrations/1623102903842_discuss.ts
@@ -1,6 +1,6 @@
 import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate'
 import {Client} from 'pg'
-import {r, RValue} from 'rethinkdb-ts'
+import {RValue, r} from 'rethinkdb-ts'
 import AgendaItemsPhase from '../../database/types/AgendaItemsPhase'
 import DiscussPhase from '../../database/types/DiscussPhase'
 import EstimatePhase from '../../database/types/EstimatePhase'
diff --git a/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts b/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts
index 2d70065fadf..d4e12dfbbbd 100644
--- a/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts
+++ b/packages/server/postgres/migrations/1625576993065_addAtlassianAuthTable.ts
@@ -2,11 +2,11 @@ import {ColumnDefinitions, MigrationBuilder} from 'node-pg-migrate'
 import AtlassianManager from 'parabol-client/utils/AtlassianManager'
 import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
+import connectRethinkDB from '../../database/connectRethinkDB'
 import {RDatum} from '../../database/stricterR'
 import {insertAtlassianAuthsQuery} from '../generatedMigrationHelpers'
 import getPgConfig from '../getPgConfig'
 export const shorthands: ColumnDefinitions | undefined = undefined
-import connectRethinkDB from '../../database/connectRethinkDB'
 
 export async function up(): Promise<void> {
   await connectRethinkDB()
diff --git a/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts b/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts
index 41ad65cff1d..d78210e62d2 100644
--- a/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts
+++ b/packages/server/postgres/migrations/1631553388387_add-template-teams-users.ts
@@ -1,8 +1,8 @@
 import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
+import connectRethinkDB from '../../database/connectRethinkDB'
 import {backupTeamQuery, backupUserQuery} from '../generatedMigrationHelpers'
 import getPgConfig from '../getPgConfig'
-import connectRethinkDB from '../../database/connectRethinkDB'
 
 export async function up() {
   const client = new Client(getPgConfig())
diff --git a/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts b/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts
index d6828a919e4..8d743e126e2 100644
--- a/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts
+++ b/packages/server/postgres/migrations/1640229261909_mattermostToIntegrationsTables.ts
@@ -1,7 +1,7 @@
 import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
-import getPgConfig from '../getPgConfig'
 import connectRethinkDB from '../../database/connectRethinkDB'
+import getPgConfig from '../getPgConfig'
 
 interface MattermostAuth {
   createdAt: Date
diff --git a/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts b/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts
index b39b2f71638..a22e396cd5e 100644
--- a/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts
+++ b/packages/server/postgres/migrations/1654861495450_migrateSecureDomain.ts
@@ -1,7 +1,7 @@
 import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
-import getPgConfig from '../getPgConfig'
 import connectRethinkDB from '../../database/connectRethinkDB'
+import getPgConfig from '../getPgConfig'
 
 export async function up() {
   await connectRethinkDB()
diff --git a/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts b/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts
index cb7d4f6ea98..c6d6b709fff 100644
--- a/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts
+++ b/packages/server/postgres/migrations/1677272969994_meetingTemplatesMove.ts
@@ -1,8 +1,8 @@
 import {FirstParam} from 'parabol-client/types/generics'
 import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
-import getPgConfig from '../getPgConfig'
 import connectRethinkDB from '../../database/connectRethinkDB'
+import getPgConfig from '../getPgConfig'
 import getPgp from '../getPgp'
 
 export async function up() {
diff --git a/packages/server/postgres/migrations/1694191002164_migrateSAML.ts b/packages/server/postgres/migrations/1694191002164_migrateSAML.ts
index 1b2a41bfbc1..1bf2899fc13 100644
--- a/packages/server/postgres/migrations/1694191002164_migrateSAML.ts
+++ b/packages/server/postgres/migrations/1694191002164_migrateSAML.ts
@@ -1,6 +1,6 @@
 import {Kysely, PostgresDialect, sql} from 'kysely'
 import {Client} from 'pg'
-import {r, RDatum} from 'rethinkdb-ts'
+import {RDatum, r} from 'rethinkdb-ts'
 import getPg from '../getPg'
 import getPgConfig from '../getPgConfig'
 
diff --git a/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts b/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts
index 8fda8802b09..cb46398628f 100644
--- a/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts
+++ b/packages/server/postgres/migrations/1695293482618_addFreemailDomain.ts
@@ -1,5 +1,5 @@
-import {Client} from 'pg'
 import {Kysely, PostgresDialect, sql} from 'kysely'
+import {Client} from 'pg'
 import getPg from '../getPg'
 import getPgConfig from '../getPgConfig'
 
diff --git a/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts b/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts
index 1a1c6950d64..c46bc4b045a 100644
--- a/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts
+++ b/packages/server/postgres/migrations/1709927835000_moveScheduledJob.ts
@@ -1,8 +1,8 @@
 import {FirstParam} from 'parabol-client/types/generics'
 import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
-import getPgConfig from '../getPgConfig'
 import connectRethinkDB from '../../database/connectRethinkDB'
+import getPgConfig from '../getPgConfig'
 import getPgp from '../getPgp'
 
 export async function up() {
diff --git a/packages/server/postgres/queries/updateUserTiers.ts b/packages/server/postgres/queries/updateUserTiers.ts
index 24569381868..ec9961dad57 100644
--- a/packages/server/postgres/queries/updateUserTiers.ts
+++ b/packages/server/postgres/queries/updateUserTiers.ts
@@ -1,5 +1,5 @@
-import catchAndLog from '../utils/catchAndLog'
 import getPg from '../getPg'
+import catchAndLog from '../utils/catchAndLog'
 import {IUpdateUserTiersQueryParams, updateUserTiersQuery} from './generated/updateUserTiersQuery'
 
 const updateUserTiers = async ({users}: IUpdateUserTiersQueryParams) => {
diff --git a/packages/server/socketHelpers/sendEncodedMessage.ts b/packages/server/socketHelpers/sendEncodedMessage.ts
index 3b86b24e1a0..559b44eceea 100644
--- a/packages/server/socketHelpers/sendEncodedMessage.ts
+++ b/packages/server/socketHelpers/sendEncodedMessage.ts
@@ -36,4 +36,4 @@ const sendEncodedMessage = (context: ConnectionContext, object: any, syn = false
   }
 }
 
-export {sendEncodedMessage, sendAndPushToReliableQueue}
+export {sendAndPushToReliableQueue, sendEncodedMessage}
diff --git a/packages/server/utils/AtlassianServerManager.ts b/packages/server/utils/AtlassianServerManager.ts
index 2cd82d3e8e4..d9d1e8e9708 100644
--- a/packages/server/utils/AtlassianServerManager.ts
+++ b/packages/server/utils/AtlassianServerManager.ts
@@ -1,16 +1,16 @@
+import JiraIssueId from 'parabol-client/shared/gqlIds/JiraIssueId'
+import JiraProjectKeyId from 'parabol-client/shared/gqlIds/JiraProjectKeyId'
+import {SprintPokerDefaults} from 'parabol-client/types/constEnums'
 import AtlassianManager, {
   AtlassianError,
   RateLimitError
 } from 'parabol-client/utils/AtlassianManager'
-import JiraIssueId from 'parabol-client/shared/gqlIds/JiraIssueId'
 import composeJQL from 'parabol-client/utils/composeJQL'
-import JiraProjectKeyId from 'parabol-client/shared/gqlIds/JiraProjectKeyId'
-import {SprintPokerDefaults} from 'parabol-client/types/constEnums'
-import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2'
 import {
   OAuth2AuthorizationParams,
   OAuth2RefreshAuthorizationParams
 } from '../integrations/OAuth2Manager'
+import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2'
 import {Logger} from './Logger'
 
 export interface JiraUser {
diff --git a/packages/server/utils/AzureDevOpsServerManager.ts b/packages/server/utils/AzureDevOpsServerManager.ts
index ba3cf7f04f3..419b19df360 100644
--- a/packages/server/utils/AzureDevOpsServerManager.ts
+++ b/packages/server/utils/AzureDevOpsServerManager.ts
@@ -6,7 +6,6 @@ import {isError} from 'util'
 import {ExternalLinks} from '~/types/constEnums'
 import AzureDevOpsProjectId from '../../client/shared/gqlIds/AzureDevOpsProjectId'
 import appOrigin from '../appOrigin'
-import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2'
 import {
   OAuth2PkceAuthorizationParams,
   OAuth2PkceRefreshAuthorizationParams
@@ -15,6 +14,7 @@ import {
   CreateTaskResponse,
   TaskIntegrationManager
 } from '../integrations/TaskIntegrationManagerFactory'
+import {authorizeOAuth2} from '../integrations/helpers/authorizeOAuth2'
 import {IGetTeamMemberIntegrationAuthQueryResult} from '../postgres/queries/generated/getTeamMemberIntegrationAuthQuery'
 import {IntegrationProviderAzureDevOps} from '../postgres/queries/getIntegrationProvidersByIds'
 import makeCreateAzureTaskComment from './makeCreateAzureTaskComment'
diff --git a/packages/server/utils/OpenAIServerManager.ts b/packages/server/utils/OpenAIServerManager.ts
index 251528770e2..6356c486e6f 100644
--- a/packages/server/utils/OpenAIServerManager.ts
+++ b/packages/server/utils/OpenAIServerManager.ts
@@ -1,9 +1,9 @@
-import OpenAI from 'openai'
 import JSON5 from 'json5'
-import sendToSentry from './sendToSentry'
+import OpenAI from 'openai'
 import Reflection from '../database/types/Reflection'
 import {ModifyType} from '../graphql/public/resolverTypes'
 import {Logger} from './Logger'
+import sendToSentry from './sendToSentry'
 
 type Prompt = {
   question: string
diff --git a/packages/server/utils/PubSubPromise.ts b/packages/server/utils/PubSubPromise.ts
index 912b882fbb2..8768ef1eb9d 100644
--- a/packages/server/utils/PubSubPromise.ts
+++ b/packages/server/utils/PubSubPromise.ts
@@ -1,7 +1,7 @@
 import ms from 'ms'
 import GQLExecutorChannelId from '../../client/shared/gqlIds/GQLExecutorChannelId'
-import numToBase64 from './numToBase64'
 import RedisInstance from './RedisInstance'
+import numToBase64 from './numToBase64'
 import sendToSentry from './sendToSentry'
 
 const STANDARD_TIMEOUT = ms('10s')
diff --git a/packages/server/utils/RecallAIServerManager.ts b/packages/server/utils/RecallAIServerManager.ts
index c5dc8e7f781..920337d662e 100644
--- a/packages/server/utils/RecallAIServerManager.ts
+++ b/packages/server/utils/RecallAIServerManager.ts
@@ -3,8 +3,8 @@ import axios from 'axios'
 import {ExternalLinks} from '../../client/types/constEnums'
 import appOrigin from '../appOrigin'
 import {TranscriptBlock} from '../database/types/MeetingRetrospective'
-import sendToSentry from './sendToSentry'
 import {Logger} from './Logger'
+import sendToSentry from './sendToSentry'
 
 const sdk = api('@recallai/v1.6#536jnqlf7d6blh')
 
diff --git a/packages/server/utils/StaticServer.ts b/packages/server/utils/StaticServer.ts
index 2ba0fd3b3b6..9061cf63477 100644
--- a/packages/server/utils/StaticServer.ts
+++ b/packages/server/utils/StaticServer.ts
@@ -2,8 +2,8 @@ import fs from 'fs'
 import mime from 'mime-types'
 import path from 'path'
 import {brotliCompressSync} from 'zlib'
-import isCompressible from './isCompressible'
 import {Logger} from './Logger'
+import isCompressible from './isCompressible'
 class StaticFileMeta {
   mtime: string
   size: number
diff --git a/packages/server/utils/__tests__/RedisLockQueue.test.ts b/packages/server/utils/__tests__/RedisLockQueue.test.ts
index 2783e1b207d..bde386f290c 100644
--- a/packages/server/utils/__tests__/RedisLockQueue.test.ts
+++ b/packages/server/utils/__tests__/RedisLockQueue.test.ts
@@ -1,7 +1,7 @@
 /* eslint-env jest */
-import getRedis from '../getRedis'
-import RedisLockQueue from '../RedisLockQueue'
 import sleep from 'parabol-client/utils/sleep'
+import RedisLockQueue from '../RedisLockQueue'
+import getRedis from '../getRedis'
 
 afterAll(async () => {
   getRedis().quit()
diff --git a/packages/server/utils/authorization.ts b/packages/server/utils/authorization.ts
index dd873e6c885..bcfb150ce19 100644
--- a/packages/server/utils/authorization.ts
+++ b/packages/server/utils/authorization.ts
@@ -1,10 +1,9 @@
 import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
 import getRethink from '../database/rethinkDriver'
+import {RDatum} from '../database/stricterR'
 import AuthToken from '../database/types/AuthToken'
-import OrganizationUser from '../database/types/OrganizationUser'
+import OrganizationUser, {OrgUserRole} from '../database/types/OrganizationUser'
 import {DataLoaderWorker} from '../graphql/graphql'
-import {RDatum} from '../database/stricterR'
-import {OrgUserRole} from '../database/types/OrganizationUser'
 
 export const getUserId = (authToken: any) => {
   return authToken && typeof authToken === 'object' ? (authToken.sub as string) : ''
diff --git a/packages/server/utils/getGraphQLExecutor.ts b/packages/server/utils/getGraphQLExecutor.ts
index 759f21bade2..3c40d66cbd8 100644
--- a/packages/server/utils/getGraphQLExecutor.ts
+++ b/packages/server/utils/getGraphQLExecutor.ts
@@ -1,7 +1,7 @@
 import {ExecutionResult} from 'graphql'
 import {ServerChannel} from 'parabol-client/types/constEnums'
-import type {GQLRequest} from '../types/custom'
 import SocketServerChannelId from '../../client/shared/gqlIds/SocketServerChannelId'
+import type {GQLRequest} from '../types/custom'
 import PubSubPromise from './PubSubPromise'
 
 let pubsub: PubSubPromise<GQLRequest & {executorServerId?: string}, ExecutionResult>
diff --git a/packages/server/utils/getPhase.ts b/packages/server/utils/getPhase.ts
index bf84ce59fe7..94a825bac70 100644
--- a/packages/server/utils/getPhase.ts
+++ b/packages/server/utils/getPhase.ts
@@ -4,9 +4,9 @@ import DiscussPhase from '../database/types/DiscussPhase'
 import EstimatePhase from '../database/types/EstimatePhase'
 import GenericMeetingPhase from '../database/types/GenericMeetingPhase'
 import ReflectPhase from '../database/types/ReflectPhase'
+import TeamHealthPhase from '../database/types/TeamHealthPhase'
 import TeamPromptResponsesPhase from '../database/types/TeamPromptResponsesPhase'
 import UpdatesPhase from '../database/types/UpdatesPhase'
-import TeamHealthPhase from '../database/types/TeamHealthPhase'
 
 interface PhaseTypeLookup {
   agendaitems: AgendaItemsPhase
diff --git a/packages/server/utils/isPhaseAvailable.ts b/packages/server/utils/isPhaseAvailable.ts
index 9f5ff95cd89..dd81f068140 100644
--- a/packages/server/utils/isPhaseAvailable.ts
+++ b/packages/server/utils/isPhaseAvailable.ts
@@ -1,6 +1,6 @@
-import {TierEnum} from '../database/types/Invoice'
-import {NewMeetingPhaseTypeEnum} from '../database/types/GenericMeetingPhase'
 import isTeamHealthAvailable from 'parabol-client/utils/features/isTeamHealthAvailable'
+import {NewMeetingPhaseTypeEnum} from '../database/types/GenericMeetingPhase'
+import {TierEnum} from '../database/types/Invoice'
 
 const isPhaseAvailable = (tier: TierEnum) => (phaseType: NewMeetingPhaseTypeEnum) => {
   if (phaseType === 'TEAM_HEALTH') {
diff --git a/packages/server/utils/isRequestToJoinDomainAllowed.ts b/packages/server/utils/isRequestToJoinDomainAllowed.ts
index 1252dba7cf1..7fef1c6cbe1 100644
--- a/packages/server/utils/isRequestToJoinDomainAllowed.ts
+++ b/packages/server/utils/isRequestToJoinDomainAllowed.ts
@@ -1,11 +1,11 @@
 import getRethink from '../database/rethinkDriver'
 import {RDatum} from '../database/stricterR'
-import isUserVerified from './isUserVerified'
+import Organization from '../database/types/Organization'
+import TeamMember from '../database/types/TeamMember'
 import User from '../database/types/User'
 import {DataLoaderWorker} from '../graphql/graphql'
 import isValid from '../graphql/isValid'
-import TeamMember from '../database/types/TeamMember'
-import Organization from '../database/types/Organization'
+import isUserVerified from './isUserVerified'
 
 export const getEligibleOrgIdsByDomain = async (
   activeDomain: string,
diff --git a/packages/server/utils/sendPromptToJoinOrg.ts b/packages/server/utils/sendPromptToJoinOrg.ts
index c871808e5f9..1c8422dc79c 100644
--- a/packages/server/utils/sendPromptToJoinOrg.ts
+++ b/packages/server/utils/sendPromptToJoinOrg.ts
@@ -1,9 +1,9 @@
 import getRethink from '../database/rethinkDriver'
 import NotificationPromptToJoinOrg from '../database/types/NotificationPromptToJoinOrg'
-import isRequestToJoinDomainAllowed from './isRequestToJoinDomainAllowed'
-import getDomainFromEmail from './getDomainFromEmail'
 import User from '../database/types/User'
 import {DataLoaderWorker} from '../graphql/graphql'
+import getDomainFromEmail from './getDomainFromEmail'
+import isRequestToJoinDomainAllowed from './isRequestToJoinDomainAllowed'
 
 const sendPromptToJoinOrg = async (newUser: User, dataLoader: DataLoaderWorker) => {
   const {id: userId, email} = newUser
diff --git a/packages/server/utils/serverHealthChecker.ts b/packages/server/utils/serverHealthChecker.ts
index 35d3539a46f..6b5ad020530 100644
--- a/packages/server/utils/serverHealthChecker.ts
+++ b/packages/server/utils/serverHealthChecker.ts
@@ -2,9 +2,9 @@ import sleep from '../../client/utils/sleep'
 import ServerAuthToken from '../database/types/ServerAuthToken'
 import {UserPresence} from '../graphql/private/mutations/connectSocket'
 import {disconnectQuery} from '../socketHandlers/handleDisconnect'
+import RedisInstance from './RedisInstance'
 import publishInternalGQL from './publishInternalGQL'
 import sendToSentry from './sendToSentry'
-import RedisInstance from './RedisInstance'
 
 const SERVER_ID = process.env.SERVER_ID!
 const INSTANCE_ID = `${SERVER_ID}:${process.pid}`
diff --git a/packages/server/utils/updateGQLSchema.ts b/packages/server/utils/updateGQLSchema.ts
index 32234ba4172..1a550e836a1 100644
--- a/packages/server/utils/updateGQLSchema.ts
+++ b/packages/server/utils/updateGQLSchema.ts
@@ -8,9 +8,9 @@ import fs from 'fs'
 import {printSchema} from 'graphql'
 import path from 'path'
 import {promisify} from 'util'
+import getProjectRoot from '../../../scripts/webpack/utils/getProjectRoot'
 import privateSchema from '../graphql/private/rootSchema'
 import publicSchema from '../graphql/public/rootSchema'
-import getProjectRoot from '../../../scripts/webpack/utils/getProjectRoot'
 
 const writeIfChanged = async (dataPath: string, data: string) => {
   const write = promisify(fs.writeFile)

From c2a3a4300c94da8c3dcf5edc33c2e2b38df8686f Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 11 Apr 2024 15:16:34 -0700
Subject: [PATCH 156/183] fix: vuln patch for undici (#9622)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 package.json                 |    2 +-
 packages/client/package.json |    3 +-
 packages/server/package.json |    2 +-
 yarn.lock                    | 2478 +++++++++++++++++++++-------------
 4 files changed, 1533 insertions(+), 952 deletions(-)

diff --git a/package.json b/package.json
index 37d92af280a..471e95bab51 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "7.18.6",
-    "@datadog/datadog-ci": "^2.22.1",
+    "@datadog/datadog-ci": "^2.33.0",
     "@graphql-codegen/add": "^5.0.0",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
diff --git a/packages/client/package.json b/packages/client/package.json
index 226c62bc03d..ca41b519eb1 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -58,7 +58,7 @@
     "react-refresh": "^0.9.0",
     "strict-event-emitter-types": "^2.0.0",
     "typescript": "^5.3.3",
-    "webpack-dev-server": "^4.15.1"
+    "webpack-dev-server": "^5.0.4"
   },
   "dependencies": {
     "@amplitude/analytics-browser": "^2.2.3",
@@ -136,7 +136,6 @@
     "react-textarea-autosize": "^7.1.0",
     "react-transition-group": "^4.3.0",
     "react-virtualized": "^9.21.1",
-    "regenerator-runtime": "^0.13.5",
     "relay-runtime": "^14.1.0",
     "resize-observer-polyfill": "^1.5.0",
     "rrule": "^2.7.2",
diff --git a/packages/server/package.json b/packages/server/package.json
index 381576fe390..f23c2b6baca 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -133,6 +133,6 @@
     "stripe": "^9.13.0",
     "tslib": "^2.4.0",
     "uWebSockets.js": "uNetworking/uWebSockets.js#v20.34.0",
-    "undici": "^5.28.3"
+    "undici": "^5.28.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c01d5591da9..19cdfead7f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -237,185 +237,199 @@
     "@aws-sdk/util-utf8-browser" "^3.0.0"
     tslib "^1.11.1"
 
-"@aws-sdk/client-cloudwatch-logs@^3.427.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.433.0.tgz#eea311048050ade56292dbf9533ede7bbb9e90be"
-  integrity sha512-AeByrfKS1KQcFmCbP6FIsTGue7xAmxuJ+uvdjc1S6MEdcR6VfJEWIqxpUHDnwgroHJN1K4MG4ZUUWMZwXgNfOw==
+"@aws-sdk/client-cloudwatch-logs@^3.537.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cloudwatch-logs/-/client-cloudwatch-logs-3.552.0.tgz#3289fd1ec3dd5fa76c8cb64cf1a9973aa5f44653"
+  integrity sha512-ITJZmQkdpGLaE6o3FmP8WryOcBUxT7uAaAcNTr8G+bUMuEVeWqdwQ2YtnDa/h0BibMELacM50Cv8/FDmSPcp2A==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.433.0"
-    "@aws-sdk/credential-provider-node" "3.433.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-signing" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/region-config-resolver" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-    uuid "^8.3.2"
-
-"@aws-sdk/client-cognito-identity@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.433.0.tgz#7113541599e7c3eac59500c0d7f65f091a3080c3"
-  integrity sha512-42znkBhcLweedtcp+k0Vz4As9FavThrYYGtvuleW82GQqtwyOXSifinXw7xfY2JngqCuCEenFQPsf1hudOWzyw==
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/credential-provider-node" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/eventstream-serde-browser" "^2.2.0"
+    "@smithy/eventstream-serde-config-resolver" "^2.2.0"
+    "@smithy/eventstream-serde-node" "^2.2.0"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+    uuid "^9.0.1"
+
+"@aws-sdk/client-cognito-identity@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.552.0.tgz#40825b0f84f27c8d5c2fb3dea72bca96023a7bf4"
+  integrity sha512-lNmgK68V7g0PhKT68IZi5EA7IUphonKDwn97GZVb6B4nfeE0pBT24di+jZzDt04EeuegZaj584sMkGHNk/4Wng==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.433.0"
-    "@aws-sdk/credential-provider-node" "3.433.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-signing" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/region-config-resolver" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@aws-sdk/client-iam@^3.427.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-iam/-/client-iam-3.433.0.tgz#a39d1cea7753d30f76ede48eb04b99d073529bc9"
-  integrity sha512-QDRqWCmIQYrIqU+AcdAeH3V028JgqIW/PUcHE1CRn29rKamo9ArdlQOB6YsH2++qDTShu7MTStYRvSRORLMlQA==
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/credential-provider-node" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/client-iam@^3.535.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-iam/-/client-iam-3.552.0.tgz#36babf847a36aced8e52399d7e6fd27a25ae5c6f"
+  integrity sha512-lRebSkFznHPq3LclO9cI4trWAfDQOMFglz8kUQgYQS7eafVXKvOSCPdht6QY5o6L1KkU7MlNaN6tS6yoNlk5gQ==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.433.0"
-    "@aws-sdk/credential-provider-node" "3.433.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-signing" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/region-config-resolver" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-utf8" "^2.0.0"
-    "@smithy/util-waiter" "^2.0.12"
-    fast-xml-parser "4.2.5"
-    tslib "^2.5.0"
-
-"@aws-sdk/client-lambda@^3.427.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.433.0.tgz#5d0f202033082b88fb4f3997a57160363657a689"
-  integrity sha512-nmEw1729u8O20wCh9brqQCZqHM1MfDPTWvf5z/hcSnFHSPNz0ok/KkenIxTB5dFTOVjC5OeRHbmkAFwUKoKxiw==
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/credential-provider-node" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    "@smithy/util-waiter" "^2.2.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/client-lambda@^3.536.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-lambda/-/client-lambda-3.552.0.tgz#5c0bd15fb451e64d2a11086ee6ab230d445baab9"
+  integrity sha512-M/xrWjP+URM0cLccQOtKELEmgyOT83iz3yQkfDSsxDAuh8fmifPx7DFTHrmy9FXL/GsnBWHPmoZToZsqIPN7YQ==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.433.0"
-    "@aws-sdk/credential-provider-node" "3.433.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-signing" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/region-config-resolver" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/eventstream-serde-browser" "^2.0.12"
-    "@smithy/eventstream-serde-config-resolver" "^2.0.12"
-    "@smithy/eventstream-serde-node" "^2.0.12"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-stream" "^2.0.17"
-    "@smithy/util-utf8" "^2.0.0"
-    "@smithy/util-waiter" "^2.0.12"
-    tslib "^2.5.0"
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/credential-provider-node" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/eventstream-serde-browser" "^2.2.0"
+    "@smithy/eventstream-serde-config-resolver" "^2.2.0"
+    "@smithy/eventstream-serde-node" "^2.2.0"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-stream" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    "@smithy/util-waiter" "^2.2.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/client-s3@^3.347.1":
   version "3.428.0"
@@ -478,48 +492,97 @@
     fast-xml-parser "4.2.5"
     tslib "^2.5.0"
 
-"@aws-sdk/client-sfn@^3.427.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sfn/-/client-sfn-3.433.0.tgz#2d1cf2b81200b7f81db2dff5c95edcd708436639"
-  integrity sha512-CALl71hbJMiXu94WFBPnjsbZXNcJwSx5Ho19/GqckrUIWxh4Fg2w0jPwPxq2BU12IghI4OCXY2jrYPw/nx4i0g==
+"@aws-sdk/client-sfn@^3.535.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sfn/-/client-sfn-3.552.0.tgz#a27c7ce1f51834f17ee75e9847ac61fe0d040159"
+  integrity sha512-7+kyeBhwE9efZEDbPNTFPok5WFVMHQcyoTR1bV+cTpEJQJtjE1zwuCTtJpHMpLHrDf007Fzdnv4CF/9OrxxEbQ==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.433.0"
-    "@aws-sdk/credential-provider-node" "3.433.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-signing" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/region-config-resolver" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/credential-provider-node" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+    uuid "^9.0.1"
+
+"@aws-sdk/client-sso-oidc@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.552.0.tgz#3215792bbce40a4373d6fca711e4b58fbf794284"
+  integrity sha512-6JYTgN/n4xTm3Z+JhEZq06pyYsgo7heYDmR+0smmauQS02Eu8lvUc2jPs/0GDAmty7J4tq3gS6TRwvf7181C2w==
+  dependencies:
+    "@aws-crypto/sha256-browser" "3.0.0"
+    "@aws-crypto/sha256-js" "3.0.0"
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/client-sso@3.428.0":
   version "3.428.0"
@@ -561,45 +624,49 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
-"@aws-sdk/client-sso@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.433.0.tgz#9d06768fab4d46efa77fa79142c173580be479e6"
-  integrity sha512-L7ksMP7UnYH+w52ly+m+s5vk8662VtyqJ+UduFEMPqKUHTFEm7w+CCw4Xfk3hl5GlVvqPvYWqBqv8eLKSHpCEQ==
+"@aws-sdk/client-sso@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.552.0.tgz#dea1533cc74e80f9bb49f8926c21912497a08616"
+  integrity sha512-IAjRj5gcuyoPe/OhciMY/UyW8C1kyXSUJFagxvbeSv8q0mEfaPBVjGgz2xSYRFhhZr3gFlGCS9SiukwOL2/VoA==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/region-config-resolver" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/client-sts@3.428.0":
   version "3.428.0"
@@ -645,60 +712,73 @@
     fast-xml-parser "4.2.5"
     tslib "^2.5.0"
 
-"@aws-sdk/client-sts@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.433.0.tgz#8155f058cd4f0259dc4377050b303b474744cd03"
-  integrity sha512-hQ+NLIcA1KRJ2qPdrtkJ3fOEVnehLLMlnB/I5mjg9K2UKjuiOufLao6tc5SyW9fseIL9AdX3fjJ8Unhg+y1RWg==
+"@aws-sdk/client-sts@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.552.0.tgz#ae6879022644348596e822e80accb468676a2005"
+  integrity sha512-rOZlAj8GyFgUBESyKezes67A8Kj5+KjRhfBHMXrkcM5h9UOIz5q7QdkSQOmzWwRoPDmmAqb6t+y041/76TnPEg==
   dependencies:
     "@aws-crypto/sha256-browser" "3.0.0"
     "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/credential-provider-node" "3.433.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-sdk-sts" "3.433.0"
-    "@aws-sdk/middleware-signing" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/region-config-resolver" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-utf8" "^2.0.0"
+    "@aws-sdk/core" "3.552.0"
+    "@aws-sdk/middleware-host-header" "3.535.0"
+    "@aws-sdk/middleware-logger" "3.535.0"
+    "@aws-sdk/middleware-recursion-detection" "3.535.0"
+    "@aws-sdk/middleware-user-agent" "3.540.0"
+    "@aws-sdk/region-config-resolver" "3.535.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@aws-sdk/util-user-agent-browser" "3.535.0"
+    "@aws-sdk/util-user-agent-node" "3.535.0"
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/core" "^1.4.2"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/hash-node" "^2.2.0"
+    "@smithy/invalid-dependency" "^2.2.0"
+    "@smithy/middleware-content-length" "^2.2.0"
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-body-length-browser" "^2.2.0"
+    "@smithy/util-body-length-node" "^2.3.0"
+    "@smithy/util-defaults-mode-browser" "^2.2.1"
+    "@smithy/util-defaults-mode-node" "^2.3.1"
+    "@smithy/util-endpoints" "^1.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/core@3.552.0", "@aws-sdk/core@^3.535.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.552.0.tgz#7f744d7cd303d1fa60006d81f75a6f999b64bfb0"
+  integrity sha512-T7ovljf6fCvIHG9SOSZqGmbVbqZPXPywLAcU+onk/fYLZJj6kjfzKZzSAUBI0nO1OKpuP/nCHaCp51NLWNqsnw==
+  dependencies:
+    "@smithy/core" "^1.4.2"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/signature-v4" "^2.2.1"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
     fast-xml-parser "4.2.5"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.433.0.tgz#4d3569be6f81ccd7f10dcfea1a6ed7af8028b342"
-  integrity sha512-zBTrVbruYkPY4/YrUNP11mHbuVwGx7lxfo/Hlul7iUFhRbVhd/Xg3EYi6fgdTojEWEhY4SltFwVFUrzVAm8V5g==
+"@aws-sdk/credential-provider-cognito-identity@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.552.0.tgz#2b56380ede0218a84d448d5de7e3da898fa8ac51"
+  integrity sha512-od45t2yc5d/vUqpWv76VgbqVc9yY5i0rKsH5U6nen6kpyZhtPlR/Q/Fwsx+TEsg8HH/GSzA4axBedL2qp8Owdg==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/client-cognito-identity" "3.552.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/credential-provider-env@3.428.0":
   version "3.428.0"
@@ -710,29 +790,30 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/credential-provider-env@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.433.0.tgz#7cceca1002ba2e79e10a9dfb119442bea7b88e7c"
-  integrity sha512-Vl7Qz5qYyxBurMn6hfSiNJeUHSqfVUlMt0C1Bds3tCkl3IzecRWwyBOlxtxO3VCrgVeW3HqswLzCvhAFzPH6nQ==
-  dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
-
-"@aws-sdk/credential-provider-http@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.433.0.tgz#2fdb52dcb9690103fc29269636745e0265ec3105"
-  integrity sha512-HA3Op+tT/EvJnRTzeURFbygNUX5wx5wlD84h4RgWpDa6x3G0lhI1wxCUR5/+qzIpF5vC7E3Q9/yu7ln07RmZlg==
-  dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+"@aws-sdk/credential-provider-env@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz#26248e263a8107953d5496cb3760d4e7c877abcf"
+  integrity sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA==
+  dependencies:
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-http@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.552.0.tgz#ecc88d02cba95621887e6b85b2583e756ad29eb6"
+  integrity sha512-vsmu7Cz1i45pFEqzVb4JcFmAmVnWFNLsGheZc8SCptlqCO5voETrZZILHYIl4cjKkSDk3pblBOf0PhyjqWW6WQ==
+  dependencies:
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-stream" "^2.2.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/credential-provider-ini@3.428.0":
   version "3.428.0"
@@ -750,21 +831,22 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/credential-provider-ini@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.433.0.tgz#2fa3da08739ab9364702fd4a54c5f50143ef0bea"
-  integrity sha512-T+YhCOORyA4+i4T86FfFCmi/jPsmLOP6GAtScHp/K8XzB9XuVvJSZ+T8SUKeW6/9G9z3Az7dqeBVLcMdC6fFDA==
-  dependencies:
-    "@aws-sdk/credential-provider-env" "3.433.0"
-    "@aws-sdk/credential-provider-process" "3.433.0"
-    "@aws-sdk/credential-provider-sso" "3.433.0"
-    "@aws-sdk/credential-provider-web-identity" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/credential-provider-imds" "^2.0.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+"@aws-sdk/credential-provider-ini@3.552.0", "@aws-sdk/credential-provider-ini@^3.535.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.552.0.tgz#436f328ea0213efe3231354248ab0d82dade4345"
+  integrity sha512-/Z9y+P4M/eZA/5hGH3Kwm6TOIAiVtsIo7sC/x7hZPXn/IMJQ2QmxzeMozVqMWzx8+2zUA/dmgmWnHoVvH4R/jg==
+  dependencies:
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/credential-provider-env" "3.535.0"
+    "@aws-sdk/credential-provider-process" "3.535.0"
+    "@aws-sdk/credential-provider-sso" "3.552.0"
+    "@aws-sdk/credential-provider-web-identity" "3.552.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/credential-provider-imds" "^2.3.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/shared-ini-file-loader" "^2.4.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/credential-provider-node@3.428.0":
   version "3.428.0"
@@ -783,22 +865,23 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/credential-provider-node@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.433.0.tgz#76bfb857b9d6339cc11223660afb2d7d925ac9da"
-  integrity sha512-uOTBJszqGJIX5SrH2YdN501cv9rW4ghuSkasxI9DL+sVV5YRMd/bwu6I3PphRyK7z4dosDEbJ1xoIuVR/W04HQ==
-  dependencies:
-    "@aws-sdk/credential-provider-env" "3.433.0"
-    "@aws-sdk/credential-provider-ini" "3.433.0"
-    "@aws-sdk/credential-provider-process" "3.433.0"
-    "@aws-sdk/credential-provider-sso" "3.433.0"
-    "@aws-sdk/credential-provider-web-identity" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/credential-provider-imds" "^2.0.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+"@aws-sdk/credential-provider-node@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.552.0.tgz#7b25882a5694f50b288b284b1885ea3e138970fa"
+  integrity sha512-GUH5awokiR4FcALeQxOrNZtDKJgzEza6NW9HYxAaHt0LNSHCjG21zMFDPYAXlDjlPP9AIdWmVvYrfJoPJI28AQ==
+  dependencies:
+    "@aws-sdk/credential-provider-env" "3.535.0"
+    "@aws-sdk/credential-provider-http" "3.552.0"
+    "@aws-sdk/credential-provider-ini" "3.552.0"
+    "@aws-sdk/credential-provider-process" "3.535.0"
+    "@aws-sdk/credential-provider-sso" "3.552.0"
+    "@aws-sdk/credential-provider-web-identity" "3.552.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/credential-provider-imds" "^2.3.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/shared-ini-file-loader" "^2.4.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/credential-provider-process@3.428.0":
   version "3.428.0"
@@ -811,16 +894,16 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/credential-provider-process@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.433.0.tgz#dd51c92480ed620e4c3f989852ee408ab1209d59"
-  integrity sha512-W7FcGlQjio9Y/PepcZGRyl5Bpwb0uWU7qIUCh+u4+q2mW4D5ZngXg8V/opL9/I/p4tUH9VXZLyLGwyBSkdhL+A==
+"@aws-sdk/credential-provider-process@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz#ea1e8a38a32e36bbdc3f75eb03352e6eafa0c659"
+  integrity sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/shared-ini-file-loader" "^2.4.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/credential-provider-sso@3.428.0":
   version "3.428.0"
@@ -835,18 +918,18 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/credential-provider-sso@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.433.0.tgz#6de1406270c74004772f6b1c738a3977f09d9860"
-  integrity sha512-vuc2X7q/1HUAO/NowfnNMpRDoHw8H2lyZZzUc0lmamy6PDrEFBi/VTm1nStGPuS9egCFrYlkRHsfp50ukYGa5w==
+"@aws-sdk/credential-provider-sso@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.552.0.tgz#dd076e6944494812b23e293ead759e859a91d70e"
+  integrity sha512-h+xyWG4HMqf4SFzilpK1u50fO2aIBRg3nwuXRy9v5E2qdpJgZS2JXibO1jNHd+JXq4qjs2YG1WK2fGcdxZJ2bQ==
   dependencies:
-    "@aws-sdk/client-sso" "3.433.0"
-    "@aws-sdk/token-providers" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/client-sso" "3.552.0"
+    "@aws-sdk/token-providers" "3.552.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/shared-ini-file-loader" "^2.4.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/credential-provider-web-identity@3.428.0":
   version "3.428.0"
@@ -858,37 +941,38 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/credential-provider-web-identity@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.433.0.tgz#32403ba9cc47d3c46500f3c8e5e0041d20e4dbe8"
-  integrity sha512-RlwjP1I5wO+aPpwyCp23Mk8nmRbRL33hqRASy73c4JA2z2YiRua+ryt6MalIxehhwQU6xvXUKulJnPG9VaMFZg==
-  dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
-
-"@aws-sdk/credential-providers@^3.427.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.433.0.tgz#7d154bd2e623fe3175001f3b7552233ff77212fa"
-  integrity sha512-GKsdnFiab+uiwUCzEZKRVa0/h2Ov/Lft/69DJQtFqkM+RHT/XXhAOA9noZmCOyta6UlRbj3P5ep28oQOTc1czw==
-  dependencies:
-    "@aws-sdk/client-cognito-identity" "3.433.0"
-    "@aws-sdk/client-sso" "3.433.0"
-    "@aws-sdk/client-sts" "3.433.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.433.0"
-    "@aws-sdk/credential-provider-env" "3.433.0"
-    "@aws-sdk/credential-provider-http" "3.433.0"
-    "@aws-sdk/credential-provider-ini" "3.433.0"
-    "@aws-sdk/credential-provider-node" "3.433.0"
-    "@aws-sdk/credential-provider-process" "3.433.0"
-    "@aws-sdk/credential-provider-sso" "3.433.0"
-    "@aws-sdk/credential-provider-web-identity" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/credential-provider-imds" "^2.0.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+"@aws-sdk/credential-provider-web-identity@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.552.0.tgz#213a8e5832a95d494b6a55ed9b1eefcc774b0cff"
+  integrity sha512-6jXfXaLKDy3S4LHR8ZXIIZw5B80uiYjnPp4bmqmY18LGeoZxmkJ/SfkwypVruezCu+GpA+IubmIbc5TQi6BCAw==
+  dependencies:
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-providers@^3.535.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.552.0.tgz#cda713016c555a87dafad8b20bb0c881b4e5469c"
+  integrity sha512-aAmxaLwv8wf06XyuMbdxrQaVYAo7oASB6TaxI3rldl3xkhLLWNuvk7IpTnrKwD5+HakGkelyy7lPHRTL/8RTCA==
+  dependencies:
+    "@aws-sdk/client-cognito-identity" "3.552.0"
+    "@aws-sdk/client-sso" "3.552.0"
+    "@aws-sdk/client-sts" "3.552.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.552.0"
+    "@aws-sdk/credential-provider-env" "3.535.0"
+    "@aws-sdk/credential-provider-http" "3.552.0"
+    "@aws-sdk/credential-provider-ini" "3.552.0"
+    "@aws-sdk/credential-provider-node" "3.552.0"
+    "@aws-sdk/credential-provider-process" "3.535.0"
+    "@aws-sdk/credential-provider-sso" "3.552.0"
+    "@aws-sdk/credential-provider-web-identity" "3.552.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/credential-provider-imds" "^2.3.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/middleware-bucket-endpoint@3.428.0":
   version "3.428.0"
@@ -937,15 +1021,15 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/middleware-host-header@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.433.0.tgz#3b6687ee4021c2b56c96cff61b45a33fb762b1c7"
-  integrity sha512-mBTq3UWv1UzeHG+OfUQ2MB/5GEkt5LTKFaUqzL7ESwzW8XtpBgXnjZvIwu3Vcd3sEetMwijwaGiJhY0ae/YyaA==
+"@aws-sdk/middleware-host-header@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz#d5264f813592f5e77df25e5a14bbb0e6441812db"
+  integrity sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/middleware-location-constraint@3.428.0":
   version "3.428.0"
@@ -965,14 +1049,14 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/middleware-logger@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.433.0.tgz#fcd4e31a8f134861cd519477b959c218a3600186"
-  integrity sha512-We346Fb5xGonTGVZC9Nvqtnqy74VJzYuTLLiuuftA5sbNzftBDy/22QCfvYSTOAl3bvif+dkDUzQY2ihc5PwOQ==
+"@aws-sdk/middleware-logger@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz#1a8ffd6c368edd6cb32e1edf7b1dced95c1820ee"
+  integrity sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/middleware-recursion-detection@3.428.0":
   version "3.428.0"
@@ -984,15 +1068,15 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/middleware-recursion-detection@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.433.0.tgz#5b4b7878ea46c70f507c9ea7c30ad0e5ee4ae6bf"
-  integrity sha512-HEvYC9PQlWY/ccUYtLvAlwwf1iCif2TSAmLNr3YTBRVa98x6jKL0hlCrHWYklFeqOGSKy6XhE+NGJMUII0/HaQ==
+"@aws-sdk/middleware-recursion-detection@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz#6aa1e1bd1e84730d58a73021b745e20d4341a92d"
+  integrity sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/middleware-sdk-s3@3.428.0":
   version "3.428.0"
@@ -1016,16 +1100,6 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/middleware-sdk-sts@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.433.0.tgz#9b30f17a922ecc5fd46b93f1edcd20d7146b814f"
-  integrity sha512-ORYbJnBejUyonFl5FwIqhvI3Cq6sAp9j+JpkKZtFNma9tFPdrhmYgfCeNH32H/wGTQV/tUoQ3luh0gA4cuk6DA==
-  dependencies:
-    "@aws-sdk/middleware-signing" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
-
 "@aws-sdk/middleware-signing@3.428.0":
   version "3.428.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.428.0.tgz#ce9f21963bac8c8bb42d84dd2901628aa661b844"
@@ -1039,19 +1113,6 @@
     "@smithy/util-middleware" "^2.0.4"
     tslib "^2.5.0"
 
-"@aws-sdk/middleware-signing@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.433.0.tgz#670557ace5b97729dbabb6a991815e44eb0ef03b"
-  integrity sha512-jxPvt59NZo/epMNLNTu47ikmP8v0q217I6bQFGJG7JVFnfl36zDktMwGw+0xZR80qiK47/2BWrNpta61Zd2FxQ==
-  dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/signature-v4" "^2.0.0"
-    "@smithy/types" "^2.4.0"
-    "@smithy/util-middleware" "^2.0.5"
-    tslib "^2.5.0"
-
 "@aws-sdk/middleware-ssec@3.428.0":
   version "3.428.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.428.0.tgz#9a0c631401c5c4bf3acaeedd7fed6f808b5f5fd5"
@@ -1072,16 +1133,16 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/middleware-user-agent@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.433.0.tgz#21b874708e015b6f5cc33bf0545d2a0f9d9ab3a5"
-  integrity sha512-jMgA1jHfisBK4oSjMKrtKEZf0sl2vzADivkFmyZFzORpSZxBnF6hC21RjaI+70LJLcc9rSCzLgcoz5lHb9LLDg==
+"@aws-sdk/middleware-user-agent@3.540.0":
+  version "3.540.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz#4981c64c1eeb6b5c453bce02d060b8c71d44994d"
+  integrity sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@aws-sdk/util-endpoints" "3.540.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/region-config-resolver@3.428.0":
   version "3.428.0"
@@ -1094,16 +1155,17 @@
     "@smithy/util-middleware" "^2.0.4"
     tslib "^2.5.0"
 
-"@aws-sdk/region-config-resolver@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.433.0.tgz#37eb5f40db8af7ba9361aeb28c62b45421e780f0"
-  integrity sha512-xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg==
+"@aws-sdk/region-config-resolver@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz#20a30fb5fbbe27ab70f2ed16327bae7e367b5cec"
+  integrity sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg==
   dependencies:
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/types" "^2.4.0"
-    "@smithy/util-config-provider" "^2.0.0"
-    "@smithy/util-middleware" "^2.0.5"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-config-provider" "^2.3.0"
+    "@smithy/util-middleware" "^2.2.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/signature-v4-multi-region@3.428.0":
   version "3.428.0"
@@ -1157,46 +1219,17 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
-"@aws-sdk/token-providers@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.433.0.tgz#de5c33a9fa660b64387afea7a89f495a3065ff2a"
-  integrity sha512-Q6aYVaQKB+CkBLHQQlN8MHVpOzZv9snRfVz7SxIpdbHkRuGEHiLliCY3fg6Sonvu3AKEPERPuHcaC75tnNpOBw==
+"@aws-sdk/token-providers@3.552.0":
+  version "3.552.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.552.0.tgz#e0cfbeb1ff9fb212ab214f2ade9827e1032fdf42"
+  integrity sha512-5dNE2KqtgkT+DQXfkSmzmVSB72LpjSIK86lLD9LeQ1T+b0gfEd74MAl/AGC15kQdKLg5I3LlN5q32f1fkmYR8g==
   dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/middleware-host-header" "3.433.0"
-    "@aws-sdk/middleware-logger" "3.433.0"
-    "@aws-sdk/middleware-recursion-detection" "3.433.0"
-    "@aws-sdk/middleware-user-agent" "3.433.0"
-    "@aws-sdk/types" "3.433.0"
-    "@aws-sdk/util-endpoints" "3.433.0"
-    "@aws-sdk/util-user-agent-browser" "3.433.0"
-    "@aws-sdk/util-user-agent-node" "3.433.0"
-    "@smithy/config-resolver" "^2.0.16"
-    "@smithy/fetch-http-handler" "^2.2.4"
-    "@smithy/hash-node" "^2.0.12"
-    "@smithy/invalid-dependency" "^2.0.12"
-    "@smithy/middleware-content-length" "^2.0.14"
-    "@smithy/middleware-endpoint" "^2.1.3"
-    "@smithy/middleware-retry" "^2.0.18"
-    "@smithy/middleware-serde" "^2.0.12"
-    "@smithy/middleware-stack" "^2.0.6"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/node-http-handler" "^2.1.8"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^3.0.8"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/smithy-client" "^2.1.12"
-    "@smithy/types" "^2.4.0"
-    "@smithy/url-parser" "^2.0.12"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.16"
-    "@smithy/util-defaults-mode-node" "^2.0.21"
-    "@smithy/util-retry" "^2.0.5"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
+    "@aws-sdk/client-sso-oidc" "3.552.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/shared-ini-file-loader" "^2.4.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/types@3.428.0":
   version "3.428.0"
@@ -1206,7 +1239,15 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/types@3.433.0", "@aws-sdk/types@^3.222.0":
+"@aws-sdk/types@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.535.0.tgz#5e6479f31299dd9df170e63f4d10fe739008cf04"
+  integrity sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/types@^3.222.0":
   version "3.433.0"
   resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.433.0.tgz#0f94eae2a4a3525ca872c9ab04e143c01806d755"
   integrity sha512-0jEE2mSrNDd8VGFjTc1otYrwYPIkzZJEIK90ZxisKvQ/EURGBhNzWn7ejWB9XCMFT6XumYLBR0V9qq5UPisWtA==
@@ -1229,13 +1270,15 @@
     "@aws-sdk/types" "3.428.0"
     tslib "^2.5.0"
 
-"@aws-sdk/util-endpoints@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.433.0.tgz#d1e00b3f0d7c3f77597787aef265fe1b247a1083"
-  integrity sha512-LFNUh9FH7RMtYjSjPGz9lAJQMzmJ3RcXISzc5X5k2R/9mNwMK7y1k2VAfvx+RbuDbll6xwsXlgv6QHcxVdF2zw==
+"@aws-sdk/util-endpoints@3.540.0":
+  version "3.540.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz#a7fea1d2a5e64623353aaa6ee32dbb86ab9cd3f8"
+  integrity sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-endpoints" "^1.2.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
   version "3.310.0"
@@ -1254,15 +1297,15 @@
     bowser "^2.11.0"
     tslib "^2.5.0"
 
-"@aws-sdk/util-user-agent-browser@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.433.0.tgz#b5ed0c0cca0db34a2c1c2ffc1b65e7cdd8dc88ff"
-  integrity sha512-2Cf/Lwvxbt5RXvWFXrFr49vXv0IddiUwrZoAiwhDYxvsh+BMnh+NUFot+ZQaTrk/8IPZVDeLPWZRdVy00iaVXQ==
+"@aws-sdk/util-user-agent-browser@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz#d67d72e8b933051620f18ddb1c2be225f79f588f"
+  integrity sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/types" "^2.4.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/types" "^2.12.0"
     bowser "^2.11.0"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/util-user-agent-node@3.428.0":
   version "3.428.0"
@@ -1274,15 +1317,15 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@aws-sdk/util-user-agent-node@3.433.0":
-  version "3.433.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.433.0.tgz#422f7f8f956bdcd97082869bc7b6520d7720b9de"
-  integrity sha512-yT1tO4MbbsUBLl5+S+jVv8wxiAtP5TKjKib9B2KQ2x0OtWWTrIf2o+IZK8va+zQqdV4MVMjezdxdE20hOdB4yQ==
+"@aws-sdk/util-user-agent-node@3.535.0":
+  version "3.535.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz#f5c26fb6f3f561d3cf35f96f303b1775afad0a5b"
+  integrity sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ==
   dependencies:
-    "@aws-sdk/types" "3.433.0"
-    "@smithy/node-config-provider" "^2.1.3"
-    "@smithy/types" "^2.4.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.535.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/util-utf8-browser@^3.0.0":
   version "3.259.0"
@@ -1884,11 +1927,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef"
   integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==
 
-"@babel/parser@^7.20.15", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
-
 "@babel/parser@^7.20.7":
   version "7.20.15"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89"
@@ -1904,6 +1942,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55"
   integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==
 
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+
 "@babel/parser@^7.23.9":
   version "7.23.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
@@ -2865,51 +2908,52 @@
     "@datadog/browser-rum-core" "3.6.12"
     tslib "^1.10.0"
 
-"@datadog/datadog-ci@^2.22.1":
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/@datadog/datadog-ci/-/datadog-ci-2.22.1.tgz#c4a1c0428c3101d3b0ec3eb5fd74af50f923a3be"
-  integrity sha512-kjAcUSw8ZjKbyL+artJUBooSshew5VY82pgjZZEsK1nr8CKcejzyyHIQh3CEWxXy8Pj/7s65bCV1pkB+7GS5Gw==
-  dependencies:
-    "@aws-sdk/client-cloudwatch-logs" "^3.427.0"
-    "@aws-sdk/client-iam" "^3.427.0"
-    "@aws-sdk/client-lambda" "^3.427.0"
-    "@aws-sdk/client-sfn" "^3.427.0"
-    "@aws-sdk/credential-providers" "^3.427.0"
-    "@google-cloud/logging" "^10.5.0"
-    "@google-cloud/run" "^0.6.0"
+"@datadog/datadog-ci@^2.33.0":
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@datadog/datadog-ci/-/datadog-ci-2.33.0.tgz#e672e2ee286bceac62ffea230250b3edc1c9a724"
+  integrity sha512-WTyOH7PIDOkXOZez0pKVN1l/z5/+AmxquWK5OZl4YLvPz7aXw8NBguBn+96x1NdjbHJYz/viiBvBCaE25V7dIQ==
+  dependencies:
+    "@aws-sdk/client-cloudwatch-logs" "^3.537.0"
+    "@aws-sdk/client-iam" "^3.535.0"
+    "@aws-sdk/client-lambda" "^3.536.0"
+    "@aws-sdk/client-sfn" "^3.535.0"
+    "@aws-sdk/core" "^3.535.0"
+    "@aws-sdk/credential-provider-ini" "^3.535.0"
+    "@aws-sdk/credential-providers" "^3.535.0"
+    "@google-cloud/logging" "^11.0.0"
+    "@google-cloud/run" "^1.0.2"
     "@smithy/property-provider" "^2.0.12"
+    "@smithy/util-retry" "^2.0.4"
     "@types/datadog-metrics" "0.6.1"
     "@types/retry" "0.12.0"
     ajv "^8.12.0"
     ajv-formats "^2.1.1"
     async-retry "1.3.1"
-    axios "0.21.4"
+    axios "^1.6.8"
     chalk "3.0.0"
     clipanion "^3.2.1"
     datadog-metrics "0.9.3"
     deep-extend "0.6.0"
     deep-object-diff "^1.1.9"
     fast-xml-parser "^4.2.5"
-    form-data "3.0.0"
+    form-data "4.0.0"
     fuzzy "^0.1.3"
     glob "7.1.4"
     google-auth-library "^8.9.0"
-    http-proxy-agent "^7.0.0"
     inquirer "^8.2.5"
     inquirer-checkbox-plus-prompt "^1.4.2"
     js-yaml "3.13.1"
     jszip "^3.10.1"
     ora "5.4.1"
-    protobufjs "^7.2.4"
-    proxy-agent "^6.3.0"
+    proxy-agent "^6.4.0"
     rimraf "^3.0.2"
     semver "^7.5.3"
     simple-git "3.16.0"
-    ssh2 "1.14.0"
+    ssh2 "^1.15.0"
     ssh2-streams "0.4.10"
     sshpk "1.16.1"
     terminal-link "2.1.1"
-    tiny-async-pool "1.2.0"
+    tiny-async-pool "^2.1.0"
     typanion "^3.14.0"
     uuid "^9.0.0"
     ws "7.4.6"
@@ -3244,66 +3288,66 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@google-cloud/common@^4.0.0":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-4.0.3.tgz#d4324ac83087385d727593f7e1b6d81ee66442cf"
-  integrity sha512-fUoMo5b8iAKbrYpneIRV3z95AlxVJPrjpevxs4SKoclngWZvTXBSGpNisF5+x5m+oNGve7jfB1e6vNBZBUs7Fw==
+"@google-cloud/common@^5.0.0":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@google-cloud/common/-/common-5.0.1.tgz#762e598b0ef61e28d20e5b627141125ef73df957"
+  integrity sha512-7NBC5vD0au75nkctVs2vEGpdUPFs1BaHTMpeI+RVEgQSMe5/wEU6dx9p0fmZA0bj4HgdpobMKeegOcLUiEoxng==
   dependencies:
-    "@google-cloud/projectify" "^3.0.0"
-    "@google-cloud/promisify" "^3.0.0"
+    "@google-cloud/projectify" "^4.0.0"
+    "@google-cloud/promisify" "^4.0.0"
     arrify "^2.0.1"
     duplexify "^4.1.1"
     ent "^2.2.0"
     extend "^3.0.2"
-    google-auth-library "^8.0.2"
-    retry-request "^5.0.0"
-    teeny-request "^8.0.0"
-
-"@google-cloud/logging@^10.5.0":
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/logging/-/logging-10.5.0.tgz#486dafe42228daf4af4a35b5944abcf73314f2c8"
-  integrity sha512-XmlNs6B8lDZvFwFB5M55g9ch873AA2rXSuFOczQ3FOAzuyd/qksf18suFJfcrLMu8lYSr3SQhTE45FlXz4p9pg==
-  dependencies:
-    "@google-cloud/common" "^4.0.0"
-    "@google-cloud/paginator" "^4.0.0"
-    "@google-cloud/projectify" "^3.0.0"
-    "@google-cloud/promisify" "^3.0.0"
+    google-auth-library "^9.0.0"
+    retry-request "^7.0.0"
+    teeny-request "^9.0.0"
+
+"@google-cloud/logging@^11.0.0":
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/logging/-/logging-11.0.0.tgz#f5a408d411ccdaac6d2738ef4cb4046cc2bcff86"
+  integrity sha512-uQeReiVICoV5yt9J/cczNxHxqzTkLLG7yGHXCMAk/wQNVZGevT4Bi7CBWpt0aXxm044a76Aj6V08cCAlBj7UZw==
+  dependencies:
+    "@google-cloud/common" "^5.0.0"
+    "@google-cloud/paginator" "^5.0.0"
+    "@google-cloud/projectify" "^4.0.0"
+    "@google-cloud/promisify" "^4.0.0"
     arrify "^2.0.1"
     dot-prop "^6.0.0"
     eventid "^2.0.0"
     extend "^3.0.2"
-    gcp-metadata "^4.0.0"
-    google-auth-library "^8.0.2"
-    google-gax "^3.5.8"
+    gcp-metadata "^6.0.0"
+    google-auth-library "^9.0.0"
+    google-gax "^4.0.3"
     on-finished "^2.3.0"
     pumpify "^2.0.1"
     stream-events "^1.0.5"
     uuid "^9.0.0"
 
-"@google-cloud/paginator@^4.0.0":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-4.0.1.tgz#5fb8793d4f84d18c50a6f2fad3dadab8d2c533ef"
-  integrity sha512-6G1ui6bWhNyHjmbYwavdN7mpVPRBtyDg/bfqBTAlwr413On2TnFNfDxc9UhTJctkgoCDgQXEKiRPLPR9USlkbQ==
+"@google-cloud/paginator@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-5.0.0.tgz#b8cc62f151685095d11467402cbf417c41bf14e6"
+  integrity sha512-87aeg6QQcEPxGCOthnpUjvw4xAZ57G7pL8FS0C4e/81fr3FjkpUpibf1s2v5XGyGhUVGF4Jfg7yEcxqn2iUw1w==
   dependencies:
     arrify "^2.0.0"
     extend "^3.0.2"
 
-"@google-cloud/projectify@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408"
-  integrity sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==
+"@google-cloud/projectify@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-4.0.0.tgz#d600e0433daf51b88c1fa95ac7f02e38e80a07be"
+  integrity sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==
 
-"@google-cloud/promisify@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e"
-  integrity sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==
+"@google-cloud/promisify@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.0.0.tgz#a906e533ebdd0f754dca2509933334ce58b8c8b1"
+  integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==
 
-"@google-cloud/run@^0.6.0":
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/run/-/run-0.6.0.tgz#e72612608b89b148e262f88e0d6e8acfe00d43a3"
-  integrity sha512-yLtfBG3T2Z+LcTA6eKpxQL81eojEJhHiATsmC2K0tIMYnPB14/jJMc8WErj0DoGtumhgTOiupUR4KBD+vCIFlw==
+"@google-cloud/run@^1.0.2":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/run/-/run-1.1.0.tgz#d416d76c3ee41fe6b36cded8ae524b57bd86facc"
+  integrity sha512-87RiYnU6jCf/3OXkME9Wiz7YgxkQ2SvEJE2WcsGSoGeoYDbM2xgcn4TfmA+Mwdu//Jbi9sMMzbcnU8Ny8qa5kw==
   dependencies:
-    google-gax "^3.5.8"
+    google-gax "^4.0.3"
 
 "@graphiql/react@^0.18.0":
   version "0.18.0"
@@ -3818,13 +3862,13 @@
   resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
   integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
 
-"@grpc/grpc-js@~1.8.0":
-  version "1.8.21"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.8.21.tgz#d282b122c71227859bf6c5866f4c40f4a2696513"
-  integrity sha512-KeyQeZpxeEBSqFVTi3q2K7PiPXmgBfECc4updA1ejCLjYmoAlvvM3ZMp5ztTDUCUQmoY3CpDxvchjO1+rFkoHg==
+"@grpc/grpc-js@~1.10.0":
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.10.6.tgz#1e3eb1af911dc888fbef7452f56a7573b8284d54"
+  integrity sha512-xP58G7wDQ4TCmN/cMUHh00DS7SRDv/+lC+xFLrTkMIN8h55X5NhZMLYbvy7dSELP15qlI6hPhNCRWVMtZMwqLA==
   dependencies:
-    "@grpc/proto-loader" "^0.7.0"
-    "@types/node" ">=12.12.47"
+    "@grpc/proto-loader" "^0.7.10"
+    "@js-sdsl/ordered-map" "^4.4.2"
 
 "@grpc/proto-loader@^0.7.0":
   version "0.7.10"
@@ -3836,6 +3880,16 @@
     protobufjs "^7.2.4"
     yargs "^17.7.2"
 
+"@grpc/proto-loader@^0.7.10":
+  version "0.7.12"
+  resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.12.tgz#787b58e3e3771df30b1567c057b6ab89e3a42911"
+  integrity sha512-DCVwMxqYzpUCiDMl7hQ384FqP4T3DbNpXU8pt681l3UWCip1WUiD5JrkImUwCB9a7f2cq4CUTmi5r/xIMRPY1Q==
+  dependencies:
+    lodash.camelcase "^4.3.0"
+    long "^5.0.0"
+    protobufjs "^7.2.4"
+    yargs "^17.7.2"
+
 "@headlessui/react@^1.7.15":
   version "1.7.15"
   resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.15.tgz#53ef6ae132af81b8f188414767b6e79ebf8dc73f"
@@ -4155,18 +4209,16 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@js-sdsl/ordered-map@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
+  integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
+
 "@jsdevtools/ono@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
-"@jsdoc/salty@^0.2.1":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692"
-  integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==
-  dependencies:
-    lodash "^4.17.21"
-
 "@kwsites/file-exists@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
@@ -6596,6 +6648,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/abort-controller@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.2.0.tgz#18983401a5e2154b5c94057730024a7d14cbcd35"
+  integrity sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/chunked-blob-reader-native@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz#f6d0eeeb5481026b68b054f45540d924c194d558"
@@ -6622,6 +6682,31 @@
     "@smithy/util-middleware" "^2.0.5"
     tslib "^2.5.0"
 
+"@smithy/config-resolver@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.2.0.tgz#54f40478bb61709b396960a3535866dba5422757"
+  integrity sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA==
+  dependencies:
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-config-provider" "^2.3.0"
+    "@smithy/util-middleware" "^2.2.0"
+    tslib "^2.6.2"
+
+"@smithy/core@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c"
+  integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA==
+  dependencies:
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-retry" "^2.3.1"
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-middleware" "^2.2.0"
+    tslib "^2.6.2"
+
 "@smithy/credential-provider-imds@^2.0.0", "@smithy/credential-provider-imds@^2.0.18":
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.18.tgz#9a5b8be3f268bb4ac7b7ef321f57b0e9a61e2940"
@@ -6633,6 +6718,17 @@
     "@smithy/url-parser" "^2.0.12"
     tslib "^2.5.0"
 
+"@smithy/credential-provider-imds@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz#326ce401b82e53f3c7ee4862a066136959a06166"
+  integrity sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w==
+  dependencies:
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    tslib "^2.6.2"
+
 "@smithy/eventstream-codec@^2.0.11", "@smithy/eventstream-codec@^2.0.12":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.0.12.tgz#99fab750d0ac3941f341d912d3c3a1ab985e1a7a"
@@ -6643,7 +6739,17 @@
     "@smithy/util-hex-encoding" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/eventstream-serde-browser@^2.0.11", "@smithy/eventstream-serde-browser@^2.0.12":
+"@smithy/eventstream-codec@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz#63d74fa817188995eb55e792a38060b0ede98dc4"
+  integrity sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw==
+  dependencies:
+    "@aws-crypto/crc32" "3.0.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-hex-encoding" "^2.2.0"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-serde-browser@^2.0.11":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.12.tgz#46b578cf30ec4b91139800d89a752502d2b28a41"
   integrity sha512-0pi8QlU/pwutNshoeJcbKR1p7Ie5STd8UFAMX5xhSoSJjNlxIv/OsHbF023jscMRN2Prrqd6ToGgdCnsZVQjvg==
@@ -6652,7 +6758,16 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/eventstream-serde-config-resolver@^2.0.11", "@smithy/eventstream-serde-config-resolver@^2.0.12":
+"@smithy/eventstream-serde-browser@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.2.0.tgz#69c93cc0210f04caeb0770856ef88c9a82564e11"
+  integrity sha512-UaPf8jKbcP71BGiO0CdeLmlg+RhWnlN8ipsMSdwvqBFigl5nil3rHOI/5GE3tfiuX8LvY5Z9N0meuU7Rab7jWw==
+  dependencies:
+    "@smithy/eventstream-serde-universal" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-serde-config-resolver@^2.0.11":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.12.tgz#07871d226561394dfd6b468a7ede142b01491a76"
   integrity sha512-I0XfwQkIX3gAnbrU5rLMkBSjTM9DHttdbLwf12CXmj7SSI5dT87PxtKLRrZGanaCMbdf2yCep+MW5/4M7IbvQA==
@@ -6660,7 +6775,15 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/eventstream-serde-node@^2.0.11", "@smithy/eventstream-serde-node@^2.0.12":
+"@smithy/eventstream-serde-config-resolver@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.2.0.tgz#23c8698ce594a128bcc556153efb7fecf6d04f87"
+  integrity sha512-RHhbTw/JW3+r8QQH7PrganjNCiuiEZmpi6fYUAetFfPLfZ6EkiA08uN3EFfcyKubXQxOwTeJRZSQmDDCdUshaA==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-serde-node@^2.0.11":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.12.tgz#9f27037b7c782f9cbde6cc10a054df37915b0726"
   integrity sha512-vf1vMHGOkG3uqN9x1zKOhnvW/XgvhJXWqjV6zZiT2FMjlEayugQ1mzpSqr7uf89+BzjTzuZKERmOsEAmewLbxw==
@@ -6669,6 +6792,15 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/eventstream-serde-node@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.2.0.tgz#b82870a838b1bd32ad6e0cf33a520191a325508e"
+  integrity sha512-zpQMtJVqCUMn+pCSFcl9K/RPNtQE0NuMh8sKpCdEHafhwRsjP50Oq/4kMmvxSRy6d8Jslqd8BLvDngrUtmN9iA==
+  dependencies:
+    "@smithy/eventstream-serde-universal" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/eventstream-serde-universal@^2.0.12":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.12.tgz#59593439e153c576ab2d46f233c7bc4ddc364cb3"
@@ -6678,6 +6810,15 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/eventstream-serde-universal@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.2.0.tgz#a75e330040d5e2ca2ac0d8bccde3e390ac5afd38"
+  integrity sha512-pvoe/vvJY0mOpuF84BEtyZoYfbehiFj8KKWk1ds2AT0mTLYFVs+7sBJZmioOFdBXKd48lfrx1vumdPdmGlCLxA==
+  dependencies:
+    "@smithy/eventstream-codec" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/fetch-http-handler@^2.2.3", "@smithy/fetch-http-handler@^2.2.4":
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.4.tgz#405716581a5a336f2c162daf4169bff600fc47ce"
@@ -6689,6 +6830,17 @@
     "@smithy/util-base64" "^2.0.0"
     tslib "^2.5.0"
 
+"@smithy/fetch-http-handler@^2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz#0b8e1562807fdf91fe7dd5cde620d7a03ddc10ac"
+  integrity sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw==
+  dependencies:
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/querystring-builder" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-base64" "^2.3.0"
+    tslib "^2.6.2"
+
 "@smithy/hash-blob-browser@^2.0.11":
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.11.tgz#6bcd0ffc1f68427dff1d8051c893df92a36f3e7e"
@@ -6699,7 +6851,7 @@
     "@smithy/types" "^2.3.5"
     tslib "^2.5.0"
 
-"@smithy/hash-node@^2.0.11", "@smithy/hash-node@^2.0.12":
+"@smithy/hash-node@^2.0.11":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.0.12.tgz#514586ca3f54840322273029eef66c41d9001e39"
   integrity sha512-fDZnTr5j9t5qcbeJ037aMZXxMka13Znqwrgy3PAqYj6Dm3XHXHftTH3q+NWgayUxl1992GFtQt1RuEzRMy3NnQ==
@@ -6709,6 +6861,16 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
+"@smithy/hash-node@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.2.0.tgz#df29e1e64811be905cb3577703b0e2d0b07fc5cc"
+  integrity sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-buffer-from" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+
 "@smithy/hash-stream-node@^2.0.11":
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-2.0.11.tgz#95c1ef3681d988770acdab863707daf068a851f8"
@@ -6718,7 +6880,7 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/invalid-dependency@^2.0.11", "@smithy/invalid-dependency@^2.0.12":
+"@smithy/invalid-dependency@^2.0.11":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.0.12.tgz#de78a5e9457cc397aad0648e18c0260b522fe604"
   integrity sha512-p5Y+iMHV3SoEpy3VSR7mifbreHQwVSvHSAz/m4GdoXfOzKzaYC8hYv10Ks7Deblkf7lhas8U+lAp9ThbBM+ZXA==
@@ -6726,6 +6888,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/invalid-dependency@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz#ee3d8980022cb5edb514ac187d159b3e773640f0"
+  integrity sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/is-array-buffer@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz#8fa9b8040651e7ba0b2f6106e636a91354ff7d34"
@@ -6733,6 +6903,13 @@
   dependencies:
     tslib "^2.5.0"
 
+"@smithy/is-array-buffer@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111"
+  integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==
+  dependencies:
+    tslib "^2.6.2"
+
 "@smithy/md5-js@^2.0.11":
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-2.0.11.tgz#0235c22eca4b5af72728f20348af5280bef2f275"
@@ -6742,7 +6919,7 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/middleware-content-length@^2.0.13", "@smithy/middleware-content-length@^2.0.14":
+"@smithy/middleware-content-length@^2.0.13":
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.0.14.tgz#ee1aa842490cee90b6ac208fb13a7d56d3ed84f2"
   integrity sha512-poUNgKTw9XwPXfX9nEHpVgrMNVpaSMZbshqvPxFVoalF4wp6kRzYKOfdesSVectlQ51VtigoLfbXcdyPwvxgTg==
@@ -6751,7 +6928,16 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
-"@smithy/middleware-endpoint@^2.1.0", "@smithy/middleware-endpoint@^2.1.3":
+"@smithy/middleware-content-length@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz#a82e97bd83d8deab69e07fea4512563bedb9461a"
+  integrity sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ==
+  dependencies:
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-endpoint@^2.1.0":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.1.3.tgz#ab7ebff4ecbc9b02ec70dd57179f47c4f16bf03f"
   integrity sha512-ZrQ0/YX6hNVTxqMEHtEaDbDv6pNeEji/a5Vk3HuFC5R3ZY8lfoATyxmOGxBVYnF3NUvZLNC7umEv1WzWGWvCGQ==
@@ -6764,7 +6950,20 @@
     "@smithy/util-middleware" "^2.0.5"
     tslib "^2.5.0"
 
-"@smithy/middleware-retry@^2.0.16", "@smithy/middleware-retry@^2.0.18":
+"@smithy/middleware-endpoint@^2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad"
+  integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ==
+  dependencies:
+    "@smithy/middleware-serde" "^2.3.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/shared-ini-file-loader" "^2.4.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/url-parser" "^2.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-retry@^2.0.16":
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.0.18.tgz#37982552a1d3815148797831df025e470423fc5e"
   integrity sha512-VyrHQRldGSb3v9oFOB5yPxmLT7U2sQic2ytylOnYlnsmVOLlFIaI6sW22c+w2675yq+XZ6HOuzV7x2OBYCWRNA==
@@ -6778,6 +6977,21 @@
     tslib "^2.5.0"
     uuid "^8.3.2"
 
+"@smithy/middleware-retry@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede"
+  integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA==
+  dependencies:
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/service-error-classification" "^2.1.5"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-retry" "^2.2.0"
+    tslib "^2.6.2"
+    uuid "^9.0.1"
+
 "@smithy/middleware-serde@^2.0.11", "@smithy/middleware-serde@^2.0.12":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.0.12.tgz#edc93c400a5ffec6c068419163f9d880bdff5e5b"
@@ -6786,6 +7000,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/middleware-serde@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz#a7615ba646a88b6f695f2d55de13d8158181dd13"
+  integrity sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/middleware-stack@^2.0.5", "@smithy/middleware-stack@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.0.6.tgz#c58d6e4ffc4498bf47fd27adcddd142395d3ba84"
@@ -6794,6 +7016,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/middleware-stack@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz#3fb49eae6313f16f6f30fdaf28e11a7321f34d9f"
+  integrity sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/node-config-provider@^2.1.1", "@smithy/node-config-provider@^2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.1.3.tgz#bf4cee69df08d43618ad4329d234351b14d98ef7"
@@ -6804,6 +7034,16 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/node-config-provider@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz#9fac0c94a14c5b5b8b8fa37f20c310a844ab9922"
+  integrity sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg==
+  dependencies:
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/shared-ini-file-loader" "^2.4.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/node-http-handler@^2.1.7", "@smithy/node-http-handler@^2.1.8":
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.1.8.tgz#aad989d5445c43a677e7e6161c6fa4abd0e46023"
@@ -6815,6 +7055,17 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/node-http-handler@^2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz#7b5e0565dd23d340380489bd5fe4316d2bed32de"
+  integrity sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA==
+  dependencies:
+    "@smithy/abort-controller" "^2.2.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/querystring-builder" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/property-provider@^2.0.0", "@smithy/property-provider@^2.0.12", "@smithy/property-provider@^2.0.13":
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.0.13.tgz#45ee47ad79d638082523f944c49fd2e851312098"
@@ -6823,6 +7074,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/property-provider@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.2.0.tgz#37e3525a3fa3e11749f86a4f89f0fd7765a6edb0"
+  integrity sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/protocol-http@^3.0.7", "@smithy/protocol-http@^3.0.8":
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.0.8.tgz#0f7c114f6b8e23a57dff7a275d085bac97b9233c"
@@ -6831,6 +7090,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/protocol-http@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.3.0.tgz#a37df7b4bb4960cdda560ce49acfd64c455e4090"
+  integrity sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/querystring-builder@^2.0.12":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.0.12.tgz#d13e0eea08d43596bdbb182206ccdee0956d06fd"
@@ -6840,6 +7107,15 @@
     "@smithy/util-uri-escape" "^2.0.0"
     tslib "^2.5.0"
 
+"@smithy/querystring-builder@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz#22937e19fcd0aaa1a3e614ef8cb6f8e86756a4ef"
+  integrity sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-uri-escape" "^2.2.0"
+    tslib "^2.6.2"
+
 "@smithy/querystring-parser@^2.0.12":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.0.12.tgz#d2c234031e266359716a0c62c8c1208a5bd2557e"
@@ -6848,6 +7124,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/querystring-parser@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz#24a5633f4b3806ff2888d4c2f4169e105fdffd79"
+  integrity sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/service-error-classification@^2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.0.5.tgz#22c84fad456730adfa31cae91d47acd31304c346"
@@ -6855,6 +7139,13 @@
   dependencies:
     "@smithy/types" "^2.4.0"
 
+"@smithy/service-error-classification@^2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz#0568a977cc0db36299d8703a5d8609c1f600c005"
+  integrity sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+
 "@smithy/shared-ini-file-loader@^2.0.6", "@smithy/shared-ini-file-loader@^2.2.2":
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.2.tgz#b52064c5254a01f5c98a821207448de439938667"
@@ -6863,6 +7154,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/shared-ini-file-loader@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz#1636d6eb9bff41e36ac9c60364a37fd2ffcb9947"
+  integrity sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/signature-v4@^2.0.0":
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.0.11.tgz#e6d9065c7a73fc6f518f0cbc94039aed49307a1c"
@@ -6877,6 +7176,19 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
+"@smithy/signature-v4@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.2.1.tgz#9b32571e9785c8f69aa4115517bf2a784f690c4d"
+  integrity sha512-j5fHgL1iqKTsKJ1mTcw88p0RUcidDu95AWSeZTgiYJb+QcfwWU/UpBnaqiB59FNH5MiAZuSbOBnZlwzeeY2tIw==
+  dependencies:
+    "@smithy/is-array-buffer" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-hex-encoding" "^2.2.0"
+    "@smithy/util-middleware" "^2.2.0"
+    "@smithy/util-uri-escape" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+
 "@smithy/smithy-client@^2.1.11", "@smithy/smithy-client@^2.1.12":
   version "2.1.12"
   resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.1.12.tgz#a7f10ab846d41ce1042eb81f087c4c9eb438b481"
@@ -6887,6 +7199,25 @@
     "@smithy/util-stream" "^2.0.17"
     tslib "^2.5.0"
 
+"@smithy/smithy-client@^2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3"
+  integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ==
+  dependencies:
+    "@smithy/middleware-endpoint" "^2.5.1"
+    "@smithy/middleware-stack" "^2.2.0"
+    "@smithy/protocol-http" "^3.3.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-stream" "^2.2.0"
+    tslib "^2.6.2"
+
+"@smithy/types@^2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.12.0.tgz#c44845f8ba07e5e8c88eda5aed7e6a0c462da041"
+  integrity sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==
+  dependencies:
+    tslib "^2.6.2"
+
 "@smithy/types@^2.3.5", "@smithy/types@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.4.0.tgz#ed35e429e3ea3d089c68ed1bf951d0ccbdf2692e"
@@ -6903,6 +7234,15 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/url-parser@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.2.0.tgz#6fcda6116391a4f61fef5580eb540e128359b3c0"
+  integrity sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ==
+  dependencies:
+    "@smithy/querystring-parser" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/util-base64@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.0.0.tgz#1beeabfb155471d1d41c8d0603be1351f883c444"
@@ -6911,6 +7251,15 @@
     "@smithy/util-buffer-from" "^2.0.0"
     tslib "^2.5.0"
 
+"@smithy/util-base64@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.3.0.tgz#312dbb4d73fb94249c7261aee52de4195c2dd8e2"
+  integrity sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw==
+  dependencies:
+    "@smithy/util-buffer-from" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+
 "@smithy/util-body-length-browser@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz#5447853003b4c73da3bc5f3c5e82c21d592d1650"
@@ -6918,6 +7267,13 @@
   dependencies:
     tslib "^2.5.0"
 
+"@smithy/util-body-length-browser@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz#25620645c6b62b42594ef4a93b66e6ab70e27d2c"
+  integrity sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w==
+  dependencies:
+    tslib "^2.6.2"
+
 "@smithy/util-body-length-node@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz#313a5f7c5017947baf5fa018bfc22628904bbcfa"
@@ -6925,6 +7281,13 @@
   dependencies:
     tslib "^2.5.0"
 
+"@smithy/util-body-length-node@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz#d065a9b5e305ff899536777bbfe075cdc980136f"
+  integrity sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw==
+  dependencies:
+    tslib "^2.6.2"
+
 "@smithy/util-buffer-from@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz#7eb75d72288b6b3001bc5f75b48b711513091deb"
@@ -6933,6 +7296,14 @@
     "@smithy/is-array-buffer" "^2.0.0"
     tslib "^2.5.0"
 
+"@smithy/util-buffer-from@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b"
+  integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==
+  dependencies:
+    "@smithy/is-array-buffer" "^2.2.0"
+    tslib "^2.6.2"
+
 "@smithy/util-config-provider@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz#4dd6a793605559d94267312fd06d0f58784b4c38"
@@ -6940,7 +7311,14 @@
   dependencies:
     tslib "^2.5.0"
 
-"@smithy/util-defaults-mode-browser@^2.0.15", "@smithy/util-defaults-mode-browser@^2.0.16":
+"@smithy/util-config-provider@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz#bc79f99562d12a1f8423100ca662a6fb07cde943"
+  integrity sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-defaults-mode-browser@^2.0.15":
   version "2.0.16"
   resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.16.tgz#7d60c4e1d00ed569f47fd6343b822c4ff3c2c9f8"
   integrity sha512-Uv5Cu8nVkuvLn0puX+R9zWbSNpLIR3AxUlPoLJ7hC5lvir8B2WVqVEkJLwtixKAncVLasnTVjPDCidtAUTGEQw==
@@ -6951,7 +7329,18 @@
     bowser "^2.11.0"
     tslib "^2.5.0"
 
-"@smithy/util-defaults-mode-node@^2.0.19", "@smithy/util-defaults-mode-node@^2.0.21":
+"@smithy/util-defaults-mode-browser@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz#9db31416daf575d2963c502e0528cfe8055f0c4e"
+  integrity sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw==
+  dependencies:
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    bowser "^2.11.0"
+    tslib "^2.6.2"
+
+"@smithy/util-defaults-mode-node@^2.0.19":
   version "2.0.21"
   resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.21.tgz#d10c887b3e641c63e235ce95ba32137fd0bd1838"
   integrity sha512-cUEsttVZ79B7Al2rWK2FW03HBpD9LyuqFtm+1qFty5u9sHSdesr215gS2Ln53fTopNiPgeXpdoM3IgjvIO0rJw==
@@ -6964,12 +7353,41 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/util-defaults-mode-node@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz#4613210a3d107aadb3f85bd80cb71c796dd8bf0a"
+  integrity sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA==
+  dependencies:
+    "@smithy/config-resolver" "^2.2.0"
+    "@smithy/credential-provider-imds" "^2.3.0"
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/property-provider" "^2.2.0"
+    "@smithy/smithy-client" "^2.5.1"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
+"@smithy/util-endpoints@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz#b8b805f47e8044c158372f69b88337703117665d"
+  integrity sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ==
+  dependencies:
+    "@smithy/node-config-provider" "^2.3.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/util-hex-encoding@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz#0aa3515acd2b005c6d55675e377080a7c513b59e"
   integrity sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==
   dependencies:
-    tslib "^2.5.0"
+    tslib "^2.5.0"
+
+"@smithy/util-hex-encoding@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz#87edb7c88c2f422cfca4bb21f1394ae9602c5085"
+  integrity sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ==
+  dependencies:
+    tslib "^2.6.2"
 
 "@smithy/util-middleware@^2.0.4", "@smithy/util-middleware@^2.0.5":
   version "2.0.5"
@@ -6979,6 +7397,14 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/util-middleware@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.2.0.tgz#80cfad40f6cca9ffe42a5899b5cb6abd53a50006"
+  integrity sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw==
+  dependencies:
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/util-retry@^2.0.4", "@smithy/util-retry@^2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.0.5.tgz#1a93721da082301aca61d8b42380369761a7e80d"
@@ -6988,6 +7414,15 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/util-retry@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.2.0.tgz#e8e019537ab47ba6b2e87e723ec51ee223422d85"
+  integrity sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g==
+  dependencies:
+    "@smithy/service-error-classification" "^2.1.5"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@smithy/util-stream@^2.0.16", "@smithy/util-stream@^2.0.17":
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.0.17.tgz#4c980891b0943e9e64949d7afcf1ec4a7b510ea8"
@@ -7002,6 +7437,20 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.5.0"
 
+"@smithy/util-stream@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.2.0.tgz#b1279e417992a0f74afa78d7501658f174ed7370"
+  integrity sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA==
+  dependencies:
+    "@smithy/fetch-http-handler" "^2.5.0"
+    "@smithy/node-http-handler" "^2.5.0"
+    "@smithy/types" "^2.12.0"
+    "@smithy/util-base64" "^2.3.0"
+    "@smithy/util-buffer-from" "^2.2.0"
+    "@smithy/util-hex-encoding" "^2.2.0"
+    "@smithy/util-utf8" "^2.3.0"
+    tslib "^2.6.2"
+
 "@smithy/util-uri-escape@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz#19955b1a0f517a87ae77ac729e0e411963dfda95"
@@ -7009,6 +7458,13 @@
   dependencies:
     tslib "^2.5.0"
 
+"@smithy/util-uri-escape@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz#56f5764051a33b67bc93fdd2a869f971b0635406"
+  integrity sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA==
+  dependencies:
+    tslib "^2.6.2"
+
 "@smithy/util-utf8@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.0.0.tgz#b4da87566ea7757435e153799df9da717262ad42"
@@ -7017,7 +7473,15 @@
     "@smithy/util-buffer-from" "^2.0.0"
     tslib "^2.5.0"
 
-"@smithy/util-waiter@^2.0.11", "@smithy/util-waiter@^2.0.12":
+"@smithy/util-utf8@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5"
+  integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==
+  dependencies:
+    "@smithy/util-buffer-from" "^2.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-waiter@^2.0.11":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-2.0.12.tgz#a7348f9fd2bade5f2f3ee7ecf7c43ab86ed244ee"
   integrity sha512-3sENmyVa1NnOPoiT2NCApPmu7ukP7S/v7kL9IxNmnygkDldn7/yK0TP42oPJLwB2k3mospNsSePIlqdXEUyPHA==
@@ -7026,6 +7490,15 @@
     "@smithy/types" "^2.4.0"
     tslib "^2.5.0"
 
+"@smithy/util-waiter@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-2.2.0.tgz#d11baf50637bfaadb9641d6ca1619da413dd2612"
+  integrity sha512-IHk53BVw6MPMi2Gsn+hCng8rFA3ZmR3Rk7GllxDUW9qFJl/hiSvskn7XldkECapQVkIg/1dHpMAxI9xSTaLLSA==
+  dependencies:
+    "@smithy/abort-controller" "^2.2.0"
+    "@smithy/types" "^2.12.0"
+    tslib "^2.6.2"
+
 "@stripe/react-stripe-js@^1.16.5":
   version "1.16.5"
   resolved "https://registry.yarnpkg.com/@stripe/react-stripe-js/-/react-stripe-js-1.16.5.tgz#51cf862b50ca91ae6193c77a5bec889e81047f10"
@@ -7442,13 +7915,18 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/bonjour@^3.5.9":
-  version "3.5.10"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
-  integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==
+"@types/bonjour@^3.5.13":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956"
+  integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==
   dependencies:
     "@types/node" "*"
 
+"@types/caseless@*":
+  version "0.12.5"
+  resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.5.tgz#db9468cb1b1b5a925b8f34822f1669df0c5472f5"
+  integrity sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==
+
 "@types/chalk@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-2.2.0.tgz#b7f6e446f4511029ee8e3f43075fb5b73fbaa0ba"
@@ -7477,10 +7955,10 @@
   dependencies:
     "@types/tern" "*"
 
-"@types/connect-history-api-fallback@^1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
-  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
+"@types/connect-history-api-fallback@^1.5.4":
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3"
+  integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
@@ -7570,7 +8048,7 @@
     "@types/range-parser" "*"
     "@types/send" "*"
 
-"@types/express@*", "@types/express@^4.17.13":
+"@types/express@*":
   version "4.17.17"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.17.tgz#01d5437f6ef9cfa8668e616e13c2f2ac9a491ae4"
   integrity sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==
@@ -7580,6 +8058,16 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/express@^4.17.21":
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
+  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.33"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/faker@^5.5.9":
   version "5.5.9"
   resolved "https://registry.yarnpkg.com/@types/faker/-/faker-5.5.9.tgz#588ede92186dc557bff8341d294335d50d255f0c"
@@ -7597,14 +8085,6 @@
   resolved "https://registry.yarnpkg.com/@types/franc/-/franc-5.0.3.tgz#7263cef3ab3512ac95a78c328fcc51c51396b49f"
   integrity sha512-YX6o2vVkeiUvOF12bUmnSGf8sezOoBnCWjHHZGeh2lt3tqAutbJ9OL3cDRiZoiAYaZR638nuOc0Ji9bzdad2XA==
 
-"@types/glob@*":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
-  integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
-  dependencies:
-    "@types/minimatch" "^5.1.2"
-    "@types/node" "*"
-
 "@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
@@ -7770,7 +8250,7 @@
   resolved "https://registry.yarnpkg.com/@types/jwt-decode/-/jwt-decode-2.2.1.tgz#afdf5c527fcfccbd4009b5fd02d1e18241f2d2f2"
   integrity sha512-aWw2YTtAdT7CskFyxEX2K21/zSDStuf/ikI3yBqmwpwJF0pS+/IX5DWv+1UFffZIbruP6cnT9/LAJV1gFwAT1A==
 
-"@types/linkify-it@*", "@types/linkify-it@^3.0.2":
+"@types/linkify-it@^3.0.2":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.4.tgz#def6a9bb0ce78140860602f16ace37a9997f086a"
   integrity sha512-hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ==
@@ -7797,19 +8277,6 @@
   resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-3.3.0.tgz#a61043a62c0a72696c73a0a305c544c96501e006"
   integrity sha512-uKRI5QORDnrGFYgcdAVnHvEIvEZ8noTpP/Bg+HeUzZghwinDlIS87DEenV5r1YoOF9G4x600YsUXLWZ19rmTmg==
 
-"@types/markdown-it@^12.2.3":
-  version "12.2.3"
-  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
-  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
-  dependencies:
-    "@types/linkify-it" "*"
-    "@types/mdurl" "*"
-
-"@types/mdurl@*":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.4.tgz#574bfbec51eb41ab5f444116c8555bc4347feba5"
-  integrity sha512-ARVxjAEX5TARFRzpDRVC6cEk0hUIXCCwaMhz8y7S1/PxU6zZS1UMjyobz7q4w/D/R552r4++EhwmXK1N2rAy0A==
-
 "@types/mime-types@^2.1.0":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1"
@@ -7825,7 +8292,7 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/minimatch@*", "@types/minimatch@^5.1.2":
+"@types/minimatch@*":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
@@ -7858,7 +8325,14 @@
     "@types/node" "*"
     form-data "^4.0.0"
 
-"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
+"@types/node-forge@^1.3.0":
+  version "1.3.11"
+  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
+  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/node@*", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
   version "20.8.8"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.8.tgz#adee050b422061ad5255fc38ff71b2bb96ea2a0e"
   integrity sha512-YRsdVxq6OaLfmR9Hy816IMp33xOBjfyOgUd77ehqg96CFywxAPbDbXvAsuN2KVg2HOT8Eh6uAfU+l4WffwPVrQ==
@@ -8041,6 +8515,16 @@
   resolved "https://registry.yarnpkg.com/@types/relay-runtime/-/relay-runtime-14.1.9.tgz#bb0e2d6574f058f8da90992166b1364fff09e2dc"
   integrity sha512-zMZnZPPawAC15zHygMk6lfHhT11xgkx2jLhXqJpgFKpV86MnQcMEs/dVTADKuUIBLBzf6Og6wK4n5PMsJ0OjVw==
 
+"@types/request@^2.48.8":
+  version "2.48.12"
+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30"
+  integrity sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==
+  dependencies:
+    "@types/caseless" "*"
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    form-data "^2.5.0"
+
 "@types/resolve@1.17.1":
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -8053,18 +8537,10 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
-"@types/retry@^0.12.0":
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
-  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
-
-"@types/rimraf@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.2.tgz#a63d175b331748e5220ad48c901d7bbf1f44eef8"
-  integrity sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
+"@types/retry@0.12.2":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
+  integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
 
 "@types/semver@^7.5.0":
   version "7.5.6"
@@ -8079,14 +8555,14 @@
     "@types/mime" "^1"
     "@types/node" "*"
 
-"@types/serve-index@^1.9.1":
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
-  integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
+"@types/serve-index@^1.9.4":
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898"
+  integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*", "@types/serve-static@^1.13.10":
+"@types/serve-static@*":
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a"
   integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==
@@ -8095,6 +8571,15 @@
     "@types/mime" "*"
     "@types/node" "*"
 
+"@types/serve-static@^1.15.5":
+  version "1.15.7"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714"
+  integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==
+  dependencies:
+    "@types/http-errors" "*"
+    "@types/node" "*"
+    "@types/send" "*"
+
 "@types/sharp@^0.32.0":
   version "0.32.0"
   resolved "https://registry.yarnpkg.com/@types/sharp/-/sharp-0.32.0.tgz#fc3ac6df6b456319bae807c3d24efdc6631cdd6f"
@@ -8102,10 +8587,10 @@
   dependencies:
     sharp "*"
 
-"@types/sockjs@^0.3.33":
-  version "0.3.33"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
-  integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
+"@types/sockjs@^0.3.36":
+  version "0.3.36"
+  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535"
+  integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==
   dependencies:
     "@types/node" "*"
 
@@ -8199,13 +8684,20 @@
     anymatch "^3.0.0"
     source-map "^0.6.0"
 
-"@types/ws@^8.0.0", "@types/ws@^8.5.5":
+"@types/ws@^8.0.0":
   version "8.5.5"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb"
   integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==
   dependencies:
     "@types/node" "*"
 
+"@types/ws@^8.5.10":
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787"
+  integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "20.2.1"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129"
@@ -8703,7 +9195,7 @@ ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^5.0.0:
+ajv-keywords@^5.0.0, ajv-keywords@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
@@ -8720,7 +9212,7 @@ ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.10.0, ajv@^8.12.0, ajv@^8.6.0, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.10.0, ajv@^8.12.0, ajv@^8.6.0, ajv@^8.8.0, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -8924,11 +9416,6 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-flatten@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
@@ -9104,13 +9591,6 @@ axios-retry@3.2.0:
   dependencies:
     is-retry-allowed "^1.1.0"
 
-axios@0.21.4:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
 axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
@@ -9137,6 +9617,15 @@ axios@^1.3.3:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+axios@^1.6.8:
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
+  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 b4a@^1.6.4:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.6.4.tgz#ef1c1422cae5ce6535ec191baeed7567443f36c9"
@@ -9430,11 +9919,6 @@ blessed@0.1.81:
   resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129"
   integrity sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk=
 
-bluebird@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 bodec@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc"
@@ -9458,13 +9942,11 @@ body-parser@1.20.2:
     type-is "~1.6.18"
     unpipe "1.0.0"
 
-bonjour-service@^1.0.11:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.1.tgz#960948fa0e0153f5d26743ab15baf8e33752c135"
-  integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==
+bonjour-service@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02"
+  integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==
   dependencies:
-    array-flatten "^2.1.2"
-    dns-equal "^1.0.0"
     fast-deep-equal "^3.1.3"
     multicast-dns "^7.2.5"
 
@@ -9592,6 +10074,13 @@ builtins@^5.0.0:
   dependencies:
     semver "^7.0.0"
 
+bundle-name@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889"
+  integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==
+  dependencies:
+    run-applescript "^7.0.0"
+
 busboy@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
@@ -9742,9 +10231,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
-  version "1.0.30001605"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz#ca12d7330dd8bcb784557eb9aa64f0037870d9d6"
-  integrity sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==
+  version "1.0.30001608"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz#7ae6e92ffb300e4b4ec2f795e0abab456ec06cc0"
+  integrity sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -9765,13 +10254,6 @@ caseless@^0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-catharsis@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121"
-  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==
-  dependencies:
-    lodash "^4.17.15"
-
 chai@latest:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49"
@@ -9937,6 +10419,21 @@ chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chownr@^1.1.1, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -10202,7 +10699,7 @@ columnify@^1.6.0:
     strip-ansi "^6.0.1"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -10610,7 +11107,7 @@ cosmiconfig@^8.1.0, cosmiconfig@^8.1.3:
     parse-json "^5.0.0"
     path-type "^4.0.0"
 
-cpu-features@~0.0.8:
+cpu-features@~0.0.9:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.9.tgz#5226b92f0f1c63122b0a3eb84cb8335a4de499fc"
   integrity sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ==
@@ -10979,6 +11476,19 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+default-browser-id@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26"
+  integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==
+
+default-browser@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf"
+  integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==
+  dependencies:
+    bundle-name "^4.1.0"
+    default-browser-id "^5.0.0"
+
 default-gateway@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
@@ -10998,6 +11508,11 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
+define-lazy-prop@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
+  integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==
+
 define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -11184,11 +11699,6 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
 dns-packet@^5.2.2:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.6.0.tgz#2202c947845c7a63c23ece58f2f70ff6ab4c2f7d"
@@ -11668,7 +12178,7 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.13.0, escodegen@^1.8.1:
+escodegen@^1.8.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
   integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
@@ -11801,7 +12311,7 @@ esniff@^2.0.1:
     event-emitter "^0.3.5"
     type "^2.7.2"
 
-espree@^9.0.0, espree@^9.6.0, espree@^9.6.1:
+espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -12130,7 +12640,7 @@ fast-safe-stringify@^2.0.7:
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
 
-fast-text-encoding@^1.0.0, fast-text-encoding@^1.0.3:
+fast-text-encoding@^1.0.0:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867"
   integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==
@@ -12356,7 +12866,7 @@ flow-parser@0.*:
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.168.0.tgz#e9c385499145828b42fd754d3528f4cb7d5c6edf"
   integrity sha512-YMlc+6vvyDPqWKOpzmyifJXBbwlNdqznuy8YBHxX1/90F8d+NnhsxMe1u/ok5LNvNJVJ2TVMkWudu0BUKOSawA==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0, follow-redirects@^1.15.6:
   version "1.15.6"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
   integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
@@ -12379,22 +12889,22 @@ form-data-encoder@^1.7.2:
   resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.9.0.tgz#fd18d316b1ec830d2a8be8ad86c1cf0317320b34"
   integrity sha512-rahaRMkN8P8d/tgK/BLPX+WBVM27NbvdXBxqQujBtkDAIFspaRqN7Od7lfdGQA6KAD+f82fYCLBq1ipvcu8qLw==
 
-form-data@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
+form-data@4.0.0, form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+form-data@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.8"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 formdata-node@^4.3.2:
@@ -12509,11 +13019,6 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-monkey@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747"
-  integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==
-
 fs-readdir-recursive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
@@ -12580,17 +13085,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaxios@^4.0.0:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-4.3.3.tgz#d44bdefe52d34b6435cc41214fdb160b64abfc22"
-  integrity sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==
-  dependencies:
-    abort-controller "^3.0.0"
-    extend "^3.0.2"
-    https-proxy-agent "^5.0.0"
-    is-stream "^2.0.0"
-    node-fetch "^2.6.7"
-
 gaxios@^5.0.0, gaxios@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-5.1.0.tgz#133b77b45532be71eec72012b7e97c2320b6140a"
@@ -12601,13 +13095,16 @@ gaxios@^5.0.0, gaxios@^5.0.1:
     is-stream "^2.0.0"
     node-fetch "^2.6.7"
 
-gcp-metadata@^4.0.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-4.3.1.tgz#fb205fe6a90fef2fd9c85e6ba06e5559ee1eefa9"
-  integrity sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==
+gaxios@^6.0.0, gaxios@^6.1.1:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.4.0.tgz#08a42cb44d5123a72efaaf9f786c266e7f18be70"
+  integrity sha512-apAloYrY4dlBGlhauDAYSZveafb5U6+L9titing1wox6BvWM0TSXBp603zTrLpyLMGkrcFgohnUN150dFN/zOA==
   dependencies:
-    gaxios "^4.0.0"
-    json-bigint "^1.0.0"
+    extend "^3.0.2"
+    https-proxy-agent "^7.0.1"
+    is-stream "^2.0.0"
+    node-fetch "^2.6.9"
+    uuid "^9.0.1"
 
 gcp-metadata@^5.3.0:
   version "5.3.0"
@@ -12617,6 +13114,14 @@ gcp-metadata@^5.3.0:
     gaxios "^5.0.0"
     json-bigint "^1.0.0"
 
+gcp-metadata@^6.0.0, gcp-metadata@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-6.1.0.tgz#9b0dd2b2445258e7597f2024332d20611cbd6b8c"
+  integrity sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==
+  dependencies:
+    gaxios "^6.0.0"
+    json-bigint "^1.0.0"
+
 generate-function@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
@@ -12849,6 +13354,17 @@ glob@^10.0.0:
     minipass "^5.0.0"
     path-scurry "^1.7.0"
 
+glob@^10.3.7:
+  version "10.3.12"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
+  integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.6"
+    minimatch "^9.0.1"
+    minipass "^7.0.4"
+    path-scurry "^1.10.2"
+
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
@@ -12861,7 +13377,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.0, glob@^8.0.1:
+glob@^8.0.1:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -12945,26 +13461,35 @@ google-auth-library@^8.0.2, google-auth-library@^8.9.0:
     jws "^4.0.0"
     lru-cache "^6.0.0"
 
-google-gax@^3.5.8:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-3.6.1.tgz#02c78fc496f5adf86f2ca9145545f4b6575f6118"
-  integrity sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w==
+google-auth-library@^9.0.0, google-auth-library@^9.3.0:
+  version "9.7.0"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.7.0.tgz#dd99a08e2e3f70778de8be4ed8556460e237550a"
+  integrity sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==
+  dependencies:
+    base64-js "^1.3.0"
+    ecdsa-sig-formatter "^1.0.11"
+    gaxios "^6.1.1"
+    gcp-metadata "^6.1.0"
+    gtoken "^7.0.0"
+    jws "^4.0.0"
+
+google-gax@^4.0.3:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-4.3.2.tgz#417cbee97f2e68d78f641af19c0f15234c0dbd9c"
+  integrity sha512-2mw7qgei2LPdtGrmd1zvxQviOcduTnsvAWYzCxhOWXK4IQKmQztHnDQwD0ApB690fBQJemFKSU7DnceAy3RLzw==
   dependencies:
-    "@grpc/grpc-js" "~1.8.0"
+    "@grpc/grpc-js" "~1.10.0"
     "@grpc/proto-loader" "^0.7.0"
     "@types/long" "^4.0.0"
-    "@types/rimraf" "^3.0.2"
     abort-controller "^3.0.0"
     duplexify "^4.0.0"
-    fast-text-encoding "^1.0.3"
-    google-auth-library "^8.0.2"
-    is-stream-ended "^0.1.4"
+    google-auth-library "^9.3.0"
     node-fetch "^2.6.1"
     object-hash "^3.0.0"
-    proto3-json-serializer "^1.0.0"
-    protobufjs "7.2.4"
-    protobufjs-cli "1.1.1"
-    retry-request "^5.0.0"
+    proto3-json-serializer "^2.0.0"
+    protobufjs "7.2.6"
+    retry-request "^7.0.0"
+    uuid "^9.0.1"
 
 google-p12-pem@^4.0.0:
   version "4.0.1"
@@ -12993,7 +13518,7 @@ googleapis@^118.0.0:
     google-auth-library "^8.0.2"
     googleapis-common "^6.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -13136,6 +13661,14 @@ gtoken@^6.1.0:
     google-p12-pem "^4.0.0"
     jws "^4.0.0"
 
+gtoken@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.1.0.tgz#d61b4ebd10132222817f7222b1e6064bd463fc26"
+  integrity sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==
+  dependencies:
+    gaxios "^6.0.0"
+    jws "^4.0.0"
+
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -13305,11 +13838,16 @@ html-encoding-sniffer@^3.0.0:
   dependencies:
     whatwg-encoding "^2.0.0"
 
-html-entities@^2.1.0, html-entities@^2.3.2:
+html-entities@^2.1.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
   integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
+html-entities@^2.4.0:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
+  integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
+
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
@@ -13424,6 +13962,14 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
+http-proxy-agent@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 http-proxy-middleware@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
@@ -13465,6 +14011,14 @@ https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.2:
     agent-base "^7.0.2"
     debug "4"
 
+https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.3:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -13777,6 +14331,11 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
+ipaddr.js@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
+  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
+
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -13865,6 +14424,11 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
+
 is-extendable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
@@ -13906,6 +14470,13 @@ is-glob@4.0.3, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-inside-container@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4"
+  integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==
+  dependencies:
+    is-docker "^3.0.0"
+
 is-interactive@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
@@ -13933,6 +14504,11 @@ is-negative-zero@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
+is-network-error@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997"
+  integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==
+
 is-number-object@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
@@ -14063,11 +14639,6 @@ is-ssh@^1.4.0:
   dependencies:
     protocols "^2.0.1"
 
-is-stream-ended@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-stream-ended/-/is-stream-ended-0.1.4.tgz#f50224e95e06bce0e356d440a4827cd35b267eda"
-  integrity sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==
-
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -14137,6 +14708,13 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
+is-wsl@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2"
+  integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==
+  dependencies:
+    is-inside-container "^1.0.0"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -14221,6 +14799,15 @@ jackspeak@^2.0.3:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
@@ -14686,13 +15273,6 @@ js-yaml@^3.10.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js2xmlparser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a"
-  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==
-  dependencies:
-    xmlcreate "^2.0.4"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -14723,27 +15303,6 @@ jscodeshift@^0.14.0:
     temp "^0.8.4"
     write-file-atomic "^2.3.0"
 
-jsdoc@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e"
-  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==
-  dependencies:
-    "@babel/parser" "^7.20.15"
-    "@jsdoc/salty" "^0.2.1"
-    "@types/markdown-it" "^12.2.3"
-    bluebird "^3.7.2"
-    catharsis "^0.9.0"
-    escape-string-regexp "^2.0.0"
-    js2xmlparser "^4.0.2"
-    klaw "^3.0.0"
-    markdown-it "^12.3.2"
-    markdown-it-anchor "^8.4.1"
-    marked "^4.0.10"
-    mkdirp "^1.0.4"
-    requizzle "^0.2.3"
-    strip-json-comments "^3.1.0"
-    underscore "~1.13.2"
-
 jsdom@^20.0.0:
   version "20.0.2"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.2.tgz#65ccbed81d5e877c433f353c58bb91ff374127db"
@@ -15035,13 +15594,6 @@ kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaw@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146"
-  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==
-  dependencies:
-    graceful-fs "^4.1.9"
-
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -15073,13 +15625,13 @@ kysely@^0.27.3:
   resolved "https://registry.yarnpkg.com/kysely/-/kysely-0.27.3.tgz#6cc6c757040500b43c4ac596cdbb12be400ee276"
   integrity sha512-lG03Ru+XyOJFsjH3OMY6R/9U38IjDPfnOfDgO3ynhbDr+Dz8fak+X6L62vqu3iybQnj+lG84OttBuU9KY3L9kA==
 
-launch-editor@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7"
-  integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==
+launch-editor@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.1.tgz#f259c9ef95cbc9425620bbbd14b468fcdb4ffe3c"
+  integrity sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==
   dependencies:
     picocolors "^1.0.0"
-    shell-quote "^1.7.3"
+    shell-quote "^1.8.1"
 
 lazy@~1.0.11:
   version "1.0.11"
@@ -15545,6 +16097,11 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+lru-cache@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
+  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -15696,12 +16253,7 @@ map-obj@^4.0.0, map-obj@^4.1.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
-markdown-it-anchor@^8.4.1:
-  version "8.6.7"
-  resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634"
-  integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==
-
-markdown-it@^12.2.0, markdown-it@^12.3.2:
+markdown-it@^12.2.0:
   version "12.3.2"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
   integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
@@ -15723,7 +16275,7 @@ markdown-it@^13.0.1:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-marked@^4.0.10, marked@^4.3.0:
+marked@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
   integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
@@ -15747,12 +16299,12 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.4.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
-  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
+memfs@^4.6.0:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.8.1.tgz#1e02c15c4397212a9a1b037fa4324c6f7dd45b47"
+  integrity sha512-7q/AdPzf2WpwPlPL4v1kE2KsJsHl7EF4+hAeVzlyanr2+YnR21NVn9mDqo+7DEaKDRsQy8nvxPlKH4WqMtiO0w==
   dependencies:
-    fs-monkey "^1.0.4"
+    tslib "^2.0.0"
 
 memoize-one@^5.1.1:
   version "5.2.1"
@@ -15945,6 +16497,13 @@ minimatch@^9.0.0:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.1:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -16037,6 +16596,11 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
 minizlib@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
@@ -16171,6 +16735,11 @@ nan@^2.17.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
   integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
 
+nan@^2.18.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0"
+  integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==
+
 nanoid@^2.1.0, nanoid@^3.1.31, nanoid@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
@@ -16314,6 +16883,13 @@ node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-fetch@^2.6.9:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-forge@^0.10.0, node-forge@^1, node-forge@^1.2.1, node-forge@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -16853,7 +17429,7 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-on-finished@2.4.1, on-finished@^2.3.0:
+on-finished@2.4.1, on-finished@^2.3.0, on-finished@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
   integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
@@ -16879,7 +17455,17 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^8.0.9, open@^8.4.0:
+open@^10.0.3:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1"
+  integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==
+  dependencies:
+    default-browser "^5.2.1"
+    define-lazy-prop "^3.0.0"
+    is-inside-container "^1.0.0"
+    is-wsl "^3.1.0"
+
+open@^8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
   integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
@@ -17090,12 +17676,13 @@ p-reduce@^2.0.0, p-reduce@^2.1.0:
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a"
   integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==
 
-p-retry@^4.5.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
-  integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
+p-retry@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd"
+  integrity sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==
   dependencies:
-    "@types/retry" "^0.12.0"
+    "@types/retry" "0.12.2"
+    is-network-error "^1.0.0"
     retry "^0.13.1"
 
 p-timeout@^3.2.0:
@@ -17368,6 +17955,14 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
+path-scurry@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
+  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-scurry@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.7.0.tgz#99c741a2cfbce782294a39994d63748b5a24f6db"
@@ -18086,33 +18681,17 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-proto3-json-serializer@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz#1b5703152b6ce811c5cdcc6468032caf53521331"
-  integrity sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==
-  dependencies:
-    protobufjs "^7.0.0"
-
-protobufjs-cli@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704"
-  integrity sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==
+proto3-json-serializer@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-2.0.1.tgz#da0b510f6d6e584b1b5c271f045c26728abe71e0"
+  integrity sha512-8awBvjO+FwkMd6gNoGFZyqkHZXCFd54CIYTb6De7dPaufGJ2XNW+QUNqbMr8MaAocMdb+KpsD4rxEOaTBDCffA==
   dependencies:
-    chalk "^4.0.0"
-    escodegen "^1.13.0"
-    espree "^9.0.0"
-    estraverse "^5.1.0"
-    glob "^8.0.0"
-    jsdoc "^4.0.0"
-    minimist "^1.2.0"
-    semver "^7.1.2"
-    tmp "^0.2.1"
-    uglify-js "^3.7.7"
+    protobufjs "^7.2.5"
 
-protobufjs@7.2.4:
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.4.tgz#3fc1ec0cdc89dd91aef9ba6037ba07408485c3ae"
-  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
+protobufjs@7.2.6, protobufjs@^7.2.5:
+  version "7.2.6"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.6.tgz#4a0ccd79eb292717aacf07530a07e0ed20278215"
+  integrity sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -18127,7 +18706,7 @@ protobufjs@7.2.4:
     "@types/node" ">=13.7.0"
     long "^5.0.0"
 
-protobufjs@^7.0.0, protobufjs@^7.1.2, protobufjs@^7.2.4:
+protobufjs@^7.1.2, protobufjs@^7.2.4:
   version "7.2.5"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.5.tgz#45d5c57387a6d29a17aab6846dcc283f9b8e7f2d"
   integrity sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==
@@ -18158,15 +18737,15 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-agent@^6.3.0:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.3.1.tgz#40e7b230552cf44fd23ffaf7c59024b692612687"
-  integrity sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ==
+proxy-agent@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.4.0.tgz#b4e2dd51dee2b377748aef8d45604c2d7608652d"
+  integrity sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==
   dependencies:
     agent-base "^7.0.2"
     debug "^4.3.4"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.2"
+    http-proxy-agent "^7.0.1"
+    https-proxy-agent "^7.0.3"
     lru-cache "^7.14.1"
     pac-proxy-agent "^7.0.1"
     proxy-from-env "^1.1.0"
@@ -18845,7 +19424,7 @@ regenerator-runtime@^0.13.11:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
   integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5:
+regenerator-runtime@^0.13.4:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
@@ -18996,13 +19575,6 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
-requizzle@^0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c"
-  integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==
-  dependencies:
-    lodash "^4.17.21"
-
 resize-observer-polyfill@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
@@ -19092,13 +19664,14 @@ rethinkdb-ts@2.6.0, rethinkdb-ts@^2.4.5:
   resolved "https://registry.yarnpkg.com/rethinkdb-ts/-/rethinkdb-ts-2.6.0.tgz#25ad1561d58836761463718470310b4bf911f9eb"
   integrity sha512-RKkTP/P1dNNK265qmNjBqiiWlawRw7+MNVoro9UJa8RPvdB9+MJwzWxz7rgTLrfJr77FuaRQMqzlRexx6ivfUQ==
 
-retry-request@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da"
-  integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==
+retry-request@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-7.0.2.tgz#60bf48cfb424ec01b03fca6665dee91d06dd95f3"
+  integrity sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==
   dependencies:
-    debug "^4.1.1"
+    "@types/request" "^2.48.8"
     extend "^3.0.2"
+    teeny-request "^9.0.0"
 
 retry@0.12.0, retry@^0.12.0:
   version "0.12.0"
@@ -19144,6 +19717,13 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
+  integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
+  dependencies:
+    glob "^10.3.7"
+
 rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -19180,6 +19760,11 @@ rrule@^2.7.2:
   dependencies:
     tslib "^2.4.0"
 
+run-applescript@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb"
+  integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==
+
 run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
@@ -19286,6 +19871,16 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.0.0"
 
+schema-utils@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.9.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.1.0"
+
 scuid@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
@@ -19296,11 +19891,12 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
-  integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
+selfsigned@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
+  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
   dependencies:
+    "@types/node-forge" "^1.3.0"
     node-forge "^1"
 
 semver-compare@^1.0.0:
@@ -19330,7 +19926,7 @@ semver@7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
+semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -19485,7 +20081,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.7.3, shell-quote@^1.8.0:
+shell-quote@^1.7.3, shell-quote@^1.8.0, shell-quote@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
@@ -19906,16 +20502,16 @@ ssh2-streams@0.4.10:
     bcrypt-pbkdf "^1.0.2"
     streamsearch "~0.1.2"
 
-ssh2@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.14.0.tgz#8f68440e1b768b66942c9e4e4620b2725b3555bb"
-  integrity sha512-AqzD1UCqit8tbOKoj6ztDDi1ffJZ2rV2SwlgrVVrHPkV5vWqGJOVp5pmtj18PunkPJAuKQsnInyKV+/Nb2bUnA==
+ssh2@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.15.0.tgz#2f998455036a7f89e0df5847efb5421748d9871b"
+  integrity sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==
   dependencies:
     asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
-    cpu-features "~0.0.8"
-    nan "^2.17.0"
+    cpu-features "~0.0.9"
+    nan "^2.18.0"
 
 sshpk@1.16.1:
   version "1.16.1"
@@ -20202,7 +20798,7 @@ strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -20469,14 +21065,14 @@ tayden-clusterfck@^0.7.0:
   resolved "https://registry.yarnpkg.com/tayden-clusterfck/-/tayden-clusterfck-0.7.0.tgz#25ebb1291a96e8bc204fff785f320cd9c3a3e62e"
   integrity sha1-JeuxKRqW6LwgT/94XzIM2cOj5i4=
 
-teeny-request@^8.0.0:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-8.0.3.tgz#5cb9c471ef5e59f2fca8280dc3c5909595e6ca24"
-  integrity sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==
+teeny-request@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-9.0.0.tgz#18140de2eb6595771b1b02203312dfad79a4716d"
+  integrity sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==
   dependencies:
     http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.0"
-    node-fetch "^2.6.1"
+    node-fetch "^2.6.9"
     stream-events "^1.0.5"
     uuid "^9.0.0"
 
@@ -20616,13 +21212,10 @@ timers-ext@^0.1.7:
     es5-ext "~0.10.46"
     next-tick "1"
 
-tiny-async-pool@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-1.2.0.tgz#22132957e18f8b6020a94b390d07718fd519cc71"
-  integrity sha512-PY/OiSenYGBU3c1nTuP1HLKRkhKFDXsAibYI5GeHbHw2WVpt6OFzAPIRP94dGnS66Jhrkheim2CHAXUNI4XwMg==
-  dependencies:
-    semver "^5.5.0"
-    yaassertion "^1.0.0"
+tiny-async-pool@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-2.1.0.tgz#3ec126568c18a7916912fb9fbecf812337ec6b84"
+  integrity sha512-ltAHPh/9k0STRQqaoUX52NH4ZQYAJz24ZAEwf1Zm+HYg3l9OXTWeqWKyYsHu40wF/F0rxd2N2bk5sLvX2qlSvg==
 
 tiny-invariant@^1.0.2, tiny-invariant@^1.0.6:
   version "1.2.0"
@@ -20665,7 +21258,7 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@^0.2.1, tmp@~0.2.1:
+tmp@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
@@ -20912,7 +21505,7 @@ tslib@^1.10.0, tslib@^1.11.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, "tslib@^2.4.1 || ^1.9.3", tslib@^2.5.0:
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, "tslib@^2.4.1 || ^1.9.3", tslib@^2.5.0, tslib@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -21074,7 +21667,7 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
-uglify-js@^3.1.4, uglify-js@^3.7.7:
+uglify-js@^3.1.4:
   version "3.17.4"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c"
   integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==
@@ -21094,11 +21687,6 @@ unc-path-regex@^0.1.2:
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
-underscore@~1.13.2:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
-  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
-
 undici-types@~5.25.1:
   version "5.25.3"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
@@ -21109,17 +21697,10 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici@^5.26.2:
-  version "5.26.3"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.26.3.tgz#ab3527b3d5bb25b12f898dfd22165d472dd71b79"
-  integrity sha512-H7n2zmKEWgOllKkIUkLvFmsJQj062lSm3uA4EYApG8gLuiOM0/go9bIoC3HVaSnfg4xunowDE2i9p8drkXuvDw==
-  dependencies:
-    "@fastify/busboy" "^2.0.0"
-
-undici@^5.28.3:
-  version "5.28.3"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b"
-  integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==
+undici@^5.26.2, undici@^5.28.4:
+  version "5.28.4"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068"
+  integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==
   dependencies:
     "@fastify/busboy" "^2.0.0"
 
@@ -21374,6 +21955,11 @@ uuid@^9.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
+uuid@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
+  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
+
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
@@ -21622,52 +22208,53 @@ webpack-cli@4.9.1:
     rechoir "^0.7.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+webpack-dev-middleware@^7.1.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz#2af00538b6e4eda05f5afdd5d711dbebc05958f7"
+  integrity sha512-hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.4.3"
+    memfs "^4.6.0"
     mime-types "^2.1.31"
+    on-finished "^2.4.1"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@^4.15.1:
-  version "4.15.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7"
-  integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/express" "^4.17.13"
-    "@types/serve-index" "^1.9.1"
-    "@types/serve-static" "^1.13.10"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.5.5"
+webpack-dev-server@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz#cb6ea47ff796b9251ec49a94f24a425e12e3c9b8"
+  integrity sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==
+  dependencies:
+    "@types/bonjour" "^3.5.13"
+    "@types/connect-history-api-fallback" "^1.5.4"
+    "@types/express" "^4.17.21"
+    "@types/serve-index" "^1.9.4"
+    "@types/serve-static" "^1.15.5"
+    "@types/sockjs" "^0.3.36"
+    "@types/ws" "^8.5.10"
     ansi-html-community "^0.0.8"
-    bonjour-service "^1.0.11"
-    chokidar "^3.5.3"
+    bonjour-service "^1.2.1"
+    chokidar "^3.6.0"
     colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^2.0.0"
     default-gateway "^6.0.3"
     express "^4.17.3"
     graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
+    html-entities "^2.4.0"
     http-proxy-middleware "^2.0.3"
-    ipaddr.js "^2.0.1"
-    launch-editor "^2.6.0"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    rimraf "^3.0.2"
-    schema-utils "^4.0.0"
-    selfsigned "^2.1.1"
+    ipaddr.js "^2.1.0"
+    launch-editor "^2.6.1"
+    open "^10.0.3"
+    p-retry "^6.2.0"
+    rimraf "^5.0.5"
+    schema-utils "^4.2.0"
+    selfsigned "^2.4.1"
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"
-    webpack-dev-middleware "^5.3.1"
-    ws "^8.13.0"
+    webpack-dev-middleware "^7.1.0"
+    ws "^8.16.0"
 
 webpack-hot-middleware@^2.22.2:
   version "2.25.1"
@@ -22112,6 +22699,11 @@ ws@^7.0.0, ws@^7.3.1:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
   integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
 
+ws@^8.16.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
+
 x-path@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/x-path/-/x-path-0.0.2.tgz#294d076bb97a7706cc070bbb2a6fd8c54df67b12"
@@ -22155,11 +22747,6 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmlcreate@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be"
-  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==
-
 xpath@0.0.32, xpath@^0.0.32:
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"
@@ -22185,11 +22772,6 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yaassertion@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/yaassertion/-/yaassertion-1.0.2.tgz#f1a90166e1cc4ad44dbb71487009ebca017e9874"
-  integrity sha512-sBoJBg5vTr3lOpRX0yFD+tz7wv/l2UPMFthag4HGTMPrypBRKerjjS8jiEnNMjcAEtPXjbHiKE0UwRR1W1GXBg==
-
 yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"

From ddb424480b7bb45c0aaae65afb0264c7b9a30091 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 11 Apr 2024 15:50:20 -0700
Subject: [PATCH 157/183] chore: migration reflection groups to pg (#9514)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .../mutations/checkRethinkPgEquality.ts       | 47 ++++++----
 .../1708127504000_updateEmbeddingMetadata.ts  |  6 +-
 .../1712075131388_retroReflectionGroups2.ts   | 88 +++++++++++++++++++
 packages/server/postgres/utils/checkEqBase.ts | 18 ++--
 .../postgres/utils/rethinkEqualityFns.ts      |  8 ++
 packages/server/utils/PubSubPromise.ts        |  2 +-
 6 files changed, 145 insertions(+), 24 deletions(-)
 create mode 100644 packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts

diff --git a/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts b/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts
index 137316624e8..818af10d9e6 100644
--- a/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts
+++ b/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts
@@ -1,12 +1,11 @@
 import fs from 'fs'
 import path from 'path'
 import getRethink from '../../../database/rethinkDriver'
-import getMeetingTemplatesByIds from '../../../postgres/queries/getMeetingTemplatesByIds'
+import getKysely from '../../../postgres/getKysely'
 import {checkRowCount, checkTableEq} from '../../../postgres/utils/checkEqBase'
 import {
   compareDateAlmostEqual,
-  compareRValUndefinedAsFalse,
-  compareRValUndefinedAsNull,
+  compareRValUndefinedAsNullAndTruncateRVal,
   defaultEqFn
 } from '../../../postgres/utils/rethinkEqualityFns'
 import {MutationResolvers} from '../resolverTypes'
@@ -35,22 +34,38 @@ const checkRethinkPgEquality: MutationResolvers['checkRethinkPgEquality'] = asyn
 ) => {
   const r = await getRethink()
 
-  if (tableName === 'MeetingTemplate') {
+  if (tableName === 'RetroReflectionGroup') {
     const rowCountResult = await checkRowCount(tableName)
-    const rethinkQuery = r.table('MeetingTemplate').orderBy('updatedAt', {index: 'updatedAt'})
-    const errors = await checkTableEq(rethinkQuery, getMeetingTemplatesByIds, {
+    const rethinkQuery = (updatedAt: Date, id: string | number) => {
+      return r
+        .table('RetroReflectionGroup')
+        .between([updatedAt, id], [r.maxval, r.maxval], {
+          index: 'updatedAtId',
+          leftBound: 'open',
+          rightBound: 'closed'
+        })
+        .orderBy({index: 'updatedAtId'}) as any
+    }
+    const pgQuery = (ids: string[]) => {
+      return getKysely()
+        .selectFrom('RetroReflectionGroup')
+        .selectAll()
+        .where('id', 'in', ids)
+        .execute()
+    }
+    const errors = await checkTableEq(rethinkQuery, pgQuery, {
+      id: defaultEqFn,
       createdAt: defaultEqFn,
-      isActive: defaultEqFn,
-      name: defaultEqFn,
-      teamId: defaultEqFn,
       updatedAt: compareDateAlmostEqual,
-      scope: defaultEqFn,
-      orgId: defaultEqFn,
-      parentTemplateId: compareRValUndefinedAsNull,
-      lastUsedAt: compareRValUndefinedAsNull,
-      type: defaultEqFn,
-      isStarter: compareRValUndefinedAsFalse,
-      isFree: compareRValUndefinedAsFalse
+      isActive: defaultEqFn,
+      meetingId: defaultEqFn,
+      promptId: defaultEqFn,
+      sortOrder: defaultEqFn,
+      voterIds: defaultEqFn,
+      smartTitle: compareRValUndefinedAsNullAndTruncateRVal(255),
+      title: compareRValUndefinedAsNullAndTruncateRVal(255),
+      summary: compareRValUndefinedAsNullAndTruncateRVal(2000),
+      discussionPromptQuestion: compareRValUndefinedAsNullAndTruncateRVal(2000)
     })
     return handleResult(tableName, rowCountResult, errors, writeToFile)
   }
diff --git a/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts b/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts
index 3c93617c0b1..279dd6f90b7 100644
--- a/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts
+++ b/packages/server/postgres/migrations/1708127504000_updateEmbeddingMetadata.ts
@@ -4,9 +4,13 @@ import getPgConfig from '../getPgConfig'
 export async function up() {
   const client = new Client(getPgConfig())
   await client.connect()
-  await client.query(`
+  try {
+    await client.query(`
     ALTER TABLE "EmbeddingsMetadata" RENAME COLUMN "embedText" TO "fullText";
   `)
+  } catch {
+    // noop
+  }
   await client.end()
 }
 
diff --git a/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts b/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts
new file mode 100644
index 00000000000..c0027a0073d
--- /dev/null
+++ b/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts
@@ -0,0 +1,88 @@
+import {Kysely, PostgresDialect} from 'kysely'
+import {r} from 'rethinkdb-ts'
+import connectRethinkDB from '../../database/connectRethinkDB'
+import getPg from '../getPg'
+
+export async function up() {
+  await connectRethinkDB()
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  try {
+    await r
+      .table('RetroReflectionGroup')
+      .indexCreate('updatedAtId', (row: any) => [row('updatedAt'), row('id')])
+      .run()
+    await r.table('RetroReflectionGroup').indexWait().run()
+  } catch {
+    // index already exists
+  }
+
+  const MAX_PG_PARAMS = 65545
+  const PG_COLS = [
+    'id',
+    'createdAt',
+    'updatedAt',
+    'isActive',
+    'meetingId',
+    'promptId',
+    'sortOrder',
+    'voterIds',
+    'smartTitle',
+    'title',
+    'summary',
+    'discussionPromptQuestion'
+  ] as const
+  type RetroReflectionGroup = {
+    [K in (typeof PG_COLS)[number]]: any
+  }
+  const BATCH_SIZE = Math.trunc(MAX_PG_PARAMS / PG_COLS.length)
+
+  let curUpdatedAt = r.minval
+  let curId = r.minval
+  for (let i = 0; i < 1e6; i++) {
+    const rawRowsToInsert = (await r
+      .table('RetroReflectionGroup')
+      .between([curUpdatedAt, curId], [r.maxval, r.maxval], {
+        index: 'updatedAtId',
+        leftBound: 'open',
+        rightBound: 'closed'
+      })
+      .orderBy({index: 'updatedAtId'})
+      .limit(BATCH_SIZE)
+      .pluck(...PG_COLS)
+      .run()) as RetroReflectionGroup[]
+
+    const rowsToInsert = rawRowsToInsert.map((row) => ({
+      ...row,
+      title: row.title?.slice(0, 255),
+      smartTitle: row.smartTitle?.slice(0, 255),
+      summary: row.summary?.slice(0, 2000)
+    }))
+    if (rowsToInsert.length === 0) break
+    const lastRow = rowsToInsert[rowsToInsert.length - 1]
+    curUpdatedAt = lastRow.updatedAt
+    curId = lastRow.id
+    try {
+      await pg
+        .insertInto('RetroReflectionGroup')
+        .values(rowsToInsert)
+        .onConflict((oc) => oc.doNothing())
+        .execute()
+    } catch (e) {
+      console.log({lastRow}, rowsToInsert.length)
+      throw e
+    }
+  }
+}
+
+export async function down() {
+  await connectRethinkDB()
+  try {
+    await r.table('RetroReflectionGroup').indexDrop('updatedAtId').run()
+  } catch {
+    // index already dropped
+  }
+}
diff --git a/packages/server/postgres/utils/checkEqBase.ts b/packages/server/postgres/utils/checkEqBase.ts
index c56da959aa3..20bc9914f43 100644
--- a/packages/server/postgres/utils/checkEqBase.ts
+++ b/packages/server/postgres/utils/checkEqBase.ts
@@ -1,5 +1,5 @@
+import {RSelection} from 'rethinkdb-ts'
 import getRethink from '../../database/rethinkDriver'
-import {RTable, TableSchema} from '../../database/stricterR'
 import getPg from '../getPg'
 
 interface DBDoc {
@@ -33,7 +33,7 @@ export const checkRowCount = async (tableName: string) => {
 }
 
 export async function checkTableEq(
-  rethinkQuery: RTable<TableSchema>,
+  rethinkQuery: (updatedAt: Date, id: string | number) => RSelection,
   pgQuery: (ids: string[]) => Promise<PGDoc[] | null>,
   equalityMap: Record<string, (a: unknown, b: unknown) => boolean>,
   maxErrors = 10
@@ -41,11 +41,17 @@ export async function checkTableEq(
   const batchSize = 3000
   const errors = [] as Diff[]
   const propsToCheck = Object.keys(equalityMap)
-
+  const r = await getRethink()
+  let curUpdatedDate = r.minval
+  let curId = r.minval
   for (let i = 0; i < 1e6; i++) {
-    const offset = batchSize * i
-    const rethinkRows = (await rethinkQuery.skip(offset).limit(batchSize).run()) as RethinkDoc[]
-    if (!rethinkRows.length) break
+    const rethinkRows = (await rethinkQuery(curUpdatedDate, curId)
+      .limit(batchSize)
+      .run()) as RethinkDoc[]
+    if (rethinkRows.length === 0) break
+    const lastRow = rethinkRows[rethinkRows.length - 1]!
+    curUpdatedDate = lastRow.updatedAt
+    curId = lastRow.id
     const ids = rethinkRows.map((t) => t.id)
     const pgRows = (await pgQuery(ids)) ?? []
     const pgRowsById = {} as {[key: string]: PGDoc}
diff --git a/packages/server/postgres/utils/rethinkEqualityFns.ts b/packages/server/postgres/utils/rethinkEqualityFns.ts
index 8cecaf562c1..69f0ec2bb20 100644
--- a/packages/server/postgres/utils/rethinkEqualityFns.ts
+++ b/packages/server/postgres/utils/rethinkEqualityFns.ts
@@ -2,6 +2,7 @@ import isValidDate from 'parabol-client/utils/isValidDate'
 
 export const defaultEqFn = (a: unknown, b: unknown) => {
   if (a instanceof Date && b instanceof Date) return a.getTime() === b.getTime()
+  if (Array.isArray(a) && Array.isArray(b)) return JSON.stringify(a) === JSON.stringify(b)
   return a === b
 }
 export const compareDateAlmostEqual = (rVal: unknown, pgVal: unknown) => {
@@ -19,3 +20,10 @@ export const compareRValUndefinedAsFalse = (rVal: unknown, pgVal: unknown) => {
   const normalizedRVal = rVal === undefined ? false : rVal
   return normalizedRVal === pgVal
 }
+
+export const compareRValUndefinedAsNullAndTruncateRVal =
+  (length: number) => (rVal: unknown, pgVal: unknown) => {
+    const truncatedRVal = typeof rVal === 'string' ? rVal.slice(0, length) : rVal
+    const normalizedRVal = truncatedRVal === undefined ? null : truncatedRVal
+    return defaultEqFn(normalizedRVal, pgVal)
+  }
diff --git a/packages/server/utils/PubSubPromise.ts b/packages/server/utils/PubSubPromise.ts
index 8768ef1eb9d..cd95cbaf325 100644
--- a/packages/server/utils/PubSubPromise.ts
+++ b/packages/server/utils/PubSubPromise.ts
@@ -5,7 +5,7 @@ import numToBase64 from './numToBase64'
 import sendToSentry from './sendToSentry'
 
 const STANDARD_TIMEOUT = ms('10s')
-const ADHOC_TIMEOUT = ms('1m')
+const ADHOC_TIMEOUT = ms('10m')
 
 interface Job {
   resolve: (payload: any) => void

From e3635ee335f59c1be0ca43c254a15e126e6e24d5 Mon Sep 17 00:00:00 2001
From: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com>
Date: Fri, 12 Apr 2024 13:58:45 -0700
Subject: [PATCH 158/183] chore: fix ironbank action file copy (#9638)

---
 .github/workflows/ironbank.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ironbank.yml b/.github/workflows/ironbank.yml
index c60df2b134f..bbd88303041 100644
--- a/.github/workflows/ironbank.yml
+++ b/.github/workflows/ironbank.yml
@@ -50,7 +50,7 @@ jobs:
         run: |
           docker cp temp-container:/home/node/parabol/dist ./dist
           docker cp temp-container:/home/node/parabol/build ./build
-          docker cp temp-container:/home/node/tools/ip-to-server_id ./tools/ip-to-server_id
+          docker cp temp-container:/home/node/tools/ip-to-server_id ./ip-to-server_id
 
       - name: Zip the files
         run: zip -r ${{ github.event.inputs.version_number }}.zip dist build

From a21f1d0895aaf987299104891e2b9c2e343a1635 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 15 Apr 2024 14:47:50 +0200
Subject: [PATCH 159/183] fix: Migrate webpack dev server settings to v5
 (#9644)

---
 scripts/webpack/dev.client.config.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/webpack/dev.client.config.js b/scripts/webpack/dev.client.config.js
index 5c626108805..e3d6766bf59 100644
--- a/scripts/webpack/dev.client.config.js
+++ b/scripts/webpack/dev.client.config.js
@@ -59,12 +59,10 @@ module.exports = {
       'self-hosted',
       // important terminating / so saml-redirect doesn't get targeted, too
       'saml/'
-    ].reduce((obj, name) => {
-      obj[`/${name}`] = {
-        target: `http://localhost:${SOCKET_PORT}`
-      }
-      return obj
-    }, {})
+    ].map((name) => ({
+        context: [`/${name}`],
+        target: `http://localhost:${SOCKET_PORT}`,
+      }))
   },
   infrastructureLogging: {level: 'warn'},
   watchOptions: {

From 19a66898f841905b801161a9576385d6480d631e Mon Sep 17 00:00:00 2001
From: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com>
Date: Mon, 15 Apr 2024 20:18:28 -0700
Subject: [PATCH 160/183] chore: add ip-to-server script dir to zip file
 (#9645)

---
 .github/workflows/ironbank.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ironbank.yml b/.github/workflows/ironbank.yml
index bbd88303041..ce69988b2b1 100644
--- a/.github/workflows/ironbank.yml
+++ b/.github/workflows/ironbank.yml
@@ -53,7 +53,7 @@ jobs:
           docker cp temp-container:/home/node/tools/ip-to-server_id ./ip-to-server_id
 
       - name: Zip the files
-        run: zip -r ${{ github.event.inputs.version_number }}.zip dist build
+        run: zip -r ${{ github.event.inputs.version_number }}.zip dist build ip-to-server_id
 
       - name: Set up AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

From 8552d43e63fa1cf548da54460c49947d5772ae61 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 16 Apr 2024 09:53:39 +0200
Subject: [PATCH 161/183] chore: Remove old template editing logic (#9627)

---
 .../ActivityDetails/ActivityDetails.tsx       |   2 -
 .../client/components/NewMeetingSettings.tsx  |  42 ---
 .../components/NewMeetingSettingsAction.tsx   |  27 --
 .../components/NewMeetingSettingsPoker.tsx    |  34 ---
 .../NewMeetingSettingsRetrospective.tsx       |  38 ---
 ...ewMeetingSettingsRetrospectiveSettings.tsx |  96 -------
 .../NewMeetingSettingsTeamPrompt.tsx          |  24 --
 .../components/AddNewPokerTemplate.tsx        | 110 --------
 .../components/AddNewReflectTemplate.tsx      | 109 --------
 .../components/PokerTemplateDetails.tsx       | 174 -------------
 .../meeting/components/PokerTemplateItem.tsx  | 109 --------
 .../meeting/components/PokerTemplateList.tsx  | 195 --------------
 .../components/PokerTemplateListOrg.tsx       | 118 ---------
 .../components/PokerTemplateListOrgRoot.tsx   |  24 --
 .../components/PokerTemplateListPublic.tsx    |  71 ------
 .../PokerTemplateListPublicRoot.tsx           |  26 --
 .../components/PokerTemplateListTeam.tsx      | 114 ---------
 .../meeting/components/PokerTemplateModal.tsx | 108 --------
 .../components/PokerTemplatePicker.tsx        |  70 -----
 .../components/ReflectTemplateDetails.tsx     | 189 --------------
 .../components/ReflectTemplateItem.tsx        | 111 --------
 .../components/ReflectTemplateList.tsx        | 240 ------------------
 .../components/ReflectTemplateListOrg.tsx     | 134 ----------
 .../components/ReflectTemplateListOrgRoot.tsx |  25 --
 .../components/ReflectTemplateListPublic.tsx  | 104 --------
 .../ReflectTemplateListPublicRoot.tsx         |  28 --
 .../components/ReflectTemplateListTeam.tsx    | 137 ----------
 .../components/ReflectTemplateModal.tsx       | 102 --------
 .../components/ReflectTemplateSearchBar.tsx   | 139 ----------
 .../components/RetroTemplatePicker.tsx        |  71 ------
 .../meeting/components/SelectTemplate.tsx     | 115 ---------
 .../mutations/AddPokerTemplateMutation.ts     |   1 -
 .../mutations/AddReflectTemplateMutation.ts   |   1 -
 .../mutations/RemovePokerTemplateMutation.ts  |   9 +-
 .../UpdatePokerTemplateScopeMutation.ts       |  17 +-
 .../UpdateReflectTemplateScopeMutation.ts     |   2 -
 .../connections/getPokerTemplateOrgConn.ts    |  13 -
 .../connections/getPokerTemplatePublicConn.ts |  10 -
 .../handleMovePokerTemplateDimension.ts       |   4 +-
 .../handlers/handleRemovePokerTemplate.ts     |  20 +-
 40 files changed, 8 insertions(+), 2955 deletions(-)
 delete mode 100644 packages/client/components/NewMeetingSettings.tsx
 delete mode 100644 packages/client/components/NewMeetingSettingsAction.tsx
 delete mode 100644 packages/client/components/NewMeetingSettingsPoker.tsx
 delete mode 100644 packages/client/components/NewMeetingSettingsRetrospective.tsx
 delete mode 100644 packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx
 delete mode 100644 packages/client/components/NewMeetingSettingsTeamPrompt.tsx
 delete mode 100644 packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
 delete mode 100644 packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateDetails.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateItem.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateList.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListOrg.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListPublic.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateListTeam.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplateModal.tsx
 delete mode 100644 packages/client/modules/meeting/components/PokerTemplatePicker.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateItem.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateList.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateModal.tsx
 delete mode 100644 packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx
 delete mode 100644 packages/client/modules/meeting/components/RetroTemplatePicker.tsx
 delete mode 100644 packages/client/modules/meeting/components/SelectTemplate.tsx
 delete mode 100644 packages/client/mutations/connections/getPokerTemplateOrgConn.ts
 delete mode 100644 packages/client/mutations/connections/getPokerTemplatePublicConn.ts

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
index 9428b641bcc..dcafb56236f 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -29,8 +29,6 @@ graphql`
     ...TemplateDetails_activity
     ...ActivityDetailsBadges_template
     ...ActivityDetailsSidebar_template
-    ...ReflectTemplateDetailsTemplate @relay(mask: false)
-    ...PokerTemplateDetailsTemplate @relay(mask: false)
     ...useTemplateDescription_template
   }
 `
diff --git a/packages/client/components/NewMeetingSettings.tsx b/packages/client/components/NewMeetingSettings.tsx
deleted file mode 100644
index 26993d5e365..00000000000
--- a/packages/client/components/NewMeetingSettings.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {MeetingTypeEnum} from '~/__generated__/MeetingSelectorQuery.graphql'
-import {NewMeetingSettings_selectedTeam$key} from '~/__generated__/NewMeetingSettings_selectedTeam.graphql'
-import NewMeetingSettingsAction from './NewMeetingSettingsAction'
-import NewMeetingSettingsPoker from './NewMeetingSettingsPoker'
-import NewMeetingSettingsRetrospective from './NewMeetingSettingsRetrospective'
-import NewMeetingSettingsTeamPrompt from './NewMeetingSettingsTeamPrompt'
-
-interface Props {
-  meetingType: MeetingTypeEnum
-  selectedTeamRef: NewMeetingSettings_selectedTeam$key
-}
-
-const settingsLookup = {
-  action: NewMeetingSettingsAction,
-  retrospective: NewMeetingSettingsRetrospective,
-  poker: NewMeetingSettingsPoker,
-  teamPrompt: NewMeetingSettingsTeamPrompt
-}
-
-const NewMeetingSettings = (props: Props) => {
-  const {meetingType, selectedTeamRef} = props
-  const selectedTeam = useFragment(
-    graphql`
-      fragment NewMeetingSettings_selectedTeam on Team {
-        ...NewMeetingSettingsRetrospective_team
-        ...NewMeetingSettingsAction_team
-        ...NewMeetingSettingsPoker_team
-        ...NewMeetingSettingsTeamPrompt_team
-        id
-      }
-    `,
-    selectedTeamRef
-  )
-
-  const Settings = settingsLookup[meetingType]
-  return <Settings teamRef={selectedTeam} />
-}
-
-export default NewMeetingSettings
diff --git a/packages/client/components/NewMeetingSettingsAction.tsx b/packages/client/components/NewMeetingSettingsAction.tsx
deleted file mode 100644
index db7e1a75d88..00000000000
--- a/packages/client/components/NewMeetingSettingsAction.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {NewMeetingSettingsAction_team$key} from '../__generated__/NewMeetingSettingsAction_team.graphql'
-import NewMeetingSettingsToggleCheckIn from './NewMeetingSettingsToggleCheckIn'
-
-interface Props {
-  teamRef: NewMeetingSettingsAction_team$key
-}
-
-const NewMeetingSettingsAction = (props: Props) => {
-  const {teamRef} = props
-  const team = useFragment(
-    graphql`
-      fragment NewMeetingSettingsAction_team on Team {
-        actionSettings: meetingSettings(meetingType: action) {
-          ...NewMeetingSettingsToggleCheckIn_settings
-        }
-      }
-    `,
-    teamRef
-  )
-  const {actionSettings} = team
-  return <NewMeetingSettingsToggleCheckIn settingsRef={actionSettings} />
-}
-
-export default NewMeetingSettingsAction
diff --git a/packages/client/components/NewMeetingSettingsPoker.tsx b/packages/client/components/NewMeetingSettingsPoker.tsx
deleted file mode 100644
index f546a8cd65a..00000000000
--- a/packages/client/components/NewMeetingSettingsPoker.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {NewMeetingSettingsPoker_team$key} from '~/__generated__/NewMeetingSettingsPoker_team.graphql'
-import PokerTemplatePicker from '../modules/meeting/components/PokerTemplatePicker'
-import NewMeetingSettingsToggleCheckIn from './NewMeetingSettingsToggleCheckIn'
-
-interface Props {
-  teamRef: NewMeetingSettingsPoker_team$key
-}
-
-const NewMeetingSettingsPoker = (props: Props) => {
-  const {teamRef} = props
-  const team = useFragment(
-    graphql`
-      fragment NewMeetingSettingsPoker_team on Team {
-        pokerSettings: meetingSettings(meetingType: poker) {
-          ...PokerTemplatePicker_settings
-          ...NewMeetingSettingsToggleCheckIn_settings
-        }
-      }
-    `,
-    teamRef
-  )
-  const {pokerSettings} = team
-  return (
-    <>
-      <PokerTemplatePicker settingsRef={pokerSettings} />
-      <NewMeetingSettingsToggleCheckIn settingsRef={pokerSettings} />
-    </>
-  )
-}
-
-export default NewMeetingSettingsPoker
diff --git a/packages/client/components/NewMeetingSettingsRetrospective.tsx b/packages/client/components/NewMeetingSettingsRetrospective.tsx
deleted file mode 100644
index 75f1d3ab983..00000000000
--- a/packages/client/components/NewMeetingSettingsRetrospective.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {NewMeetingSettingsRetrospective_team$key} from '~/__generated__/NewMeetingSettingsRetrospective_team.graphql'
-import RetroTemplatePicker from '../modules/meeting/components/RetroTemplatePicker'
-import NewMeetingSettingsRetrospectiveSettings from './NewMeetingSettingsRetrospectiveSettings'
-
-interface Props {
-  teamRef: NewMeetingSettingsRetrospective_team$key
-}
-
-const NewMeetingSettingsRetrospective = (props: Props) => {
-  const {teamRef} = props
-  const team = useFragment(
-    graphql`
-      fragment NewMeetingSettingsRetrospective_team on Team {
-        ...NewMeetingSettingsRetrospectiveSettings_team
-        retroSettings: meetingSettings(meetingType: retrospective) {
-          ...RetroTemplatePicker_settings
-        }
-        organization {
-          ...NewMeetingSettingsRetrospectiveSettings_organization
-        }
-      }
-    `,
-    teamRef
-  )
-  const {organization} = team
-  const {retroSettings} = team
-  return (
-    <>
-      <RetroTemplatePicker settingsRef={retroSettings} />
-      <NewMeetingSettingsRetrospectiveSettings teamRef={team} organizationRef={organization} />
-    </>
-  )
-}
-
-export default NewMeetingSettingsRetrospective
diff --git a/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx b/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx
deleted file mode 100644
index 08f6dc3286e..00000000000
--- a/packages/client/components/NewMeetingSettingsRetrospectiveSettings.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {NewMeetingSettingsRetrospectiveSettings_organization$key} from '~/__generated__/NewMeetingSettingsRetrospectiveSettings_organization.graphql'
-import {NewMeetingSettingsRetrospectiveSettings_team$key} from '~/__generated__/NewMeetingSettingsRetrospectiveSettings_team.graphql'
-import {MenuPosition} from '../hooks/useCoords'
-import useMenu from '../hooks/useMenu'
-import {PortalStatus} from '../hooks/usePortal'
-import NewMeetingDropdown from './NewMeetingDropdown'
-import NewMeetingSettingsToggleAnonymity from './NewMeetingSettingsToggleAnonymity'
-import NewMeetingSettingsToggleCheckIn from './NewMeetingSettingsToggleCheckIn'
-import NewMeetingSettingsToggleTeamHealth from './NewMeetingSettingsToggleTeamHealth'
-import NewMeetingSettingsToggleTranscription from './NewMeetingSettingsToggleTranscription'
-
-const NewMeetingSettingsToggleCheckInMenuEntry = styled(NewMeetingSettingsToggleCheckIn)({
-  background: 'none',
-  borderRadius: 0
-})
-
-const NewMeetingSettingsToggleTeamHealthMenuEntry = styled(NewMeetingSettingsToggleTeamHealth)({
-  background: 'none',
-  borderRadius: 0
-})
-
-const NewMeetingSettingsToggleAnonymityMenuEntry = styled(NewMeetingSettingsToggleAnonymity)({
-  background: 'none',
-  borderRadius: 0
-})
-
-interface Props {
-  teamRef: NewMeetingSettingsRetrospectiveSettings_team$key
-  organizationRef: NewMeetingSettingsRetrospectiveSettings_organization$key
-}
-
-const NewMeetingSettingsRetrospectiveSettings = (props: Props) => {
-  const {teamRef, organizationRef} = props
-  const {togglePortal, menuPortal, originRef, menuProps, portalStatus} = useMenu<HTMLDivElement>(
-    MenuPosition.LOWER_RIGHT,
-    {
-      isDropdown: true
-    }
-  )
-
-  const team = useFragment(
-    graphql`
-      fragment NewMeetingSettingsRetrospectiveSettings_team on Team {
-        ...NewMeetingSettingsToggleTeamHealth_team
-        retroSettings: meetingSettings(meetingType: retrospective) {
-          ...NewMeetingSettingsToggleCheckIn_settings
-          ...NewMeetingSettingsToggleTeamHealth_settings
-          ...NewMeetingSettingsToggleAnonymity_settings
-          ...NewMeetingSettingsToggleTranscription_settings
-        }
-      }
-    `,
-    teamRef
-  )
-  const {retroSettings} = team
-
-  const organization = useFragment(
-    graphql`
-      fragment NewMeetingSettingsRetrospectiveSettings_organization on Organization {
-        featureFlags {
-          zoomTranscription
-        }
-      }
-    `,
-    organizationRef
-  )
-  const {zoomTranscription} = organization.featureFlags
-
-  return (
-    <>
-      <NewMeetingDropdown
-        dropdownIcon={'keyboard_arrow_down'}
-        label={'Settings'}
-        onClick={togglePortal}
-        ref={originRef}
-        opened={[PortalStatus.Entering, PortalStatus.Entered].includes(portalStatus)}
-      />
-      {menuPortal(
-        <div {...menuProps}>
-          <NewMeetingSettingsToggleCheckInMenuEntry settingsRef={retroSettings} />
-          <NewMeetingSettingsToggleTeamHealthMenuEntry settingsRef={retroSettings} teamRef={team} />
-          <NewMeetingSettingsToggleAnonymityMenuEntry settingsRef={retroSettings} />
-          {zoomTranscription && (
-            <NewMeetingSettingsToggleTranscription settingsRef={retroSettings} />
-          )}
-        </div>
-      )}
-    </>
-  )
-}
-
-export default NewMeetingSettingsRetrospectiveSettings
diff --git a/packages/client/components/NewMeetingSettingsTeamPrompt.tsx b/packages/client/components/NewMeetingSettingsTeamPrompt.tsx
deleted file mode 100644
index 0d396e4fa9f..00000000000
--- a/packages/client/components/NewMeetingSettingsTeamPrompt.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import graphql from 'babel-plugin-relay/macro'
-import {useFragment} from 'react-relay'
-import {NewMeetingSettingsTeamPrompt_team$key} from '../__generated__/NewMeetingSettingsTeamPrompt_team.graphql'
-
-interface Props {
-  teamRef: NewMeetingSettingsTeamPrompt_team$key
-}
-
-const NewMeetingSettingsTeamPrompt = (props: Props) => {
-  const {teamRef} = props
-  useFragment(
-    graphql`
-      fragment NewMeetingSettingsTeamPrompt_team on Team {
-        teamPromptSettings: meetingSettings(meetingType: teamPrompt) {
-          id
-        }
-      }
-    `,
-    teamRef
-  )
-
-  return null
-}
-export default NewMeetingSettingsTeamPrompt
diff --git a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx b/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
deleted file mode 100644
index 5a6307d7fdd..00000000000
--- a/packages/client/modules/meeting/components/AddNewPokerTemplate.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
-import {useFragment} from 'react-relay'
-import {AddNewPokerTemplate_pokerTemplates$key} from '../../../__generated__/AddNewPokerTemplate_pokerTemplates.graphql'
-import {AddNewPokerTemplate_team$key} from '../../../__generated__/AddNewPokerTemplate_team.graphql'
-import LinkButton from '../../../components/LinkButton'
-import TooltipStyled from '../../../components/TooltipStyled'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useMutationProps from '../../../hooks/useMutationProps'
-import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation'
-
-const ErrorLine = styled(TooltipStyled)({
-  margin: '0 0 8px'
-})
-
-const AddPokerTemplateLink = styled(LinkButton)({
-  alignItems: 'center',
-  display: 'flex',
-  justifyContent: 'flex-start',
-  fontSize: 16,
-  fontWeight: 600,
-  lineHeight: '24px',
-  outline: 'none',
-  padding: '20px 16px',
-  width: '100%'
-})
-
-interface Props {
-  gotoTeamTemplates: () => void
-  pokerTemplatesRef: AddNewPokerTemplate_pokerTemplates$key
-  teamRef: AddNewPokerTemplate_team$key
-  displayUpgradeDetails: () => void
-}
-
-const AddNewPokerTemplate = (props: Props) => {
-  const {gotoTeamTemplates, teamRef, pokerTemplatesRef, displayUpgradeDetails} = props
-  const atmosphere = useAtmosphere()
-  const pokerTemplates = useFragment(
-    graphql`
-      fragment AddNewPokerTemplate_pokerTemplates on PokerTemplate @relay(plural: true) {
-        name
-      }
-    `,
-    pokerTemplatesRef
-  )
-  const team = useFragment(
-    graphql`
-      fragment AddNewPokerTemplate_team on Team {
-        id
-        tier
-        viewerTeamMember {
-          id
-          user {
-            id
-            freeCustomPokerTemplatesRemaining
-          }
-        }
-      }
-    `,
-    teamRef
-  )
-  const {id: teamId, tier, viewerTeamMember} = team
-  const {user} = viewerTeamMember || {}
-  const {freeCustomPokerTemplatesRemaining} = user || {}
-
-  const {onError, onCompleted, submitMutation, submitting, error} = useMutationProps()
-  const errorTimerId = useRef<undefined | number>()
-  useEffect(() => {
-    return () => {
-      window.clearTimeout(errorTimerId.current)
-    }
-  }, [])
-  const canEditTemplates =
-    tier !== 'starter' ||
-    (freeCustomPokerTemplatesRemaining && freeCustomPokerTemplatesRemaining > 0)
-  const addNewTemplate = () => {
-    if (submitting) return
-    if (!canEditTemplates) {
-      displayUpgradeDetails()
-      return
-    }
-    if (pokerTemplates.find((template) => template.name.startsWith('*New Template'))) {
-      onError(new Error('You already have a new template. Try renaming that one first.'))
-      errorTimerId.current = window.setTimeout(() => {
-        onCompleted()
-      }, 8000)
-      return
-    }
-    submitMutation()
-    AddPokerTemplateMutation(atmosphere, {teamId}, {onError, onCompleted})
-    gotoTeamTemplates()
-  }
-
-  const containsNewTemplate = pokerTemplates.find((template) =>
-    template.name.startsWith('*New Template')
-  )
-
-  if (containsNewTemplate) return null
-  return (
-    <div>
-      {error && <ErrorLine>{error.message}</ErrorLine>}
-      <AddPokerTemplateLink palette='blue' onClick={addNewTemplate} waiting={submitting}>
-        Create New Template {!canEditTemplates && '🔒'}
-      </AddPokerTemplateLink>
-    </div>
-  )
-}
-
-export default AddNewPokerTemplate
diff --git a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx b/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
deleted file mode 100644
index 6b87c2a9ff3..00000000000
--- a/packages/client/modules/meeting/components/AddNewReflectTemplate.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
-import {useFragment} from 'react-relay'
-import {AddNewReflectTemplate_reflectTemplates$key} from '../../../__generated__/AddNewReflectTemplate_reflectTemplates.graphql'
-import {AddNewReflectTemplate_team$key} from '../../../__generated__/AddNewReflectTemplate_team.graphql'
-import LinkButton from '../../../components/LinkButton'
-import TooltipStyled from '../../../components/TooltipStyled'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useMutationProps from '../../../hooks/useMutationProps'
-import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
-
-const ErrorLine = styled(TooltipStyled)({
-  margin: '0 0 8px'
-})
-
-const AddRetroTemplateLink = styled(LinkButton)({
-  alignItems: 'center',
-  display: 'flex',
-  justifyContent: 'flex-start',
-  fontSize: 16,
-  fontWeight: 600,
-  lineHeight: '24px',
-  outline: 'none',
-  padding: '20px 16px',
-  width: '100%'
-})
-
-interface Props {
-  gotoTeamTemplates: () => void
-  reflectTemplatesRef: AddNewReflectTemplate_reflectTemplates$key
-  displayUpgradeDetails: () => void
-  teamRef: AddNewReflectTemplate_team$key
-}
-
-const AddNewReflectTemplate = (props: Props) => {
-  const {gotoTeamTemplates, reflectTemplatesRef, teamRef, displayUpgradeDetails} = props
-  const atmosphere = useAtmosphere()
-  const reflectTemplates = useFragment(
-    graphql`
-      fragment AddNewReflectTemplate_reflectTemplates on ReflectTemplate @relay(plural: true) {
-        name
-      }
-    `,
-    reflectTemplatesRef
-  )
-  const team = useFragment(
-    graphql`
-      fragment AddNewReflectTemplate_team on Team {
-        id
-        tier
-        viewerTeamMember {
-          id
-          user {
-            id
-            freeCustomRetroTemplatesRemaining
-          }
-        }
-      }
-    `,
-    teamRef
-  )
-  const {id: teamId, tier, viewerTeamMember} = team
-  const {user} = viewerTeamMember || {}
-  const {freeCustomRetroTemplatesRemaining} = user || {}
-  const {onError, onCompleted, submitMutation, submitting, error} = useMutationProps()
-  const errorTimerId = useRef<undefined | number>()
-  useEffect(() => {
-    return () => {
-      window.clearTimeout(errorTimerId.current)
-    }
-  }, [])
-  const canEditTemplates =
-    tier !== 'starter' ||
-    (freeCustomRetroTemplatesRemaining && freeCustomRetroTemplatesRemaining > 0)
-  const addNewTemplate = () => {
-    if (submitting) return
-    if (!canEditTemplates) {
-      displayUpgradeDetails()
-      return
-    }
-    if (reflectTemplates.find((template) => template.name.startsWith('*New Template'))) {
-      onError(new Error('You already have a new template. Try renaming that one first.'))
-      errorTimerId.current = window.setTimeout(() => {
-        onCompleted()
-      }, 8000)
-      return
-    }
-    submitMutation()
-    AddReflectTemplateMutation(atmosphere, {teamId}, {onError, onCompleted})
-    gotoTeamTemplates()
-  }
-
-  const containsNewTemplate = reflectTemplates.find((template) =>
-    template.name.startsWith('*New Template')
-  )
-
-  if (containsNewTemplate) return null
-  return (
-    <div>
-      {error && <ErrorLine>{error.message}</ErrorLine>}
-      <AddRetroTemplateLink palette='blue' onClick={addNewTemplate} waiting={submitting}>
-        Create New Template {!canEditTemplates && '🔒'}
-      </AddRetroTemplateLink>
-    </div>
-  )
-}
-
-export default AddNewReflectTemplate
diff --git a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx b/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
deleted file mode 100644
index e1fd1e27d4e..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateDetails.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {PokerTemplateDetails_settings$key} from '../../../__generated__/PokerTemplateDetails_settings.graphql'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useMutationProps from '../../../hooks/useMutationProps'
-import AddPokerTemplateMutation from '../../../mutations/AddPokerTemplateMutation'
-import {PALETTE} from '../../../styles/paletteV3'
-import getTemplateList from '../../../utils/getTemplateList'
-import useTemplateDescription from '../../../utils/useTemplateDescription'
-import AddPokerTemplateDimension from './AddPokerTemplateDimension'
-import CloneTemplate from './CloneTemplate'
-import EditableTemplateName from './EditableTemplateName'
-import RemoveTemplate from './RemoveTemplate'
-import SelectTemplate from './SelectTemplate'
-import TemplateDimensionList from './TemplateDimensionList'
-import TemplateSharing from './TemplateSharing'
-
-const TemplateHeader = styled('div')({
-  display: 'flex',
-  flexDirection: 'column',
-  margin: '16px 0',
-  paddingLeft: 56,
-  paddingRight: 16,
-  width: '100%',
-  flexShrink: 0
-})
-
-const DimensionEditor = styled('div')({
-  alignItems: 'flex-start',
-  background: '#fff',
-  borderRadius: 8,
-  display: 'flex',
-  flexDirection: 'column',
-  overflow: 'hidden',
-  maxWidth: 520,
-  width: '100%'
-})
-
-const TemplateImg = styled('img')({
-  margin: '0 auto',
-  maxWidth: 360,
-  maxHeight: 200,
-  padding: '16px 0 0',
-  width: '100%',
-  objectFit: 'contain'
-})
-
-const Description = styled('div')({
-  color: PALETTE.SLATE_700,
-  fontSize: 14,
-  lineHeight: '20px'
-})
-
-const FirstLine = styled('div')({
-  alignItems: 'center',
-  display: 'flex'
-})
-
-const Scrollable = styled('div')<{isActiveTemplate: boolean}>(({isActiveTemplate}) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  overflow: 'auto',
-  paddingBottom: isActiveTemplate ? undefined : 56,
-  width: '100%'
-}))
-
-interface Props {
-  gotoTeamTemplates: () => void
-  gotoPublicTemplates: () => void
-  closePortal: () => void
-  settings: PokerTemplateDetails_settings$key
-}
-
-const PokerTemplateDetails = (props: Props) => {
-  const {gotoTeamTemplates, gotoPublicTemplates, closePortal, settings: settingsRef} = props
-  const settings = useFragment(
-    graphql`
-      fragment PokerTemplateDetails_settings on PokerMeetingSettings {
-        activeTemplate {
-          illustrationUrl
-          ...PokerTemplateDetailsTemplate @relay(mask: false)
-          ...SelectTemplate_template
-        }
-        selectedTemplate {
-          illustrationUrl
-          ...PokerTemplateDetailsTemplate @relay(mask: false)
-          ...SelectTemplate_template
-        }
-        teamTemplates {
-          ...RemoveTemplate_teamTemplates
-        }
-        team {
-          id
-          orgId
-          tier
-        }
-      }
-    `,
-    settingsRef
-  )
-  const {teamTemplates, team} = settings
-  const activeTemplate = settings.activeTemplate ?? settings.selectedTemplate
-  const {id: templateId, name: templateName, dimensions, illustrationUrl} = activeTemplate
-  const {id: teamId, orgId, tier} = team
-  const lowestScope = getTemplateList(teamId, orgId, activeTemplate)
-  const isOwner = activeTemplate.teamId === teamId
-  const description = useTemplateDescription(lowestScope, activeTemplate, tier)
-  const atmosphere = useAtmosphere()
-  const {onError, onCompleted, submitting, submitMutation} = useMutationProps()
-  const onClone = () => {
-    if (submitting) return
-    submitMutation()
-    AddPokerTemplateMutation(
-      atmosphere,
-      {parentTemplateId: templateId, teamId},
-      {onError, onCompleted}
-    )
-    gotoTeamTemplates()
-  }
-  const isActiveTemplate = activeTemplate.id === settings.selectedTemplate.id
-  const showClone = !isOwner && tier !== 'starter'
-  return (
-    <DimensionEditor>
-      <Scrollable isActiveTemplate={isActiveTemplate}>
-        <TemplateImg src={illustrationUrl} />
-        <TemplateHeader>
-          <FirstLine>
-            <EditableTemplateName
-              key={templateId}
-              name={templateName}
-              templateId={templateId}
-              isOwner={isOwner}
-            />
-            {isOwner && (
-              <RemoveTemplate
-                templateId={templateId}
-                teamId={teamId}
-                teamTemplates={teamTemplates}
-                gotoPublicTemplates={gotoPublicTemplates}
-                type='poker'
-              />
-            )}
-            {showClone && <CloneTemplate onClick={onClone} />}
-          </FirstLine>
-          <Description>{description}</Description>
-        </TemplateHeader>
-        <TemplateDimensionList isOwner={isOwner} dimensions={dimensions} templateId={templateId} />
-        {isOwner && <AddPokerTemplateDimension templateId={templateId} dimensions={dimensions} />}
-        <TemplateSharing isOwner={isOwner} template={activeTemplate} />
-      </Scrollable>
-      {!isActiveTemplate && (
-        <SelectTemplate closePortal={closePortal} template={activeTemplate} teamId={teamId} />
-      )}
-    </DimensionEditor>
-  )
-}
-
-graphql`
-  fragment PokerTemplateDetailsTemplate on PokerTemplate {
-    ...TemplateSharing_template
-    ...getTemplateList_template
-    ...useTemplateDescription_template
-    id
-    name
-    dimensions {
-      ...TemplateDimensionList_dimensions
-      ...AddPokerTemplateDimension_dimensions
-    }
-    teamId
-  }
-`
-export default PokerTemplateDetails
diff --git a/packages/client/modules/meeting/components/PokerTemplateItem.tsx b/packages/client/modules/meeting/components/PokerTemplateItem.tsx
deleted file mode 100644
index 96bf03c302d..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateItem.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
-import {commitLocalUpdate, useFragment} from 'react-relay'
-import {PokerTemplateItem_template$key} from '../../../__generated__/PokerTemplateItem_template.graphql'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useScrollIntoView from '../../../hooks/useScrollIntoVIew'
-import {DECELERATE} from '../../../styles/animation'
-import textOverflow from '../../../styles/helpers/textOverflow'
-import {PALETTE} from '../../../styles/paletteV3'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import useTemplateDescription from '../../../utils/useTemplateDescription'
-
-const TemplateItem = styled('li')<{isActive: boolean}>(({isActive}) => ({
-  backgroundColor: isActive ? PALETTE.SLATE_200 : undefined,
-  cursor: 'pointer',
-  display: 'flex',
-  fontSize: 14,
-  justifyContent: 'space-between',
-  lineHeight: '22px',
-  paddingTop: 12,
-  paddingBottom: 12,
-  paddingLeft: 16,
-  transition: `background-color 300ms ${DECELERATE}`,
-  userSelect: 'none',
-  width: '100%'
-}))
-
-const TemplateItemDetails = styled('div')({
-  display: 'flex',
-  flexDirection: 'column',
-  width: '100%'
-})
-
-const TemplateTitle = styled('div')({
-  ...textOverflow,
-  color: PALETTE.SLATE_700,
-  fontSize: 16,
-  fontWeight: 600,
-  lineHeight: '24px'
-})
-
-const TemplateDescription = styled('div')({
-  ...textOverflow,
-  color: PALETTE.SLATE_600,
-  fontSize: 12,
-  lineHeight: '16px'
-})
-
-const TemplateItemAction = styled('div')({})
-
-interface Props {
-  isActive: boolean
-  teamId: string
-  templateRef: PokerTemplateItem_template$key
-  lowestScope: 'TEAM' | 'ORGANIZATION' | 'PUBLIC'
-}
-
-const PokerTemplateItem = (props: Props) => {
-  const {lowestScope, isActive, teamId, templateRef} = props
-  const template = useFragment(
-    graphql`
-      fragment PokerTemplateItem_template on PokerTemplate {
-        #get the details here so we can show them in the details view
-        ...PokerTemplateDetailsTemplate
-        ...useTemplateDescription_template
-        id
-        name
-        lastUsedAt
-        scope
-        isFree
-      }
-    `,
-    templateRef
-  )
-  const {id: templateId, name: templateName, scope, isFree} = template
-  const description = useTemplateDescription(lowestScope, template)
-  const atmosphere = useAtmosphere()
-  const ref = useRef<HTMLLIElement>(null)
-  useScrollIntoView(ref, isActive)
-  const selectTemplate = () => {
-    if (isActive) return
-    setActiveTemplate(atmosphere, teamId, templateId, 'poker')
-    commitLocalUpdate(atmosphere, (store) => {
-      store.get(teamId)?.setValue(null, 'editingScaleId')
-    })
-  }
-  useEffect(() => {
-    if (!isActive) return
-    SendClientSideEvent(atmosphere, 'Viewed Template', {
-      meetingType: 'poker',
-      scope,
-      templateName,
-      isFree
-    })
-  }, [isActive])
-  return (
-    <TemplateItem ref={ref} isActive={isActive} onClick={selectTemplate}>
-      <TemplateItemDetails>
-        <TemplateTitle>{templateName}</TemplateTitle>
-        <TemplateDescription>{description}</TemplateDescription>
-      </TemplateItemDetails>
-      <TemplateItemAction></TemplateItemAction>
-    </TemplateItem>
-  )
-}
-
-export default PokerTemplateItem
diff --git a/packages/client/modules/meeting/components/PokerTemplateList.tsx b/packages/client/modules/meeting/components/PokerTemplateList.tsx
deleted file mode 100644
index ba699a47f4e..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateList.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import styled from '@emotion/styled'
-import {
-  Business as BusinessIcon,
-  Group as GroupIcon,
-  Public as PublicIcon
-} from '@mui/icons-material'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import SwipeableViews from 'react-swipeable-views'
-import {PokerTemplateList_settings$key} from '../../../__generated__/PokerTemplateList_settings.graphql'
-import Tab from '../../../components/Tab/Tab'
-import Tabs from '../../../components/Tabs/Tabs'
-import useBreakpoint from '../../../hooks/useBreakpoint'
-import {desktopSidebarShadow} from '../../../styles/elevation'
-import {PALETTE} from '../../../styles/paletteV3'
-import {Breakpoint} from '../../../types/constEnums'
-import AddNewPokerTemplate from './AddNewPokerTemplate'
-import PokerTemplateListOrgRoot from './PokerTemplateListOrgRoot'
-import PokerTemplateListPublicRoot from './PokerTemplateListPublicRoot'
-import PokerTemplateListTeam from './PokerTemplateListTeam'
-
-const WIDTH = 360
-const TemplateSidebar = styled('div')<{isDesktop: boolean}>(({isDesktop}) => ({
-  boxShadow: desktopSidebarShadow,
-  display: 'flex',
-  flexDirection: 'column',
-  position: 'relative',
-  width: !isDesktop ? '100%' : WIDTH,
-  zIndex: 1 // show above template details to show box-shadow
-}))
-
-const Label = styled('div')({
-  color: PALETTE.SLATE_700,
-  fontSize: 20,
-  fontWeight: 600,
-  lineHeight: '24px',
-  paddingTop: 16,
-  paddingLeft: 24,
-  paddingBottom: 8
-})
-
-const StyledTabsBar = styled(Tabs)({
-  boxShadow: `inset 0 -1px 0 ${PALETTE.SLATE_300}`
-})
-
-const FullTab = styled(Tab)({
-  padding: '4px 0 8px',
-  width: '30%'
-})
-
-const WideTab = styled(FullTab)({
-  width: '40%'
-})
-
-const TabContents = styled('div')({
-  display: 'flex',
-  flexDirection: 'column',
-  height: '100%'
-})
-
-const TabLabel = styled('div')({
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center'
-})
-
-const TabIcon = styled('div')({
-  height: 24,
-  width: 24,
-  marginRight: 4
-})
-
-const containerStyle = {height: '100%'}
-const innerStyle = {width: '100%', height: '100%'}
-interface Props {
-  activeIdx: number
-  setActiveIdx: (idx: number) => void
-  settingsRef: PokerTemplateList_settings$key
-  displayUpgradeDetails: () => void
-}
-
-const PokerTemplateList = (props: Props) => {
-  const {activeIdx, setActiveIdx, settingsRef, displayUpgradeDetails} = props
-  const settings = useFragment(
-    graphql`
-      fragment PokerTemplateList_settings on PokerMeetingSettings {
-        id
-        team {
-          ...PokerTemplateListTeam_team
-          ...AddNewPokerTemplate_team
-          id
-        }
-        activeTemplate {
-          ...getTemplateList_template
-          id
-        }
-        teamTemplates {
-          ...PokerTemplateListTeam_teamTemplates
-          ...AddNewPokerTemplate_pokerTemplates
-          id
-        }
-      }
-    `,
-    settingsRef
-  )
-  const {team, teamTemplates} = settings
-  const {id: teamId} = team
-  const activeTemplateId = settings.activeTemplate?.id ?? '-tmp'
-
-  const gotoTeamTemplates = () => {
-    setActiveIdx(0)
-  }
-  const gotoPublicTemplates = () => {
-    setActiveIdx(2)
-  }
-  const onChangeIdx = (idx: number, _fromIdx: number, props: {reason: string}) => {
-    //very buggy behavior, probably linked to the vertical scrolling.
-    // to repro, go from team > org > team > org by clicking tabs & see this this get called for who knows why
-    if (props.reason === 'focus') return
-    setActiveIdx(idx)
-  }
-  const isDesktop = useBreakpoint(Breakpoint.NEW_MEETING_GRID)
-
-  return (
-    <TemplateSidebar isDesktop={isDesktop}>
-      <Label>Sprint Poker Templates</Label>
-      <StyledTabsBar activeIdx={activeIdx}>
-        <FullTab
-          label={
-            <TabLabel>
-              <TabIcon>
-                <GroupIcon />
-              </TabIcon>{' '}
-              Team
-            </TabLabel>
-          }
-          onClick={gotoTeamTemplates}
-        />
-        <WideTab
-          label={
-            <TabLabel>
-              <TabIcon>
-                <BusinessIcon />
-              </TabIcon>{' '}
-              Organization
-            </TabLabel>
-          }
-          onClick={() => setActiveIdx(1)}
-        />
-        <FullTab
-          label={
-            <TabLabel>
-              <TabIcon>
-                <PublicIcon />
-              </TabIcon>{' '}
-              Public
-            </TabLabel>
-          }
-          onClick={gotoPublicTemplates}
-        />
-      </StyledTabsBar>
-      <AddNewPokerTemplate
-        teamRef={team}
-        pokerTemplatesRef={teamTemplates}
-        gotoTeamTemplates={gotoTeamTemplates}
-        displayUpgradeDetails={displayUpgradeDetails}
-      />
-      <SwipeableViews
-        enableMouseEvents
-        index={activeIdx}
-        onChangeIndex={onChangeIdx as any}
-        containerStyle={containerStyle}
-        style={innerStyle}
-      >
-        <TabContents>
-          <PokerTemplateListTeam
-            activeTemplateId={activeTemplateId}
-            showPublicTemplates={gotoPublicTemplates}
-            teamTemplatesRef={teamTemplates}
-            teamRef={team}
-            isActive={activeIdx === 0}
-          />
-        </TabContents>
-        <TabContents>{activeIdx === 1 && <PokerTemplateListOrgRoot teamId={teamId} />}</TabContents>
-        <TabContents>
-          {activeIdx === 2 && <PokerTemplateListPublicRoot teamId={teamId} />}
-        </TabContents>
-      </SwipeableViews>
-      {/* add a key to clear the error when they change */}
-    </TemplateSidebar>
-  )
-}
-
-export default PokerTemplateList
diff --git a/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx b/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx
deleted file mode 100644
index d5baa9de65f..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateListOrg.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {useHistory} from 'react-router'
-import {PokerTemplateListOrgQuery} from '../../../__generated__/PokerTemplateListOrgQuery.graphql'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import {PALETTE} from '../../../styles/paletteV3'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import PokerTemplateItem from './PokerTemplateItem'
-
-const TemplateList = styled('ul')({
-  listStyle: 'none',
-  paddingLeft: 0,
-  marginTop: 0
-})
-
-const StyledLink = styled('span')({
-  color: PALETTE.SKY_500,
-  cursor: 'pointer',
-  outline: 0,
-  ':hover, :focus, :active': {
-    color: PALETTE.SKY_600
-  }
-})
-
-const Message = styled('div')({
-  border: `1px dashed ${PALETTE.SLATE_400}`,
-  borderRadius: 4,
-  color: PALETTE.SLATE_600,
-  fontSize: 14,
-  fontStyle: 'italic',
-  lineHeight: '20px',
-  margin: 'auto 32px',
-  padding: '8px 16px'
-})
-interface Props {
-  queryRef: PreloadedQuery<PokerTemplateListOrgQuery>
-}
-
-const query = graphql`
-  query PokerTemplateListOrgQuery($teamId: ID!) {
-    viewer {
-      id
-      team(teamId: $teamId) {
-        id
-        tier
-        orgId
-        meetingSettings(meetingType: poker) {
-          ... on PokerMeetingSettings {
-            organizationTemplates(first: 20)
-              @connection(key: "PokerTemplateListOrg_organizationTemplates") {
-              edges {
-                node {
-                  ...PokerTemplateItem_template
-                  id
-                }
-              }
-            }
-            activeTemplate {
-              id
-            }
-          }
-        }
-      }
-    }
-  }
-`
-const PokerTemplateListOrg = (props: Props) => {
-  const {queryRef} = props
-  const data = usePreloadedQuery<PokerTemplateListOrgQuery>(query, queryRef)
-  const {viewer} = data
-  const team = viewer.team!
-  const {id: teamId, meetingSettings, tier, orgId} = team
-  const activeTemplateId = meetingSettings.activeTemplate?.id ?? '-tmp'
-  const organizationTemplates = meetingSettings.organizationTemplates!
-  const {edges} = organizationTemplates
-  useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'poker')
-  const atmosphere = useAtmosphere()
-  const history = useHistory()
-
-  if (edges.length === 0) {
-    if (tier === 'starter') {
-      const goToBilling = () => {
-        SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', {
-          upgradeCTALocation: 'orgTemplate',
-          meetingType: 'poker'
-        })
-        history.push(`/me/organizations/${orgId}`)
-      }
-      return (
-        <Message>
-          <StyledLink onClick={goToBilling}>Upgrade </StyledLink>
-          <span>to create custom templates for your organization</span>
-        </Message>
-      )
-    }
-    return <Message>{'No other teams in your organization are sharing a template.'}</Message>
-  }
-  return (
-    <TemplateList>
-      {edges.map(({node: template}) => {
-        return (
-          <PokerTemplateItem
-            key={template.id}
-            templateRef={template}
-            isActive={template.id === activeTemplateId}
-            lowestScope={'ORGANIZATION'}
-            teamId={teamId}
-          />
-        )
-      })}
-    </TemplateList>
-  )
-}
-
-export default PokerTemplateListOrg
diff --git a/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx b/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx
deleted file mode 100644
index 6964af2cd94..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateListOrgRoot.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React, {Suspense} from 'react'
-import pokerTemplateListOrgQuery, {
-  PokerTemplateListOrgQuery
-} from '../../../__generated__/PokerTemplateListOrgQuery.graphql'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import MockTemplateList from './MockTemplateList'
-import PokerTemplateListOrg from './PokerTemplateListOrg'
-
-interface Props {
-  teamId: string
-}
-
-const PokerTemplateListOrgRoot = (props: Props) => {
-  const {teamId} = props
-  const queryRef = useQueryLoaderNow<PokerTemplateListOrgQuery>(pokerTemplateListOrgQuery, {teamId})
-
-  return (
-    <Suspense fallback={<MockTemplateList />}>
-      {queryRef && <PokerTemplateListOrg queryRef={queryRef} />}
-    </Suspense>
-  )
-}
-
-export default PokerTemplateListOrgRoot
diff --git a/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx b/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx
deleted file mode 100644
index d0464cf896a..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateListPublic.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {PokerTemplateListPublicQuery} from '../../../__generated__/PokerTemplateListPublicQuery.graphql'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
-import PokerTemplateItem from './PokerTemplateItem'
-
-const TemplateList = styled('ul')({
-  listStyle: 'none',
-  paddingLeft: 0,
-  marginTop: 0
-})
-
-interface Props {
-  queryRef: PreloadedQuery<PokerTemplateListPublicQuery>
-}
-const query = graphql`
-  query PokerTemplateListPublicQuery($teamId: ID!) {
-    viewer {
-      id
-      team(teamId: $teamId) {
-        id
-        meetingSettings(meetingType: poker) {
-          ... on PokerMeetingSettings {
-            publicTemplates(first: 20) @connection(key: "PokerTemplateListPublic_publicTemplates") {
-              edges {
-                node {
-                  ...PokerTemplateItem_template
-                  id
-                }
-              }
-            }
-            activeTemplate {
-              id
-            }
-          }
-        }
-      }
-    }
-  }
-`
-
-const PokerTemplateListPublic = (props: Props) => {
-  const {queryRef} = props
-  const data = usePreloadedQuery<PokerTemplateListPublicQuery>(query, queryRef)
-  const {viewer} = data
-  const team = viewer.team!
-  const {id: teamId, meetingSettings} = team
-  const publicTemplates = meetingSettings.publicTemplates!
-  const activeTemplateId = meetingSettings.activeTemplate?.id ?? '-tmp'
-  const {edges} = publicTemplates
-  useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'poker')
-  return (
-    <TemplateList>
-      {edges.map(({node: template}) => {
-        return (
-          <PokerTemplateItem
-            key={template.id}
-            templateRef={template}
-            isActive={template.id === activeTemplateId}
-            lowestScope={'PUBLIC'}
-            teamId={teamId}
-          />
-        )
-      })}
-    </TemplateList>
-  )
-}
-
-export default PokerTemplateListPublic
diff --git a/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx b/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx
deleted file mode 100644
index 63a0da5e425..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateListPublicRoot.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React, {Suspense} from 'react'
-import pokerTemplateListPublicQuery, {
-  PokerTemplateListPublicQuery
-} from '../../../__generated__/PokerTemplateListPublicQuery.graphql'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import MockTemplateList from './MockTemplateList'
-import PokerTemplateListPublic from './PokerTemplateListPublic'
-
-interface Props {
-  teamId: string
-}
-
-const PokerTemplateListPublicRoot = (props: Props) => {
-  const {teamId} = props
-  const queryRef = useQueryLoaderNow<PokerTemplateListPublicQuery>(pokerTemplateListPublicQuery, {
-    teamId
-  })
-
-  return (
-    <Suspense fallback={<MockTemplateList />}>
-      {queryRef && <PokerTemplateListPublic queryRef={queryRef} />}
-    </Suspense>
-  )
-}
-
-export default PokerTemplateListPublicRoot
diff --git a/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx b/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx
deleted file mode 100644
index 1917ef7da1c..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateListTeam.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {useHistory} from 'react-router'
-import {PokerTemplateListTeam_team$key} from '../../../__generated__/PokerTemplateListTeam_team.graphql'
-import {PokerTemplateListTeam_teamTemplates$key} from '../../../__generated__/PokerTemplateListTeam_teamTemplates.graphql'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import {PALETTE} from '../../../styles/paletteV3'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import PokerTemplateItem from './PokerTemplateItem'
-
-const TemplateList = styled('ul')({
-  listStyle: 'none',
-  paddingLeft: 0,
-  marginTop: 0
-})
-
-const Message = styled('div')({
-  border: `1px dashed ${PALETTE.SLATE_400}`,
-  borderRadius: 4,
-  color: PALETTE.SLATE_600,
-  fontSize: 14,
-  fontStyle: 'italic',
-  lineHeight: '20px',
-  margin: 'auto 32px',
-  padding: '8px 16px'
-})
-
-const StyledLink = styled('span')({
-  color: PALETTE.SKY_500,
-  cursor: 'pointer',
-  outline: 0,
-  ':hover, :focus, :active': {
-    color: PALETTE.SKY_600
-  }
-})
-
-interface Props {
-  isActive: boolean
-  activeTemplateId: string
-  showPublicTemplates: () => void
-  teamTemplatesRef: PokerTemplateListTeam_teamTemplates$key
-  teamRef: PokerTemplateListTeam_team$key
-}
-
-const PokerTemplateListTeam = (props: Props) => {
-  const {isActive, activeTemplateId, showPublicTemplates, teamTemplatesRef, teamRef} = props
-  const teamTemplates = useFragment(
-    graphql`
-      fragment PokerTemplateListTeam_teamTemplates on PokerTemplate @relay(plural: true) {
-        id
-        ...PokerTemplateItem_template
-      }
-    `,
-    teamTemplatesRef
-  )
-  const team = useFragment(
-    graphql`
-      fragment PokerTemplateListTeam_team on Team {
-        id
-        orgId
-        tier
-      }
-    `,
-    teamRef
-  )
-  const {id: teamId, tier, orgId} = team
-  const edges = teamTemplates.map((t) => ({node: {id: t.id}})) as readonly {node: {id: string}}[]
-  useActiveTopTemplate(edges, activeTemplateId, teamId, isActive, 'poker')
-  const atmosphere = useAtmosphere()
-  const history = useHistory()
-  if (teamTemplates.length === 0) {
-    if (tier === 'starter') {
-      const goToBilling = () => {
-        SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', {
-          upgradeCTALocation: 'teamTemplate',
-          meetingType: 'poker'
-        })
-        history.push(`/me/organizations/${orgId}`)
-      }
-      return (
-        <Message>
-          <StyledLink onClick={goToBilling}>Upgrade </StyledLink>
-          <span>to create custom templates for your team</span>
-        </Message>
-      )
-    }
-    return (
-      <Message>
-        <span>Your custom templates will show up here. Get started with a </span>
-        <StyledLink onClick={showPublicTemplates}>Public Template</StyledLink>
-      </Message>
-    )
-  }
-  return (
-    <TemplateList>
-      {teamTemplates.map((template) => {
-        return (
-          <PokerTemplateItem
-            key={template.id}
-            templateRef={template}
-            isActive={template.id === activeTemplateId}
-            lowestScope={'TEAM'}
-            teamId={teamId}
-          />
-        )
-      })}
-    </TemplateList>
-  )
-}
-
-export default PokerTemplateListTeam
diff --git a/packages/client/modules/meeting/components/PokerTemplateModal.tsx b/packages/client/modules/meeting/components/PokerTemplateModal.tsx
deleted file mode 100644
index 8527779afbc..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplateModal.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useState} from 'react'
-import {useFragment} from 'react-relay'
-import {PokerTemplateModal_pokerMeetingSettings$key} from '../../../__generated__/PokerTemplateModal_pokerMeetingSettings.graphql'
-import DialogContainer from '../../../components/DialogContainer'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import getTemplateList from '../../../utils/getTemplateList'
-import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import CustomTemplateUpgradeMsg from './CustomTemplateUpgradeMsg'
-import PokerTemplateDetails from './PokerTemplateDetails'
-import PokerTemplateList from './PokerTemplateList'
-import PokerTemplateScaleDetails from './PokerTemplateScaleDetails'
-
-interface Props {
-  closePortal: () => void
-  pokerMeetingSettingsRef: PokerTemplateModal_pokerMeetingSettings$key
-}
-
-const StyledDialogContainer = styled(DialogContainer)({
-  flexDirection: 'row',
-  width: 880,
-  maxHeight: 520,
-  minHeight: 520
-})
-
-const SCOPES = ['TEAM', 'ORGANIZATION', 'PUBLIC']
-
-const PokerTemplateModal = (props: Props) => {
-  const {closePortal, pokerMeetingSettingsRef} = props
-  const pokerMeetingSettings = useFragment(
-    graphql`
-      fragment PokerTemplateModal_pokerMeetingSettings on PokerMeetingSettings {
-        ...PokerTemplateList_settings
-        ...PokerTemplateDetails_settings
-        meetingType
-        team {
-          ...PokerTemplateScaleDetails_team
-          id
-          orgId
-          editingScaleId
-        }
-        selectedTemplate {
-          id
-          ...getTemplateList_template
-        }
-        activeTemplate {
-          id
-        }
-      }
-    `,
-    pokerMeetingSettingsRef
-  )
-
-  const {selectedTemplate, team, activeTemplate, meetingType} = pokerMeetingSettings
-  const {id: teamId, orgId, editingScaleId} = team
-  const lowestScope = getTemplateList(teamId, orgId, selectedTemplate)
-  const listIdx = SCOPES.indexOf(lowestScope)
-  const [activeIdx, setActiveIdx] = useState(listIdx)
-  const [showUpgradeDetails, setShowUpgradeDetails] = useState(false)
-  const gotoTeamTemplates = () => {
-    setActiveIdx(0)
-  }
-  const gotoPublicTemplates = () => {
-    setActiveIdx(2)
-  }
-
-  const atmosphere = useAtmosphere()
-  useEffect(() => {
-    setActiveTemplate(atmosphere, teamId, selectedTemplate.id, 'poker')
-  }, [])
-
-  const displayUpgradeDetails = () => {
-    setShowUpgradeDetails(true)
-  }
-
-  const hideUpgradeDetails = () => {
-    setShowUpgradeDetails(false)
-  }
-
-  useEffect(() => {
-    if (showUpgradeDetails) hideUpgradeDetails()
-  }, [activeTemplate])
-
-  return (
-    <StyledDialogContainer>
-      <PokerTemplateList
-        settingsRef={pokerMeetingSettings}
-        activeIdx={activeIdx}
-        setActiveIdx={setActiveIdx}
-        displayUpgradeDetails={displayUpgradeDetails}
-      />
-      {showUpgradeDetails ? (
-        <CustomTemplateUpgradeMsg orgId={orgId} meetingType={meetingType} />
-      ) : editingScaleId ? (
-        <PokerTemplateScaleDetails team={team} />
-      ) : (
-        <PokerTemplateDetails
-          settings={pokerMeetingSettings}
-          gotoTeamTemplates={gotoTeamTemplates}
-          gotoPublicTemplates={gotoPublicTemplates}
-          closePortal={closePortal}
-        />
-      )}
-    </StyledDialogContainer>
-  )
-}
-export default PokerTemplateModal
diff --git a/packages/client/modules/meeting/components/PokerTemplatePicker.tsx b/packages/client/modules/meeting/components/PokerTemplatePicker.tsx
deleted file mode 100644
index eb2524e7bf9..00000000000
--- a/packages/client/modules/meeting/components/PokerTemplatePicker.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {PokerTemplatePicker_settings$key} from '../../../__generated__/PokerTemplatePicker_settings.graphql'
-import NewMeetingDropdown from '../../../components/NewMeetingDropdown'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useModal from '../../../hooks/useModal'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import lazyPreload from '../../../utils/lazyPreload'
-
-interface Props {
-  settingsRef: PokerTemplatePicker_settings$key
-}
-
-const PokerTemplateModal = lazyPreload(
-  () =>
-    import(
-      /* webpackChunkName: 'PokerTemplateModal' */
-      './PokerTemplateModal'
-    )
-)
-
-const PokerTemplatePicker = (props: Props) => {
-  const {settingsRef} = props
-  const settings = useFragment(
-    graphql`
-      fragment PokerTemplatePicker_settings on PokerMeetingSettings {
-        ...PokerTemplateModal_pokerMeetingSettings
-        selectedTemplate {
-          id
-          name
-          scope
-          ...PokerTemplateDetailsTemplate
-        }
-      }
-    `,
-    settingsRef
-  )
-  const {selectedTemplate} = settings
-  const {name: templateName, scope} = selectedTemplate
-  const {togglePortal, modalPortal, closePortal} = useModal({
-    id: 'templateModal'
-  })
-  const atmosphere = useAtmosphere()
-
-  const handleClick = () => {
-    togglePortal()
-    SendClientSideEvent(atmosphere, 'Opened Template Picker', {
-      meetingType: 'poker',
-      scope
-    })
-  }
-
-  return (
-    <>
-      <NewMeetingDropdown
-        dropdownIcon={'keyboard_arrow_right'}
-        label={templateName}
-        onClick={handleClick}
-        onMouseEnter={PokerTemplateModal.preload}
-        title={'Template'}
-      />
-      {modalPortal(
-        <PokerTemplateModal closePortal={closePortal} pokerMeetingSettingsRef={settings} />
-      )}
-    </>
-  )
-}
-
-export default PokerTemplatePicker
diff --git a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx b/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
deleted file mode 100644
index 81f27ef8cb0..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateDetails.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {ReflectTemplateDetails_settings$key} from '../../../__generated__/ReflectTemplateDetails_settings.graphql'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useMutationProps from '../../../hooks/useMutationProps'
-import AddReflectTemplateMutation from '../../../mutations/AddReflectTemplateMutation'
-import {PALETTE} from '../../../styles/paletteV3'
-import getTemplateList from '../../../utils/getTemplateList'
-import useTemplateDescription from '../../../utils/useTemplateDescription'
-import AddTemplatePrompt from './AddTemplatePrompt'
-import CloneTemplate from './CloneTemplate'
-import EditableTemplateName from './EditableTemplateName'
-import RemoveTemplate from './RemoveTemplate'
-import SelectTemplate from './SelectTemplate'
-import TemplatePromptList from './TemplatePromptList'
-import TemplateSharing from './TemplateSharing'
-
-const TemplateHeader = styled('div')({
-  display: 'flex',
-  flexDirection: 'column',
-  margin: '16px 0',
-  paddingLeft: 56,
-  paddingRight: 16,
-  width: '100%',
-  flexShrink: 0
-})
-
-const PromptEditor = styled('div')({
-  alignItems: 'flex-start',
-  background: '#fff',
-  borderRadius: 8,
-  display: 'flex',
-  flexDirection: 'column',
-  overflow: 'hidden',
-  maxWidth: 520,
-  width: '100%'
-})
-
-const TemplateImage = styled('img')({
-  margin: '0 auto',
-  maxWidth: 360,
-  maxHeight: 200,
-  padding: '16px 0 0',
-  width: '100%',
-  objectFit: 'contain'
-})
-
-const Description = styled('div')({
-  color: PALETTE.SLATE_700,
-  fontSize: 14,
-  lineHeight: '20px'
-})
-
-const FirstLine = styled('div')({
-  alignItems: 'center',
-  display: 'flex'
-})
-
-const Scrollable = styled('div')<{isActiveTemplate: boolean}>(({isActiveTemplate}) => ({
-  display: 'flex',
-  flexDirection: 'column',
-  overflow: 'auto',
-  paddingBottom: isActiveTemplate ? undefined : 56,
-  width: '100%'
-}))
-
-interface Props {
-  gotoTeamTemplates: () => void
-  gotoPublicTemplates: () => void
-  closePortal: () => void
-  settings: ReflectTemplateDetails_settings$key
-}
-
-const ReflectTemplateDetails = (props: Props) => {
-  const {gotoTeamTemplates, gotoPublicTemplates, closePortal, settings: settingsRef} = props
-  const settings = useFragment(
-    graphql`
-      fragment ReflectTemplateDetails_settings on RetrospectiveMeetingSettings {
-        activeTemplate {
-          ...ReflectTemplateDetailsTemplate @relay(mask: false)
-          ...SelectTemplate_template
-          illustrationUrl
-        }
-        selectedTemplate {
-          ...ReflectTemplateDetailsTemplate @relay(mask: false)
-          ...SelectTemplate_template
-        }
-        teamTemplates {
-          ...RemoveTemplate_teamTemplates
-        }
-        team {
-          id
-          orgId
-          tier
-          viewerTeamMember {
-            user {
-              id
-              featureFlags {
-                noTemplateLimit
-              }
-            }
-          }
-        }
-      }
-    `,
-    settingsRef
-  )
-  const {teamTemplates, team} = settings
-  const activeTemplate = settings.activeTemplate ?? settings.selectedTemplate
-  const {id: templateId, name: templateName, prompts, illustrationUrl} = activeTemplate
-  const {id: teamId, orgId, tier, viewerTeamMember} = team
-  const noTemplateLimit = viewerTeamMember?.user?.featureFlags?.noTemplateLimit
-  const lowestScope = getTemplateList(teamId, orgId, activeTemplate)
-  const isOwner = activeTemplate.teamId === teamId
-  const description = useTemplateDescription(lowestScope, activeTemplate, tier)
-  const atmosphere = useAtmosphere()
-  const {onError, onCompleted, submitting, submitMutation} = useMutationProps()
-  const onClone = () => {
-    if (submitting) return
-    submitMutation()
-    AddReflectTemplateMutation(
-      atmosphere,
-      {parentTemplateId: templateId, teamId},
-      {onError, onCompleted}
-    )
-    gotoTeamTemplates()
-  }
-  const isActiveTemplate = templateId === settings.selectedTemplate.id
-  const showClone = !isOwner && tier !== 'starter'
-  return (
-    <PromptEditor>
-      <Scrollable isActiveTemplate={isActiveTemplate}>
-        <TemplateImage src={illustrationUrl} />
-        <TemplateHeader>
-          <FirstLine>
-            <EditableTemplateName
-              key={templateId}
-              name={templateName}
-              templateId={templateId}
-              isOwner={isOwner}
-            />
-            {isOwner && (
-              <RemoveTemplate
-                templateId={templateId}
-                teamId={teamId}
-                teamTemplates={teamTemplates}
-                gotoPublicTemplates={gotoPublicTemplates}
-                type='retrospective'
-              />
-            )}
-            {showClone && <CloneTemplate onClick={onClone} />}
-          </FirstLine>
-          <Description>{description}</Description>
-        </TemplateHeader>
-        <TemplatePromptList isOwner={isOwner} prompts={prompts} templateId={templateId} />
-        {isOwner && <AddTemplatePrompt templateId={templateId} prompts={prompts} />}
-        <TemplateSharing isOwner={isOwner} template={activeTemplate} />
-      </Scrollable>
-      {!isActiveTemplate && (
-        <SelectTemplate
-          closePortal={closePortal}
-          template={activeTemplate}
-          teamId={teamId}
-          tier={tier}
-          noTemplateLimit={noTemplateLimit}
-          orgId={orgId}
-        />
-      )}
-    </PromptEditor>
-  )
-}
-
-graphql`
-  fragment ReflectTemplateDetailsTemplate on ReflectTemplate {
-    ...TemplateSharing_template
-    ...getTemplateList_template
-    ...useTemplateDescription_template
-    id
-    name
-    prompts {
-      ...TemplatePromptList_prompts
-      ...AddTemplatePrompt_prompts
-    }
-    teamId
-  }
-`
-export default ReflectTemplateDetails
diff --git a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx b/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
deleted file mode 100644
index 82ecc0b860a..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateItem.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
-import {useFragment} from 'react-relay'
-import TypeAheadLabel from '~/components/TypeAheadLabel'
-import {TierEnum} from '../../../__generated__/OrganizationSubscription.graphql'
-import {ReflectTemplateItem_template$key} from '../../../__generated__/ReflectTemplateItem_template.graphql'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useScrollIntoView from '../../../hooks/useScrollIntoVIew'
-import {DECELERATE} from '../../../styles/animation'
-import textOverflow from '../../../styles/helpers/textOverflow'
-import {PALETTE} from '../../../styles/paletteV3'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import useTemplateDescription from '../../../utils/useTemplateDescription'
-
-const TemplateItem = styled('li')<{isActive: boolean}>(({isActive}) => ({
-  backgroundColor: isActive ? PALETTE.SLATE_200 : undefined,
-  cursor: 'pointer',
-  display: 'flex',
-  fontSize: 14,
-  justifyContent: 'space-between',
-  lineHeight: '22px',
-  paddingTop: 12,
-  paddingBottom: 12,
-  paddingLeft: 16,
-  transition: `background-color 300ms ${DECELERATE}`,
-  userSelect: 'none',
-  width: '100%'
-}))
-
-const TemplateItemDetails = styled('div')({
-  display: 'flex',
-  flexDirection: 'column',
-  width: '100%'
-})
-
-const TemplateTitle = styled('div')({
-  ...textOverflow,
-  color: PALETTE.SLATE_700,
-  fontSize: 16,
-  fontWeight: 600,
-  lineHeight: '24px'
-})
-
-const TemplateDescription = styled('div')({
-  ...textOverflow,
-  color: PALETTE.SLATE_600,
-  fontSize: 12,
-  lineHeight: '16px'
-})
-
-const TemplateItemAction = styled('div')({})
-
-interface Props {
-  isActive: boolean
-  teamId: string
-  template: ReflectTemplateItem_template$key
-  lowestScope: 'TEAM' | 'ORGANIZATION' | 'PUBLIC'
-  templateSearchQuery: string
-  tier?: TierEnum
-}
-
-const ReflectTemplateItem = (props: Props) => {
-  const {lowestScope, isActive, teamId, template: templateRef, templateSearchQuery, tier} = props
-  const template = useFragment(
-    graphql`
-      fragment ReflectTemplateItem_template on ReflectTemplate {
-        #get the details here so we can show them in the details view
-        ...ReflectTemplateDetailsTemplate
-        ...useTemplateDescription_template
-        id
-        name
-        lastUsedAt
-        scope
-        isFree
-      }
-    `,
-    templateRef
-  )
-  const {id: templateId, name: templateName, scope, isFree} = template
-  const description = useTemplateDescription(lowestScope, template, tier)
-  const atmosphere = useAtmosphere()
-  const ref = useRef<HTMLLIElement>(null)
-  useScrollIntoView(ref, isActive, true)
-  const selectTemplate = () => {
-    setActiveTemplate(atmosphere, teamId, templateId, 'retrospective')
-  }
-  useEffect(() => {
-    if (!isActive) return
-    SendClientSideEvent(atmosphere, 'Viewed Template', {
-      meetingType: 'retrospective',
-      scope,
-      templateName,
-      isFree
-    })
-  }, [isActive])
-  return (
-    <TemplateItem ref={ref} isActive={isActive} onClick={selectTemplate}>
-      <TemplateItemDetails>
-        <TemplateTitle>
-          <TypeAheadLabel highlight query={templateSearchQuery} label={templateName} />
-        </TemplateTitle>
-        <TemplateDescription>{description}</TemplateDescription>
-      </TemplateItemDetails>
-      <TemplateItemAction></TemplateItemAction>
-    </TemplateItem>
-  )
-}
-
-export default ReflectTemplateItem
diff --git a/packages/client/modules/meeting/components/ReflectTemplateList.tsx b/packages/client/modules/meeting/components/ReflectTemplateList.tsx
deleted file mode 100644
index f26a201be81..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateList.tsx
+++ /dev/null
@@ -1,240 +0,0 @@
-import styled from '@emotion/styled'
-import {
-  Business as BusinessIcon,
-  Group as GroupIcon,
-  Public as PublicIcon
-} from '@mui/icons-material'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useRef} from 'react'
-import {commitLocalUpdate, useFragment} from 'react-relay'
-import SwipeableViews from 'react-swipeable-views'
-import {SharingScopeEnum} from '~/__generated__/ReflectTemplateItem_template.graphql'
-import useAtmosphere from '~/hooks/useAtmosphere'
-import {ReflectTemplateList_settings$key} from '../../../__generated__/ReflectTemplateList_settings.graphql'
-import Tab from '../../../components/Tab/Tab'
-import Tabs from '../../../components/Tabs/Tabs'
-import useBreakpoint from '../../../hooks/useBreakpoint'
-import {desktopSidebarShadow} from '../../../styles/elevation'
-import {PALETTE} from '../../../styles/paletteV3'
-import {Breakpoint} from '../../../types/constEnums'
-import AddNewReflectTemplate from './AddNewReflectTemplate'
-import ReflectTemplateListOrgRoot from './ReflectTemplateListOrgRoot'
-import ReflectTemplateListPublicRoot from './ReflectTemplateListPublicRoot'
-import ReflectTemplateListTeam from './ReflectTemplateListTeam'
-import ReflectTemplateSearchBar from './ReflectTemplateSearchBar'
-
-const WIDTH = 360
-const TemplateSidebar = styled('div')<{isDesktop: boolean}>(({isDesktop}) => ({
-  boxShadow: desktopSidebarShadow,
-  display: 'flex',
-  flexDirection: 'column',
-  position: 'relative',
-  width: !isDesktop ? '100%' : WIDTH,
-  zIndex: 1 // show above template details to show box-shadow
-}))
-
-const Label = styled('div')({
-  color: PALETTE.SLATE_700,
-  fontSize: 20,
-  fontWeight: 600,
-  lineHeight: '24px',
-  paddingTop: 16,
-  paddingLeft: 24,
-  paddingBottom: 8
-})
-
-const StyledTabsBar = styled(Tabs)({
-  boxShadow: `inset 0 -1px 0 ${PALETTE.SLATE_300}`,
-  flexShrink: 0
-})
-
-const FullTab = styled(Tab)({
-  padding: '4px 0 8px',
-  width: '30%'
-})
-
-const WideTab = styled(FullTab)({
-  width: '40%'
-})
-
-const TabContents = styled('div')({
-  display: 'flex',
-  flexDirection: 'column',
-  height: '100%'
-})
-
-const TabLabel = styled('div')({
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center'
-})
-
-const TabIcon = styled('div')({
-  width: 24,
-  height: 24,
-  marginRight: 4
-})
-
-const containerStyle = {height: '100%'}
-const innerStyle = {width: '100%', height: '100%'}
-interface Props {
-  activeIdx: number
-  setActiveIdx: (idx: number) => void
-  displayUpgradeDetails: () => void
-  settingsRef: ReflectTemplateList_settings$key
-}
-
-const useReadyToSmoothScroll = (activeTemplateId: string) => {
-  // Don't animate the scroll behavior on the initial render
-  const oldActiveTemplateIdRef = useRef(activeTemplateId)
-  const oldActiveTemplateId = oldActiveTemplateIdRef.current
-  useEffect(() => {
-    oldActiveTemplateIdRef.current = activeTemplateId
-  }, [activeTemplateId])
-  return oldActiveTemplateId !== activeTemplateId && oldActiveTemplateId !== '-tmp'
-}
-
-export const templateIdxs = {
-  TEAM: 0,
-  ORGANIZATION: 1,
-  PUBLIC: 2
-} as const
-
-const ReflectTemplateList = (props: Props) => {
-  const {activeIdx, setActiveIdx, settingsRef, displayUpgradeDetails} = props
-  const settings = useFragment(
-    graphql`
-      fragment ReflectTemplateList_settings on RetrospectiveMeetingSettings {
-        ...ReflectTemplateSearchBar_settings
-        id
-        templateSearchQuery
-        team {
-          ...AddNewReflectTemplate_team
-          ...ReflectTemplateListTeam_team
-          id
-        }
-        activeTemplate {
-          ...getTemplateList_template
-          id
-        }
-        teamTemplates {
-          ...AddNewReflectTemplate_reflectTemplates
-          ...ReflectTemplateListTeam_teamTemplates
-          id
-        }
-      }
-    `,
-    settingsRef
-  )
-  const {id: settingsId, team, teamTemplates, templateSearchQuery} = settings
-  const {id: teamId} = team
-  const activeTemplateId = settings.activeTemplate?.id ?? '-tmp'
-  const readyToScrollSmooth = useReadyToSmoothScroll(activeTemplateId)
-  const atmosphere = useAtmosphere()
-  const slideStyle = {scrollBehavior: readyToScrollSmooth ? 'smooth' : undefined}
-  const templateType = Object.keys(templateIdxs).find(
-    (key) => templateIdxs[key as keyof typeof templateIdxs] === activeIdx
-  ) as SharingScopeEnum
-
-  const clearSearch = () => {
-    commitLocalUpdate(atmosphere, (store) => {
-      const settings = store.get(settingsId)
-      if (!settings) return
-      settings.setValue('', 'templateSearchQuery')
-    })
-  }
-
-  const goToTab = (templateType: SharingScopeEnum) => {
-    setActiveIdx(templateIdxs[templateType])
-    clearSearch()
-  }
-
-  const onChangeIdx = (idx: number, _fromIdx: number, props: {reason: string}) => {
-    //very buggy behavior, probably linked to the vertical scrolling.
-    // to repro, go from team > org > team > org by clicking tabs & see this this get called for who knows why
-    if (props.reason === 'focus') return
-    setActiveIdx(idx)
-    clearSearch()
-  }
-  const isDesktop = useBreakpoint(Breakpoint.NEW_MEETING_GRID)
-
-  return (
-    <TemplateSidebar isDesktop={isDesktop}>
-      <Label>Retro Templates</Label>
-      <StyledTabsBar activeIdx={activeIdx}>
-        <FullTab
-          label={
-            <TabLabel>
-              <TabIcon>
-                <GroupIcon />
-              </TabIcon>{' '}
-              Team
-            </TabLabel>
-          }
-          onClick={() => goToTab('TEAM')}
-        />
-        <WideTab
-          label={
-            <TabLabel>
-              <TabIcon>
-                <BusinessIcon />
-              </TabIcon>{' '}
-              Organization
-            </TabLabel>
-          }
-          onClick={() => goToTab('ORGANIZATION')}
-        />
-        <FullTab
-          label={
-            <TabLabel>
-              <TabIcon>
-                <PublicIcon />
-              </TabIcon>{' '}
-              Public
-            </TabLabel>
-          }
-          onClick={() => goToTab('PUBLIC')}
-        />
-      </StyledTabsBar>
-      <ReflectTemplateSearchBar
-        templateType={templateType}
-        clearSearch={clearSearch}
-        settingsRef={settings}
-      />
-      <AddNewReflectTemplate
-        reflectTemplatesRef={teamTemplates}
-        teamRef={team}
-        displayUpgradeDetails={displayUpgradeDetails}
-        gotoTeamTemplates={() => goToTab('TEAM')}
-      />
-      <SwipeableViews
-        enableMouseEvents
-        index={activeIdx}
-        onChangeIndex={onChangeIdx as any /* typedef is wrong */}
-        containerStyle={containerStyle}
-        style={innerStyle}
-        slideStyle={slideStyle as any}
-      >
-        <TabContents>
-          <ReflectTemplateListTeam
-            activeTemplateId={activeTemplateId}
-            showPublicTemplates={() => goToTab('PUBLIC')}
-            templateSearchQuery={templateSearchQuery ?? ''}
-            teamRef={team}
-            teamTemplatesRef={teamTemplates}
-            isActive={activeIdx === 0}
-          />
-        </TabContents>
-        <TabContents>
-          {activeIdx === 1 && <ReflectTemplateListOrgRoot teamId={teamId} />}
-        </TabContents>
-        <TabContents>
-          {activeIdx === 2 && <ReflectTemplateListPublicRoot teamId={teamId} />}
-        </TabContents>
-      </SwipeableViews>
-      {/* add a key to clear the error when they change */}
-    </TemplateSidebar>
-  )
-}
-
-export default ReflectTemplateList
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx b/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx
deleted file mode 100644
index cb3be11db2a..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateListOrg.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import {useHistory} from 'react-router'
-import useFilteredItems from '~/hooks/useFilteredItems'
-import {ReflectTemplateListOrgQuery} from '../../../__generated__/ReflectTemplateListOrgQuery.graphql'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import {PALETTE} from '../../../styles/paletteV3'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import ReflectTemplateItem from './ReflectTemplateItem'
-
-const TemplateList = styled('ul')({
-  listStyle: 'none',
-  paddingLeft: 0,
-  marginTop: 0
-})
-
-const StyledLink = styled('span')({
-  color: PALETTE.SKY_500,
-  cursor: 'pointer',
-  outline: 0,
-  ':hover, :focus, :active': {
-    color: PALETTE.SKY_600
-  }
-})
-
-const Message = styled('div')({
-  border: `1px dashed ${PALETTE.SLATE_400}`,
-  borderRadius: 4,
-  color: PALETTE.SLATE_600,
-  fontSize: 14,
-  fontStyle: 'italic',
-  lineHeight: '20px',
-  margin: 'auto 32px',
-  padding: '8px 16px'
-})
-interface Props {
-  queryRef: PreloadedQuery<ReflectTemplateListOrgQuery>
-}
-
-const getValue = (item: {node: {id: string; name: string}}) => {
-  return item.node.name.toLowerCase()
-}
-
-const query = graphql`
-  query ReflectTemplateListOrgQuery($teamId: ID!) {
-    viewer {
-      id
-      team(teamId: $teamId) {
-        id
-        orgId
-        tier
-        meetingSettings(meetingType: retrospective) {
-          ... on RetrospectiveMeetingSettings {
-            templateSearchQuery
-            organizationTemplates(first: 20)
-              @connection(key: "ReflectTemplateListOrg_organizationTemplates") {
-              edges {
-                node {
-                  ...ReflectTemplateItem_template
-                  id
-                  name
-                }
-              }
-            }
-            activeTemplate {
-              id
-            }
-          }
-        }
-      }
-    }
-  }
-`
-
-const ReflectTemplateListOrg = (props: Props) => {
-  const {queryRef} = props
-  const data = usePreloadedQuery<ReflectTemplateListOrgQuery>(query, queryRef)
-  const atmosphere = useAtmosphere()
-  const history = useHistory()
-  const {viewer} = data
-  const team = viewer.team!
-  const {id: teamId, meetingSettings, orgId, tier} = team
-  const {templateSearchQuery, organizationTemplates, activeTemplate} = meetingSettings
-  const searchQuery = templateSearchQuery ?? ''
-  const activeTemplateId = activeTemplate?.id ?? '-tmp'
-  const {edges} = organizationTemplates!
-  const filteredEdges = useFilteredItems(searchQuery, edges, getValue)
-  useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'retrospective')
-
-  if (edges.length === 0) {
-    if (tier === 'starter') {
-      const goToBilling = () => {
-        SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', {
-          upgradeCTALocation: 'orgTemplate',
-          meetingType: 'retrospective'
-        })
-        history.push(`/me/organizations/${orgId}`)
-      }
-      return (
-        <Message>
-          <StyledLink onClick={goToBilling}>Upgrade </StyledLink>
-          <span>to create custom templates for your organization</span>
-        </Message>
-      )
-    }
-    return <Message>{'No other teams in your organization are sharing a template.'}</Message>
-  }
-  if (filteredEdges.length === 0) {
-    return (
-      <Message>{`No template names in your organization match your search query "${searchQuery}"`}</Message>
-    )
-  }
-  return (
-    <TemplateList>
-      {filteredEdges.map(({node: template}) => {
-        return (
-          <ReflectTemplateItem
-            key={template.id}
-            template={template}
-            isActive={template.id === activeTemplateId}
-            lowestScope={'ORGANIZATION'}
-            teamId={teamId}
-            templateSearchQuery={searchQuery}
-          />
-        )
-      })}
-    </TemplateList>
-  )
-}
-
-export default ReflectTemplateListOrg
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx b/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx
deleted file mode 100644
index 13013cb74ea..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateListOrgRoot.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React, {Suspense} from 'react'
-import reflectTemplateListOrgQuery, {
-  ReflectTemplateListOrgQuery
-} from '../../../__generated__/ReflectTemplateListOrgQuery.graphql'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import MockTemplateList from './MockTemplateList'
-import ReflectTemplateListOrg from './ReflectTemplateListOrg'
-
-interface Props {
-  teamId: string
-}
-
-const ReflectTemplateListOrgRoot = (props: Props) => {
-  const {teamId} = props
-  const queryRef = useQueryLoaderNow<ReflectTemplateListOrgQuery>(reflectTemplateListOrgQuery, {
-    teamId
-  })
-  return (
-    <Suspense fallback={<MockTemplateList />}>
-      {queryRef && <ReflectTemplateListOrg queryRef={queryRef} />}
-    </Suspense>
-  )
-}
-
-export default ReflectTemplateListOrgRoot
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx b/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx
deleted file mode 100644
index 4db3cc5fef4..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateListPublic.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
-import useFilteredItems from '~/hooks/useFilteredItems'
-import {PALETTE} from '~/styles/paletteV3'
-import {ReflectTemplateListPublicQuery} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
-import ReflectTemplateItem from './ReflectTemplateItem'
-
-const TemplateList = styled('ul')({
-  listStyle: 'none',
-  paddingLeft: 0,
-  marginTop: 0
-})
-
-const Message = styled('div')({
-  border: `1px dashed ${PALETTE.SLATE_400}`,
-  borderRadius: 4,
-  color: PALETTE.SLATE_600,
-  fontSize: 14,
-  fontStyle: 'italic',
-  lineHeight: '20px',
-  margin: 'auto 32px',
-  padding: '8px 16px'
-})
-
-interface Props {
-  queryRef: PreloadedQuery<ReflectTemplateListPublicQuery>
-}
-
-const getValue = (item: {node: {id: string; name: string}}) => {
-  return item.node.name.toLowerCase()
-}
-
-const query = graphql`
-  query ReflectTemplateListPublicQuery($teamId: ID!) {
-    viewer {
-      id
-      team(teamId: $teamId) {
-        id
-        tier
-        meetingSettings(meetingType: retrospective) {
-          ... on RetrospectiveMeetingSettings {
-            templateSearchQuery
-            publicTemplates(first: 100)
-              @connection(key: "ReflectTemplateListPublic_publicTemplates") {
-              edges {
-                node {
-                  ...ReflectTemplateItem_template
-                  id
-                  name
-                  createdAt
-                  category
-                }
-              }
-            }
-            activeTemplate {
-              id
-            }
-          }
-        }
-      }
-    }
-  }
-`
-
-const ReflectTemplateListPublic = (props: Props) => {
-  const {queryRef} = props
-  const data = usePreloadedQuery<ReflectTemplateListPublicQuery>(query, queryRef)
-  const {viewer} = data
-  const team = viewer.team!
-  const {id: teamId, meetingSettings, tier} = team
-  const {templateSearchQuery, publicTemplates, activeTemplate} = meetingSettings
-  const searchQuery = templateSearchQuery ?? ''
-  const activeTemplateId = activeTemplate?.id ?? '-tmp'
-  const {edges} = publicTemplates!
-  const filteredEdges = useFilteredItems(searchQuery, edges, getValue).filter(
-    ({node}) => !['premortem', 'postmortem'].includes(node.category)
-  )
-  useActiveTopTemplate(edges, activeTemplateId, teamId, true, 'retrospective')
-  if (filteredEdges.length === 0) {
-    return <Message>{`No public templates match your search query "${searchQuery}"`}</Message>
-  }
-  return (
-    <TemplateList>
-      {filteredEdges.map(({node: template}) => {
-        return (
-          <ReflectTemplateItem
-            key={template.id}
-            template={template}
-            isActive={template.id === activeTemplateId}
-            lowestScope={'PUBLIC'}
-            teamId={teamId}
-            tier={tier}
-            templateSearchQuery={searchQuery}
-          />
-        )
-      })}
-    </TemplateList>
-  )
-}
-
-export default ReflectTemplateListPublic
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx b/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx
deleted file mode 100644
index 98d478b0fb1..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateListPublicRoot.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React, {Suspense} from 'react'
-import reflectTemplateListPublicQuery, {
-  ReflectTemplateListPublicQuery
-} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql'
-import useQueryLoaderNow from '../../../hooks/useQueryLoaderNow'
-import MockTemplateList from './MockTemplateList'
-import ReflectTemplateListPublic from './ReflectTemplateListPublic'
-
-interface Props {
-  teamId: string
-}
-
-const ReflectTemplateListPublicRoot = (props: Props) => {
-  const {teamId} = props
-  const queryRef = useQueryLoaderNow<ReflectTemplateListPublicQuery>(
-    reflectTemplateListPublicQuery,
-    {
-      teamId
-    }
-  )
-  return (
-    <Suspense fallback={<MockTemplateList />}>
-      {queryRef && <ReflectTemplateListPublic queryRef={queryRef} />}
-    </Suspense>
-  )
-}
-
-export default ReflectTemplateListPublicRoot
diff --git a/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx b/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx
deleted file mode 100644
index 49abd2e6ab8..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateListTeam.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {useHistory} from 'react-router'
-import useFilteredItems from '~/hooks/useFilteredItems'
-import {ReflectTemplateListTeam_team$key} from '../../../__generated__/ReflectTemplateListTeam_team.graphql'
-import {
-  ReflectTemplateListTeam_teamTemplates$data,
-  ReflectTemplateListTeam_teamTemplates$key
-} from '../../../__generated__/ReflectTemplateListTeam_teamTemplates.graphql'
-import useActiveTopTemplate from '../../../hooks/useActiveTopTemplate'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import {PALETTE} from '../../../styles/paletteV3'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import ReflectTemplateItem from './ReflectTemplateItem'
-
-const TemplateList = styled('ul')({
-  listStyle: 'none',
-  paddingLeft: 0,
-  marginTop: 0
-})
-
-const Message = styled('div')({
-  border: `1px dashed ${PALETTE.SLATE_400}`,
-  borderRadius: 4,
-  color: PALETTE.SLATE_600,
-  fontSize: 14,
-  fontStyle: 'italic',
-  lineHeight: '20px',
-  margin: 'auto 32px',
-  padding: '8px 16px'
-})
-
-const StyledLink = styled('span')({
-  color: PALETTE.SKY_500,
-  cursor: 'pointer',
-  outline: 0,
-  ':hover, :focus, :active': {
-    color: PALETTE.SKY_600
-  }
-})
-
-interface Props {
-  isActive: boolean
-  activeTemplateId: string
-  showPublicTemplates: () => void
-  teamTemplatesRef: ReflectTemplateListTeam_teamTemplates$key
-  teamRef: ReflectTemplateListTeam_team$key
-  templateSearchQuery: string
-}
-
-const getValue = (item: ReflectTemplateListTeam_teamTemplates$data[0]) => {
-  return item.name.toLowerCase()
-}
-
-const ReflectTemplateListTeam = (props: Props) => {
-  const {
-    isActive,
-    activeTemplateId,
-    showPublicTemplates,
-    templateSearchQuery,
-    teamTemplatesRef,
-    teamRef
-  } = props
-  const teamTemplates = useFragment(
-    graphql`
-      fragment ReflectTemplateListTeam_teamTemplates on ReflectTemplate @relay(plural: true) {
-        id
-        name
-        ...ReflectTemplateItem_template
-      }
-    `,
-    teamTemplatesRef
-  )
-  const team = useFragment(
-    graphql`
-      fragment ReflectTemplateListTeam_team on Team {
-        id
-        orgId
-        tier
-      }
-    `,
-    teamRef
-  )
-  const history = useHistory()
-  const atmosphere = useAtmosphere()
-  const {orgId, tier, id: teamId} = team
-  const searchQuery = templateSearchQuery ?? ''
-  const edges = teamTemplates.map((t) => ({node: {id: t.id}})) as readonly {node: {id: string}}[]
-  useActiveTopTemplate(edges, activeTemplateId, teamId, isActive, 'retrospective')
-  const filteredTemplates = useFilteredItems(searchQuery, teamTemplates, getValue)
-  if (teamTemplates.length === 0) {
-    if (tier === 'starter') {
-      const goToBilling = () => {
-        SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', {
-          upgradeCTALocation: 'teamTemplate',
-          meetingType: 'retrospective'
-        })
-        history.push(`/me/organizations/${orgId}`)
-      }
-      return (
-        <Message>
-          <StyledLink onClick={goToBilling}>Upgrade </StyledLink>
-          <span>to create custom templates for your team</span>
-        </Message>
-      )
-    }
-    return (
-      <Message>
-        <span>Your custom templates will show up here. Get started with a </span>
-        <StyledLink onClick={showPublicTemplates}>Public Template</StyledLink>
-      </Message>
-    )
-  }
-  if (filteredTemplates.length === 0) {
-    return <Message>{`No team templates match your search query "${searchQuery}"`}</Message>
-  }
-  return (
-    <TemplateList>
-      {teamTemplates.map((template) => {
-        return (
-          <ReflectTemplateItem
-            key={template.id}
-            template={template}
-            isActive={template.id === activeTemplateId}
-            lowestScope={'TEAM'}
-            teamId={teamId}
-            templateSearchQuery={searchQuery}
-          />
-        )
-      })}
-    </TemplateList>
-  )
-}
-
-export default ReflectTemplateListTeam
diff --git a/packages/client/modules/meeting/components/ReflectTemplateModal.tsx b/packages/client/modules/meeting/components/ReflectTemplateModal.tsx
deleted file mode 100644
index 384ebb73cd7..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateModal.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import styled from '@emotion/styled'
-import graphql from 'babel-plugin-relay/macro'
-import React, {useEffect, useState} from 'react'
-import {useFragment} from 'react-relay'
-import {ReflectTemplateModal_retroMeetingSettings$key} from '../../../__generated__/ReflectTemplateModal_retroMeetingSettings.graphql'
-import DialogContainer from '../../../components/DialogContainer'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import getTemplateList from '../../../utils/getTemplateList'
-import {setActiveTemplate} from '../../../utils/relay/setActiveTemplate'
-import CustomTemplateUpgradeMsg from './CustomTemplateUpgradeMsg'
-import ReflectTemplateDetails from './ReflectTemplateDetails'
-import ReflectTemplateList from './ReflectTemplateList'
-
-interface Props {
-  closePortal: () => void
-  retroMeetingSettingsRef: ReflectTemplateModal_retroMeetingSettings$key
-}
-
-const StyledDialogContainer = styled(DialogContainer)({
-  flexDirection: 'row',
-  width: 880,
-  maxHeight: 520,
-  minHeight: 520
-})
-
-const SCOPES = ['TEAM', 'ORGANIZATION', 'PUBLIC']
-
-const ReflectTemplateModal = (props: Props) => {
-  const {closePortal, retroMeetingSettingsRef} = props
-  const retroMeetingSettings = useFragment(
-    graphql`
-      fragment ReflectTemplateModal_retroMeetingSettings on RetrospectiveMeetingSettings {
-        ...ReflectTemplateList_settings
-        ...ReflectTemplateDetails_settings
-        meetingType
-        team {
-          id
-          orgId
-        }
-        selectedTemplate {
-          id
-          ...getTemplateList_template
-        }
-        activeTemplate {
-          id
-        }
-      }
-    `,
-    retroMeetingSettingsRef
-  )
-  const {selectedTemplate, team, activeTemplate, meetingType} = retroMeetingSettings
-  const {id: teamId, orgId} = team
-  const lowestScope = getTemplateList(teamId, orgId, selectedTemplate)
-  const listIdx = SCOPES.indexOf(lowestScope)
-  const [activeIdx, setActiveIdx] = useState(listIdx)
-  const [showUpgradeDetails, setShowUpgradeDetails] = useState(false)
-  const gotoTeamTemplates = () => {
-    setActiveIdx(0)
-  }
-  const gotoPublicTemplates = () => {
-    setActiveIdx(2)
-  }
-
-  const atmosphere = useAtmosphere()
-  useEffect(() => {
-    setActiveTemplate(atmosphere, teamId, selectedTemplate.id, 'retrospective')
-  }, [])
-
-  const displayUpgradeDetails = () => {
-    setShowUpgradeDetails(true)
-  }
-
-  const hideUpgradeDetails = () => {
-    setShowUpgradeDetails(false)
-  }
-
-  useEffect(() => {
-    if (showUpgradeDetails) hideUpgradeDetails()
-  }, [activeTemplate])
-
-  return (
-    <StyledDialogContainer>
-      <ReflectTemplateList
-        settingsRef={retroMeetingSettings}
-        activeIdx={activeIdx}
-        setActiveIdx={setActiveIdx}
-        displayUpgradeDetails={displayUpgradeDetails}
-      />
-      {showUpgradeDetails ? (
-        <CustomTemplateUpgradeMsg orgId={orgId} meetingType={meetingType} />
-      ) : (
-        <ReflectTemplateDetails
-          settings={retroMeetingSettings}
-          gotoTeamTemplates={gotoTeamTemplates}
-          gotoPublicTemplates={gotoPublicTemplates}
-          closePortal={closePortal}
-        />
-      )}
-    </StyledDialogContainer>
-  )
-}
-export default ReflectTemplateModal
diff --git a/packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx b/packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx
deleted file mode 100644
index d0d78ed14c7..00000000000
--- a/packages/client/modules/meeting/components/ReflectTemplateSearchBar.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import styled from '@emotion/styled'
-import {Close, Search as SearchIcon} from '@mui/icons-material'
-import graphql from 'babel-plugin-relay/macro'
-import React, {ChangeEvent, useRef} from 'react'
-import {commitLocalUpdate, useFragment} from 'react-relay'
-import {SharingScopeEnum} from '~/__generated__/ReflectTemplateItem_template.graphql'
-import {ReflectTemplateSearchBar_settings$key} from '~/__generated__/ReflectTemplateSearchBar_settings.graphql'
-import Atmosphere from '../../../Atmosphere'
-import MenuItemComponentAvatar from '../../../components/MenuItemComponentAvatar'
-import MenuItemLabel from '../../../components/MenuItemLabel'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import {PALETTE} from '../../../styles/paletteV3'
-
-const SearchBarWrapper = styled('div')({
-  padding: '16px 16px 0 16px'
-})
-
-const Search = styled(MenuItemLabel)({
-  alignItems: 'center',
-  border: `1px solid ${PALETTE.SLATE_400}`,
-  borderRadius: '40px',
-  display: 'flex',
-  height: 40,
-  overflow: 'visible',
-  paddingLeft: 20,
-  position: 'relative',
-  width: '100%'
-})
-
-const StyledMenuItemIcon = styled(MenuItemComponentAvatar)({
-  position: 'absolute',
-  left: 10,
-  top: 8
-})
-
-const StyledSearchIcon = styled(SearchIcon)({
-  color: PALETTE.SLATE_600
-})
-
-const ClearSearchIcon = styled(Close)<{isEmpty: boolean}>(({isEmpty}) => ({
-  color: PALETTE.SLATE_500,
-  cursor: 'pointer',
-  margin: 8,
-  display: isEmpty ? 'none' : 'flex'
-}))
-
-const InputWrapper = styled('div')({
-  alignItems: 'center',
-  display: 'flex',
-  flex: 1,
-  paddingLeft: 8
-})
-
-const SearchInput = styled('input')({
-  appearance: 'none',
-  border: 'none',
-  color: PALETTE.SLATE_700,
-  fontSize: 16,
-  margin: 0,
-  padding: 12,
-  height: 40,
-  outline: 0,
-  backgroundColor: 'transparent',
-  width: '100%'
-})
-
-const setTemplateSearch = (atmosphere: Atmosphere, settingsId: string, value: string) => {
-  commitLocalUpdate(atmosphere, (store) => {
-    const settings = store.get(settingsId)
-    if (!settings) return
-    const normalizedSearch = value.toLowerCase()
-    settings.setValue(normalizedSearch, 'templateSearchQuery')
-  })
-}
-
-interface Props {
-  templateType: SharingScopeEnum
-  clearSearch: () => void
-  settingsRef: ReflectTemplateSearchBar_settings$key
-}
-
-const ReflectTemplateSearchBar = (props: Props) => {
-  const {templateType, clearSearch, settingsRef} = props
-  const atmosphere = useAtmosphere()
-  const settings = useFragment(
-    graphql`
-      fragment ReflectTemplateSearchBar_settings on RetrospectiveMeetingSettings {
-        id
-        templateSearchQuery
-      }
-    `,
-    settingsRef
-  )
-  const {id: settingsId, templateSearchQuery} = settings
-  const normalizedTempType = templateType === 'ORGANIZATION' ? 'org' : templateType?.toLowerCase()
-
-  const onChange = (e: ChangeEvent<HTMLInputElement>) => {
-    setTemplateSearch(atmosphere, settingsId, e.currentTarget.value)
-  }
-
-  const inputRef = useRef<HTMLInputElement>(null)
-  const onKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Escape' && inputRef.current) {
-      e.stopPropagation()
-      e.preventDefault()
-      inputRef.current.blur()
-    }
-  }
-
-  const handleClear = () => {
-    inputRef.current?.focus()
-    clearSearch()
-  }
-
-  return (
-    <SearchBarWrapper>
-      <Search>
-        <StyledMenuItemIcon>
-          <StyledSearchIcon />
-        </StyledMenuItemIcon>
-        <InputWrapper>
-          <SearchInput
-            onKeyDown={onKeyDown}
-            autoComplete='off'
-            name='search'
-            placeholder={`Search ${normalizedTempType} templates...`}
-            type='text'
-            onChange={onChange}
-            ref={inputRef}
-            value={templateSearchQuery ?? ''}
-          />
-        </InputWrapper>
-        <ClearSearchIcon isEmpty={!templateSearchQuery} onClick={handleClear} />
-      </Search>
-    </SearchBarWrapper>
-  )
-}
-
-export default ReflectTemplateSearchBar
diff --git a/packages/client/modules/meeting/components/RetroTemplatePicker.tsx b/packages/client/modules/meeting/components/RetroTemplatePicker.tsx
deleted file mode 100644
index 348f38cebf2..00000000000
--- a/packages/client/modules/meeting/components/RetroTemplatePicker.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {RetroTemplatePicker_settings$key} from '../../../__generated__/RetroTemplatePicker_settings.graphql'
-import NewMeetingDropdown from '../../../components/NewMeetingDropdown'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useModal from '../../../hooks/useModal'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-import lazyPreload from '../../../utils/lazyPreload'
-
-interface Props {
-  settingsRef: RetroTemplatePicker_settings$key
-}
-
-const ReflectTemplateModal = lazyPreload(
-  () =>
-    import(
-      /* webpackChunkName: 'ReflectTemplateModal' */
-      './ReflectTemplateModal'
-    )
-)
-
-const RetroTemplatePicker = (props: Props) => {
-  const {settingsRef} = props
-  const settings = useFragment(
-    graphql`
-      fragment RetroTemplatePicker_settings on RetrospectiveMeetingSettings {
-        ...ReflectTemplateModal_retroMeetingSettings
-        selectedTemplate {
-          id
-          name
-          scope
-          ...ReflectTemplateDetailsTemplate
-        }
-      }
-    `,
-    settingsRef
-  )
-
-  const {selectedTemplate} = settings
-  const {name: templateName, scope} = selectedTemplate
-  const {togglePortal, modalPortal, closePortal} = useModal({
-    id: 'templateModal'
-  })
-  const atmosphere = useAtmosphere()
-
-  const handleClick = () => {
-    togglePortal()
-    SendClientSideEvent(atmosphere, 'Opened Template Picker', {
-      meetingType: 'retrospective',
-      scope
-    })
-  }
-
-  return (
-    <>
-      <NewMeetingDropdown
-        dropdownIcon={'keyboard_arrow_right'}
-        label={templateName}
-        onClick={handleClick}
-        onMouseEnter={ReflectTemplateModal.preload}
-        title={'Template'}
-      />
-      {modalPortal(
-        <ReflectTemplateModal closePortal={closePortal} retroMeetingSettingsRef={settings} />
-      )}
-    </>
-  )
-}
-
-export default RetroTemplatePicker
diff --git a/packages/client/modules/meeting/components/SelectTemplate.tsx b/packages/client/modules/meeting/components/SelectTemplate.tsx
deleted file mode 100644
index 26dc199aae6..00000000000
--- a/packages/client/modules/meeting/components/SelectTemplate.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import {keyframes} from '@emotion/core'
-import styled from '@emotion/styled'
-import {Check} from '@mui/icons-material'
-import graphql from 'babel-plugin-relay/macro'
-import React from 'react'
-import {useFragment} from 'react-relay'
-import {useHistory} from 'react-router'
-import {TierEnum} from '../../../__generated__/ReflectTemplateListPublicQuery.graphql'
-import {SelectTemplate_template$key} from '../../../__generated__/SelectTemplate_template.graphql'
-import FloatingActionButton from '../../../components/FloatingActionButton'
-import StyledError from '../../../components/StyledError'
-import useAtmosphere from '../../../hooks/useAtmosphere'
-import useMutationProps from '../../../hooks/useMutationProps'
-import SelectTemplateMutation from '../../../mutations/SelectTemplateMutation'
-import {BezierCurve} from '../../../types/constEnums'
-import SendClientSideEvent from '../../../utils/SendClientSideEvent'
-
-const fadein = keyframes`
-0% { opacity: 0; }
-100% { opacity: 1; }
-`
-
-const ButtonBlock = styled('div')({
-  animation: `${fadein} 200ms ${BezierCurve.DECELERATE}`,
-  alignItems: 'flex-end',
-  display: 'flex',
-  flexDirection: 'column',
-  justifyContent: 'flex-end',
-  pointerEvents: 'none',
-  position: 'absolute',
-  right: 16,
-  bottom: 16,
-  width: '100%',
-  zIndex: 1
-})
-
-const Button = styled(FloatingActionButton)({
-  border: 0,
-  fontSize: 16,
-  padding: '8px 20px',
-  pointerEvents: 'all'
-})
-
-const UpgradeButton = styled(Button)({
-  padding: '10px 24px'
-})
-
-const StyledIcon = styled(Check)({
-  marginRight: 4
-})
-
-interface Props {
-  closePortal: () => void
-  template: SelectTemplate_template$key
-  teamId: string
-  tier?: TierEnum
-  noTemplateLimit?: boolean
-  orgId?: string
-}
-
-const SelectTemplate = (props: Props) => {
-  const {template: templateRef, closePortal, teamId, tier, noTemplateLimit, orgId} = props
-  const template = useFragment(
-    graphql`
-      fragment SelectTemplate_template on MeetingTemplate {
-        id
-        teamId
-        scope
-        isFree
-        type
-      }
-    `,
-    templateRef
-  )
-  const {id: templateId, isFree, type, scope} = template
-  const atmosphere = useAtmosphere()
-  const history = useHistory()
-  const {submitting, error, onCompleted, onError} = useMutationProps()
-  const selectTemplate = () => {
-    SelectTemplateMutation(
-      atmosphere,
-      {selectedTemplateId: templateId, teamId},
-      {onCompleted, onError}
-    )
-    closePortal()
-  }
-  const goToBilling = () => {
-    SendClientSideEvent(atmosphere, 'Upgrade CTA Clicked', {
-      upgradeCTALocation: 'publicTemplate',
-      meetingType: type
-    })
-    history.push(`/me/organizations/${orgId}`)
-  }
-  const showUpgradeCTA = !isFree && tier === 'starter' && scope === 'PUBLIC' && !noTemplateLimit
-  if (showUpgradeCTA) {
-    return (
-      <ButtonBlock>
-        <UpgradeButton onClick={goToBilling} palette='pink' waiting={submitting}>
-          {'Upgrade Now'}
-        </UpgradeButton>
-      </ButtonBlock>
-    )
-  }
-  return (
-    <ButtonBlock>
-      {error && <StyledError>{error.message}</StyledError>}
-      <Button onClick={selectTemplate} palette='blue' waiting={submitting}>
-        <StyledIcon />
-        {'Use Template'}
-      </Button>
-    </ButtonBlock>
-  )
-}
-
-export default SelectTemplate
diff --git a/packages/client/mutations/AddPokerTemplateMutation.ts b/packages/client/mutations/AddPokerTemplateMutation.ts
index cf2d9fce175..698dd1d14d2 100644
--- a/packages/client/mutations/AddPokerTemplateMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateMutation.ts
@@ -15,7 +15,6 @@ graphql`
     }
     pokerTemplate {
       ...TemplateSharing_template
-      ...PokerTemplateDetailsTemplate
       ...ActivityDetails_template
       id
       teamId
diff --git a/packages/client/mutations/AddReflectTemplateMutation.ts b/packages/client/mutations/AddReflectTemplateMutation.ts
index 10ee982db9a..19d73535764 100644
--- a/packages/client/mutations/AddReflectTemplateMutation.ts
+++ b/packages/client/mutations/AddReflectTemplateMutation.ts
@@ -14,7 +14,6 @@ graphql`
     }
     reflectTemplate {
       ...TemplateSharing_template
-      ...ReflectTemplateDetailsTemplate
       ...ActivityDetails_template
       id
       teamId
diff --git a/packages/client/mutations/RemovePokerTemplateMutation.ts b/packages/client/mutations/RemovePokerTemplateMutation.ts
index e463b7de7c0..978c8bafaf6 100644
--- a/packages/client/mutations/RemovePokerTemplateMutation.ts
+++ b/packages/client/mutations/RemovePokerTemplateMutation.ts
@@ -32,12 +32,9 @@ export const removePokerTemplateTeamUpdater: SharedUpdater<
   RemovePokerTemplateMutation_team$data
 > = (payload, {store}) => {
   const templateId = payload.getLinkedRecord('pokerTemplate').getValue('id')
-  const teamId = payload.getLinkedRecord('pokerTemplate').getValue('teamId')
-  handleRemovePokerTemplate(templateId, teamId, store)
+  handleRemovePokerTemplate(templateId, store)
 }
 
-type PokerTemplate = NonNullable<RemovePokerTemplateMutation_team$data['pokerTemplate']>
-
 const RemovePokerTemplateMutation: StandardMutation<TRemovePokerTemplateMutation> = (
   atmosphere,
   variables,
@@ -55,9 +52,7 @@ const RemovePokerTemplateMutation: StandardMutation<TRemovePokerTemplateMutation
     },
     optimisticUpdater: (store) => {
       const {templateId} = variables
-      const template = store.get<PokerTemplate>(templateId)!
-      const teamId = template.getValue('teamId')
-      handleRemovePokerTemplate(templateId, teamId, store)
+      handleRemovePokerTemplate(templateId, store)
     }
   })
 }
diff --git a/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts b/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts
index e71c59146c8..2210146aaa8 100644
--- a/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts
+++ b/packages/client/mutations/UpdatePokerTemplateScopeMutation.ts
@@ -13,15 +13,12 @@ import getCachedRecord from '../utils/relay/getCachedRecord'
 import getNodeById from '../utils/relay/getNodeById'
 import {insertEdgeAfter} from '../utils/relay/insertEdge'
 import safeRemoveNodeFromArray from '../utils/relay/safeRemoveNodeFromArray'
-import safeRemoveNodeFromConn from '../utils/relay/safeRemoveNodeFromConn'
-import getPokerTemplateOrgConn from './connections/getPokerTemplateOrgConn'
 
 graphql`
   fragment UpdatePokerTemplateScopeMutation_organization on UpdateTemplateScopeSuccess {
     template {
       # these fragments are needed for listening org members
       ...TemplateSharing_template
-      ...PokerTemplateDetailsTemplate
       id
       orgId
       scope
@@ -29,7 +26,6 @@ graphql`
     }
     clonedTemplate {
       ...TemplateSharing_template
-      ...PokerTemplateDetailsTemplate
       orgId
     }
   }
@@ -55,9 +51,6 @@ const removeTemplateFromCurrentScope = (
 ) => {
   if (scopeList === 'TEAM') {
     safeRemoveNodeFromArray(templateId, meetingSettings, 'teamTemplates')
-  } else if (scopeList === 'ORGANIZATION') {
-    const orgTemplatesConn = getPokerTemplateOrgConn(meetingSettings)
-    safeRemoveNodeFromConn(templateId, orgTemplatesConn)
   }
   // not possible for the public list to get mutated because this is an org subscription
 }
@@ -78,14 +71,10 @@ export const putTemplateInConnection = (
 const addTemplateToScope = (
   template: RecordProxy,
   scope: SharingScopeEnum,
-  meetingSettings: RecordProxy,
-  store: RecordSourceSelectorProxy
+  meetingSettings: RecordProxy
 ) => {
   if (scope === 'TEAM') {
     addNodeToArray(template, meetingSettings, 'teamTemplates')
-  } else if (scope === 'ORGANIZATION') {
-    const orgTemplatesConn = getPokerTemplateOrgConn(meetingSettings)
-    putTemplateInConnection(template, orgTemplatesConn, store)
   }
 }
 
@@ -117,13 +106,13 @@ const handleUpdateTemplateScope = (
     if (scopeList === 'TEAM') {
       if (clonedTemplate) {
         removeTemplateFromCurrentScope(templateId, scopeList, meetingSettings)
-        addTemplateToScope(nextTemplate, scopeList, meetingSettings, store)
+        addTemplateToScope(nextTemplate, scopeList, meetingSettings)
       }
     } else if (scopeList === 'ORGANIZATION') {
       if (isDecreasing) {
         removeTemplateFromCurrentScope(templateId, scopeList, meetingSettings)
       } else {
-        addTemplateToScope(nextTemplate, scopeList, meetingSettings, store)
+        addTemplateToScope(nextTemplate, scopeList, meetingSettings)
       }
     }
   })
diff --git a/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts b/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts
index a82aea83e11..7e547ad17d3 100644
--- a/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts
+++ b/packages/client/mutations/UpdateReflectTemplateScopeMutation.ts
@@ -21,7 +21,6 @@ graphql`
     template {
       # these fragments are needed for listening org members
       ...TemplateSharing_template
-      ...ReflectTemplateDetailsTemplate
       id
       orgId
       scope
@@ -29,7 +28,6 @@ graphql`
     }
     clonedTemplate {
       ...TemplateSharing_template
-      ...ReflectTemplateDetailsTemplate
       orgId
     }
   }
diff --git a/packages/client/mutations/connections/getPokerTemplateOrgConn.ts b/packages/client/mutations/connections/getPokerTemplateOrgConn.ts
deleted file mode 100644
index b9737b45d76..00000000000
--- a/packages/client/mutations/connections/getPokerTemplateOrgConn.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {ConnectionHandler, ReadOnlyRecordProxy} from 'relay-runtime'
-
-const getPokerTemplateOrgConn = (pokerSettings: ReadOnlyRecordProxy | null | undefined) => {
-  if (pokerSettings) {
-    return ConnectionHandler.getConnection(
-      pokerSettings,
-      'PokerTemplateListOrg_organizationTemplates'
-    )
-  }
-  return null
-}
-
-export default getPokerTemplateOrgConn
diff --git a/packages/client/mutations/connections/getPokerTemplatePublicConn.ts b/packages/client/mutations/connections/getPokerTemplatePublicConn.ts
deleted file mode 100644
index 1dd09e2f14e..00000000000
--- a/packages/client/mutations/connections/getPokerTemplatePublicConn.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {ConnectionHandler, ReadOnlyRecordProxy} from 'relay-runtime'
-
-const getPokerTemplatePublicConn = (pokerSettings: ReadOnlyRecordProxy | null | undefined) => {
-  if (pokerSettings) {
-    return ConnectionHandler.getConnection(pokerSettings, 'PokerTemplateListPublic_publicTemplates')
-  }
-  return null
-}
-
-export default getPokerTemplatePublicConn
diff --git a/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts b/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts
index 540c012f9c8..6cc0d13df0f 100644
--- a/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts
+++ b/packages/client/mutations/handlers/handleMovePokerTemplateDimension.ts
@@ -1,8 +1,8 @@
 import {RecordSourceProxy} from 'relay-runtime'
-import {PokerTemplateDetailsTemplate$data} from '~/__generated__/PokerTemplateDetailsTemplate.graphql'
+import {TemplateDetails_activity$data} from '~/__generated__/TemplateDetails_activity.graphql'
 
 const handleMovePokerTemplateDimension = (store: RecordSourceProxy, templateId: string) => {
-  const template = store.get<PokerTemplateDetailsTemplate$data>(templateId)
+  const template = store.get<TemplateDetails_activity$data>(templateId)
   if (!template) return
   const dimensions = template.getLinkedRecords('dimensions')
   if (!Array.isArray(dimensions)) return
diff --git a/packages/client/mutations/handlers/handleRemovePokerTemplate.ts b/packages/client/mutations/handlers/handleRemovePokerTemplate.ts
index d35ba7bd540..2036fcb94fa 100644
--- a/packages/client/mutations/handlers/handleRemovePokerTemplate.ts
+++ b/packages/client/mutations/handlers/handleRemovePokerTemplate.ts
@@ -1,26 +1,8 @@
 import {ConnectionHandler, RecordSourceSelectorProxy} from 'relay-runtime'
-import {PokerTemplateList_settings$data} from '~/__generated__/PokerTemplateList_settings.graphql'
-import safeRemoveNodeFromArray from '../../utils/relay/safeRemoveNodeFromArray'
 import safeRemoveNodeFromConn from '../../utils/relay/safeRemoveNodeFromConn'
-import getPokerTemplateOrgConn from '../connections/getPokerTemplateOrgConn'
-import getPokerTemplatePublicConn from '../connections/getPokerTemplatePublicConn'
 import pluralizeHandler from './pluralizeHandler'
 
-const handleRemovePokerTemplate = (
-  templateId: string,
-  teamId: string,
-  store: RecordSourceSelectorProxy<any>
-) => {
-  const team = store.get(teamId)!
-  const settings = team.getLinkedRecord<PokerTemplateList_settings$data>('meetingSettings', {
-    meetingType: 'poker'
-  })
-  safeRemoveNodeFromArray(templateId, settings, 'teamTemplates')
-  const orgConn = getPokerTemplateOrgConn(settings)
-  const publicConn = getPokerTemplatePublicConn(settings)
-  safeRemoveNodeFromConn(templateId, orgConn)
-  safeRemoveNodeFromConn(templateId, publicConn)
-
+const handleRemovePokerTemplate = (templateId: string, store: RecordSourceSelectorProxy<any>) => {
   const viewer = store.getRoot().getLinkedRecord('viewer')
   const allAvailableConn =
     viewer && ConnectionHandler.getConnection(viewer, 'ActivityLibrary_availableTemplates')

From 6f1c1d9378536bd212032c84e0f35e074cca0941 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Tue, 16 Apr 2024 10:26:11 +0200
Subject: [PATCH 162/183] chore: Improve Activity Library focus and hover
 states (#9626)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: Dale Bumblis <135627447+dbumblis-parabol@users.noreply.github.com>
---
 .../ActivityLibrary/ActivityCard.tsx          |  2 +-
 .../ActivityLibrary/ActivityGrid.tsx          |  9 ++--
 .../ActivityLibrary/ActivityLibraryCard.tsx   | 14 ------
 .../ActivityLibrary/CreateActivityCard.tsx    | 11 +++--
 .../CreateNewActivity/CreateNewActivity.tsx   |  4 +-
 .../components/RetroDrawerTemplateCard.tsx    | 47 ++++++++++---------
 6 files changed, 38 insertions(+), 49 deletions(-)
 delete mode 100644 packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx

diff --git a/packages/client/components/ActivityLibrary/ActivityCard.tsx b/packages/client/components/ActivityLibrary/ActivityCard.tsx
index e0ccdbdf51d..724e791960b 100644
--- a/packages/client/components/ActivityLibrary/ActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityCard.tsx
@@ -94,7 +94,7 @@ export const ActivityCard = (props: ActivityCardProps) => {
 
   return (
     <div
-      className='flex w-full flex-col'
+      className='flex w-full flex-col rounded-xl p-2'
       onMouseEnter={handleMouseEnter}
       onMouseLeave={handleMouseLeave}
     >
diff --git a/packages/client/components/ActivityLibrary/ActivityGrid.tsx b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
index f9db6c34480..5892e37aca8 100644
--- a/packages/client/components/ActivityLibrary/ActivityGrid.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
@@ -1,9 +1,8 @@
 import React from 'react'
 import {Link} from 'react-router-dom'
 import {ActivityBadge} from './ActivityBadge'
-import {ActivityCardImage} from './ActivityCard'
+import {ActivityCard, ActivityCardImage} from './ActivityCard'
 import {Template} from './ActivityLibrary'
-import {ActivityLibraryCard} from './ActivityLibraryCard'
 import {ActivityLibraryCardDescription} from './ActivityLibraryCardDescription'
 import {CATEGORY_THEMES, CategoryID} from './Categories'
 
@@ -23,9 +22,9 @@ const ActivityGrid = ({templates, selectedCategory}: ActivityGridProps) => {
               pathname: `/activity-library/details/${template.id}`,
               state: {prevCategory: selectedCategory}
             }}
-            className='flex focus:rounded-md focus:outline-primary'
+            className='flex rounded-2xl hover:bg-slate-100 focus:outline-sky-500'
           >
-            <ActivityLibraryCard
+            <ActivityCard
               className='group aspect-[256/160] flex-1'
               key={template.id}
               theme={CATEGORY_THEMES[template.category as CategoryID]}
@@ -47,7 +46,7 @@ const ActivityGrid = ({templates, selectedCategory}: ActivityGridProps) => {
                 className='hidden group-hover/card:flex'
                 templateRef={template}
               />
-            </ActivityLibraryCard>
+            </ActivityCard>
           </Link>
         )
       })}
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx
deleted file mode 100644
index 55055d77d94..00000000000
--- a/packages/client/components/ActivityLibrary/ActivityLibraryCard.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import clsx from 'clsx'
-import React from 'react'
-import {ActivityCard, ActivityCardProps} from './ActivityCard'
-
-export const ActivityLibraryCard = (props: ActivityCardProps) => {
-  const {className, ...rest} = props
-
-  return (
-    <ActivityCard
-      className={clsx('focus-within:ring-2 focus-within:ring-primary hover:shadow-md', className)}
-      {...rest}
-    />
-  )
-}
diff --git a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
index 38a2b7b9744..fbe52650e94 100644
--- a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
@@ -3,7 +3,7 @@ import clsx from 'clsx'
 import React from 'react'
 import {Link} from 'react-router-dom'
 import {ActivityBadge} from './ActivityBadge'
-import {ActivityLibraryCard} from './ActivityLibraryCard'
+import {ActivityCard} from './ActivityCard'
 import {AllCategoryID, CATEGORY_ID_TO_NAME, CATEGORY_THEMES} from './Categories'
 
 interface Props {
@@ -15,8 +15,11 @@ const CreateActivityCard = (props: Props) => {
   const {category, className} = props
 
   return (
-    <Link className={clsx('flex', className)} to={`/activity-library/new-activity/${category}`}>
-      <ActivityLibraryCard
+    <Link
+      className={clsx('flex rounded-2xl hover:bg-slate-100 focus:outline-sky-500', className)}
+      to={`/activity-library/new-activity/${category}`}
+    >
+      <ActivityCard
         className={'flex-1 cursor-pointer'}
         theme={CATEGORY_THEMES[category]}
         badge={<ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>}
@@ -27,7 +30,7 @@ const CreateActivityCard = (props: Props) => {
           </div>
           Create Custom {category !== 'recommended' ? CATEGORY_ID_TO_NAME[category] : ''} Activity
         </div>
-      </ActivityLibraryCard>
+      </ActivityCard>
     </Link>
   )
 }
diff --git a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
index 2207adf83b2..8017e115b63 100644
--- a/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
+++ b/packages/client/components/ActivityLibrary/CreateNewActivity/CreateNewActivity.tsx
@@ -245,11 +245,11 @@ export const CreateNewActivity = (props: Props) => {
             return (
               <RadioGroup.Item
                 key={activity.title}
-                className='group flex cursor-pointer flex-col items-start space-y-3 rounded-lg bg-transparent p-1 focus:outline-none'
+                className='group flex cursor-pointer flex-col items-start space-y-3 rounded-2xl bg-transparent p-1 pb-4 hover:bg-slate-100 focus:outline-sky-500 data-[state=checked]:ring-4 data-[state=checked]:ring-sky-500'
                 value={activity.type}
               >
                 <ActivityCard
-                  className='aspect-[320/190] w-80 group-data-[state=checked]:ring-4 group-data-[state=checked]:ring-sky-500 group-data-[state=checked]:ring-offset-4'
+                  className='aspect-[320/190] w-80'
                   theme={DEFAULT_CARD_THEME}
                   title={activity.title}
                   type={activity.type}
diff --git a/packages/client/components/RetroDrawerTemplateCard.tsx b/packages/client/components/RetroDrawerTemplateCard.tsx
index c732b060bdf..4d668edeab1 100644
--- a/packages/client/components/RetroDrawerTemplateCard.tsx
+++ b/packages/client/components/RetroDrawerTemplateCard.tsx
@@ -7,8 +7,7 @@ import useMutationProps from '../hooks/useMutationProps'
 import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation'
 import {CATEGORY_THEMES, CategoryID} from '././ActivityLibrary/Categories'
 import {ActivityBadge} from './ActivityLibrary/ActivityBadge'
-import {ActivityCardImage} from './ActivityLibrary/ActivityCard'
-import {ActivityLibraryCard} from './ActivityLibrary/ActivityLibraryCard'
+import {ActivityCard, ActivityCardImage} from './ActivityLibrary/ActivityCard'
 import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription'
 
 interface Props {
@@ -49,27 +48,29 @@ const RetroDrawerTemplateCard = (props: Props) => {
 
   return (
     <form className='px-4 py-2' onClick={handleClick}>
-      <ActivityLibraryCard
-        className='group aspect-[256/160] flex-1 hover:cursor-pointer'
-        theme={CATEGORY_THEMES[template.category as CategoryID]}
-        title={template.name}
-        type='retrospective'
-        badge={
-          !template.isFree ? (
-            <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>
-          ) : null
-        }
-      >
-        <ActivityCardImage
-          className='group-hover/card:hidden'
-          src={template.illustrationUrl}
-          category='retrospective'
-        />
-        <ActivityLibraryCardDescription
-          className='hidden group-hover/card:flex'
-          templateRef={template}
-        />
-      </ActivityLibraryCard>
+      <div className='flex hover:rounded-2xl hover:bg-slate-100 focus:rounded-2xl focus:outline-sky-500'>
+        <ActivityCard
+          className='group aspect-[256/160] flex-1 hover:cursor-pointer'
+          theme={CATEGORY_THEMES[template.category as CategoryID]}
+          title={template.name}
+          type='retrospective'
+          badge={
+            !template.isFree ? (
+              <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>
+            ) : null
+          }
+        >
+          <ActivityCardImage
+            className='group-hover/card:hidden'
+            src={template.illustrationUrl}
+            category='retrospective'
+          />
+          <ActivityLibraryCardDescription
+            className='hidden group-hover/card:flex'
+            templateRef={template}
+          />
+        </ActivityCard>
+      </div>
     </form>
   )
 }

From a01cf2bd2324fe62fa4af3044f06c94d6f14b087 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:20:17 +0100
Subject: [PATCH 163/183] chore(docker): delete all files used by old PPMIs and
 old Docker images (#9648)

---
 docker/images/parabol-ubi/cloudbuild.yml      |  17 ---
 docker/images/parabol-ubi/docker-compose.yml  |  30 -----
 .../dockerfiles/parabol.dockerfile            | 118 ------------------
 .../parabol-ubi/environments/legacy-build     |  54 --------
 ...rule_account_disable_post_pw_expiration.sh |  93 --------------
 ....content_rule_accounts_logon_fail_delay.sh |  95 --------------
 ..._accounts_max_concurrent_login_sessions.sh |  25 ----
 ...nt_rule_accounts_maximum_age_login_defs.sh |  23 ----
 ...nt_rule_accounts_minimum_age_login_defs.sh |  23 ----
 ...e_accounts_password_all_shadowed_sha512.sh |   7 --
 ...ule_accounts_password_minlen_login_defs.sh |  24 ----
 ...tent_rule_accounts_password_pam_dcredit.sh |  93 --------------
 ...nt_rule_accounts_password_pam_dictcheck.sh |  43 -------
 ...ontent_rule_accounts_password_pam_difok.sh |  93 --------------
 ...tent_rule_accounts_password_pam_lcredit.sh |  93 --------------
 ...le_accounts_password_pam_maxclassrepeat.sh |  93 --------------
 ...nt_rule_accounts_password_pam_maxrepeat.sh |  93 --------------
 ...ent_rule_accounts_password_pam_minclass.sh |  93 --------------
 ...ntent_rule_accounts_password_pam_minlen.sh |  93 --------------
 ...tent_rule_accounts_password_pam_ocredit.sh |  93 --------------
 ...rd_pam_pwhistory_remember_password_auth.sh |  48 -------
 ...word_pam_pwhistory_remember_system_auth.sh |  48 -------
 ...tent_rule_accounts_password_pam_ucredit.sh |  93 --------------
 ...ule_accounts_password_pam_unix_remember.sh |  18 ---
 ...nt_rule_accounts_passwords_pam_faillock.sh |  25 ----
 ...le_accounts_passwords_pam_faillock_deny.sh |  78 ------------
 ...counts_passwords_pam_faillock_deny_root.sh |  42 -------
 ...ccounts_passwords_pam_faillock_interval.sh |  78 ------------
 ...unts_passwords_pam_faillock_unlock_time.sh |  78 ------------
 ....content_rule_accounts_umask_etc_bashrc.sh |  16 ---
 ...ntent_rule_accounts_umask_etc_csh_cshrc.sh |  12 --
 ...tent_rule_accounts_umask_etc_login_defs.sh |  93 --------------
 ...content_rule_accounts_umask_etc_profile.sh |  12 --
 ...sgproject.content_rule_banner_etc_issue.sh |  16 ---
 ...ct.content_rule_configure_crypto_policy.sh |  27 ----
 ...t_rule_configure_kerberos_crypto_policy.sh |   7 --
 ...nt_rule_configure_openssl_crypto_policy.sh |  27 ----
 ...nt_rule_configure_usbguard_auditbackend.sh |  17 ---
 ...ontent_rule_coredump_disable_backtraces.sh |  17 ---
 ...t.content_rule_coredump_disable_storage.sh |  17 ---
 ...ent_rule_disable_ctrlaltdel_burstaction.sh |  91 --------------
 ...ct.content_rule_disable_users_coredumps.sh |  20 ---
 ...ect.content_rule_display_login_attempts.sh |  73 -----------
 ...ent_rule_ensure_gpgcheck_local_packages.sh |  91 --------------
 ...t_rule_file_groupowner_var_log_messages.sh |   9 --
 ...ile_groupownership_system_commands_dirs.sh |  11 --
 ...ontent_rule_file_owner_var_log_messages.sh |   9 --
 ...content_rule_kernel_module_atm_disabled.sh |   3 -
 ...content_rule_kernel_module_can_disabled.sh |   2 -
 ...tent_rule_kernel_module_cramfs_disabled.sh |   2 -
 ...le_kernel_module_firewire-core_disabled.sh |   2 -
 ...ontent_rule_kernel_module_sctp_disabled.sh |   2 -
 ...ontent_rule_kernel_module_tipc_disabled.sh |   2 -
 ...project.content_rule_no_empty_passwords.sh |   6 -
 ...content_rule_openssl_use_strong_entropy.sh |  35 ------
 ..._rule_package_crypto-policies_installed.sh |   8 --
 ...content_rule_package_iptables_installed.sh |   8 --
 ...ontent_rule_package_rng-tools_installed.sh |  10 --
 ...ect.content_rule_package_sudo_installed.sh |   8 --
 ...content_rule_package_usbguard_installed.sh |  10 --
 ...tent_rule_sudo_require_reauthentication.sh |  37 ------
 ...ct.content_rule_sudoers_validate_passwd.sh |  40 ------
 62 files changed, 2544 deletions(-)
 delete mode 100644 docker/images/parabol-ubi/cloudbuild.yml
 delete mode 100644 docker/images/parabol-ubi/docker-compose.yml
 delete mode 100644 docker/images/parabol-ubi/dockerfiles/parabol.dockerfile
 delete mode 100644 docker/images/parabol-ubi/environments/legacy-build
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh
 delete mode 100755 docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh

diff --git a/docker/images/parabol-ubi/cloudbuild.yml b/docker/images/parabol-ubi/cloudbuild.yml
deleted file mode 100644
index 1ba32c91d96..00000000000
--- a/docker/images/parabol-ubi/cloudbuild.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-steps:
-- name: 'docker/compose:1.29.2'
-  args: ['up', '-d']
-  env:
-  - '_REDIS_VERSION=$_REDIS_VERSION'
-  - '_RETHINKDB_VERSION=$_RETHINKDB_VERSION'
-  - '_POSTGRES_VERSION=$_POSTGRES_VERSION'
-- name: 'gcr.io/cloud-builders/docker'
-  args: [ 'build', '--network=cloudbuild', '-t', 'gcr.io/prbl-prod/parabol/parabol-ubi:$_APP_VERSION', '-f', './dockerfiles/parabol.dockerfile', '--build-arg','_PARABOL_GIT_REF=$_PARABOL_GIT_REF', '--build-arg','_NODE_VERSION=$_NODE_VERSION', '.' ]
-  env:
-  - '_NODE_VERSION=$_NODE_VERSION'
-images:
-- 'gcr.io/prbl-prod/parabol/parabol-ubi:$_APP_VERSION'
-options:
-  logging: CLOUD_LOGGING_ONLY
-  machineType: 'E2_HIGHCPU_32'
-timeout: 3600s
\ No newline at end of file
diff --git a/docker/images/parabol-ubi/docker-compose.yml b/docker/images/parabol-ubi/docker-compose.yml
deleted file mode 100644
index 40651aceb39..00000000000
--- a/docker/images/parabol-ubi/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: '3'
-services:
-  redis:
-    image: redis:$_REDIS_VERSION
-    network_mode: cloudbuild
-    container_name: redis
-    expose:
-      - 6379
-  rethinkdb:
-    image: rethinkdb:$_RETHINKDB_VERSION
-    network_mode: cloudbuild
-    container_name: rethinkdb
-    expose:
-      - 8080
-      - 29015
-      - 28015
-  postgres:
-    image: postgres:$_POSTGRES_VERSION
-    network_mode: cloudbuild
-    container_name: postgres
-    environment:
-      - POSTGRES_USER=tempuser
-      - POSTGRES_PASSWORD=temppassword
-      - POSTGRES_DB=tempdb
-    expose:
-      - 5432
-networks:
-  default:
-    external:
-      name: cloudbuild
\ No newline at end of file
diff --git a/docker/images/parabol-ubi/dockerfiles/parabol.dockerfile b/docker/images/parabol-ubi/dockerfiles/parabol.dockerfile
deleted file mode 100644
index 2688d19ee8d..00000000000
--- a/docker/images/parabol-ubi/dockerfiles/parabol.dockerfile
+++ /dev/null
@@ -1,118 +0,0 @@
-# DO NOT DELETE. Legacy docker file for versions still in use. Delete only when all Parabol instances are using the newest docker image.
-ARG _NODE_VERSION=${_NODE_VERSION}
-#base build for dev deps
-FROM node:${_NODE_VERSION} as base
-
-ARG _PARABOL_GIT_REF=${_PARABOL_GIT_REF}
-ARG _BUILD_ENV_PATH=environments/legacy-build
-ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
-
-WORKDIR /home/node
-
-ADD ${_BUILD_ENV_PATH} ./.env
-
-RUN git clone https://github.com/ParabolInc/parabol.git -b ${_PARABOL_GIT_REF} --depth 1 && \
-    cd parabol && \
-    rm -rf .git/ && \
-    mv /home/node/.env ./.env && \
-    mkdir -p /home/node/parabol/node_modules && \
-    mkdir -p /home/node/.npm-global && \
-    apt update -y && \
-    apt install systemtap -y && \
-    NODE_OPTIONS=--max-old-space-size=20480 && \
-    yarn install --frozen-lockfile && \
-    yarn cache clean && \
-    yarn db:migrate && \
-    yarn pg:migrate up && \
-    yarn pg:build && \
-    yarn build && \
-    chown -R node:1000 /home/node/parabol
-
-#final image - copies in parabol build and applies all security configurations to container
-FROM redhat/ubi9:9.2
-
-ENV HOME=/home/node \
-    USER=node
-
-RUN groupadd -g 1000 node && \
-    useradd -r -u 1000 -m -s /sbin/nologin -g node node
-
-COPY --from=base /usr/local/bin /usr/local/bin
-COPY --from=base /usr/local/include /usr/local/include
-COPY --from=base /usr/local/share/man /usr/local/share/man
-COPY --from=base /usr/local/share/doc /usr/local/share/doc
-COPY --from=base /usr/share/systemtap /usr/local/share/systemtap
-COPY --from=base /usr/local/lib/node_modules /usr/local/lib/node_modules
-COPY --from=base /opt /opt
-COPY --from=base /home/node/parabol/ ${HOME}/parabol
-RUN rm -rf ${HOME}/parabol/.env
-COPY entrypoints/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-COPY security /security
-
-COPY ./tools/ip-to-server_id /home/node/tools/ip-to-server_id
-
-RUN echo Update packages and install security patches && \
-    sed -i "s/enabled=1/enabled=0/" /etc/dnf/plugins/subscription-manager.conf && \
-    echo "exclude=filesystem-*" >> /etc/dnf/dnf.conf && \
-    chmod +x /security/*.sh && \
-    dnf repolist && \
-    dnf update -y && \
-    echo "* hard maxlogins 10" > /etc/security/limits.d/maxlogins.conf && \
-    /security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh && \
-    /security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh && \
-    /security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh && \
-    /security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh && \
-    /security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh && \
-    /security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh && \
-    /security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh && \
-    /security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh && \
-    /security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh && \
-    /security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh && \
-    /security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh && \
-    /security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh && \
-    /security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh && \
-    /security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh && \
-    /security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh && \
-    dnf clean all && \
-    rm -rf /security/ /var/cache/dnf/ /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* && \
-    chmod 755 /usr/local/bin/docker-entrypoint.sh && \
-    chmod g-s /opt/yarn-v*/bin /opt/yarn-v*/lib && \
-    chgrp -R root /opt/yarn-v* && \
-    chgrp root /opt/yarn-v*/lib/* /opt/yarn-v*/bin/* /opt/yarn-v*/* && \
-    mkdir -p /home/node/parabol/self-hosted && \
-    chown node:node /home/node/parabol/self-hosted
-
-
-WORKDIR ${HOME}/parabol/
-USER 1000
-
-EXPOSE 3000
-
-ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/docker/images/parabol-ubi/environments/legacy-build b/docker/images/parabol-ubi/environments/legacy-build
deleted file mode 100644
index d3defd290e1..00000000000
--- a/docker/images/parabol-ubi/environments/legacy-build
+++ /dev/null
@@ -1,54 +0,0 @@
-ATLASSIAN_CLIENT_ID=''
-ATLASSIAN_CLIENT_SECRET=''
-AWS_ACCESS_KEY_ID=''
-AWS_REGION=''
-AWS_S3_BUCKET=''
-AWS_SECRET_ACCESS_KEY=''
-CDN_BASE_URL=''
-FILE_STORE_PROVIDER='local'
-GITHUB_CLIENT_ID=''
-GITHUB_CLIENT_SECRET=''
-GITHUB_WEBHOOK_SECRET=''
-GITLAB_CLIENT_ID=''
-GITLAB_CLIENT_SECRET=''
-GOOGLE_CLOUD_CLIENT_EMAIL=''
-GOOGLE_CLOUD_PRIVATE_KEY=''
-GOOGLE_CLOUD_PRIVATE_KEY_ID=''
-GOOGLE_OAUTH_CLIENT_ID=''
-GOOGLE_OAUTH_CLIENT_SECRET=''
-GOOGLE_TAG_MANAGER_CONTAINER_ID=''
-GRAPHQL_HOST=''
-GRAPHQL_PROTOCOL=''
-HOST=''
-INVITATION_SHORTLINK=''
-MAIL_PROVIDER=''
-MAIL_GOOGLE_USER=''
-MAIL_GOOGLE_PASS=''
-MAILGUN_API_KEY=''
-MAILGUN_DOMAIN=''
-MAILGUN_PUBLIC_KEY=''
-MAIL_FROM=''
-NODE_ENV='production'
-NODE_EXTRA_CA_CERTS=''
-PROTO='https'
-PGADMIN_DEFAULT_EMAIL=''
-PGADMIN_DEFAULT_PASSWORD=''
-PGSSLMODE=''
-PORT=''
-POSTGRES_PASSWORD='temppassword'
-POSTGRES_USER='tempuser'
-POSTGRES_DB='tempdb'
-POSTGRES_HOST='postgres'
-POSTGRES_PORT='5432'
-REDIS_URL='redis://redis:6379'
-RETHINKDB_SSL=''
-RETHINKDB_URL='rethinkdb://rethinkdb:28015/actionProduction'
-SENTRY_DSN=''
-SERVER_ID=''
-SERVER_SECRET='FAKE_VALUE'
-SLACK_CLIENT_ID=''
-SLACK_CLIENT_SECRET=''
-STRIPE_PUBLISHABLE_KEY=''
-STRIPE_SECRET_KEY=''
-STRIPE_WEBHOOK_SECRET=''
-HUBSPOT_API_KEY=''
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh
deleted file mode 100755
index 4723b62c1c9..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q shadow-utils; then
-
-
-var_account_disable_post_pw_expiration="35"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/default/useradd' '^INACTIVE' "$var_account_disable_post_pw_expiration" 'CCE-80954-1' '%s=%s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh
deleted file mode 100755
index 1c48d0c935d..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_logon_fail_delay'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q shadow-utils; then
-
-
-
-# Set variables
-var_accounts_fail_delay="4"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/login.defs' '^FAIL_DELAY' "$var_accounts_fail_delay" 'CCE-84037-1' '%s %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh
deleted file mode 100755
index 57c685ff97e..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_max_concurrent_login_sessions'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_accounts_max_concurrent_login_sessions="10"
-
-
-
-if grep -q '^[^#]*\<maxlogins\>' /etc/security/limits.d/*.conf; then
-	sed -i "/^[^#]*\<maxlogins\>/ s/maxlogins.*/maxlogins $var_accounts_max_concurrent_login_sessions/" /etc/security/limits.d/*.conf
-elif grep -q '^[^#]*\<maxlogins\>' /etc/security/limits.conf; then
-	sed -i "/^[^#]*\<maxlogins\>/ s/maxlogins.*/maxlogins $var_accounts_max_concurrent_login_sessions/" /etc/security/limits.conf
-else
-	echo "*	hard	maxlogins	$var_accounts_max_concurrent_login_sessions" >> /etc/security/limits.conf
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh
deleted file mode 100755
index ee8858697d1..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_maximum_age_login_defs'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q shadow-utils; then
-
-
-var_accounts_maximum_age_login_defs="60"
-
-
-
-grep -q ^PASS_MAX_DAYS /etc/login.defs && \
-  sed -i "s/PASS_MAX_DAYS.*/PASS_MAX_DAYS     $var_accounts_maximum_age_login_defs/g" /etc/login.defs
-if ! [ $? -eq 0 ]; then
-    echo "PASS_MAX_DAYS      $var_accounts_maximum_age_login_defs" >> /etc/login.defs
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh
deleted file mode 100755
index ad5419f5e8b..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_minimum_age_login_defs'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q shadow-utils; then
-
-
-var_accounts_minimum_age_login_defs="1"
-
-
-
-grep -q ^PASS_MIN_DAYS /etc/login.defs && \
-  sed -i "s/PASS_MIN_DAYS.*/PASS_MIN_DAYS     $var_accounts_minimum_age_login_defs/g" /etc/login.defs
-if ! [ $? -eq 0 ]; then
-    echo "PASS_MIN_DAYS      $var_accounts_minimum_age_login_defs" >> /etc/login.defs
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh
deleted file mode 100755
index 5e794e5eafc..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512'")
-
-(>&2 echo "FIX FOR THIS RULE 'xccdf_org.ssgproject.content_rule_accounts_password_all_shadowed_sha512' IS MISSING!")
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh
deleted file mode 100755
index ed174d4ac12..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q shadow-utils; then
-
-
-var_accounts_password_minlen_login_defs="15"
-
-
-
-grep -q ^PASS_MIN_LEN /etc/login.defs && \
-sed -i "s/PASS_MIN_LEN.*/PASS_MIN_LEN\t$var_accounts_password_minlen_login_defs/g" /etc/login.defs
-if ! [ $? -eq 0 ]
-then
-  echo -e "PASS_MIN_LEN\t$var_accounts_password_minlen_login_defs" >> /etc/login.defs
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh
deleted file mode 100755
index 6354fc6c7ab..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_dcredit'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_dcredit="-1"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^dcredit' $var_password_pam_dcredit 'CCE-80653-9' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh
deleted file mode 100755
index 5267cfe1794..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_dictcheck.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_dictcheck="1"
-
-
-
-# Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-# Otherwise, regular sed command will do.
-sed_command=('sed' '-i')
-if test -L "/etc/security/pwquality.conf"; then
-    sed_command+=('--follow-symlinks')
-fi
-
-# If the cce arg is empty, CCE is not assigned.
-if [ -z "CCE-86233-4" ]; then
-    cce="CCE"
-else
-    cce="CCE-86233-4"
-fi
-
-# Strip any search characters in the key arg so that the key can be replaced without
-# adding any search characters to the config file.
-stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "^dictcheck")
-
-# shellcheck disable=SC2059
-printf -v formatted_output "%s = %s" "$stripped_key" "$var_password_pam_dictcheck"
-
-# If the key exists, change it. Otherwise, add it to the config_file.
-# We search for the key string followed by a word boundary (matched by \>),
-# so if we search for 'setting', 'setting2' won't match.
-if LC_ALL=C grep -q -m 1 -i -e "^dictcheck\\>" "/etc/security/pwquality.conf"; then
-    "${sed_command[@]}" "s/^dictcheck\\>.*/$formatted_output/gi" "/etc/security/pwquality.conf"
-else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "/etc/security/pwquality.conf" >> "/etc/security/pwquality.conf"
-    printf '%s\n' "$formatted_output" >> "/etc/security/pwquality.conf"
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh
deleted file mode 100755
index 60370f10b87..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_difok.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_difok'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_difok="8"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^difok' $var_password_pam_difok 'CCE-80654-7' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh
deleted file mode 100755
index d7913195c80..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_lcredit'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_lcredit="-1"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^lcredit' $var_password_pam_lcredit 'CCE-80655-4' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh
deleted file mode 100755
index aa1efc1002a..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_maxclassrepeat'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_maxclassrepeat="4"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^maxclassrepeat' $var_password_pam_maxclassrepeat 'CCE-81034-1' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh
deleted file mode 100755
index 970e780f2a0..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_maxrepeat'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_maxrepeat="3"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^maxrepeat' $var_password_pam_maxrepeat 'CCE-82066-2' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh
deleted file mode 100755
index 80113e1bc09..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_minclass'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_minclass="4"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^minclass' $var_password_pam_minclass 'CCE-82046-4' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh
deleted file mode 100755
index 10fd7a99b5b..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_minlen'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_minlen="15"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^minlen' $var_password_pam_minlen 'CCE-80656-2' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh
deleted file mode 100755
index 36e295f5539..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_ocredit'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_ocredit="-1"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^ocredit' $var_password_pam_ocredit 'CCE-80663-8' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh
deleted file mode 100755
index 4587873627d..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_password_auth'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_remember="5"
-
-var_password_pam_remember_control_flag="required"
-
-
-
-pamFile="/etc/pam.d/password-auth"
-# control required is for rhel8, while requisite is for other distros
-CONTROL=${var_password_pam_remember_control_flag}
-
-if [ ! -f $pamFile ]; then
-	continue
-fi
-
-# is 'password required|requisite pam_pwhistory.so' here?
-if grep -q "^password.*pam_pwhistory.so.*" $pamFile; then
-	# is the remember option set?
-	option=$(sed -rn 's/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\2/p' $pamFile)
-	if [[ -z $option ]]; then
-		# option is not set, append to module
-		sed -i --follow-symlinks "/pam_pwhistory.so/ s/$/ remember=$var_password_pam_remember/"
-	else
-		# option is set, replace value
-		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$var_password_pam_remember\3/" $pamFile
-	fi
-	# ensure corect control is being used per os requirement
-	if ! grep -q "^password.*$CONTROL.*pam_pwhistory.so.*" $pamFile; then
-		#replace incorrect value
-		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$CONTROL\3/" $pamFile
-	fi
-else
-	# no 'password required|requisite pam_pwhistory.so', add it
-	sed -i --follow-symlinks "/^password.*pam_unix.so.*/i password $CONTROL pam_pwhistory.so use_authtok remember=$var_password_pam_remember" $pamFile
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh
deleted file mode 100755
index 399cc9bf4b9..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_pwhistory_remember_system_auth'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_remember="5"
-
-var_password_pam_remember_control_flag="required"
-
-
-
-pamFile="/etc/pam.d/system-auth"
-# control required is for rhel8, while requisite is for other distros
-CONTROL=${var_password_pam_remember_control_flag}
-
-if [ ! -f $pamFile ]; then
-	continue
-fi
-
-# is 'password required|requisite pam_pwhistory.so' here?
-if grep -q "^password.*pam_pwhistory.so.*" $pamFile; then
-	# is the remember option set?
-	option=$(sed -rn 's/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\2/p' $pamFile)
-	if [[ -z $option ]]; then
-		# option is not set, append to module
-		sed -i --follow-symlinks "/pam_pwhistory.so/ s/$/ remember=$var_password_pam_remember/"
-	else
-		# option is set, replace value
-		sed -r -i --follow-symlinks "s/^(.*pam_pwhistory\.so.*)(remember=[0-9]+)(.*)$/\1remember=$var_password_pam_remember\3/" $pamFile
-	fi
-	# ensure corect control is being used per os requirement
-	if ! grep -q "^password.*$CONTROL.*pam_pwhistory.so.*" $pamFile; then
-		#replace incorrect value
-		sed -r -i --follow-symlinks "s/(^password.*)(required|requisite)(.*pam_pwhistory\.so.*)$/\1$CONTROL\3/" $pamFile
-	fi
-else
-	# no 'password required|requisite pam_pwhistory.so', add it
-	sed -i --follow-symlinks "/^password.*pam_unix.so.*/i password $CONTROL pam_pwhistory.so use_authtok remember=$var_password_pam_remember" $pamFile
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh
deleted file mode 100755
index 3b81606b8b4..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_ucredit'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-
-var_password_pam_ucredit="-1"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/security/pwquality.conf' '^ucredit' $var_password_pam_ucredit 'CCE-80665-3' '%s = %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh
deleted file mode 100755
index 28686ba4d22..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_password_pam_unix_remember'")
-
-var_password_pam_unix_remember="5"
-
-AUTH_FILES[0]="/etc/pam.d/system-auth"
-AUTH_FILES[1]="/etc/pam.d/password-auth"
-
-for pamFile in "${AUTH_FILES[@]}"
-do
-	if grep -q "remember=" $pamFile; then
-		sed -i --follow-symlinks "s/\(^password.*sufficient.*pam_unix.so.*\)\(\(remember *= *\)[^ $]*\)/\1remember=$var_password_pam_unix_remember/" $pamFile
-	else
-		sed -i --follow-symlinks "/^password[[:space:]]\+sufficient[[:space:]]\+pam_unix.so/ s/$/ remember=$var_password_pam_unix_remember/" $pamFile
-	fi
-done
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh
deleted file mode 100755
index 914fff33156..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth")
-
-for pam_file in "${AUTH_FILES[@]}"
-do
-    # is auth required pam_faillock.so preauth present?
-    if ! grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth        required      pam_faillock.so preauth silent' "$pam_file"
-    fi
-
-    # is auth default pam_faillock.so authfail present?
-    if ! grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth        [success=ok new_authtok_reqd=ok ignore=ignore default=bad] pam_faillock.so authfail' "$pam_file"
-    fi
-
-    if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then
-        sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account     required      pam_faillock.so' "$pam_file"
-    fi
-done
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh
deleted file mode 100755
index 64b35a0da96..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-var_accounts_passwords_pam_faillock_deny='3'
-
-
-if [ -f /usr/sbin/authconfig ]; then
-    authconfig --enablefaillock --update
-elif [ -f /usr/bin/authselect ]; then
-    if authselect check; then
-        authselect enable-feature with-faillock
-        authselect apply-changes
-    else
-        echo "
-authselect integrity check failed. Remediation aborted!
-This remediation could not be applied because the authselect profile is not intact.
-It is not recommended to manually edit the PAM files when authselect is available
-In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended."
-        false
-    fi
-fi
-
-FAILLOCK_CONF="/etc/security/faillock.conf"
-if [ -f $FAILLOCK_CONF ]; then
-    if $(grep -q '^\s*deny\s*=' $FAILLOCK_CONF); then
-        sed -i --follow-symlinks "s/^\s*\(deny\s*\)=.*$/\1 = $var_accounts_passwords_pam_faillock_deny/g" $FAILLOCK_CONF
-    else
-        echo "deny = $var_accounts_passwords_pam_faillock_deny" >> $FAILLOCK_CONF
-    fi
-else
-    AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth")
-
-for pam_file in "${AUTH_FILES[@]}"
-do
-    # is auth required pam_faillock.so preauth present?
-    if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then
-        # is the option set?
-        if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*'"deny"'=([0-9]*).*$' "$pam_file" ; then
-            # just change the value of option to a correct value
-            sed -i --follow-symlinks 's/\(^auth.*required.*pam_faillock.so.*preauth.*silent.*\)\('"deny"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file"
-        # the option is not set.
-        else
-            # append the option
-            sed -i --follow-symlinks '/^auth.*required.*pam_faillock.so.*preauth.*silent.*/ s/$/ '"deny"'='"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file"
-        fi
-    # auth required pam_faillock.so preauth is not present, insert the whole line
-    else
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth        required      pam_faillock.so preauth silent '"deny"'='"$var_accounts_passwords_pam_faillock_deny" "$pam_file"
-    fi
-    # is auth default pam_faillock.so authfail present?
-    if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then
-        # is the option set?
-        if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*'"deny"'=([0-9]*).*$' "$pam_file" ; then
-            # just change the value of option to a correct value
-            sed -i --follow-symlinks 's/\(^auth.*[default=die].*pam_faillock.so.*authfail.*\)\('"deny"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file"
-        # the option is not set.
-        else
-            # append the option
-            sed -i --follow-symlinks '/^auth.*[default=die].*pam_faillock.so.*authfail.*/ s/$/ '"deny"'='"$var_accounts_passwords_pam_faillock_deny"'/' "$pam_file"
-        fi
-    # auth default pam_faillock.so authfail is not present, insert the whole line
-    else
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth        [default=die] pam_faillock.so authfail '"deny"'='"$var_accounts_passwords_pam_faillock_deny" "$pam_file"
-    fi
-    if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then
-        sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account     required      pam_faillock.so' "$pam_file"
-    fi
-done
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh
deleted file mode 100755
index 374c546fb06..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_deny_root'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-if [ -f /usr/sbin/authconfig ]; then
-    authconfig --enablefaillock --update
-elif [ -f /usr/bin/authselect ]; then
-    if authselect check; then
-        authselect enable-feature with-faillock
-        authselect apply-changes
-    else
-        echo "
-authselect integrity check failed. Remediation aborted!
-This remediation could not be applied because the authselect profile is not intact.
-It is not recommended to manually edit the PAM files when authselect is available
-In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended."
-        false
-    fi
-fi
-
-FAILLOCK_CONF="/etc/security/faillock.conf"
-if [ -f $FAILLOCK_CONF ]; then
-    if [ ! $(grep -q '^\s*even_deny_root' $FAILLOCK_CONF) ]; then
-        echo "even_deny_root" >> $FAILLOCK_CONF
-    fi
-else
-    SYSTEM_AUTH="/etc/pam.d/system-auth"
-    PASSWORD_AUTH="/etc/pam.d/password-auth"
-    for file in $SYSTEM_AUTH $PASSWORD_AUTH; do
-        if ! grep -q "^auth.*pam_faillock.so \(preauth silent\|authfail\).*even_deny_root" $file; then
-			sed -i --follow-symlinks 's/\(pam_faillock.so \(preauth silent\|authfail\).*\)$/\1 even_deny_root/g' $file
-		fi
-    done
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh
deleted file mode 100755
index 12eeb916ca9..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_interval'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-var_accounts_passwords_pam_faillock_fail_interval='900'
-
-
-if [ -f /usr/sbin/authconfig ]; then
-    authconfig --enablefaillock --update
-elif [ -f /usr/bin/authselect ]; then
-    if authselect check; then
-        authselect enable-feature with-faillock
-        authselect apply-changes
-    else
-        echo "
-authselect integrity check failed. Remediation aborted!
-This remediation could not be applied because the authselect profile is not intact.
-It is not recommended to manually edit the PAM files when authselect is available
-In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended."
-        false
-    fi
-fi
-
-FAILLOCK_CONF="/etc/security/faillock.conf"
-if [ -f $FAILLOCK_CONF ]; then
-    if $(grep -q '^\s*fail_interval\s*=' $FAILLOCK_CONF); then
-        sed -i --follow-symlinks "s/^\s*\(fail_interval\s*\)=.*$/\1 = $var_accounts_passwords_pam_faillock_fail_interval/g" $FAILLOCK_CONF
-    else
-        echo "fail_interval = $var_accounts_passwords_pam_faillock_fail_interval" >> $FAILLOCK_CONF
-    fi
-else
-    AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth")
-
-for pam_file in "${AUTH_FILES[@]}"
-do
-    # is auth required pam_faillock.so preauth present?
-    if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then
-        # is the option set?
-        if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*'"fail_interval"'=([0-9]*).*$' "$pam_file" ; then
-            # just change the value of option to a correct value
-            sed -i --follow-symlinks 's/\(^auth.*required.*pam_faillock.so.*preauth.*silent.*\)\('"fail_interval"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file"
-        # the option is not set.
-        else
-            # append the option
-            sed -i --follow-symlinks '/^auth.*required.*pam_faillock.so.*preauth.*silent.*/ s/$/ '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file"
-        fi
-    # auth required pam_faillock.so preauth is not present, insert the whole line
-    else
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth        required      pam_faillock.so preauth silent '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval" "$pam_file"
-    fi
-    # is auth default pam_faillock.so authfail present?
-    if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then
-        # is the option set?
-        if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*'"fail_interval"'=([0-9]*).*$' "$pam_file" ; then
-            # just change the value of option to a correct value
-            sed -i --follow-symlinks 's/\(^auth.*[default=die].*pam_faillock.so.*authfail.*\)\('"fail_interval"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file"
-        # the option is not set.
-        else
-            # append the option
-            sed -i --follow-symlinks '/^auth.*[default=die].*pam_faillock.so.*authfail.*/ s/$/ '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval"'/' "$pam_file"
-        fi
-    # auth default pam_faillock.so authfail is not present, insert the whole line
-    else
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth        [default=die] pam_faillock.so authfail '"fail_interval"'='"$var_accounts_passwords_pam_faillock_fail_interval" "$pam_file"
-    fi
-    if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then
-        sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account     required      pam_faillock.so' "$pam_file"
-    fi
-done
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh
deleted file mode 100755
index e373b26c49d..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_passwords_pam_faillock_unlock_time'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-var_accounts_passwords_pam_faillock_unlock_time='0'
-
-
-if [ -f /usr/sbin/authconfig ]; then
-    authconfig --enablefaillock --update
-elif [ -f /usr/bin/authselect ]; then
-    if authselect check; then
-        authselect enable-feature with-faillock
-        authselect apply-changes
-    else
-        echo "
-authselect integrity check failed. Remediation aborted!
-This remediation could not be applied because the authselect profile is not intact.
-It is not recommended to manually edit the PAM files when authselect is available
-In cases where the default authselect profile does not cover a specific demand, a custom authselect profile is recommended."
-        false
-    fi
-fi
-
-FAILLOCK_CONF="/etc/security/faillock.conf"
-if [ -f $FAILLOCK_CONF ]; then
-    if $(grep -q '^\s*unlock_time\s*=' $FAILLOCK_CONF); then
-        sed -i --follow-symlinks "s/^\s*\(unlock_time\s*\)=.*$/\1 = $var_accounts_passwords_pam_faillock_unlock_time/g" $FAILLOCK_CONF
-    else
-        echo "unlock_time = $var_accounts_passwords_pam_faillock_unlock_time" >> $FAILLOCK_CONF
-    fi
-else
-    AUTH_FILES=("/etc/pam.d/system-auth" "/etc/pam.d/password-auth")
-
-for pam_file in "${AUTH_FILES[@]}"
-do
-    # is auth required pam_faillock.so preauth present?
-    if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*$' "$pam_file" ; then
-        # is the option set?
-        if grep -qE '^\s*auth\s+required\s+pam_faillock\.so\s+preauth.*'"unlock_time"'=([0-9]*).*$' "$pam_file" ; then
-            # just change the value of option to a correct value
-            sed -i --follow-symlinks 's/\(^auth.*required.*pam_faillock.so.*preauth.*silent.*\)\('"unlock_time"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file"
-        # the option is not set.
-        else
-            # append the option
-            sed -i --follow-symlinks '/^auth.*required.*pam_faillock.so.*preauth.*silent.*/ s/$/ '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file"
-        fi
-    # auth required pam_faillock.so preauth is not present, insert the whole line
-    else
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/i auth        required      pam_faillock.so preauth silent '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time" "$pam_file"
-    fi
-    # is auth default pam_faillock.so authfail present?
-    if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*$' "$pam_file" ; then
-        # is the option set?
-        if grep -qE '^\s*auth\s+(\[default=die\])\s+pam_faillock\.so\s+authfail.*'"unlock_time"'=([0-9]*).*$' "$pam_file" ; then
-            # just change the value of option to a correct value
-            sed -i --follow-symlinks 's/\(^auth.*[default=die].*pam_faillock.so.*authfail.*\)\('"unlock_time"' *= *\).*/\1\2'"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file"
-        # the option is not set.
-        else
-            # append the option
-            sed -i --follow-symlinks '/^auth.*[default=die].*pam_faillock.so.*authfail.*/ s/$/ '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time"'/' "$pam_file"
-        fi
-    # auth default pam_faillock.so authfail is not present, insert the whole line
-    else
-        sed -i --follow-symlinks '/^auth.*sufficient.*pam_unix.so.*/a auth        [default=die] pam_faillock.so authfail '"unlock_time"'='"$var_accounts_passwords_pam_faillock_unlock_time" "$pam_file"
-    fi
-    if ! grep -qE '^\s*account\s+required\s+pam_faillock\.so.*$' "$pam_file" ; then
-        sed -E -i --follow-symlinks '/^\s*account\s*required\s*pam_unix.so/i account     required      pam_faillock.so' "$pam_file"
-    fi
-done
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh
deleted file mode 100755
index c1ed6b04660..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_bashrc'")
-
-
-var_accounts_user_umask="077"
-
-
-
-grep -q umask /etc/bashrc && \
-  sed -i "s/umask.*/umask $var_accounts_user_umask/g" /etc/bashrc
-if ! [ $? -eq 0 ]; then
-    echo "umask $var_accounts_user_umask" >> /etc/bashrc
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh
deleted file mode 100755
index 3c5083cf84b..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_csh_cshrc'")
-
-var_accounts_user_umask='077'
-
-grep -q umask /etc/csh.cshrc && \
-  sed -i "s/umask.*/umask $var_accounts_user_umask/g" /etc/csh.cshrc
-if ! [ $? -eq 0 ]; then
-    echo "umask $var_accounts_user_umask" >> /etc/csh.cshrc
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh
deleted file mode 100755
index ea460bd249f..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_login_defs'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q shadow-utils; then
-
-
-var_accounts_user_umask="077"
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/login.defs' '^UMASK' "$var_accounts_user_umask" 'CCE-82888-9' '%s %s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh
deleted file mode 100755
index 2b0f4e8c501..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_accounts_umask_etc_profile'")
-
-var_accounts_user_umask='077'
-
-grep -q umask /etc/profile && \
-  sed -i "s/umask.*/umask $var_accounts_user_umask/g" /etc/profile
-if ! [ $? -eq 0 ]; then
-    echo "umask $var_accounts_user_umask" >> /etc/profile
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh
deleted file mode 100755
index cac66fc1767..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_banner_etc_issue.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_banner_etc_issue'")
-
-login_banner_text="(^You[\s\n]+are[\s\n]+accessing[\s\n]+a[\s\n]+U.S.[\s\n]+Government[\s\n]+\(USG\)[\s\n]+Information[\s\n]+System[\s\n]+\(IS\)[\s\n]+that[\s\n]+is[\s\n]+provided[\s\n]+for[\s\n]+USG-authorized[\s\n]+use[\s\n]+only.[\s\n]*By[\s\n]+using[\s\n]+this[\s\n]+IS[\s\n]+\(which[\s\n]+includes[\s\n]+any[\s\n]+device[\s\n]+attached[\s\n]+to[\s\n]+this[\s\n]+IS\),[\s\n]+you[\s\n]+consent[\s\n]+to[\s\n]+the[\s\n]+following[\s\n]+conditions\:(\\n)*(\n)*-[\s\n]*The[\s\n]+USG[\s\n]+routinely[\s\n]+intercepts[\s\n]+and[\s\n]+monitors[\s\n]+communications[\s\n]+on[\s\n]+this[\s\n]+IS[\s\n]+for[\s\n]+purposes[\s\n]+including,[\s\n]+but[\s\n]+not[\s\n]+limited[\s\n]+to,[\s\n]+penetration[\s\n]+testing,[\s\n]+COMSEC[\s\n]+monitoring,[\s\n]+network[\s\n]+operations[\s\n]+and[\s\n]+defense,[\s\n]+personnel[\s\n]+misconduct[\s\n]+\(PM\),[\s\n]+law[\s\n]+enforcement[\s\n]+\(LE\),[\s\n]+and[\s\n]+counterintelligence[\s\n]+\(CI\)[\s\n]+investigations.(\\n)*(\n)*-[\s\n]*At[\s\n]+any[\s\n]+time,[\s\n]+the[\s\n]+USG[\s\n]+may[\s\n]+inspect[\s\n]+and[\s\n]+seize[\s\n]+data[\s\n]+stored[\s\n]+on[\s\n]+this[\s\n]+IS.(\\n)*(\n)*-[\s\n]*Communications[\s\n]+using,[\s\n]+or[\s\n]+data[\s\n]+stored[\s\n]+on,[\s\n]+this[\s\n]+IS[\s\n]+are[\s\n]+not[\s\n]+private,[\s\n]+are[\s\n]+subject[\s\n]+to[\s\n]+routine[\s\n]+monitoring,[\s\n]+interception,[\s\n]+and[\s\n]+search,[\s\n]+and[\s\n]+may[\s\n]+be[\s\n]+disclosed[\s\n]+or[\s\n]+used[\s\n]+for[\s\n]+any[\s\n]+USG-authorized[\s\n]+purpose.(\\n)*(\n)*-[\s\n]*This[\s\n]+IS[\s\n]+includes[\s\n]+security[\s\n]+measures[\s\n]+\(e.g.,[\s\n]+authentication[\s\n]+and[\s\n]+access[\s\n]+controls\)[\s\n]+to[\s\n]+protect[\s\n]+USG[\s\n]+interests--not[\s\n]+for[\s\n]+your[\s\n]+personal[\s\n]+benefit[\s\n]+or[\s\n]+privacy.(\\n)*(\n)*-[\s\n]*Notwithstanding[\s\n]+the[\s\n]+above,[\s\n]+using[\s\n]+this[\s\n]+IS[\s\n]+does[\s\n]+not[\s\n]+constitute[\s\n]+consent[\s\n]+to[\s\n]+PM,[\s\n]+LE[\s\n]+or[\s\n]+CI[\s\n]+investigative[\s\n]+searching[\s\n]+or[\s\n]+monitoring[\s\n]+of[\s\n]+the[\s\n]+content[\s\n]+of[\s\n]+privileged[\s\n]+communications,[\s\n]+or[\s\n]+work[\s\n]+product,[\s\n]+related[\s\n]+to[\s\n]+personal[\s\n]+representation[\s\n]+or[\s\n]+services[\s\n]+by[\s\n]+attorneys,[\s\n]+psychotherapists,[\s\n]+or[\s\n]+clergy,[\s\n]+and[\s\n]+their[\s\n]+assistants.[\s\n]+Such[\s\n]+communications[\s\n]+and[\s\n]+work[\s\n]+product[\s\n]+are[\s\n]+private[\s\n]+and[\s\n]+confidential.[\s\n]+See[\s\n]+User[\s\n]+Agreement[\s\n]+for[\s\n]+details.$|^I\'ve[\s\n]+read[\s\n]+\&[\s\n]+consent[\s\n]+to[\s\n]+terms[\s\n]+in[\s\n]+IS[\s\n]+user[\s\n]+agreem\'t$)"
-
-# There was a regular-expression matching various banners, needs to be expanded
-expanded=$(echo "$login_banner_text" | sed 's/(\\\\\x27)\*/\\\x27/g;s/(\\\x27)\*//g;s/(\^\(.*\)\$|.*$/\1/g;s/\[\\s\\n\][+*]/ /g;s/\\//g;s/[^-]- /\n\n-/g;s/(n)\**//g')
-formatted=$(echo "$expanded" | fold -sw 80)
-
-cat <<EOF >/etc/issue
-$formatted
-EOF
-
-printf "\n" >> /etc/issue
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh
deleted file mode 100755
index ffc9df011c8..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_crypto_policy.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_crypto_policy'")
-
-
-# include remediation functions library
-
-var_system_crypto_policy="FIPS"
-
-
-
-stderr_of_call=$(update-crypto-policies --set ${var_system_crypto_policy} 2>&1 > /dev/null)
-rc=$?
-
-if test "$rc" = 127; then
-	echo "$stderr_of_call" >&2
-	echo "Make sure that the script is installed on the remediated system." >&2
-	echo "See output of the 'dnf provides update-crypto-policies' command" >&2
-	echo "to see what package to (re)install" >&2
-
-	false  # end with an error code
-elif test "$rc" != 0; then
-	echo "Error invoking the update-crypto-policies script: $stderr_of_call" >&2
-	false  # end with an error code
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh
deleted file mode 100755
index ae51972a936..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_kerberos_crypto_policy'")
-
-rm -f /etc/krb5.conf.d/crypto-policies
-ln -s /etc/crypto-policies/back-ends/krb5.config /etc/krb5.conf.d/crypto-policies
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh
deleted file mode 100755
index 4836e373bae..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_openssl_crypto_policy'")
-
-OPENSSL_CRYPTO_POLICY_SECTION='[ crypto_policy ]'
-OPENSSL_CRYPTO_POLICY_SECTION_REGEX='\[\s*crypto_policy\s*\]'
-OPENSSL_CRYPTO_POLICY_INCLUSION='.include /etc/crypto-policies/back-ends/opensslcnf.config'
-OPENSSL_CRYPTO_POLICY_INCLUSION_REGEX='^\s*\.include\s*/etc/crypto-policies/back-ends/opensslcnf.config$'
-
-function remediate_openssl_crypto_policy() {
-	CONFIG_FILE="/etc/pki/tls/openssl.cnf"
-	if test -f "$CONFIG_FILE"; then
-		if ! grep -q "^\\s*$OPENSSL_CRYPTO_POLICY_SECTION_REGEX" "$CONFIG_FILE"; then
-			printf '\n%s\n\n%s' "$OPENSSL_CRYPTO_POLICY_SECTION" "$OPENSSL_CRYPTO_POLICY_INCLUSION" >> "$CONFIG_FILE"
-			return 0
-		elif ! grep -q "$OPENSSL_CRYPTO_POLICY_INCLUSION_REGEX" "$CONFIG_FILE"; then
-			sed -i "s|$OPENSSL_CRYPTO_POLICY_SECTION_REGEX|&\\n\\n$OPENSSL_CRYPTO_POLICY_INCLUSION\\n|" "$CONFIG_FILE"
-			return 0
-		fi
-	else
-		echo "Aborting remediation as '$CONFIG_FILE' was not even found." >&2
-		return 1
-	fi
-}
-
-remediate_openssl_crypto_policy
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh
deleted file mode 100755
index e5359044ac7..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_configure_usbguard_auditbackend'")
-
-if [ -e "/etc/usbguard/usbguard-daemon.conf" ] ; then
-    
-    LC_ALL=C sed -i "/^\s*AuditBackend=/d" "/etc/usbguard/usbguard-daemon.conf"
-else
-    touch "/etc/usbguard/usbguard-daemon.conf"
-fi
-cp "/etc/usbguard/usbguard-daemon.conf" "/etc/usbguard/usbguard-daemon.conf.bak"
-# Insert at the end of the file
-printf '%s\n' "AuditBackend=LinuxAudit" >> "/etc/usbguard/usbguard-daemon.conf"
-# Clean up after ourselves.
-rm "/etc/usbguard/usbguard-daemon.conf.bak"
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh
deleted file mode 100755
index 87e5bdc325b..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_backtraces.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_coredump_disable_backtraces'")
-
-if [ -e "/etc/systemd/coredump.conf" ] ; then
-    
-    LC_ALL=C sed -i "/^\s*ProcessSizeMax\s*=\s*/Id" "/etc/systemd/coredump.conf"
-else
-    touch "/etc/systemd/coredump.conf"
-fi
-cp "/etc/systemd/coredump.conf" "/etc/systemd/coredump.conf.bak"
-# Insert at the end of the file
-printf '%s\n' "ProcessSizeMax=0" >> "/etc/systemd/coredump.conf"
-# Clean up after ourselves.
-rm "/etc/systemd/coredump.conf.bak"
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh
deleted file mode 100755
index f0af8c7d1dd..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_coredump_disable_storage.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_coredump_disable_storage'")
-
-if [ -e "/etc/systemd/coredump.conf" ] ; then
-    
-    LC_ALL=C sed -i "/^\s*Storage\s*=\s*/Id" "/etc/systemd/coredump.conf"
-else
-    touch "/etc/systemd/coredump.conf"
-fi
-cp "/etc/systemd/coredump.conf" "/etc/systemd/coredump.conf.bak"
-# Insert at the end of the file
-printf '%s\n' "Storage=none" >> "/etc/systemd/coredump.conf"
-# Clean up after ourselves.
-rm "/etc/systemd/coredump.conf.bak"
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh
deleted file mode 100755
index 63c48fb3623..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_disable_ctrlaltdel_burstaction'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q systemd; then
-
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/systemd/system.conf' '^CtrlAltDelBurstAction=' 'none' 'CCE-80784-2' '%s=%s'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh
deleted file mode 100755
index a5d2240323e..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_disable_users_coredumps.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_disable_users_coredumps'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-SECURITY_LIMITS_FILE="/etc/security/limits.conf"
-
-if grep -qE '\*\s+hard\s+core' $SECURITY_LIMITS_FILE; then
-        sed -ri 's/(hard\s+core\s+)[[:digit:]]+/\1 0/' $SECURITY_LIMITS_FILE
-else
-        echo "*     hard   core    0" >> $SECURITY_LIMITS_FILE
-fi
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh
deleted file mode 100755
index cb7a7652c5a..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_display_login_attempts.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_display_login_attempts'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q pam; then
-
-function ensure_pam_module_options {
-	if [ $# -lt 7 ] || [ $# -gt 8 ] ; then
-                echo "$0 requires seven or eight arguments" >&2
-                exit 1
-        fi
-	local _pamFile="$1" _type="$2" _control="$3" _module="$4" _option="$5" _valueRegex="$6" _defaultValue="$7"
-	local _remove_argument=""
-	if [ $# -eq 8 ] ; then
-        	_remove_argument="$8"
-		# convert it to lowercase
-		_remove_argument=${_remove_argument,,}
-	fi
-
-	# make sure that we have a line like this in ${_pamFile} (additional options are left as-is):
-	# ${_type} ${_control} ${_module} ${_option}=${_valueRegex}
-
-	if ! [ -e "$_pamFile" ] ; then
-		echo "$_pamFile doesn't exist" >&2
-		exit 1
-	fi
-
-	# if remove argument only
-	if [ "${_remove_argument}" = "yes" -o "${_remove_argument}" = "true" ] ; then
-		sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+\\S+\\s+${_module}(\\s.+)?)\\s${_option}(=\\S+)?/\\1/" "${_pamFile}"
-		exit 0
-	fi
-
-	# non-empty values need to be preceded by an equals sign
-	[ -n "${_valueRegex}" ] && _valueRegex="=${_valueRegex}"
-	# add an equals sign to non-empty values
-	[ -n "${_defaultValue}" ] && _defaultValue="=${_defaultValue}"
-
-	# fix 'type' if it's wrong
-	if grep -q -P "^\\s*(?"'!'"${_type}\\s)[[:alnum:]]+\\s+[[:alnum:]]+\\s+${_module}" < "${_pamFile}" ; then
-		sed --follow-symlinks -i -E -e "s/^(\\s*)[[:alnum:]]+(\\s+[[:alnum:]]+\\s+${_module})/\\1${_type}\\2/" "${_pamFile}"
-	fi
-
-	# fix 'control' if it's wrong
-	if grep -q -P "^\\s*${_type}\\s+(?"'!'"${_control})[[:alnum:]]+\\s+${_module}" < "${_pamFile}" ; then
-		sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+)[[:alnum:]]+(\\s+${_module})/\\1${_control}\\2/" "${_pamFile}"
-	fi
-
-	# fix the value for 'option' if one exists but does not match '_valueRegex'
-    if grep -q -P "^\\s*${_type}\\s+${_control}\\s+${_module}(\\s.+)?\\s+${_option}(?"'!'"${_valueRegex}(\\s|\$))" < "${_pamFile}" ; then
-		sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+${_control}\\s+${_module}(\\s.+)?\\s)${_option}=[^[:space:]]*/\\1${_option}${_defaultValue}/" "${_pamFile}"
-
-    # add 'option=default' if option is not set
-	elif grep -q -E "^\\s*${_type}\\s+${_control}\\s+${_module}" < "${_pamFile}" &&
-         grep    -E "^\\s*${_type}\\s+${_control}\\s+${_module}" < "${_pamFile}" | grep -q -E -v "\\s${_option}(=|\\s|\$)" ; then
-
-		sed --follow-symlinks -i -E -e "s/^(\\s*${_type}\\s+${_control}\\s+${_module}[^\\n]*)/\\1 ${_option}${_defaultValue}/" "${_pamFile}"
-	# add a new entry if none exists
-	elif ! grep -q -P "^\\s*${_type}\\s+${_control}\\s+${_module}(\\s.+)?\\s+${_option}${_valueRegex}(\\s|\$)" < "${_pamFile}" ; then
-		echo "${_type} ${_control} ${_module} ${_option}${_defaultValue}" >> "${_pamFile}"
-	fi
-}
-ensure_pam_module_options '/etc/pam.d/postlogin' 'session' 'required' 'pam_lastlog.so' 'showfailed' "" ""
-
-# remove 'silent' option
-sed -i --follow-symlinks -E -e 's/^([^#]+pam_lastlog\.so[^#]*)\ssilent/\1/' '/etc/pam.d/postlogin'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh
deleted file mode 100755
index 83cae433b4e..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_ensure_gpgcheck_local_packages'")
-
-# Remediation is applicable only in certain platforms
-if rpm --quiet -q yum; then
-
-# Function to replace configuration setting in config file or add the configuration setting if
-# it does not exist.
-#
-# Expects arguments:
-#
-# config_file:		Configuration file that will be modified
-# key:			Configuration option to change
-# value:		Value of the configuration option to change
-# cce:			The CCE identifier or '@CCENUM@' if no CCE identifier exists
-# format:		The printf-like format string that will be given stripped key and value as arguments,
-#			so e.g. '%s=%s' will result in key=value subsitution (i.e. without spaces around =)
-#
-# Optional arugments:
-#
-# format:		Optional argument to specify the format of how key/value should be
-# 			modified/appended in the configuration file. The default is key = value.
-#
-# Example Call(s):
-#
-#     With default format of 'key = value':
-#     replace_or_append '/etc/sysctl.conf' '^kernel.randomize_va_space' '2' '@CCENUM@'
-#
-#     With custom key/value format:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' 'disabled' '@CCENUM@' '%s=%s'
-#
-#     With a variable:
-#     replace_or_append '/etc/sysconfig/selinux' '^SELINUX=' $var_selinux_state '@CCENUM@' '%s=%s'
-#
-function replace_or_append {
-  local default_format='%s = %s' case_insensitive_mode=yes sed_case_insensitive_option='' grep_case_insensitive_option=''
-  local config_file=$1
-  local key=$2
-  local value=$3
-  local cce=$4
-  local format=$5
-
-  if [ "$case_insensitive_mode" = yes ]; then
-    sed_case_insensitive_option="i"
-    grep_case_insensitive_option="-i"
-  fi
-  [ -n "$format" ] || format="$default_format"
-  # Check sanity of the input
-  [ $# -ge "3" ] || { echo "Usage: replace_or_append <config_file_location> <key_to_search> <new_value> [<CCE number or literal '@CCENUM@' if unknown>] [printf-like format, default is '$default_format']" >&2; exit 1; }
-
-  # Test if the config_file is a symbolic link. If so, use --follow-symlinks with sed.
-  # Otherwise, regular sed command will do.
-  sed_command=('sed' '-i')
-  if test -L "$config_file"; then
-    sed_command+=('--follow-symlinks')
-  fi
-
-  # Test that the cce arg is not empty or does not equal @CCENUM@.
-  # If @CCENUM@ exists, it means that there is no CCE assigned.
-  if [ -n "$cce" ] && [ "$cce" != '@CCENUM@' ]; then
-    cce="${cce}"
-  else
-    cce="CCE"
-  fi
-
-  # Strip any search characters in the key arg so that the key can be replaced without
-  # adding any search characters to the config file.
-  stripped_key=$(sed 's/[\^=\$,;+]*//g' <<< "$key")
-
-  # shellcheck disable=SC2059
-  printf -v formatted_output "$format" "$stripped_key" "$value"
-
-  # If the key exists, change it. Otherwise, add it to the config_file.
-  # We search for the key string followed by a word boundary (matched by \>),
-  # so if we search for 'setting', 'setting2' won't match.
-  if LC_ALL=C grep -q -m 1 $grep_case_insensitive_option -e "${key}\\>" "$config_file"; then
-    "${sed_command[@]}" "s/${key}\\>.*/$formatted_output/g$sed_case_insensitive_option" "$config_file"
-  else
-    # \n is precaution for case where file ends without trailing newline
-    printf '\n# Per %s: Set %s in %s\n' "$cce" "$formatted_output" "$config_file" >> "$config_file"
-    printf '%s\n' "$formatted_output" >> "$config_file"
-  fi
-}
-replace_or_append '/etc/yum.conf' '^localpkg_gpgcheck' '1' 'CCE-80791-7'
-
-else
-    >&2 echo 'Remediation is not applicable, nothing was done'
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh
deleted file mode 100755
index 987dd0e7063..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages'")
-
-
-
-chgrp 0 /var/log/messages
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh
deleted file mode 100755
index 6542b2e74a2..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_file_groupownership_system_commands_dirs'")
-
-
-for SYSCMDFILES in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin
-do
-   find -L $SYSCMDFILES \! -group root -type f -exec chgrp root '{}' \;
-done
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh
deleted file mode 100755
index e579359e520..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_file_owner_var_log_messages.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_file_owner_var_log_messages'")
-
-
-
-chown 0 /var/log/messages
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh
deleted file mode 100755
index ac7a70a4c12..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_atm_disabled.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-touch /etc/modprobe.d/blacklist.conf
-echo "install atm /bin/true" >> /etc/modprobe.d/blacklist.conf
-echo "blacklist atm" >> /etc/modprobe.d/blacklist.conf
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh
deleted file mode 100755
index 71b0848f11c..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_can_disabled.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "install can /bin/true" >> /etc/modprobe.d/blacklist.conf
-echo "blacklist can" >> /etc/modprobe.d/blacklist.conf
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh
deleted file mode 100755
index 49745c5a50d..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_cramfs_disabled.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "install cramfs /bin/true" >> /etc/modprobe.d/blacklist.conf
-echo "blacklist cramfs" >> /etc/modprobe.d/blacklist.conf
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh
deleted file mode 100755
index 7347678924b..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_firewire-core_disabled.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "install firewire-core /bin/true" >> /etc/modprobe.d/blacklist.conf
-echo "blacklist firewire-core" >> /etc/modprobe.d/blacklist.conf
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh
deleted file mode 100755
index 14e72551b88..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_sctp_disabled.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "install sctp /bin/true" >> /etc/modprobe.d/blacklist.conf
-echo "blacklist sctp" >> /etc/modprobe.d/blacklist.conf
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh
deleted file mode 100755
index e5bac79988a..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_kernel_module_tipc_disabled.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "install tipc /bin/true" >> /etc/modprobe.d/blacklist.conf
-echo "blacklist tipc" >> /etc/modprobe.d/blacklist.conf
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh
deleted file mode 100755
index 37bbac9c375..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_no_empty_passwords.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_no_empty_passwords'")
-sed --follow-symlinks -i 's/\<nullok\>//g' /etc/pam.d/system-auth
-sed --follow-symlinks -i 's/\<nullok\>//g' /etc/pam.d/password-auth
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh
deleted file mode 100755
index 7122b9855f4..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_openssl_use_strong_entropy'")
-
-cat > /etc/profile.d/openssl-rand.sh <<- 'EOM'
-# provide a default -rand /dev/random option to openssl commands that
-# support it
-
-# written inefficiently for maximum shell compatibility
-openssl()
-(
-  openssl_bin=/usr/bin/openssl
-
-  case "$*" in
-    # if user specified -rand, honor it
-    *\ -rand\ *|*\ -help*) exec $openssl_bin "$@" ;;
-  esac
-
-  cmds=`$openssl_bin list -digest-commands -cipher-commands | tr '\n' ' '`
-  for i in `$openssl_bin list -commands`; do
-    if $openssl_bin list -options "$i" | grep -q '^rand '; then
-      cmds=" $i $cmds"
-    fi
-  done
-
-  case "$cmds" in
-    *\ "$1"\ *)
-      cmd="$1"; shift
-      exec $openssl_bin "$cmd" -rand /dev/random "$@" ;;
-  esac
-
-  exec $openssl_bin "$@"
-)
-EOM
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh
deleted file mode 100755
index ed77897d4ff..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_crypto-policies_installed.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_crypto-policies_installed'")
-
-if ! rpm -q --quiet "crypto-policies" ; then
-    dnf install -y "crypto-policies"
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh
deleted file mode 100755
index 8ac78de0f9e..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_iptables_installed.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_iptables_installed'")
-
-if ! rpm -q --quiet "iptables" ; then
-    dnf install -y "iptables"
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh
deleted file mode 100755
index e3e6e90c173..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_rng-tools_installed.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_rng-tools_installed'")
-
-
-if ! rpm -q --quiet "rng-tools" ; then
-    yum install -y "rng-tools"
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh
deleted file mode 100755
index 6b216782441..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_sudo_installed.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_sudo_installed'")
-
-if ! rpm -q --quiet "sudo" ; then
-    dnf install -y "sudo"
-fi
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh
deleted file mode 100755
index dcc8b170c93..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_package_usbguard_installed.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_package_usbguard_installed'")
-
-
-if ! rpm -q --quiet "usbguard" ; then
-    yum install -y "usbguard"
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh
deleted file mode 100755
index 07c1fd8950a..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudo_require_reauthentication.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_sudo_require_reauthentication'")
-
-
-
-var_sudo_timestamp_timeout="0"
-
-
-
-if /usr/sbin/visudo -qcf /etc/sudoers; then
-    cp /etc/sudoers /etc/sudoers.bak
-    if ! grep -P '^[\s]*Defaults.*\btimestamp_timeout=[-]?\w+\b\b.*$' /etc/sudoers; then
-        # sudoers file doesn't define Option timestamp_timeout
-        echo "Defaults timestamp_timeout=${var_sudo_timestamp_timeout}" >> /etc/sudoers
-    else
-        # sudoers file defines Option timestamp_timeout, remediate if appropriate value is not set
-        if ! grep -P "^[\s]*Defaults.*\btimestamp_timeout=${var_sudo_timestamp_timeout}\b.*$" /etc/sudoers; then
-            
-            sed -Ei "s/(^[\s]*Defaults.*\btimestamp_timeout=)[-]?\w+(\b.*$)/\1${var_sudo_timestamp_timeout}\2/" /etc/sudoers
-        fi
-    fi
-    
-    # Check validity of sudoers and cleanup bak
-    if /usr/sbin/visudo -qcf /etc/sudoers; then
-        rm -f /etc/sudoers.bak
-    else
-        echo "Fail to validate remediated /etc/sudoers, reverting to original file."
-        mv /etc/sudoers.bak /etc/sudoers
-        false
-    fi
-else
-    echo "Skipping remediation, /etc/sudoers failed to validate"
-    false
-fi
-
diff --git a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh b/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh
deleted file mode 100755
index 721dbd4c157..00000000000
--- a/docker/images/parabol-ubi/security/xccdf_org.ssgproject.content_rule_sudoers_validate_passwd.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -e
-
-(>&2 echo "Remediating: 'xccdf_org.ssgproject.content_rule_sudoers_validate_passwd'")
-
-
-if [ -e "/etc/sudoers" ] ; then
-    
-    LC_ALL=C sed -i "/Defaults !targetpw/d" "/etc/sudoers"
-else
-    touch "/etc/sudoers"
-fi
-cp "/etc/sudoers" "/etc/sudoers.bak"
-# Insert at the end of the file
-printf '%s\n' "Defaults !targetpw" >> "/etc/sudoers"
-# Clean up after ourselves.
-rm "/etc/sudoers.bak"
-if [ -e "/etc/sudoers" ] ; then
-    
-    LC_ALL=C sed -i "/Defaults !rootpw/d" "/etc/sudoers"
-else
-    touch "/etc/sudoers"
-fi
-cp "/etc/sudoers" "/etc/sudoers.bak"
-# Insert at the end of the file
-printf '%s\n' "Defaults !rootpw" >> "/etc/sudoers"
-# Clean up after ourselves.
-rm "/etc/sudoers.bak"
-if [ -e "/etc/sudoers" ] ; then
-    
-    LC_ALL=C sed -i "/Defaults !runaspw/d" "/etc/sudoers"
-else
-    touch "/etc/sudoers"
-fi
-cp "/etc/sudoers" "/etc/sudoers.bak"
-# Insert at the end of the file
-printf '%s\n' "Defaults !runaspw" >> "/etc/sudoers"
-# Clean up after ourselves.
-rm "/etc/sudoers.bak"
-

From 1d18ec7b9455289f24fe6dcb8a6ea3d0f2539f16 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:48:26 +0100
Subject: [PATCH 164/183] chore(release): release v7.27.1 (#9636)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 20 ++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index bb6937b0fd0..cf326cfc480 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.27.0"
+  ".": "7.27.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdd40c2dd68..88267ea9504 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,26 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.27.1](https://github.com/ParabolInc/parabol/compare/v7.27.0...v7.27.1) (2024-04-16)
+
+
+### Fixed
+
+* add prettier-plugin-organize-imports ([#9637](https://github.com/ParabolInc/parabol/issues/9637)) ([7d1086d](https://github.com/ParabolInc/parabol/commit/7d1086d4c1e5b0466617b007bb96c6642b4d5015))
+* margin spacing on hover ([#9635](https://github.com/ParabolInc/parabol/issues/9635)) ([4f25cba](https://github.com/ParabolInc/parabol/commit/4f25cba7393f28bb2f0269db1b1916e9792df4a7))
+* Migrate webpack dev server settings to v5 ([#9644](https://github.com/ParabolInc/parabol/issues/9644)) ([a21f1d0](https://github.com/ParabolInc/parabol/commit/a21f1d0895aaf987299104891e2b9c2e343a1635))
+* vuln patch for undici ([#9622](https://github.com/ParabolInc/parabol/issues/9622)) ([c2a3a43](https://github.com/ParabolInc/parabol/commit/c2a3a4300c94da8c3dcf5edc33c2e2b38df8686f))
+
+
+### Changed
+
+* add ip-to-server script dir to zip file ([#9645](https://github.com/ParabolInc/parabol/issues/9645)) ([19a6689](https://github.com/ParabolInc/parabol/commit/19a66898f841905b801161a9576385d6480d631e))
+* **docker:** delete all files used by old PPMIs and old Docker images ([#9648](https://github.com/ParabolInc/parabol/issues/9648)) ([a01cf2b](https://github.com/ParabolInc/parabol/commit/a01cf2bd2324fe62fa4af3044f06c94d6f14b087))
+* fix ironbank action file copy ([#9638](https://github.com/ParabolInc/parabol/issues/9638)) ([e3635ee](https://github.com/ParabolInc/parabol/commit/e3635ee335f59c1be0ca43c254a15e126e6e24d5))
+* Improve Activity Library focus and hover states ([#9626](https://github.com/ParabolInc/parabol/issues/9626)) ([6f1c1d9](https://github.com/ParabolInc/parabol/commit/6f1c1d9378536bd212032c84e0f35e074cca0941))
+* migration reflection groups to pg ([#9514](https://github.com/ParabolInc/parabol/issues/9514)) ([ddb4244](https://github.com/ParabolInc/parabol/commit/ddb424480b7bb45c0aaae65afb0264c7b9a30091))
+* Remove old template editing logic ([#9627](https://github.com/ParabolInc/parabol/issues/9627)) ([8552d43](https://github.com/ParabolInc/parabol/commit/8552d43e63fa1cf548da54460c49947d5772ae61))
+
 ## [7.27.0](https://github.com/ParabolInc/parabol/compare/v7.26.0...v7.27.0) (2024-04-11)
 
 
diff --git a/package.json b/package.json
index 471e95bab51..81610942ffb 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.0",
+  "version": "7.27.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 436bf0a45d2..db7d5d4170a 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.27.0",
+  "version": "7.27.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.27.0"
+    "parabol-server": "7.27.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index ca41b519eb1..8c4676de54e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.0",
+  "version": "7.27.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 44b40e97562..b1d94a51ebd 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.27.0",
+  "version": "7.27.1",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 518c0231736..a16754074d2 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.27.0",
+  "version": "7.27.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.27.0",
-    "parabol-server": "7.27.0",
+    "parabol-client": "7.27.1",
+    "parabol-server": "7.27.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 4813aec47b6..f356935ec4f 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.0",
+  "version": "7.27.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index f23c2b6baca..68a5eace3d8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.0",
+  "version": "7.27.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -120,7 +120,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.27.0",
+    "parabol-client": "7.27.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 0092d0baf6852e820384ae114f59e23294fed0e9 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 17 Apr 2024 10:39:40 -0700
Subject: [PATCH 165/183] fix: change retro group schema to allow for rethinkdb
 table migration (#9653)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .../1712075131388_retroReflectionGroups2.ts   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts b/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts
index c0027a0073d..6887169ac6e 100644
--- a/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts
+++ b/packages/server/postgres/migrations/1712075131388_retroReflectionGroups2.ts
@@ -1,4 +1,4 @@
-import {Kysely, PostgresDialect} from 'kysely'
+import {Kysely, PostgresDialect, sql} from 'kysely'
 import {r} from 'rethinkdb-ts'
 import connectRethinkDB from '../../database/connectRethinkDB'
 import getPg from '../getPg'
@@ -20,6 +20,12 @@ export async function up() {
     // index already exists
   }
 
+  await pg.schema
+    .alterTable('RetroReflectionGroup')
+    .alterColumn('voterIds', (ac) => ac.setDataType(sql`text[]`))
+    .alterColumn('promptId', (ac) => ac.setDataType('varchar(111)'))
+    .execute()
+
   const MAX_PG_PARAMS = 65545
   const PG_COLS = [
     'id',
@@ -73,6 +79,19 @@ export async function up() {
         .execute()
     } catch (e) {
       console.log({lastRow}, rowsToInsert.length)
+      await Promise.all(
+        rowsToInsert.map(async (row) => {
+          try {
+            const res = await pg
+              .insertInto('RetroReflectionGroup')
+              .values(row)
+              .onConflict((oc) => oc.doNothing())
+              .execute()
+          } catch (e) {
+            console.log(e, row)
+          }
+        })
+      )
       throw e
     }
   }

From 4549c447c7211d69d84e4c1adbe980bc19423888 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:30:17 -0700
Subject: [PATCH 166/183] chore(release): release v7.27.2 (#9654)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/embedder/package.json          | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 9 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index cf326cfc480..2b5d525691a 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.27.1"
+  ".": "7.27.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88267ea9504..862ce334349 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.27.2](https://github.com/ParabolInc/parabol/compare/v7.27.1...v7.27.2) (2024-04-17)
+
+
+### Fixed
+
+* change retro group schema to allow for rethinkdb table migration ([#9653](https://github.com/ParabolInc/parabol/issues/9653)) ([0092d0b](https://github.com/ParabolInc/parabol/commit/0092d0baf6852e820384ae114f59e23294fed0e9))
+
 ## [7.27.1](https://github.com/ParabolInc/parabol/compare/v7.27.0...v7.27.1) (2024-04-16)
 
 
diff --git a/package.json b/package.json
index 81610942ffb..bb23d7072d8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.1",
+  "version": "7.27.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index db7d5d4170a..f87e1ea864e 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.27.1",
+  "version": "7.27.2",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.27.1"
+    "parabol-server": "7.27.2"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 8c4676de54e..23dee4fe881 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.1",
+  "version": "7.27.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index b1d94a51ebd..c379221d450 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.27.1",
+  "version": "7.27.2",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index a16754074d2..65c777dd7f6 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.27.1",
+  "version": "7.27.2",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.27.1",
-    "parabol-server": "7.27.1",
+    "parabol-client": "7.27.2",
+    "parabol-server": "7.27.2",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index f356935ec4f..99191908243 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.1",
+  "version": "7.27.2",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 68a5eace3d8..c72517529ed 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.1",
+  "version": "7.27.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -120,7 +120,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.27.1",
+    "parabol-client": "7.27.2",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 9944ac046c0ea2186be149147ca630190d92faef Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 18 Apr 2024 09:29:03 +0200
Subject: [PATCH 167/183] fix: Threaded reply input does not immediately close
 (#9652)

---
 packages/client/components/ThreadedReplyButton.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/client/components/ThreadedReplyButton.tsx b/packages/client/components/ThreadedReplyButton.tsx
index 015c78b3aef..dda689cd45f 100644
--- a/packages/client/components/ThreadedReplyButton.tsx
+++ b/packages/client/components/ThreadedReplyButton.tsx
@@ -18,8 +18,14 @@ interface Props {
 
 const ThreadedReplyButton = (props: Props) => {
   const {onReply, dataCy} = props
+
+  const onClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+    // stop propagating so the new reply is not immediately cancelled
+    e.stopPropagation()
+    onReply()
+  }
   return (
-    <Reply data-cy={`${dataCy}-reply-button`} onClick={onReply}>
+    <Reply data-cy={`${dataCy}-reply-button`} onClick={onClick}>
       Reply
     </Reply>
   )

From fb76d9a3ec977e886dcc778b96fc2a5abfd4716c Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 18 Apr 2024 09:36:27 +0200
Subject: [PATCH 168/183] chore: remove noTemplateLimit flag (#9631)

---
 .../ActivityDetails/ActivityDetails.tsx       |  2 --
 .../ActivityDetails/TemplateDetails.tsx       |  6 ++--
 .../ActivityDetailsSidebar.tsx                |  1 -
 .../client/utils/useTemplateDescription.ts    | 27 ++---------------
 .../mutations/helpers/bootstrapNewUser.ts     | 10 -------
 .../graphql/mutations/selectTemplate.ts       | 18 ++---------
 .../public/typeDefs/updateFeatureFlag.graphql |  2 --
 .../graphql/public/types/UserFeatureFlags.ts  |  1 -
 .../helpers/resolveSelectedTemplate.ts        | 30 +++----------------
 packages/server/graphql/types/UserFlagEnum.ts |  1 -
 10 files changed, 12 insertions(+), 86 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
index dcafb56236f..2f7ecf45cc3 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -23,7 +23,6 @@ graphql`
     orgId
     teamId
     illustrationUrl
-    isFree
     scope
     viewerLowestScope
     ...TemplateDetails_activity
@@ -78,7 +77,6 @@ const ActivityDetails = (props: Props) => {
       meetingType: activity.type,
       scope: activity.scope,
       templateName: activity.name,
-      isFree: activity.isFree,
       queryString: activityLibrarySearch
     })
   }, [])
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
index f45191fad8c..9317097b4c2 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
@@ -132,18 +132,16 @@ export const TemplateDetails = (props: Props) => {
   const viewer = useFragment(
     graphql`
       fragment TemplateDetails_user on User {
-        tier
         preferredTeamId
         teams {
           ...TeamPickerModal_teams
         }
-        ...useTemplateDescription_viewer
       }
     `,
     viewerRef
   )
 
-  const {teams, tier, preferredTeamId} = viewer
+  const {teams, preferredTeamId} = viewer
   const history = useHistory<{prevCategory?: string; edit?: boolean}>()
   const prevCategory = history.location.state?.prevCategory
 
@@ -201,7 +199,7 @@ export const TemplateDetails = (props: Props) => {
 
   const isOwner = viewerLowestScope === 'TEAM'
 
-  const description = useTemplateDescription(viewerLowestScope, activity, tier, viewer)
+  const description = useTemplateDescription(viewerLowestScope, activity)
 
   useEffect(() => {
     setIsEditing(!!history.location.state?.edit)
diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index 880b12f59c0..5e158061100 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -57,7 +57,6 @@ const ActivityDetailsSidebar = (props: Props) => {
         teamId
         orgId
         scope
-        isFree
       }
     `,
     selectedTemplateRef
diff --git a/packages/client/utils/useTemplateDescription.ts b/packages/client/utils/useTemplateDescription.ts
index 6f17000e918..2ec778ad525 100644
--- a/packages/client/utils/useTemplateDescription.ts
+++ b/packages/client/utils/useTemplateDescription.ts
@@ -1,15 +1,11 @@
 import graphql from 'babel-plugin-relay/macro'
 import {readInlineData} from 'react-relay'
-import {TierEnum} from '../__generated__/OrganizationSubscription.graphql'
 import {useTemplateDescription_template$key} from '../__generated__/useTemplateDescription_template.graphql'
-import {useTemplateDescription_viewer$key} from '../__generated__/useTemplateDescription_viewer.graphql'
 import relativeDate from './date/relativeDate'
 
 const useTemplateDescription = (
   lowestScope: string,
-  templateRef?: useTemplateDescription_template$key,
-  tier?: TierEnum,
-  viewerRef?: useTemplateDescription_viewer$key
+  templateRef?: useTemplateDescription_template$key
 ) => {
   if (!templateRef) {
     return null
@@ -20,7 +16,6 @@ const useTemplateDescription = (
       fragment useTemplateDescription_template on MeetingTemplate @inline {
         lastUsedAt
         scope
-        isFree
         team {
           name
         }
@@ -29,26 +24,10 @@ const useTemplateDescription = (
     templateRef
   )
 
-  const viewer = readInlineData(
-    graphql`
-      fragment useTemplateDescription_viewer on User @inline {
-        id
-        featureFlags {
-          noTemplateLimit
-        }
-      }
-    `,
-    viewerRef ?? null
-  )
-
-  const {lastUsedAt, team, isFree} = template
+  const {lastUsedAt, team} = template
   const {name: teamName} = team
   if (lowestScope === 'PUBLIC') {
-    return isFree
-      ? 'Free template'
-      : `Premium template ${
-          tier === 'starter' && !viewer?.featureFlags?.noTemplateLimit ? '🔒' : '✨'
-        }`
+    return 'Public template'
   }
   if (lowestScope === 'TEAM')
     return lastUsedAt
diff --git a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
index a631100aa35..b3a79ed611f 100644
--- a/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
+++ b/packages/server/graphql/mutations/helpers/bootstrapNewUser.ts
@@ -53,16 +53,6 @@ const bootstrapNewUser = async (
     experimentalFlags.push('signUpDestinationTeam')
   }
 
-  // No template limit
-  const domainUserHasNoTemplateLimitFlag = usersWithDomain.some((user) =>
-    user.featureFlags.includes('noTemplateLimit')
-  )
-  if (domainUserHasNoTemplateLimitFlag) {
-    experimentalFlags.push('noTemplateLimit')
-  } else if (Math.random() < 0.5) {
-    experimentalFlags.push('noTemplateLimit')
-  }
-
   const isVerified = identities.some((identity) => identity.isEmailVerified)
   const hasSAMLURL = !!(await getSAMLURLFromEmail(email, dataLoader, false))
   const isQualifiedForAutoJoin = (isVerified || hasSAMLURL) && isCompanyDomain
diff --git a/packages/server/graphql/mutations/selectTemplate.ts b/packages/server/graphql/mutations/selectTemplate.ts
index abb775409f5..5e0855e6912 100644
--- a/packages/server/graphql/mutations/selectTemplate.ts
+++ b/packages/server/graphql/mutations/selectTemplate.ts
@@ -8,7 +8,6 @@ import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import SelectTemplatePayload from '../types/SelectTemplatePayload'
-import {getFeatureTier} from '../types/helpers/getFeatureTier'
 
 const selectTemplate = {
   description: 'Set the selected template for the upcoming retro meeting',
@@ -32,9 +31,8 @@ const selectTemplate = {
     const viewerId = getUserId(authToken)
 
     // AUTH
-    const [template, viewer] = await Promise.all([
-      dataLoader.get('meetingTemplates').load(selectedTemplateId) as Promise<MeetingTemplate>,
-      dataLoader.get('users').loadNonNull(viewerId)
+    const [template] = await Promise.all([
+      dataLoader.get('meetingTemplates').load(selectedTemplateId) as Promise<MeetingTemplate>
     ])
 
     if (!template || !template.isActive) {
@@ -42,7 +40,7 @@ const selectTemplate = {
       return standardError(new Error('Template not found'), {userId: viewerId})
     }
 
-    const {scope, isFree} = template
+    const {scope} = template
     const viewerTeam = await dataLoader.get('teams').loadNonNull(teamId)
     if (scope === 'TEAM') {
       if (!isTeamMember(authToken, template.teamId))
@@ -52,16 +50,6 @@ const selectTemplate = {
       if (viewerTeam.orgId !== templateTeam.orgId) {
         return standardError(new Error('Template is scoped to organization'), {userId: viewerId})
       }
-    } else if (scope === 'PUBLIC') {
-      if (
-        !isFree &&
-        !viewer.featureFlags.includes('noTemplateLimit') &&
-        getFeatureTier(viewerTeam) === 'starter'
-      ) {
-        return standardError(new Error('User does not have access to this premium template'), {
-          userId: viewerId
-        })
-      }
     }
 
     // RESOLUTION
diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
index 8eefed7fef4..c14a39e0c6d 100644
--- a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
+++ b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
@@ -8,7 +8,6 @@ enum UserFlagEnum {
   noAISummary
   noMeetingHistoryLimit
   adHocTeams
-  noTemplateLimit
   signUpDestinationTeam
 }
 
@@ -22,7 +21,6 @@ type UserFeatureFlags {
   noAISummary: Boolean!
   noMeetingHistoryLimit: Boolean!
   adHocTeams: Boolean!
-  noTemplateLimit: Boolean!
   signUpDestinationTeam: Boolean!
 }
 
diff --git a/packages/server/graphql/public/types/UserFeatureFlags.ts b/packages/server/graphql/public/types/UserFeatureFlags.ts
index a96af981d89..e2158a960d0 100644
--- a/packages/server/graphql/public/types/UserFeatureFlags.ts
+++ b/packages/server/graphql/public/types/UserFeatureFlags.ts
@@ -5,7 +5,6 @@ const UserFeatureFlags: UserFeatureFlagsResolvers = {
   noAISummary: ({noAISummary}) => !!noAISummary,
   noMeetingHistoryLimit: ({noMeetingHistoryLimit}) => !!noMeetingHistoryLimit,
   adHocTeams: ({adHocTeams}) => !!adHocTeams,
-  noTemplateLimit: ({noTemplateLimit}) => !!noTemplateLimit,
   signUpDestinationTeam: ({signUpDestinationTeam}) => !!signUpDestinationTeam
 }
 
diff --git a/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts b/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts
index a1abb0db8f9..b5dd346e218 100644
--- a/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts
+++ b/packages/server/graphql/queries/helpers/resolveSelectedTemplate.ts
@@ -1,41 +1,19 @@
 import getRethink from '../../../database/rethinkDriver'
 import MeetingSettingsPoker from '../../../database/types/MeetingSettingsPoker'
 import MeetingSettingsRetrospective from '../../../database/types/MeetingSettingsRetrospective'
-import {getUserId} from '../../../utils/authorization'
 import {GQLContext} from '../../graphql'
-import isValid from '../../isValid'
-import {getFeatureTier} from '../../types/helpers/getFeatureTier'
 
 const resolveSelectedTemplate =
   (fallbackTemplateId: string) =>
   async (
     source: MeetingSettingsPoker | MeetingSettingsRetrospective,
     _args: unknown,
-    {authToken, dataLoader}: GQLContext
+    {dataLoader}: GQLContext
   ) => {
-    const viewerId = getUserId(authToken)
-    const {id: settingsId, selectedTemplateId, teamId} = source
-    const [team, template, viewer] = await Promise.all([
-      dataLoader.get('teams').loadNonNull(teamId),
-      dataLoader.get('meetingTemplates').load(selectedTemplateId),
-      dataLoader.get('users').loadNonNull(viewerId)
-    ])
+    const {id: settingsId, selectedTemplateId} = source
+    const template = await dataLoader.get('meetingTemplates').load(selectedTemplateId)
     if (template) {
-      if (
-        template.isFree ||
-        template.scope !== 'PUBLIC' ||
-        getFeatureTier(team) !== 'starter' ||
-        viewer.featureFlags.includes('noTemplateLimit')
-      ) {
-        return template
-      }
-      // if anyone on the team has the noTemplateLimit flag, they might have selected a non-starter template
-      const teamMembers = await dataLoader.get('teamMembersByTeamId').load(teamId)
-      const userIds = teamMembers.map(({userId}) => userId)
-      const users = (await dataLoader.get('users').loadMany(userIds)).filter(isValid)
-      if (users.some(({featureFlags}) => featureFlags.includes('noTemplateLimit'))) {
-        return template
-      }
+      return template
     }
     // there may be holes in our template deletion or reselection logic, so doing this to be safe
     source.selectedTemplateId = fallbackTemplateId
diff --git a/packages/server/graphql/types/UserFlagEnum.ts b/packages/server/graphql/types/UserFlagEnum.ts
index 09c6c59140a..edc3752f565 100644
--- a/packages/server/graphql/types/UserFlagEnum.ts
+++ b/packages/server/graphql/types/UserFlagEnum.ts
@@ -8,7 +8,6 @@ const UserFlagEnum = new GraphQLEnumType({
     noAISummary: {},
     noMeetingHistoryLimit: {},
     adHocTeams: {},
-    noTemplateLimit: {},
     signUpDestinationTeam: {}
   }
 })

From 240e78d9c7003b748a4c31353e869278c2bb528c Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Tue, 23 Apr 2024 14:26:36 +0100
Subject: [PATCH 169/183] chore: update activity library custom tab empty state
 (#9666)

---
 .../ActivityLibrary/ActivityLibrary.tsx       | 21 ++++-------
 .../ActivityLibraryEmptyState.tsx             | 36 +++++++++++++++++++
 2 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx

diff --git a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
index 5ee39ff1bd7..5a8b361ada0 100644
--- a/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityLibrary.tsx
@@ -9,7 +9,6 @@ import {useDebounce} from 'use-debounce'
 import {ActivityLibraryQuery} from '~/__generated__/ActivityLibraryQuery.graphql'
 import {ActivityLibrary_template$data} from '~/__generated__/ActivityLibrary_template.graphql'
 import {ActivityLibrary_templateSearchDocument$data} from '~/__generated__/ActivityLibrary_templateSearchDocument.graphql'
-import halloweenRetrospectiveTemplate from '../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useRouter from '../../hooks/useRouter'
 import useSearchFilter from '../../hooks/useSearchFilter'
@@ -18,14 +17,15 @@ import SendClientSideEvent from '../../utils/SendClientSideEvent'
 import IconLabel from '../IconLabel'
 import AISearch from './AISearch'
 import ActivityGrid from './ActivityGrid'
+import ActivityLibraryEmptyState from './ActivityLibraryEmptyState'
 import {
+  AllCategoryID,
   CATEGORY_ID_TO_NAME,
   CATEGORY_THEMES,
   CUSTOM_CATEGORY_ID,
   CategoryID,
   QUICK_START_CATEGORY_ID
 } from './Categories'
-import CreateActivityCard from './CreateActivityCard'
 import SearchBar from './SearchBar'
 
 graphql`
@@ -359,19 +359,10 @@ export const ActivityLibrary = (props: Props) => {
             </div>
           )}
           {templatesToRender.length === 0 ? (
-            <div className='mx-auto flex p-2 text-slate-700'>
-              <div className='ml-10'>
-                <img className='w-32' src={halloweenRetrospectiveTemplate} />
-                <div className='mb-4 text-xl font-semibold'>No results found!</div>
-                <div className='mb-6 max-w-[360px]'>
-                  Try tapping a category above, using a different search, or creating exactly what
-                  you have in mind.
-                </div>
-                <div className='h-40 w-64'>
-                  <CreateActivityCard category={QUICK_START_CATEGORY_ID} className='h-full' />
-                </div>
-              </div>
-            </div>
+            <ActivityLibraryEmptyState
+              searchQuery={searchQuery}
+              categoryId={categoryId as AllCategoryID}
+            />
           ) : (
             <>
               {sectionedTemplates ? (
diff --git a/packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx b/packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx
new file mode 100644
index 00000000000..8b112783c50
--- /dev/null
+++ b/packages/client/components/ActivityLibrary/ActivityLibraryEmptyState.tsx
@@ -0,0 +1,36 @@
+import React from 'react'
+import halloweenRetrospectiveTemplate from '../../../../static/images/illustrations/halloweenRetrospectiveTemplate.png'
+import {AllCategoryID, QUICK_START_CATEGORY_ID} from './Categories'
+import CreateActivityCard from './CreateActivityCard'
+
+type Props = {
+  categoryId: AllCategoryID
+  searchQuery: string
+}
+
+const ActivityLibraryEmptyState = (props: Props) => {
+  const {categoryId, searchQuery} = props
+  const showResultsNotFound = categoryId !== 'custom' || searchQuery !== ''
+
+  return (
+    <div className='mx-auto flex p-2 text-slate-700'>
+      <div className='ml-10'>
+        {showResultsNotFound && (
+          <>
+            <img className='w-32' src={halloweenRetrospectiveTemplate} />
+            <div className='mb-4 text-xl font-semibold'>No results found!</div>
+            <div className='mb-6 max-w-[360px]'>
+              Try tapping a category above, using a different search, or creating exactly what you
+              have in mind.
+            </div>
+          </>
+        )}
+        <div className='h-40 w-64'>
+          <CreateActivityCard category={QUICK_START_CATEGORY_ID} className='h-full' />
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default ActivityLibraryEmptyState

From 898e1fddfa342014d8db162215babe8079652f84 Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Tue, 23 Apr 2024 14:26:45 +0100
Subject: [PATCH 170/183] feat: roll out ai icebreakers (#9660)

---
 .../MeetingCheckInPrompt/NewCheckInQuestion.tsx        | 10 +++++-----
 .../private/typeDefs/updateOrgFeatureFlag.graphql      |  1 -
 .../graphql/public/typeDefs/Organization.graphql       |  1 -
 .../graphql/public/types/OrganizationFeatureFlags.ts   |  1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
index 7a4779194b8..1bfa7f930cc 100644
--- a/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
+++ b/packages/client/modules/meeting/components/MeetingCheckInPrompt/NewCheckInQuestion.tsx
@@ -87,7 +87,7 @@ const NewCheckInQuestion = (props: Props) => {
         team {
           organization {
             featureFlags {
-              aiIcebreakers
+              noAISummary
             }
           }
         }
@@ -227,7 +227,7 @@ const NewCheckInQuestion = (props: Props) => {
       }
     })
   }
-  const shouldShowAiIcebreakers = featureFlags?.aiIcebreakers && isFacilitating
+  const hideAiIcebreaker = featureFlags.noAISummary || !isFacilitating
 
   return (
     <>
@@ -269,8 +269,8 @@ const NewCheckInQuestion = (props: Props) => {
           </div>
         )}
       </QuestionBlock>
-      {shouldShowAiIcebreakers && (
-        <div className='flex flex-col gap-4 rounded-lg bg-slate-100 p-3'>
+      {!hideAiIcebreaker && (
+        <div className='flex flex-col gap-4 rounded-lg bg-slate-100 p-6'>
           <div className='flex flex-col items-center justify-center gap-2'>
             <div className='inline-flex gap-2'>
               <div className='font-semibold'>Modify current icebreaker with AI</div>
@@ -298,7 +298,7 @@ const NewCheckInQuestion = (props: Props) => {
               disabled={isModifyingCheckInQuestion}
               onClick={() => modifyCheckInQuestion('FUNNY')}
             >
-              More funny
+              Funnier
             </Button>
             <Button
               variant='outline'
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
index ab0497ff8b3..6806f1f872a 100644
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
@@ -13,7 +13,6 @@ enum OrganizationFeatureFlagsEnum {
   singleColumnStandups
   publicTeams
   kudos
-  aiIcebreakers
   aiTemplate
   relatedDiscussions
 }
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index 349a943c5b6..5c398e3330a 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -188,7 +188,6 @@ type OrganizationFeatureFlags {
   singleColumnStandups: Boolean!
   publicTeams: Boolean!
   kudos: Boolean!
-  aiIcebreakers: Boolean!
   aiTemplate: Boolean!
   relatedDiscussions: Boolean!
 }
diff --git a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
index dac0884752c..6dce6268a4a 100644
--- a/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
+++ b/packages/server/graphql/public/types/OrganizationFeatureFlags.ts
@@ -12,7 +12,6 @@ const OrganizationFeatureFlags: OrganizationFeatureFlagsResolvers = {
   publicTeams: ({publicTeams}) => !!publicTeams,
   singleColumnStandups: ({singleColumnStandups}) => !!singleColumnStandups,
   kudos: ({kudos}) => !!kudos,
-  aiIcebreakers: ({aiIcebreakers}) => !!aiIcebreakers,
   aiTemplate: ({aiTemplate}) => !!aiTemplate,
   relatedDiscussions: ({relatedDiscussions}) => !!relatedDiscussions
 }

From 01372bc29b14681db8094c0b55cc3d3f2f2418ea Mon Sep 17 00:00:00 2001
From: Bruce Tian <tianrunhe@gmail.com>
Date: Tue, 23 Apr 2024 10:17:30 -0700
Subject: [PATCH 171/183] feat(orgAdmin): org admin can promote others to org
 admin (#9655)

---
 .../public/mutations/setOrgUserRole.ts        | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/packages/server/graphql/public/mutations/setOrgUserRole.ts b/packages/server/graphql/public/mutations/setOrgUserRole.ts
index 404eafc82e9..5b6d2bb4fc6 100644
--- a/packages/server/graphql/public/mutations/setOrgUserRole.ts
+++ b/packages/server/graphql/public/mutations/setOrgUserRole.ts
@@ -18,7 +18,7 @@ const addNotifications = async (orgId: string, userId: string) => {
 
 const setOrgUserRole: MutationResolvers['setOrgUserRole'] = async (
   _source,
-  {orgId, userId, role},
+  {orgId, userId, role: roleToSet},
   {authToken, dataLoader, socketId: mutatorId}
 ) => {
   const r = await getRethink()
@@ -35,11 +35,11 @@ const setOrgUserRole: MutationResolvers['setOrgUserRole'] = async (
     })
   }
 
-  if (role && role !== 'BILLING_LEADER' && role !== 'ORG_ADMIN') {
-    return standardError(new Error('Invalid role'), {userId: viewerId})
+  if (roleToSet && roleToSet !== 'BILLING_LEADER' && roleToSet !== 'ORG_ADMIN') {
+    return standardError(new Error('Invalid role to set'), {userId: viewerId})
   }
 
-  const [organizationUser, viewer] = await Promise.all([
+  const [organizationUser, viewer, viewerOrgUser] = await Promise.all([
     r
       .table('OrganizationUser')
       .getAll(userId, {index: 'userId'})
@@ -47,7 +47,14 @@ const setOrgUserRole: MutationResolvers['setOrgUserRole'] = async (
       .nth(0)
       .default(null)
       .run(),
-    dataLoader.get('users').loadNonNull(viewerId)
+    dataLoader.get('users').loadNonNull(viewerId),
+    r
+      .table('OrganizationUser')
+      .getAll(viewerId, {index: 'userId'})
+      .filter({orgId, removedAt: null})
+      .nth(0)
+      .default(null)
+      .run()
   ])
 
   if (!organizationUser) {
@@ -56,10 +63,15 @@ const setOrgUserRole: MutationResolvers['setOrgUserRole'] = async (
     })
   }
 
-  if ((role === 'ORG_ADMIN' || organizationUser.role === 'ORG_ADMIN') && !isSuperUser(authToken)) {
-    return standardError(new Error('Must be super user to promote/demote user to admin'), {
-      userId: viewerId
-    })
+  if (
+    roleToSet === 'ORG_ADMIN' || // promoting someone to ORG_ADMIN
+    organizationUser.role === 'ORG_ADMIN' // the user is already an ORG_ADMIN so the mutation is intended to change their role
+  ) {
+    if (!isSuperUser(authToken) && viewerOrgUser?.role !== 'ORG_ADMIN') {
+      return standardError(new Error('Only super user or org admin can perform this action'), {
+        userId: viewerId
+      })
+    }
   }
 
   // if someone is leaving, make sure there is someone else to take their place
@@ -71,7 +83,7 @@ const setOrgUserRole: MutationResolvers['setOrgUserRole'] = async (
       .filter((row: RDatum) => r.expr(['BILLING_LEADER', 'ORG_ADMIN']).contains(row('role')))
       .count()
       .run()
-    if (leaderCount === 1) {
+    if (leaderCount === 1 && !roleToSet) {
       return standardError(new Error('You’re the last leader, you can’t give that up'), {
         userId: viewerId
       })
@@ -80,23 +92,23 @@ const setOrgUserRole: MutationResolvers['setOrgUserRole'] = async (
 
   // no change required
   const {id: organizationUserId} = organizationUser
-  if (organizationUser.role === role) {
+  if (organizationUser.role === roleToSet) {
     return {
       orgId,
       organizationUserId,
       notificationIdsAdded: []
     }
   }
-  await r.table('OrganizationUser').get(organizationUserId).update({role}).run()
+  await r.table('OrganizationUser').get(organizationUserId).update({role: roleToSet}).run()
 
-  if (role !== 'ORG_ADMIN') {
-    const modificationType = role === 'BILLING_LEADER' ? 'add' : 'remove'
+  if (roleToSet !== 'ORG_ADMIN') {
+    const modificationType = roleToSet === 'BILLING_LEADER' ? 'add' : 'remove'
     analytics.billingLeaderModified(viewer, userId, orgId, modificationType)
   }
 
   // Don't add notification when promoting to org admin.
   const notificationIdsAdded =
-    role === 'BILLING_LEADER' ? await addNotifications(orgId, userId) : []
+    roleToSet === 'BILLING_LEADER' ? await addNotifications(orgId, userId) : []
 
   const data = {orgId, organizationUserId, notificationIdsAdded}
   publish(SubscriptionChannel.ORGANIZATION, orgId, 'SetOrgUserRoleSuccess', data, subOptions)

From 32574a650697a3ee5e43aac33478c9ac7eab6966 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 23 Apr 2024 12:14:53 -0700
Subject: [PATCH 172/183] fix: support PG reconnects (#9663)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/embedder/EmbeddingsJobQueueStream.ts | 20 +++++++-----
 packages/server/postgres/getKysely.ts         | 31 +++++++++++--------
 packages/server/postgres/getPg.ts             | 19 ++++++++++++
 3 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/packages/embedder/EmbeddingsJobQueueStream.ts b/packages/embedder/EmbeddingsJobQueueStream.ts
index cb995821f4b..49c3e4c9e58 100644
--- a/packages/embedder/EmbeddingsJobQueueStream.ts
+++ b/packages/embedder/EmbeddingsJobQueueStream.ts
@@ -41,16 +41,20 @@ export class EmbeddingsJobQueueStream implements AsyncIterableIterator<DBJob> {
         .returningAll()
         .executeTakeFirst()
     }
-    const job = (await getJob(false)) || (await getJob(true))
-    if (!job) {
-      Logger.log('JobQueueStream: no jobs found')
-      // queue is empty, so sleep for a while
-      await sleep(ms('10s'))
+    try {
+      const job = (await getJob(false)) || (await getJob(true))
+      if (!job) {
+        Logger.log('JobQueueStream: no jobs found')
+        // queue is empty, so sleep for a while
+        await sleep(ms('10s'))
+        return this.next()
+      }
+      await this.orchestrator.runStep(job)
+      return {done: false, value: job}
+    } catch (e) {
+      await sleep(1000)
       return this.next()
     }
-
-    await this.orchestrator.runStep(job)
-    return {done: false, value: job}
   }
   return() {
     return Promise.resolve({done: true as const, value: undefined})
diff --git a/packages/server/postgres/getKysely.ts b/packages/server/postgres/getKysely.ts
index f2824a800d0..0a3256081d3 100644
--- a/packages/server/postgres/getKysely.ts
+++ b/packages/server/postgres/getKysely.ts
@@ -3,21 +3,26 @@ import getPg from './getPg'
 import {DB} from './pg.d'
 
 let kysely: Kysely<DB> | undefined
+
+const makeKysely = () => {
+  const nextPg = getPg()
+  nextPg.on('poolChange' as any, makeKysely)
+  return new Kysely<DB>({
+    dialect: new PostgresDialect({
+      pool: nextPg
+    })
+    // ,log(event) {
+    //   if (event.level === 'query') {
+    //     console.log(event.query.sql)
+    //     console.log(event.query.parameters)
+    //   }
+    // }
+  })
+}
+
 const getKysely = () => {
   if (!kysely) {
-    const pg = getPg()
-    kysely = new Kysely<DB>({
-      dialect: new PostgresDialect({
-        pool: pg
-      })
-      // query logging, if you'd like it:
-      // log(event) {
-      //   if (event.level === 'query') {
-      //     console.log(event.query.sql)
-      //     console.log(event.query.parameters)
-      //   }
-      // }
-    })
+    kysely = makeKysely()
   }
   return kysely
 }
diff --git a/packages/server/postgres/getPg.ts b/packages/server/postgres/getPg.ts
index f9d474c9026..2edc5ff4729 100644
--- a/packages/server/postgres/getPg.ts
+++ b/packages/server/postgres/getPg.ts
@@ -1,12 +1,31 @@
 import {Pool} from 'pg'
+import sleep from '../../client/utils/sleep'
 import getPgConfig from './getPgConfig'
 
 const config = getPgConfig()
 
+const graceFullyReconnect = async () => {
+  for (let i = 0; i < 1e6; i++) {
+    const nextPool = new Pool(getPgConfig())
+    try {
+      const testClient = await nextPool.connect()
+      testClient.release()
+      nextPool.on('error', graceFullyReconnect)
+      const oldPool = pool
+      pool = nextPool
+      oldPool?.emit('changePool')
+      return
+    } catch (e) {
+      await sleep(1000)
+    }
+  }
+}
+
 let pool: Pool | undefined
 const getPg = () => {
   if (!pool) {
     pool = new Pool(config)
+    pool.on('error', graceFullyReconnect)
   }
   return pool
 }

From f3f058803b16ec06840a0b673d8299663ff3d533 Mon Sep 17 00:00:00 2001
From: Bartosz Jarocki <jarocki.bartek@gmail.com>
Date: Thu, 25 Apr 2024 12:45:34 +0200
Subject: [PATCH 173/183] fix: remove premium badges from activity library
 cards (#9669)

---
 packages/client/components/ActivityLibrary/ActivityGrid.tsx | 6 ------
 .../components/ActivityLibrary/CreateActivityCard.tsx       | 3 +--
 packages/client/components/RetroDrawerTemplateCard.tsx      | 6 ------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityGrid.tsx b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
index 5892e37aca8..75142ebdcdc 100644
--- a/packages/client/components/ActivityLibrary/ActivityGrid.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityGrid.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 import {Link} from 'react-router-dom'
-import {ActivityBadge} from './ActivityBadge'
 import {ActivityCard, ActivityCardImage} from './ActivityCard'
 import {Template} from './ActivityLibrary'
 import {ActivityLibraryCardDescription} from './ActivityLibraryCardDescription'
@@ -31,11 +30,6 @@ const ActivityGrid = ({templates, selectedCategory}: ActivityGridProps) => {
               title={template.name}
               type={template.type}
               templateRef={template}
-              badge={
-                !template.isFree ? (
-                  <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>
-                ) : null
-              }
             >
               <ActivityCardImage
                 className='group-hover/card:hidden'
diff --git a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
index fbe52650e94..96ec6837b28 100644
--- a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
@@ -2,7 +2,7 @@ import {Add as AddIcon} from '@mui/icons-material'
 import clsx from 'clsx'
 import React from 'react'
 import {Link} from 'react-router-dom'
-import {ActivityBadge} from './ActivityBadge'
+
 import {ActivityCard} from './ActivityCard'
 import {AllCategoryID, CATEGORY_ID_TO_NAME, CATEGORY_THEMES} from './Categories'
 
@@ -22,7 +22,6 @@ const CreateActivityCard = (props: Props) => {
       <ActivityCard
         className={'flex-1 cursor-pointer'}
         theme={CATEGORY_THEMES[category]}
-        badge={<ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>}
       >
         <div className='flex h-full w-full flex-col items-center justify-center pb-2 font-semibold'>
           <div className='h-12 w-12'>
diff --git a/packages/client/components/RetroDrawerTemplateCard.tsx b/packages/client/components/RetroDrawerTemplateCard.tsx
index 4d668edeab1..55afd2a343c 100644
--- a/packages/client/components/RetroDrawerTemplateCard.tsx
+++ b/packages/client/components/RetroDrawerTemplateCard.tsx
@@ -6,7 +6,6 @@ import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation'
 import {CATEGORY_THEMES, CategoryID} from '././ActivityLibrary/Categories'
-import {ActivityBadge} from './ActivityLibrary/ActivityBadge'
 import {ActivityCard, ActivityCardImage} from './ActivityLibrary/ActivityCard'
 import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription'
 
@@ -54,11 +53,6 @@ const RetroDrawerTemplateCard = (props: Props) => {
           theme={CATEGORY_THEMES[template.category as CategoryID]}
           title={template.name}
           type='retrospective'
-          badge={
-            !template.isFree ? (
-              <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Premium</ActivityBadge>
-            ) : null
-          }
         >
           <ActivityCardImage
             className='group-hover/card:hidden'

From 42c432eb0ea9112ef28652d75cc784c3b3dd79fd Mon Sep 17 00:00:00 2001
From: Nick O'Ferrall <nickoferrall@gmail.com>
Date: Thu, 25 Apr 2024 11:46:19 +0100
Subject: [PATCH 174/183] fix: can update gcal start datetime (#9668)

---
 .../components/GcalModal/DateTimePickers.tsx  | 27 ++--------------
 .../components/GcalModal/GcalModal.tsx        | 27 ++++++++++++++--
 .../components/GcalModal/GcalSettings.tsx     | 31 ++++++++++++++-----
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
index 4348f8099bb..55a6425c050 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/DateTimePickers.tsx
@@ -42,39 +42,18 @@ const timePickerStyles = {
 
 type Props = {
   startValue: Dayjs
-  setStart: (newValue: Dayjs) => void
   endValue: Dayjs
-  setEnd: (newValue: Dayjs) => void
+  handleChangeStart: (date: Dayjs | null, time: Dayjs | null) => void
+  handleChangeEnd: (date: Dayjs | null, time: Dayjs | null) => void
 }
 
 const DateTimePickers = (props: Props) => {
-  const {startValue, setStart, endValue, setEnd} = props
+  const {startValue, endValue, handleChangeStart, handleChangeEnd} = props
   const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
   const date = new Date()
   const dateTimeString = date.toLocaleString('en-US', {timeZone: timeZone, timeZoneName: 'short'})
   const timeZoneShort = dateTimeString.split(' ').pop()
 
-  const handleChangeStart = (date: Dayjs | null, time: Dayjs | null) => {
-    if (date && time) {
-      const newValue = date.hour(time.hour()).minute(time.minute())
-      setStart(newValue)
-      setEnd(newValue.add(1, 'hour'))
-    }
-  }
-
-  const handleChangeEnd = (date: Dayjs | null, time: Dayjs | null) => {
-    if (date && time) {
-      const newValue = date.hour(time.hour()).minute(time.minute())
-      if (newValue.isAfter(startValue)) {
-        setEnd(newValue)
-      } else {
-        const newStartValue = newValue.subtract(1, 'hour')
-        setStart(newStartValue)
-        setEnd(newValue)
-      }
-    }
-  }
-
   const handleMouseDown = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
     // prevent gcal modal from closing when clicking datetime pickers
     e.stopPropagation()
diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
index 21b77a164ab..98bef3b7751 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/GcalModal.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled'
 import {Close} from '@mui/icons-material'
 import graphql from 'babel-plugin-relay/macro'
-import dayjs from 'dayjs'
+import dayjs, {Dayjs} from 'dayjs'
 import React, {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
@@ -204,6 +204,27 @@ const GcalModal = (props: Props) => {
     setVideoType(option)
   }
 
+  const handleChangeStart = (date: Dayjs | null, time: Dayjs | null) => {
+    if (date && time) {
+      const newValue = date.hour(time.hour()).minute(time.minute())
+      setStart(newValue)
+      setEnd(newValue.add(1, 'hour'))
+    }
+  }
+
+  const handleChangeEnd = (date: Dayjs | null, time: Dayjs | null) => {
+    if (date && time) {
+      const newValue = date.hour(time.hour()).minute(time.minute())
+      if (newValue.isAfter(start)) {
+        setEnd(newValue)
+      } else {
+        const newStartValue = newValue.subtract(1, 'hour')
+        setStart(newStartValue)
+        setEnd(newValue)
+      }
+    }
+  }
+
   return (
     <StyledDialogContainer>
       <DialogTitle>
@@ -234,8 +255,8 @@ const GcalModal = (props: Props) => {
             <DateTimePickers
               startValue={start}
               endValue={end}
-              setStart={setStart}
-              setEnd={setEnd}
+              handleChangeStart={handleChangeStart}
+              handleChangeEnd={handleChangeEnd}
             />
           </div>
           <VideoConferencing videoType={videoType} handleChangeVideoType={handleChangeVideoType} />
diff --git a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
index ce464d188e3..48e6d0d39d3 100644
--- a/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
+++ b/packages/client/modules/userDashboard/components/GcalModal/GcalSettings.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled'
 import graphql from 'babel-plugin-relay/macro'
-import dayjs from 'dayjs'
+import dayjs, {Dayjs} from 'dayjs'
 import React, {useEffect, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {GcalModal_team$key} from '../../../../__generated__/GcalModal_team.graphql'
@@ -35,7 +35,6 @@ const GcalSettings = (props: Props) => {
   const {invitees, start, end, videoType} = settings
   const [rawInvitees, setRawInvitees] = useState(invitees.join(', '))
   const [inviteAll, setInviteAll] = useState(true)
-
   const [inviteError, setInviteError] = useState<null | string>(null)
 
   const setInvitees = (invitees: string[]) => {
@@ -45,11 +44,24 @@ const GcalSettings = (props: Props) => {
     onSettingsChanged({...settings, videoType})
   }
 
-  const setStart = (start: dayjs.Dayjs) => {
-    onSettingsChanged({...settings, start})
+  const handleChangeStart = (date: Dayjs | null, time: Dayjs | null) => {
+    if (date && time) {
+      const newStart = date.hour(time.hour()).minute(time.minute())
+      const newEnd = newStart.add(1, 'hour')
+      onSettingsChanged({...settings, start: newStart, end: newEnd})
+    }
   }
-  const setEnd = (end: dayjs.Dayjs) => {
-    onSettingsChanged({...settings, end})
+
+  const handleChangeEnd = (date: Dayjs | null, time: Dayjs | null) => {
+    if (date && time) {
+      const startValue = settings.start
+      const newEnd = date.hour(time.hour()).minute(time.minute())
+      let newStart = startValue
+      if (newEnd.isBefore(startValue) || newEnd.isSame(startValue)) {
+        newStart = newEnd.subtract(1, 'hour')
+      }
+      onSettingsChanged({...settings, start: newStart, end: newEnd})
+    }
   }
 
   const team = useFragment(
@@ -135,7 +147,12 @@ const GcalSettings = (props: Props) => {
   return (
     <div className='space-y-4 p-4'>
       <div className='pt-1'>
-        <DateTimePickers startValue={start} endValue={end} setStart={setStart} setEnd={setEnd} />
+        <DateTimePickers
+          startValue={start}
+          endValue={end}
+          handleChangeStart={handleChangeStart}
+          handleChangeEnd={handleChangeEnd}
+        />
       </div>
       <VideoConferencing
         videoType={videoType ?? null}

From f4e0cda947c5407a651a73f6675cca27a2ea55dd Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 25 Apr 2024 12:52:14 +0200
Subject: [PATCH 175/183] fix: Increase process recurrence timeout (#9665)

---
 packages/chronos/chronos.ts                | 16 ++++++++--------
 packages/server/utils/PubSubPromise.ts     |  6 ++++--
 packages/server/utils/publishWebhookGQL.ts |  9 +++++++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/chronos/chronos.ts b/packages/chronos/chronos.ts
index 2a8b255878c..2ac79da82fa 100644
--- a/packages/chronos/chronos.ts
+++ b/packages/chronos/chronos.ts
@@ -102,16 +102,16 @@ const chronos = () => {
     processRecurrence: {
       onTick: () => {
         const query = `
-        mutation ProcessRecurrence{
-          processRecurrence{
-            ... on ProcessRecurrenceSuccess {
-              meetingsStarted
-              meetingsEnded
+          mutation ProcessRecurrence {
+            processRecurrence{
+              ... on ProcessRecurrenceSuccess {
+                meetingsStarted
+                meetingsEnded
+              }
             }
           }
-        }
-      `
-        publishWebhookGQL(query, {})
+        `
+        publishWebhookGQL(query, {}, {longRunning: true})
       },
       cronTime: CHRONOS_PROCESS_RECURRENCE
     }
diff --git a/packages/server/utils/PubSubPromise.ts b/packages/server/utils/PubSubPromise.ts
index cd95cbaf325..de0452ac3f1 100644
--- a/packages/server/utils/PubSubPromise.ts
+++ b/packages/server/utils/PubSubPromise.ts
@@ -5,6 +5,7 @@ import numToBase64 from './numToBase64'
 import sendToSentry from './sendToSentry'
 
 const STANDARD_TIMEOUT = ms('10s')
+const LONG_TIMEOUT = ms('60s')
 const ADHOC_TIMEOUT = ms('10m')
 
 interface Job {
@@ -17,6 +18,7 @@ const {SERVER_ID} = process.env
 interface BaseRequest {
   executorServerId?: string
   isAdHoc?: boolean
+  longRunning?: boolean
 }
 
 export default class PubSubPromise<Request extends BaseRequest, Response> {
@@ -51,8 +53,8 @@ export default class PubSubPromise<Request extends BaseRequest, Response> {
     return new Promise<Response>((resolve, reject) => {
       const nextJob = numToBase64(this.jobCounter++)
       const jobId = `${SERVER_ID}:${nextJob}`
-      const {isAdHoc} = request
-      const timeout = isAdHoc ? ADHOC_TIMEOUT : STANDARD_TIMEOUT
+      const {isAdHoc, longRunning} = request
+      const timeout = isAdHoc ? ADHOC_TIMEOUT : longRunning ? LONG_TIMEOUT : STANDARD_TIMEOUT
       const timeoutId = setTimeout(() => {
         delete this.jobs[jobId]
         reject(new Error('TIMEOUT'))
diff --git a/packages/server/utils/publishWebhookGQL.ts b/packages/server/utils/publishWebhookGQL.ts
index 609f3dd2bc0..4c10f861604 100644
--- a/packages/server/utils/publishWebhookGQL.ts
+++ b/packages/server/utils/publishWebhookGQL.ts
@@ -3,13 +3,18 @@ import ServerAuthToken from '../database/types/ServerAuthToken'
 import getGraphQLExecutor from './getGraphQLExecutor'
 import sendToSentry from './sendToSentry'
 
-const publishWebhookGQL = async (query: string, variables: Variables) => {
+interface PublishOptions {
+  longRunning?: boolean
+}
+
+const publishWebhookGQL = async (query: string, variables: Variables, options?: PublishOptions) => {
   try {
     return await getGraphQLExecutor().publish({
       authToken: new ServerAuthToken(),
       query,
       variables,
-      isPrivate: true
+      isPrivate: true,
+      ...options
     })
   } catch (e) {
     const error = e instanceof Error ? e : new Error('GQL executor failed to publish')

From 359222de046c9fed5853a79106b3d640d8fc994f Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 25 Apr 2024 13:00:38 +0200
Subject: [PATCH 176/183] Prettier

---
 .../client/components/ActivityLibrary/CreateActivityCard.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
index 96ec6837b28..ee0cf0c248d 100644
--- a/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/CreateActivityCard.tsx
@@ -19,10 +19,7 @@ const CreateActivityCard = (props: Props) => {
       className={clsx('flex rounded-2xl hover:bg-slate-100 focus:outline-sky-500', className)}
       to={`/activity-library/new-activity/${category}`}
     >
-      <ActivityCard
-        className={'flex-1 cursor-pointer'}
-        theme={CATEGORY_THEMES[category]}
-      >
+      <ActivityCard className={'flex-1 cursor-pointer'} theme={CATEGORY_THEMES[category]}>
         <div className='flex h-full w-full flex-col items-center justify-center pb-2 font-semibold'>
           <div className='h-12 w-12'>
             <AddIcon className='h-full w-full text-slate-700' />

From 052a729de9e0b0fe9d730b5a4859a39d385c9a8d Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 13:09:21 +0200
Subject: [PATCH 177/183] chore(release): release v7.28.0 (#9657)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 23 +++++++++++++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 2b5d525691a..c0f08cda624 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.27.2"
+  ".": "7.28.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 862ce334349..91045da284c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.28.0](https://github.com/ParabolInc/parabol/compare/v7.27.2...v7.28.0) (2024-04-25)
+
+
+### Added
+
+* **orgAdmin:** org admin can promote others to org admin ([#9655](https://github.com/ParabolInc/parabol/issues/9655)) ([01372bc](https://github.com/ParabolInc/parabol/commit/01372bc29b14681db8094c0b55cc3d3f2f2418ea))
+* roll out ai icebreakers ([#9660](https://github.com/ParabolInc/parabol/issues/9660)) ([898e1fd](https://github.com/ParabolInc/parabol/commit/898e1fddfa342014d8db162215babe8079652f84))
+
+
+### Fixed
+
+* can update gcal start datetime ([#9668](https://github.com/ParabolInc/parabol/issues/9668)) ([42c432e](https://github.com/ParabolInc/parabol/commit/42c432eb0ea9112ef28652d75cc784c3b3dd79fd))
+* Increase process recurrence timeout ([#9665](https://github.com/ParabolInc/parabol/issues/9665)) ([f4e0cda](https://github.com/ParabolInc/parabol/commit/f4e0cda947c5407a651a73f6675cca27a2ea55dd))
+* remove premium badges from activity library cards ([#9669](https://github.com/ParabolInc/parabol/issues/9669)) ([f3f0588](https://github.com/ParabolInc/parabol/commit/f3f058803b16ec06840a0b673d8299663ff3d533))
+* support PG reconnects ([#9663](https://github.com/ParabolInc/parabol/issues/9663)) ([32574a6](https://github.com/ParabolInc/parabol/commit/32574a650697a3ee5e43aac33478c9ac7eab6966))
+* Threaded reply input does not immediately close ([#9652](https://github.com/ParabolInc/parabol/issues/9652)) ([9944ac0](https://github.com/ParabolInc/parabol/commit/9944ac046c0ea2186be149147ca630190d92faef))
+
+
+### Changed
+
+* remove noTemplateLimit flag ([#9631](https://github.com/ParabolInc/parabol/issues/9631)) ([fb76d9a](https://github.com/ParabolInc/parabol/commit/fb76d9a3ec977e886dcc778b96fc2a5abfd4716c))
+* update activity library custom tab empty state ([#9666](https://github.com/ParabolInc/parabol/issues/9666)) ([240e78d](https://github.com/ParabolInc/parabol/commit/240e78d9c7003b748a4c31353e869278c2bb528c))
+
 ## [7.27.2](https://github.com/ParabolInc/parabol/compare/v7.27.1...v7.27.2) (2024-04-17)
 
 
diff --git a/package.json b/package.json
index bb23d7072d8..c7735d5e9b0 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.2",
+  "version": "7.28.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index f87e1ea864e..70f1e0d5b1e 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.27.2",
+  "version": "7.28.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.27.2"
+    "parabol-server": "7.28.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 23dee4fe881..9071228bd44 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.2",
+  "version": "7.28.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index c379221d450..9bb2c2eb416 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.27.2",
+  "version": "7.28.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 65c777dd7f6..9693a340f54 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.27.2",
+  "version": "7.28.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.27.2",
-    "parabol-server": "7.27.2",
+    "parabol-client": "7.28.0",
+    "parabol-server": "7.28.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 99191908243..0f97cfb586e 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.2",
+  "version": "7.28.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index c72517529ed..f037a0defe8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.27.2",
+  "version": "7.28.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -120,7 +120,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.27.2",
+    "parabol-client": "7.28.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From a1658d8e02534e90a5da1a30860995c4aa714fe2 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 29 Apr 2024 08:53:32 +0200
Subject: [PATCH 178/183] fix: Sidebar in start custom activity (#9647)

---
 .../ActivityLibrary/ActivityCard.tsx          |  2 +-
 .../ActivityDetails/ActivityDetails.tsx       | 70 ++++++++-----------
 .../ActivityDetails/TemplateDetails.tsx       |  6 +-
 .../components/IntegrationsTip.tsx            |  2 +-
 .../ActivityDetailsSidebar.tsx                | 13 +---
 5 files changed, 38 insertions(+), 55 deletions(-)

diff --git a/packages/client/components/ActivityLibrary/ActivityCard.tsx b/packages/client/components/ActivityLibrary/ActivityCard.tsx
index 724e791960b..260013189a5 100644
--- a/packages/client/components/ActivityLibrary/ActivityCard.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityCard.tsx
@@ -38,7 +38,7 @@ export const ActivityCardImage = (props: PropsWithChildren<ActivityCardImageProp
     >
       <img className='object-contain' src={backgroundSrc} alt='' />
       <img
-        className='absolute top-0 left-0 z-10 h-full w-full object-contain p-10'
+        className='absolute top-0 left-0 h-full w-full object-contain p-10'
         src={src}
         alt='Card Illustration'
       />
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
index 2f7ecf45cc3..a46f0a1c924 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx
@@ -88,13 +88,12 @@ const ActivityDetails = (props: Props) => {
   }`
 
   const isOwner = viewerLowestScope === 'TEAM'
-  const MOBILE_SETTINGS_HEIGHT = 208
 
   return (
-    <div className='flex h-full flex-col bg-white'>
-      <div className={clsx(`flex grow pb-[${MOBILE_SETTINGS_HEIGHT}px]`)}>
-        <div className='mt-4 grow'>
-          <div className='mb-14 ml-4 flex h-min w-max items-center'>
+    <div className='flex h-full w-full flex-col bg-white'>
+      <div className='flex grow'>
+        <div className='mt-4 w-full grow'>
+          <div className='mb-14 ml-4 flex h-min w-max items-center max-md:mb-6'>
             <div className='mr-4'>
               <Link to={categoryLink}>
                 <IconLabel icon={'arrow_back'} iconLarge />
@@ -102,58 +101,51 @@ const ActivityDetails = (props: Props) => {
             </div>
             <div className='w-max text-xl font-semibold'>Start Activity</div>
           </div>
-          <div className='mx-auto w-min'>
-            <div
-              className={clsx(
-                'flex w-full flex-col justify-start pl-4 pr-14 xl:flex-row xl:justify-center xl:pl-14',
-                isEditing && 'lg:flex-row lg:justify-center lg:pl-14'
-              )}
-            >
-              <ActivityCard
-                className='ml-14 mb-8 max-h-[200px] w-80 xl:ml-0 xl:mb-0'
-                theme={CATEGORY_THEMES[category as CategoryID]}
-                badge={null}
-                type={type}
-              >
-                <ActivityCardImage src={illustrationUrl} category={category as CategoryID} />
-              </ActivityCard>
-              <div className='pb-20'>
-                <div className='mb-10 space-y-2 pl-14'>
-                  <div className='flex min-h-[40px] items-center'>
-                    <EditableTemplateName
-                      className='text-[32px] leading-9'
-                      name={activity.name}
-                      templateId={activity.id}
-                      isOwner={isOwner && isEditing}
-                    />
-                  </div>
-                  <TemplateDetails
-                    activityRef={activity}
-                    viewerRef={viewer}
-                    isEditing={isEditing}
-                    setIsEditing={setIsEditing}
+          <div className='mx-auto'>
+            <div className='flex flex-col justify-start pl-4 pr-4 md:pr-14 xl:flex-row xl:justify-center xl:pl-14'>
+              <div>
+                <ActivityCard
+                  className='mb-8 w-80 max-md:hidden sm:ml-14 xl:ml-0 xl:mb-0'
+                  theme={CATEGORY_THEMES[category as CategoryID]}
+                  badge={null}
+                  type={type}
+                >
+                  <ActivityCardImage src={illustrationUrl} category={category as CategoryID} />
+                </ActivityCard>
+              </div>
+              <div className='mb-10 space-y-2 sm:pl-14'>
+                <div className='flex min-h-[40px] items-center'>
+                  <EditableTemplateName
+                    className='text-[32px] leading-9'
+                    name={activity.name}
+                    templateId={activity.id}
+                    isOwner={isOwner && isEditing}
                   />
                 </div>
+                <TemplateDetails
+                  activityRef={activity}
+                  viewerRef={viewer}
+                  isEditing={isEditing}
+                  setIsEditing={setIsEditing}
+                />
               </div>
             </div>
           </div>
         </div>
-        <div className='hidden lg:block'>
+        <div className='hidden w-[385px] shrink-0 lg:block'>
           <ActivityDetailsSidebar
             selectedTemplateRef={activity}
             teamsRef={teams}
-            isOpen={!isEditing}
             type={activity.type}
             preferredTeamId={preferredTeamId}
             viewerRef={viewer}
           />
         </div>
       </div>
-      <div className={`fixed min-h-[${MOBILE_SETTINGS_HEIGHT}px] bottom-0 w-full lg:hidden`}>
+      <div className={clsx('lg:hidden', isEditing && 'hidden')}>
         <ActivityDetailsSidebar
           selectedTemplateRef={activity}
           teamsRef={teams}
-          isOpen={!isEditing}
           type={activity.type}
           preferredTeamId={preferredTeamId}
           viewerRef={viewer}
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
index 9317097b4c2..b0ca11e0583 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/TemplateDetails.tsx
@@ -210,7 +210,7 @@ export const TemplateDetails = (props: Props) => {
   return (
     <div className='space-y-6'>
       <ActivityDetailsBadges isEditing={isEditing} templateRef={activity} />
-      <div className='w-[480px]'>
+      <div className='max-w-[480px]'>
         <div className='mb-6'>
           {__typename === 'FixedActivity' && (
             <div className='text-base font-semibold text-slate-600'>Created by Parabol</div>
@@ -273,9 +273,9 @@ export const TemplateDetails = (props: Props) => {
         </div>
         {activityDescription}
       </div>
-      <IntegrationsTip>{integrationsTip}</IntegrationsTip>
+      <IntegrationsTip className='flex-wrap'>{integrationsTip}</IntegrationsTip>
 
-      <div className='-ml-14 pt-4'>
+      <div className='pt-4 sm:-ml-14'>
         {prompts && (
           <>
             <TemplatePromptList
diff --git a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
index e0cec9c4116..27e33d76790 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetails/components/IntegrationsTip.tsx
@@ -15,7 +15,7 @@ export const IntegrationsTip = (props: Props) => {
   const {className, children} = props
 
   return (
-    <div className={clsx('flex min-w-max items-center', className)}>
+    <div className={clsx('flex items-center', className)}>
       <div className='flex items-center gap-3'>
         <JiraSVG />
         <GitHubSVG />
diff --git a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
index 5e158061100..928416576a5 100644
--- a/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
+++ b/packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx
@@ -40,13 +40,12 @@ interface Props {
   selectedTemplateRef: ActivityDetailsSidebar_template$key
   teamsRef: ActivityDetailsSidebar_teams$key
   type: MeetingTypeEnum
-  isOpen: boolean
   preferredTeamId: string | null
   viewerRef: ActivityDetailsSidebar_viewer$key
 }
 
 const ActivityDetailsSidebar = (props: Props) => {
-  const {selectedTemplateRef, teamsRef, type, isOpen, preferredTeamId, viewerRef} = props
+  const {selectedTemplateRef, teamsRef, type, preferredTeamId, viewerRef} = props
   const [isMinimized, setIsMinimized] = useState(false)
   const isMobile = !useBreakpoint(Breakpoint.INVOICE)
   const selectedTemplate = useFragment(
@@ -252,14 +251,7 @@ const ActivityDetailsSidebar = (props: Props) => {
 
   return (
     <>
-      {isOpen && <div className='w-96' />}
-      <div
-        className={clsx(
-          'fixed bottom-0 flex  w-full flex-col overflow-hidden border-t border-solid border-slate-300 bg-white px-4 pt-2 lg:right-0 lg:top-0 lg:w-96 lg:border-l lg:pt-14',
-          isOpen ? 'translate-y-0' : 'translate-y-full lg:translate-x-0 lg:translate-y-0',
-          isOpen ? 'opacity-100' : 'opacity-0 lg:opacity-100'
-        )}
-      >
+      <div className='sticky bottom-0 flex w-full flex-col border-t border-solid border-slate-300 bg-white px-4 pt-2 lg:right-0 lg:top-0 lg:min-h-screen lg:w-full lg:w-96 lg:border-l lg:pt-14'>
         <div className='flex-grow'>
           <div className='flex items-center justify-between pt-2 text-xl font-semibold lg:pt-0'>
             Settings
@@ -311,7 +303,6 @@ const ActivityDetailsSidebar = (props: Props) => {
         <div className='z-10 flex h-fit w-full flex-col gap-2 pb-4'>
           {error && <StyledError>{error.message}</StyledError>}
           <NewMeetingActionsCurrentMeetings team={selectedTeam} />
-          {/* TODO: scheduling meeting does not work with one-on-one https://github.com/ParabolInc/parabol/issues/8820  */}
           <ScheduleMeetingButton
             handleStartActivity={handleStartActivity}
             mutationProps={mutationProps}

From b28ccc2f62614d903c1f268d98d5923de5d6e1f8 Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Mon, 29 Apr 2024 15:23:19 +0200
Subject: [PATCH 179/183] chore: Remove adhoc teams (#9678)

---
 .../ActivityDetails/ActivityDetails.tsx       |  3 ---
 .../ActivityDetailsSidebar.tsx                | 21 +---------------
 .../components/NewMeetingTeamPicker.tsx       | 25 +------------------
 .../client/components/SelectTeamDropdown.tsx  | 20 ++-------------
 .../public/typeDefs/updateFeatureFlag.graphql |  2 --
 .../graphql/public/types/UserFeatureFlags.ts  |  1 -
 packages/server/graphql/types/UserFlagEnum.ts |  1 -
 7 files changed, 4 insertions(+), 69 deletions(-)

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}
           />
         </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
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<HTMLDivElement>(
     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 && (
-        <AddTeamDialogRoot
-          onAddTeam={(teamId) => {
-            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 (
     <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
index c14a39e0c6d..f76df918087 100644
--- 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
index e2158a960d0..eb7947a851d 100644
--- 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
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: {}
   }
 })

From cedc91c9febb47d7b2fa5c24b7a6012b06a4cf95 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 29 Apr 2024 10:14:45 -0700
Subject: [PATCH 180/183] fix: handle 0 discussions (#9682)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/embedder/EmbeddingsJobQueueStream.ts          | 5 ++++-
 packages/embedder/WorkflowOrchestrator.ts              | 2 +-
 packages/embedder/workflows/relatedDiscussionsStart.ts | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/embedder/EmbeddingsJobQueueStream.ts b/packages/embedder/EmbeddingsJobQueueStream.ts
index 49c3e4c9e58..1be69480856 100644
--- a/packages/embedder/EmbeddingsJobQueueStream.ts
+++ b/packages/embedder/EmbeddingsJobQueueStream.ts
@@ -29,7 +29,10 @@ export class EmbeddingsJobQueueStream implements AsyncIterableIterator<DBJob> {
               .orderBy(['priority'])
               .$if(!isFailed, (db) => db.where('state', '=', 'queued'))
               .$if(isFailed, (db) =>
-                db.where('state', '=', 'failed').where('retryAfter', '<', new Date())
+                db
+                  .where('state', '=', 'failed')
+                  .where('retryAfter', 'is not', null)
+                  .where('retryAfter', '<', new Date())
               )
               .limit(1)
               .forUpdate()
diff --git a/packages/embedder/WorkflowOrchestrator.ts b/packages/embedder/WorkflowOrchestrator.ts
index 704320542be..f81f67bcd1a 100644
--- a/packages/embedder/WorkflowOrchestrator.ts
+++ b/packages/embedder/WorkflowOrchestrator.ts
@@ -40,7 +40,7 @@ export class WorkflowOrchestrator {
     Logger.error(error)
     const pg = getKysely()
     const {message, retryDelay, jobData} = error
-    const maxRetries = error.maxRetries ?? 1e6
+    const maxRetries = error.maxRetries ?? 10
     await pg
       .updateTable('EmbeddingsJobQueue')
       .set((eb) => ({
diff --git a/packages/embedder/workflows/relatedDiscussionsStart.ts b/packages/embedder/workflows/relatedDiscussionsStart.ts
index e62a986a182..a9881f2999c 100644
--- a/packages/embedder/workflows/relatedDiscussionsStart.ts
+++ b/packages/embedder/workflows/relatedDiscussionsStart.ts
@@ -31,6 +31,7 @@ export const relatedDiscussionsStart: JobQueueStepRun<
     // Not techincally updatedAt since discussions are updated after they get created
     refUpdatedAt: createdAt
   }))
+  if (metadataRows.length === 0) return false
   const inserts = await pg
     .insertInto('EmbeddingsMetadata')
     .values(metadataRows)

From b433f7f8e59d1421c052ec6926cd802504a905b4 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 10:28:37 -0700
Subject: [PATCH 181/183] chore(release): release v7.28.1 (#9676)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 13 +++++++++++++
 package.json                            |  2 +-
 packages/chronos/package.json           |  4 ++--
 packages/client/package.json            |  2 +-
 packages/embedder/package.json          |  2 +-
 packages/gql-executor/package.json      |  6 +++---
 packages/integration-tests/package.json |  2 +-
 packages/server/package.json            |  4 ++--
 9 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index c0f08cda624..305cad7da5b 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.28.0"
+  ".": "7.28.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91045da284c..450d6bbe1ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.28.1](https://github.com/ParabolInc/parabol/compare/v7.28.0...v7.28.1) (2024-04-29)
+
+
+### Fixed
+
+* handle 0 discussions ([#9682](https://github.com/ParabolInc/parabol/issues/9682)) ([cedc91c](https://github.com/ParabolInc/parabol/commit/cedc91c9febb47d7b2fa5c24b7a6012b06a4cf95))
+* Sidebar in start custom activity ([#9647](https://github.com/ParabolInc/parabol/issues/9647)) ([a1658d8](https://github.com/ParabolInc/parabol/commit/a1658d8e02534e90a5da1a30860995c4aa714fe2))
+
+
+### Changed
+
+* Remove adhoc teams ([#9678](https://github.com/ParabolInc/parabol/issues/9678)) ([b28ccc2](https://github.com/ParabolInc/parabol/commit/b28ccc2f62614d903c1f268d98d5923de5d6e1f8))
+
 ## [7.28.0](https://github.com/ParabolInc/parabol/compare/v7.27.2...v7.28.0) (2024-04-25)
 
 
diff --git a/package.json b/package.json
index c7735d5e9b0..b7e73fedc17 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.0",
+  "version": "7.28.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 70f1e0d5b1e..4ff73c7de84 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.28.0",
+  "version": "7.28.1",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.28.0"
+    "parabol-server": "7.28.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 9071228bd44..b6d347b27f4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.0",
+  "version": "7.28.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 9bb2c2eb416..1ab680c8bcf 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.28.0",
+  "version": "7.28.1",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index 9693a340f54..fe462691b1e 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.28.0",
+  "version": "7.28.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.28.0",
-    "parabol-server": "7.28.0",
+    "parabol-client": "7.28.1",
+    "parabol-server": "7.28.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 0f97cfb586e..3b86b2296b1 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.0",
+  "version": "7.28.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index f037a0defe8..e607e0f94df 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.0",
+  "version": "7.28.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -120,7 +120,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.28.0",
+    "parabol-client": "7.28.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From e7836627f9a36315af9b8bbd262e60f46b680920 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Mon, 29 Apr 2024 14:37:36 -0700
Subject: [PATCH 182/183] feat: initial avatars on the fly (#9675)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/server/database/types/User.ts        | 14 +------
 .../server/fileStorage/FileStoreManager.ts    | 12 +++---
 packages/server/fileStorage/GCSManager.ts     |  6 +--
 .../fileStorage/LocalFileStoreManager.ts      |  6 +--
 .../server/fileStorage/S3FileStoreManager.ts  |  8 ++--
 .../mutations/helpers/generateIdenticon.ts    | 32 +++++++++++++++
 .../graphql/private/mutations/loginSAML.ts    |  3 ++
 .../public/mutations/loginWithGoogle.ts       |  3 +-
 .../public/mutations/loginWithMicrosoft.ts    |  2 +
 .../public/mutations/signUpWithPassword.ts    |  7 +++-
 .../graphql/public/mutations/verifyEmail.ts   |  2 +-
 packages/server/package.json                  |  2 +
 packages/server/utils/createNewLocalUser.ts   |  8 +++-
 scripts/webpack/dev.servers.config.js         |  9 +++--
 scripts/webpack/prod.servers.config.js        |  5 ++-
 scripts/webpack/toolbox.config.js             |  6 ++-
 yarn.lock                                     | 39 +++++++++++++++++--
 17 files changed, 121 insertions(+), 43 deletions(-)
 create mode 100644 packages/server/graphql/private/mutations/helpers/generateIdenticon.ts

diff --git a/packages/server/database/types/User.ts b/packages/server/database/types/User.ts
index f59cc8165b3..0f5002becae 100644
--- a/packages/server/database/types/User.ts
+++ b/packages/server/database/types/User.ts
@@ -13,7 +13,7 @@ interface Input {
   lastSeenAt?: Date
   lastSeenAtURLs?: string[]
   updatedAt?: Date
-  picture?: string
+  picture: string
   inactive?: boolean
   identities?: AuthIdentity[]
   isWatched?: boolean
@@ -24,9 +24,6 @@ interface Input {
   tms?: string[]
 }
 
-const letters = 'abcdefghijklmnopqrstuvwxyz'
-const AVATAR_BUCKET = `https://${process.env.AWS_S3_BUCKET}/static/avatars`
-
 export default class User {
   id: string
   preferredName: string
@@ -69,19 +66,12 @@ export default class User {
       sendSummaryEmail,
       tier
     } = input
-    const avatarName =
-      preferredName
-        .toLowerCase()
-        .split('')
-        .filter((letter) => letters.includes(letter))
-        .slice(0, 2)
-        .join('') || 'pa'
     const now = new Date()
     this.id = id ?? `local|${generateUID()}`
     this.tms = tms || []
     this.email = email
     this.createdAt = createdAt || now
-    this.picture = picture || `${AVATAR_BUCKET}/${avatarName}.png`
+    this.picture = picture
     this.updatedAt = updatedAt || now
     this.featureFlags = featureFlags || []
     this.identities = identities || []
diff --git a/packages/server/fileStorage/FileStoreManager.ts b/packages/server/fileStorage/FileStoreManager.ts
index 32bb27e2d6d..15aaa525e93 100644
--- a/packages/server/fileStorage/FileStoreManager.ts
+++ b/packages/server/fileStorage/FileStoreManager.ts
@@ -7,10 +7,10 @@ export default abstract class FileStoreManager {
   abstract prependPath(partialPath: string, assetDir?: FileAssetDir): string
   abstract getPublicFileLocation(fullPath: string): string
 
-  protected abstract putFile(file: Buffer, fullPath: string): Promise<string>
-  protected abstract putUserFile(file: Buffer, partialPath: string): Promise<string>
-  abstract putBuildFile(file: Buffer, partialPath: string): Promise<string>
-  async putUserAvatar(file: Buffer, userId: string, ext: string, name?: string) {
+  protected abstract putFile(file: ArrayBufferLike, fullPath: string): Promise<string>
+  protected abstract putUserFile(file: ArrayBufferLike, partialPath: string): Promise<string>
+  abstract putBuildFile(file: ArrayBufferLike, partialPath: string): Promise<string>
+  async putUserAvatar(file: ArrayBufferLike, userId: string, ext: string, name?: string) {
     const filename = name ?? generateUID()
     // replace the first dot, if there is one, but not any other dots
     const dotfreeExt = ext.replace(/^\./, '')
@@ -18,14 +18,14 @@ export default abstract class FileStoreManager {
     return this.putUserFile(file, partialPath)
   }
 
-  async putOrgAvatar(file: Buffer, orgId: string, ext: string, name?: string) {
+  async putOrgAvatar(file: ArrayBufferLike, orgId: string, ext: string, name?: string) {
     const filename = name ?? generateUID()
     const dotfreeExt = ext.replace(/^\./, '')
     const partialPath = `Organization/${orgId}/picture/${filename}.${dotfreeExt}`
     return this.putUserFile(file, partialPath)
   }
 
-  async putTemplateIllustration(file: Buffer, orgId: string, ext: string, name?: string) {
+  async putTemplateIllustration(file: ArrayBufferLike, orgId: string, ext: string, name?: string) {
     const filename = name ?? generateUID()
     const dotfreeExt = ext.replace(/^\./, '')
     const partialPath = `Organization/${orgId}/template/${filename}.${dotfreeExt}`
diff --git a/packages/server/fileStorage/GCSManager.ts b/packages/server/fileStorage/GCSManager.ts
index d99cf943f69..d5418161889 100644
--- a/packages/server/fileStorage/GCSManager.ts
+++ b/packages/server/fileStorage/GCSManager.ts
@@ -112,12 +112,12 @@ export default class GCSManager extends FileStoreManager {
     return this.accessToken
   }
 
-  protected async putUserFile(file: Buffer, partialPath: string) {
+  protected async putUserFile(file: ArrayBufferLike, partialPath: string) {
     const fullPath = this.prependPath(partialPath)
     return this.putFile(file, fullPath)
   }
 
-  protected async putFile(file: Buffer, fullPath: string) {
+  protected async putFile(file: ArrayBufferLike, fullPath: string) {
     const url = new URL(`https://storage.googleapis.com/upload/storage/v1/b/${this.bucket}/o`)
     url.searchParams.append('uploadType', 'media')
     url.searchParams.append('name', fullPath)
@@ -143,7 +143,7 @@ export default class GCSManager extends FileStoreManager {
     return this.getPublicFileLocation(fullPath)
   }
 
-  putBuildFile(file: Buffer, partialPath: string): Promise<string> {
+  putBuildFile(file: ArrayBufferLike, partialPath: string): Promise<string> {
     const fullPath = this.prependPath(partialPath, 'build')
     return this.putFile(file, fullPath)
   }
diff --git a/packages/server/fileStorage/LocalFileStoreManager.ts b/packages/server/fileStorage/LocalFileStoreManager.ts
index 732e3f1cd5d..f6203144279 100644
--- a/packages/server/fileStorage/LocalFileStoreManager.ts
+++ b/packages/server/fileStorage/LocalFileStoreManager.ts
@@ -12,14 +12,14 @@ export default class LocalFileSystemManager extends FileStoreManager {
     }
   }
 
-  protected async putUserFile(file: Buffer, partialPath: string) {
+  protected async putUserFile(file: ArrayBufferLike, partialPath: string) {
     const fullPath = this.prependPath(partialPath)
     return this.putFile(file, fullPath)
   }
-  protected async putFile(file: Buffer, fullPath: string) {
+  protected async putFile(file: ArrayBufferLike, fullPath: string) {
     const fsAbsLocation = path.join(process.cwd(), fullPath)
     await fs.promises.mkdir(path.dirname(fsAbsLocation), {recursive: true})
-    await fs.promises.writeFile(fsAbsLocation, file)
+    await fs.promises.writeFile(fsAbsLocation, Buffer.from(file))
     return this.getPublicFileLocation(fullPath)
   }
 
diff --git a/packages/server/fileStorage/S3FileStoreManager.ts b/packages/server/fileStorage/S3FileStoreManager.ts
index 3971ea80eea..817ad605f40 100644
--- a/packages/server/fileStorage/S3FileStoreManager.ts
+++ b/packages/server/fileStorage/S3FileStoreManager.ts
@@ -40,13 +40,13 @@ export default class S3Manager extends FileStoreManager {
     })
   }
 
-  protected async putUserFile(file: Buffer, partialPath: string) {
+  protected async putUserFile(file: ArrayBufferLike, partialPath: string) {
     const fullPath = this.prependPath(partialPath)
     return this.putFile(file, fullPath)
   }
-  protected async putFile(file: Buffer, fullPath: string) {
+  protected async putFile(file: ArrayBufferLike, fullPath: string) {
     const s3Params = {
-      Body: file,
+      Body: Buffer.from(file),
       Bucket: this.bucket,
       Key: fullPath,
       ContentType: mime.lookup(fullPath) || 'application/octet-stream'
@@ -63,7 +63,7 @@ export default class S3Manager extends FileStoreManager {
     return encodeURI(`${this.baseUrl}${fullPath}`)
   }
 
-  putBuildFile(file: Buffer, partialPath: string): Promise<string> {
+  putBuildFile(file: ArrayBufferLike, partialPath: string): Promise<string> {
     const fullPath = this.prependPath(partialPath, 'build')
     return this.putFile(file, fullPath)
   }
diff --git a/packages/server/graphql/private/mutations/helpers/generateIdenticon.ts b/packages/server/graphql/private/mutations/helpers/generateIdenticon.ts
new file mode 100644
index 00000000000..f650a1f6225
--- /dev/null
+++ b/packages/server/graphql/private/mutations/helpers/generateIdenticon.ts
@@ -0,0 +1,32 @@
+import {createAvatar} from '@dicebear/core'
+import * as initials from '@dicebear/initials'
+import sharp from 'sharp'
+import tailwindPreset from '../../../../../client/tailwindTheme'
+import getFileStoreManager from '../../../../fileStorage/getFileStoreManager'
+
+export const generateIdenticon = async (userId: string, name: string) => {
+  const letters = 'abcdefghijklmnopqrstuvwxyz'
+  const {colors} = tailwindPreset.theme
+  const backgroundColor = Object.values(colors)
+    .map((color) => {
+      return color['500']?.slice(1) ?? undefined
+    })
+    .filter(Boolean)
+
+  const seed =
+    name
+      .toLowerCase()
+      .split('')
+      .filter((letter) => letters.includes(letter))
+      .slice(0, 2)
+      .join('') || 'pa'
+  const avatar = createAvatar(initials, {
+    seed,
+    backgroundColor
+  })
+  const svgBuffer = await avatar.toArrayBuffer()
+  const pngBuffer = await sharp(svgBuffer).png().toBuffer()
+  const manager = getFileStoreManager()
+  const publicLocation = await manager.putUserAvatar(pngBuffer, userId, 'png')
+  return publicLocation
+}
diff --git a/packages/server/graphql/private/mutations/loginSAML.ts b/packages/server/graphql/private/mutations/loginSAML.ts
index 03584f15300..9e861aa4f98 100644
--- a/packages/server/graphql/private/mutations/loginSAML.ts
+++ b/packages/server/graphql/private/mutations/loginSAML.ts
@@ -17,6 +17,7 @@ import bootstrapNewUser from '../../mutations/helpers/bootstrapNewUser'
 import getSignOnURL from '../../public/mutations/helpers/SAMLHelpers/getSignOnURL'
 import {SSORelayState} from '../../public/queries/SAMLIdP'
 import {MutationResolvers} from '../resolverTypes'
+import {generateIdenticon} from './helpers/generateIdenticon'
 
 const serviceProvider = samlify.ServiceProvider({})
 samlify.setSchemaValidator(samlXMLValidator)
@@ -135,10 +136,12 @@ const loginSAML: MutationResolvers['loginSAML'] = async (
   }
 
   const userId = `sso|${generateUID()}`
+  const picture = await generateIdenticon(userId, preferredName)
   const tempUser = new User({
     id: userId,
     email,
     preferredName,
+    picture,
     tier: 'enterprise'
   })
 
diff --git a/packages/server/graphql/public/mutations/loginWithGoogle.ts b/packages/server/graphql/public/mutations/loginWithGoogle.ts
index b2d120c4e7f..d09247d482f 100644
--- a/packages/server/graphql/public/mutations/loginWithGoogle.ts
+++ b/packages/server/graphql/public/mutations/loginWithGoogle.ts
@@ -11,6 +11,7 @@ import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail'
 import GoogleServerManager from '../../../utils/GoogleServerManager'
 import standardError from '../../../utils/standardError'
 import bootstrapNewUser from '../../mutations/helpers/bootstrapNewUser'
+import {generateIdenticon} from '../../private/mutations/helpers/generateIdenticon'
 import {MutationResolvers} from '../resolverTypes'
 
 const loginWithGoogle: MutationResolvers['loginWithGoogle'] = async (
@@ -93,7 +94,7 @@ const loginWithGoogle: MutationResolvers['loginWithGoogle'] = async (
   const newUser = new User({
     id: userId,
     preferredName,
-    picture,
+    picture: picture || (await generateIdenticon(userId, preferredName)),
     email,
     identities: [identity],
     pseudoId
diff --git a/packages/server/graphql/public/mutations/loginWithMicrosoft.ts b/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
index e41022046d6..045c3a01ebe 100644
--- a/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
+++ b/packages/server/graphql/public/mutations/loginWithMicrosoft.ts
@@ -11,6 +11,7 @@ import getSAMLURLFromEmail from '../../../utils/getSAMLURLFromEmail'
 import MicrosoftServerManager from '../../../utils/MicrosoftServerManager'
 import standardError from '../../../utils/standardError'
 import bootstrapNewUser from '../../mutations/helpers/bootstrapNewUser'
+import {generateIdenticon} from '../../private/mutations/helpers/generateIdenticon'
 import {MutationResolvers} from '../resolverTypes'
 
 const loginWithMicrosoft: MutationResolvers['loginWithMicrosoft'] = async (
@@ -96,6 +97,7 @@ const loginWithMicrosoft: MutationResolvers['loginWithMicrosoft'] = async (
   const newUser = new User({
     id: userId,
     preferredName,
+    picture: await generateIdenticon(userId, preferredName),
     email,
     identities: [identity],
     pseudoId
diff --git a/packages/server/graphql/public/mutations/signUpWithPassword.ts b/packages/server/graphql/public/mutations/signUpWithPassword.ts
index fa7486a05f0..2982d3fbdc9 100644
--- a/packages/server/graphql/public/mutations/signUpWithPassword.ts
+++ b/packages/server/graphql/public/mutations/signUpWithPassword.ts
@@ -63,7 +63,12 @@ const signUpWithPassword: MutationResolvers['signUpWithPassword'] = async (
     return createEmailVerification({invitationToken, password, pseudoId, email, redirectTo})
   }
   const hashedPassword = await bcrypt.hash(password, Security.SALT_ROUNDS)
-  const newUser = createNewLocalUser({email, hashedPassword, isEmailVerified: false, pseudoId})
+  const newUser = await createNewLocalUser({
+    email,
+    hashedPassword,
+    isEmailVerified: false,
+    pseudoId
+  })
   // MUTATIVE
   context.authToken = await bootstrapNewUser(newUser, isOrganic, dataLoader)
   return {
diff --git a/packages/server/graphql/public/mutations/verifyEmail.ts b/packages/server/graphql/public/mutations/verifyEmail.ts
index 0b9485c13e2..8f210c96e7e 100644
--- a/packages/server/graphql/public/mutations/verifyEmail.ts
+++ b/packages/server/graphql/public/mutations/verifyEmail.ts
@@ -60,7 +60,7 @@ const verifyEmail: MutationResolvers['verifyEmail'] = async (
     return {error: {message: 'Invalid hash for email. Please reverify'}}
   }
   // user does not exist, create them bootstrap
-  const newUser = createNewLocalUser({email, hashedPassword, isEmailVerified: true, pseudoId})
+  const newUser = await createNewLocalUser({email, hashedPassword, isEmailVerified: true, pseudoId})
   // it's possible that the invitationToken is no good.
   // if that happens, then they'll get into the app & won't be on any team
   // edge case because that requires the invitation token to have expired
diff --git a/packages/server/package.json b/packages/server/package.json
index e607e0f94df..c361b35fce2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -76,6 +76,8 @@
   "dependencies": {
     "@amplitude/analytics-node": "^1.3.2",
     "@aws-sdk/client-s3": "^3.347.1",
+    "@dicebear/core": "^8.0.1",
+    "@dicebear/initials": "^8.0.1",
     "@graphql-tools/schema": "^9.0.16",
     "@mattkrick/sanitize-svg": "0.4.0",
     "@octokit/graphql-schema": "^10.36.0",
diff --git a/packages/server/utils/createNewLocalUser.ts b/packages/server/utils/createNewLocalUser.ts
index 4c216fb19b0..92037c394fe 100644
--- a/packages/server/utils/createNewLocalUser.ts
+++ b/packages/server/utils/createNewLocalUser.ts
@@ -1,6 +1,8 @@
 import {AuthIdentityTypeEnum} from '../../client/types/constEnums'
 import AuthIdentityLocal from '../database/types/AuthIdentityLocal'
 import User from '../database/types/User'
+import generateUID from '../generateUID'
+import {generateIdenticon} from '../graphql/private/mutations/helpers/generateIdenticon'
 
 interface Props {
   email: string
@@ -9,17 +11,19 @@ interface Props {
   isEmailVerified: boolean
 }
 
-const createNewLocalUser = (props: Props) => {
+const createNewLocalUser = async (props: Props) => {
   const {email, hashedPassword, pseudoId, isEmailVerified} = props
   const nickname = email.split('@')[0]!
   const preferredName = nickname.length === 1 ? nickname.repeat(2) : nickname
+  const userId = `local|${generateUID()}`
   const newUser = new User({
+    id: userId,
     preferredName,
     email,
+    picture: await generateIdenticon(userId, preferredName),
     identities: [],
     pseudoId
   })
-  const {id: userId} = newUser
   const identityId = `${userId}:${AuthIdentityTypeEnum.LOCAL}`
   newUser.identities.push(new AuthIdentityLocal({hashedPassword, id: identityId, isEmailVerified}))
   return newUser
diff --git a/scripts/webpack/dev.servers.config.js b/scripts/webpack/dev.servers.config.js
index 0d8e4db7e0e..198cebc52b4 100644
--- a/scripts/webpack/dev.servers.config.js
+++ b/scripts/webpack/dev.servers.config.js
@@ -34,8 +34,7 @@ module.exports = {
   },
   output: {
     filename: '[name].js',
-    path: path.join(PROJECT_ROOT, 'dev'),
-    libraryTarget: 'commonjs'
+    path: path.join(PROJECT_ROOT, 'dev')
   },
   resolve: {
     alias: {
@@ -54,13 +53,15 @@ module.exports = {
   target: 'node',
   externals: [
     nodeExternals({
-      allowlist: [/parabol-client/, /parabol-server/]
+      allowlist: [/parabol-client/, /parabol-server/, /@dicebear/]
     })
   ],
   plugins: [
     new webpack.DefinePlugin({
       __PRODUCTION__: false
-    })
+    }),
+    new webpack.IgnorePlugin({resourceRegExp: /^exiftool-vendored$/, contextRegExp: /@dicebear/}),
+    new webpack.IgnorePlugin({resourceRegExp: /^@resvg\/resvg-js$/, contextRegExp: /@dicebear/})
   ],
   module: {
     rules: [
diff --git a/scripts/webpack/prod.servers.config.js b/scripts/webpack/prod.servers.config.js
index 4f11b012db4..2d81fd739df 100644
--- a/scripts/webpack/prod.servers.config.js
+++ b/scripts/webpack/prod.servers.config.js
@@ -67,7 +67,7 @@ module.exports = (config) => {
     externals: [
       !noDeps &&
         nodeExternals({
-          allowlist: [/parabol-client/, /parabol-server/]
+          allowlist: [/parabol-client/, /parabol-server/, /@dicebear/]
         })
     ].filter(Boolean),
     optimization: {
@@ -92,6 +92,9 @@ module.exports = (config) => {
       new webpack.IgnorePlugin({resourceRegExp: /^canvas$/, contextRegExp: /jsdom$/}),
       // native bindings might be faster, but abandonware & not currently used
       new webpack.IgnorePlugin({resourceRegExp: /^pg-native$/, contextRegExp: /pg\/lib/}),
+      new webpack.IgnorePlugin({resourceRegExp: /^exiftool-vendored$/, contextRegExp: /@dicebear/}),
+      new webpack.IgnorePlugin({resourceRegExp: /^@resvg\/resvg-js$/, contextRegExp: /@dicebear/}),
+
       noDeps &&
         new CopyWebpackPlugin({
           patterns: [
diff --git a/scripts/webpack/toolbox.config.js b/scripts/webpack/toolbox.config.js
index d63a8f6505c..bb3913a2b78 100644
--- a/scripts/webpack/toolbox.config.js
+++ b/scripts/webpack/toolbox.config.js
@@ -49,13 +49,15 @@ module.exports = {
   target: 'node',
   externals: [
     nodeExternals({
-      allowlist: [/parabol-client/, '/parabol-server/']
+      allowlist: [/parabol-client/, /parabol-server/, /@dicebear/]
     })
   ],
   plugins: [
     new webpack.DefinePlugin({
       __PRODUCTION__: true
-    })
+    }),
+    new webpack.IgnorePlugin({resourceRegExp: /^exiftool-vendored$/, contextRegExp: /@dicebear/}),
+    new webpack.IgnorePlugin({resourceRegExp: /^@resvg\/resvg-js$/, contextRegExp: /@dicebear/})
     // new CircularDependencyPlugin({
     //   // `onStart` is called before the cycle detection starts
     //   onStart({compilation}) {
diff --git a/yarn.lock b/yarn.lock
index 19cdfead7f3..7d65afd154f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3007,6 +3007,27 @@
   resolved "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-2.1.0.tgz#8c7e8028a5fc22ad102fa542b0a446c956830455"
   integrity sha512-smLocSfrt3s53H/XSVP3/1kP42oqvrkjUPtyaFd1F79ux24oE31BKt+q0c6lsa6hOYrFzsIwyc5GXAI5JmfOew==
 
+"@dicebear/converter@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/converter/-/converter-8.0.1.tgz#c037c1404f73a994ee4f943928edb367029425e1"
+  integrity sha512-65L04fN4V07WcUnwQuDYDH+zrP8WA6/UeIuqqH/Pv7VWoJtIk9qHlaA+XGpPr4qgRtkmY7uXVkrED/RMlqvUDA==
+  dependencies:
+    "@types/json-schema" "^7.0.11"
+    tmp-promise "^3.0.3"
+
+"@dicebear/core@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/core/-/core-8.0.1.tgz#3ac1e98a5380071c4a1e0d874cc8ff83b1c9ba8f"
+  integrity sha512-HWqvQRpVjkboQXinCOjU3poZIMd5p+32wPvc9N5fYiXe3KQLhJNw5T5XiRttDUm3XpoTvhQ4DVTPDsXT8CqrTg==
+  dependencies:
+    "@dicebear/converter" "8.0.1"
+    "@types/json-schema" "^7.0.11"
+
+"@dicebear/initials@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@dicebear/initials/-/initials-8.0.1.tgz#0e9686abd67af452f650373ab1156104aecb37ed"
+  integrity sha512-ctO1f92XAms72qkhiKI/vvS/E6mco1RiTEACPJGv6hDPfdjR1vxpkzFpo3jm3RohfwOPCN5fH2l3BSinnlbzzw==
+
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"
@@ -10231,9 +10252,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001580, caniuse-lite@~1.0.0:
-  version "1.0.30001608"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz#7ae6e92ffb300e4b4ec2f795e0abab456ec06cc0"
-  integrity sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==
+  version "1.0.30001614"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001614.tgz#f894b4209376a0bf923d67d9c361d96b1dfebe39"
+  integrity sha512-jmZQ1VpmlRwHgdP1/uiKzgiAuGOfLEJsYFP4+GBou/QQ4U6IOJCB4NP1c+1p9RGLpwObcT94jA5/uO+F1vBbog==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -21251,6 +21272,13 @@ tlds@^1.192.0:
   resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.228.0.tgz#416ab76ac1a06aad0b5d6b484a13bf5a0ad63f39"
   integrity sha512-Q0TU9zh5hDs2CpRFNM7SOW3K7OSgUgJC/cMrq9t44ei4tu+G3KV8BZyIJuYVvryJHH96mKgc9WXdhgKVvGD7jg==
 
+tmp-promise@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
+  integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==
+  dependencies:
+    tmp "^0.2.0"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -21258,6 +21286,11 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+
 tmp@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"

From 43d78492940356c27690198a0bca770475a99f6e Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:15:50 -0700
Subject: [PATCH 183/183] chore(release): release v7.29.0 (#9685)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           | 2 +-
 CHANGELOG.md                            | 7 +++++++
 package.json                            | 2 +-
 packages/chronos/package.json           | 4 ++--
 packages/client/package.json            | 2 +-
 packages/embedder/package.json          | 2 +-
 packages/gql-executor/package.json      | 6 +++---
 packages/integration-tests/package.json | 2 +-
 packages/server/package.json            | 4 ++--
 9 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 305cad7da5b..eb1dd03c923 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.28.1"
+  ".": "7.29.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 450d6bbe1ad..5a371bdd6e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.29.0](https://github.com/ParabolInc/parabol/compare/v7.28.1...v7.29.0) (2024-04-29)
+
+
+### Added
+
+* initial avatars on the fly ([#9675](https://github.com/ParabolInc/parabol/issues/9675)) ([e783662](https://github.com/ParabolInc/parabol/commit/e7836627f9a36315af9b8bbd262e60f46b680920))
+
 ## [7.28.1](https://github.com/ParabolInc/parabol/compare/v7.28.0...v7.28.1) (2024-04-29)
 
 
diff --git a/package.json b/package.json
index b7e73fedc17..3fbf527e7da 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 4ff73c7de84..9bf2a082ebc 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.28.1"
+    "parabol-server": "7.29.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index b6d347b27f4..38222274f35 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 1ab680c8bcf..cba142fb90e 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <jordan.husney@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/embedder#readme",
diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
index fe462691b1e..0464d2aae00 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.28.1",
-    "parabol-server": "7.28.1",
+    "parabol-client": "7.29.0",
+    "parabol-server": "7.29.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 3b86b2296b1..02a835d564d 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index c361b35fce2..f7bd0888ab2 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <love@parabol.co> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.28.1",
+  "version": "7.29.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -122,7 +122,7 @@
     "oauth-1.0a": "^2.2.6",
     "openai": "^4.24.1",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.28.1",
+    "parabol-client": "7.29.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",