From eceb7af96b44f832dd31b43df48ed050c8b01343 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 11:36:10 -0700
Subject: [PATCH 01/18] chore(release): release v7.39.0 (#10010)

Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
---
 .release-please-manifest.json           |  2 +-
 CHANGELOG.md                            | 15 +++++++++++++++
 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, 27 insertions(+), 12 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 444fcf166a0..6054f981be4 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.38.11"
+  ".": "7.39.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 523db907f02..2a7739ff7b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.39.0](https://github.com/ParabolInc/parabol/compare/v7.38.11...v7.39.0) (2024-07-23)
+
+
+### Added
+
+* GCal event series for Standup ([#9959](https://github.com/ParabolInc/parabol/issues/9959)) ([8a6659a](https://github.com/ParabolInc/parabol/commit/8a6659a2373a101a970b2fb2a1004c0e21c85f65))
+
+
+### Changed
+
+* Fix test ([#10013](https://github.com/ParabolInc/parabol/issues/10013)) ([23c8048](https://github.com/ParabolInc/parabol/commit/23c8048eb88916d5f2021dc0e830fd3b953452e6))
+* Move more integration GraphQL types to SDL ([#10015](https://github.com/ParabolInc/parabol/issues/10015)) ([1279971](https://github.com/ParabolInc/parabol/commit/12799719081e53fdf0976005dabf851fc2908c42))
+* Reduce Azure DevOps scope ([#9999](https://github.com/ParabolInc/parabol/issues/9999)) ([e6a3c7d](https://github.com/ParabolInc/parabol/commit/e6a3c7d12b0f4e7a3b7caa4fe62ab81764c9f577))
+* upgrade from gpt-3.5-turbo to gpt-4o-mini ([#10002](https://github.com/ParabolInc/parabol/issues/10002)) ([b816727](https://github.com/ParabolInc/parabol/commit/b816727460620637f49027a1b32e47d3a2676152))
+
 ## [7.38.11](https://github.com/ParabolInc/parabol/compare/v7.38.10...v7.38.11) (2024-07-19)
 
 
diff --git a/package.json b/package.json
index dcd82b5d9e7..7c1052a333a 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.38.11",
+  "version": "7.39.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 729ca876e99..c71da5ef114 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.38.11",
+  "version": "7.39.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.38.11"
+    "parabol-server": "7.39.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index b968a7a3998..1a7a040a775 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.38.11",
+  "version": "7.39.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index b80958ac24f..812dc94a797 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.38.11",
+  "version": "7.39.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 0d125435860..71a1e1dea06 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.38.11",
+  "version": "7.39.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.38.11",
-    "parabol-server": "7.38.11",
+    "parabol-client": "7.39.0",
+    "parabol-server": "7.39.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index bb4a3bf0cc5..a0cb0594b08 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.38.11",
+  "version": "7.39.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index bef4d94ca22..ec51fbe3381 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.38.11",
+  "version": "7.39.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "openai": "^4.24.1",
     "openapi-fetch": "^0.9.7",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.38.11",
+    "parabol-client": "7.39.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 90de32f702849a92be28dff42188445947a54325 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 23 Jul 2024 16:26:54 -0700
Subject: [PATCH 02/18] chore(rethinkdb): TeamMember: Phase 2 (#9993)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 packages/server/__tests__/globalTeardown.ts   |   1 +
 .../__tests__/isOrgVerified.test.ts           |   1 +
 .../__tests__/usersCustomRedisQueries.test.ts |   3 -
 .../mutations/checkRethinkPgEquality.ts       |  36 +++--
 .../1721356124871_TeamMember-phase2.ts        | 144 ++++++++++++++++++
 packages/server/postgres/utils/checkEqBase.ts |   4 +-
 .../postgres/utils/rethinkEqualityFns.ts      |   5 +
 .../isRequestToJoinDomainAllowed.test.ts      |   1 +
 8 files changed, 176 insertions(+), 19 deletions(-)
 create mode 100644 packages/server/postgres/migrations/1721356124871_TeamMember-phase2.ts

diff --git a/packages/server/__tests__/globalTeardown.ts b/packages/server/__tests__/globalTeardown.ts
index b5a3cd1633f..03744b6ffa4 100644
--- a/packages/server/__tests__/globalTeardown.ts
+++ b/packages/server/__tests__/globalTeardown.ts
@@ -6,6 +6,7 @@ async function teardown() {
   const r = await getRethink()
   await r.getPoolMaster()?.drain()
   await getKysely().destroy()
+  console.log('global teardown destroy')
   await getRedis().quit()
 }
 
diff --git a/packages/server/dataloader/__tests__/isOrgVerified.test.ts b/packages/server/dataloader/__tests__/isOrgVerified.test.ts
index ed37f906642..2c6957b83f4 100644
--- a/packages/server/dataloader/__tests__/isOrgVerified.test.ts
+++ b/packages/server/dataloader/__tests__/isOrgVerified.test.ts
@@ -68,6 +68,7 @@ afterEach(async () => {
 
 afterAll(async () => {
   await getKysely().destroy()
+  console.log('org verified destroy')
 })
 
 test('Founder is billing lead', async () => {
diff --git a/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts b/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts
index 50fcc7fa77f..3d1dbb8c44e 100644
--- a/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts
+++ b/packages/server/dataloader/__tests__/usersCustomRedisQueries.test.ts
@@ -5,10 +5,7 @@ import isValid from '../../graphql/isValid'
 import getPg from '../../postgres/getPg'
 
 afterAll(async () => {
-  const pg = getPg()
   const dataloader = getDataLoader()
-
-  await pg.end()
   dataloader.dispose(true)
   // TODO shutdown redis to properly end test
 })
diff --git a/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts b/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts
index 47c8215ed43..927cf3685fe 100644
--- a/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts
+++ b/packages/server/graphql/private/mutations/checkRethinkPgEquality.ts
@@ -2,7 +2,13 @@ import getRethink from '../../../database/rethinkDriver'
 import getFileStoreManager from '../../../fileStorage/getFileStoreManager'
 import getKysely from '../../../postgres/getKysely'
 import {checkRowCount, checkTableEq} from '../../../postgres/utils/checkEqBase'
-import {compareRValUndefinedAsNull, defaultEqFn} from '../../../postgres/utils/rethinkEqualityFns'
+import {
+  compareDateAlmostEqual,
+  compareRValUndefinedAsFalse,
+  compareRValUndefinedAsNull,
+  compareRValUndefinedAsNullAndTruncateRVal,
+  defaultEqFn
+} from '../../../postgres/utils/rethinkEqualityFns'
 import {MutationResolvers} from '../resolverTypes'
 
 const handleResult = async (
@@ -27,35 +33,37 @@ const checkRethinkPgEquality: MutationResolvers['checkRethinkPgEquality'] = asyn
 ) => {
   const r = await getRethink()
 
-  if (tableName === 'OrganizationUser') {
+  if (tableName === 'TeamMember') {
     const rowCountResult = await checkRowCount(tableName)
     const rethinkQuery = (joinedAt: Date, id: string | number) => {
       return r
-        .table('OrganizationUser' as any)
+        .table('TeamMember' as any)
         .between([joinedAt, id], [r.maxval, r.maxval], {
-          index: 'joinedAtId',
+          index: 'updatedAtId',
           leftBound: 'open',
           rightBound: 'closed'
         })
-        .orderBy({index: 'joinedAtId'}) as any
+        .orderBy({index: 'updatedAtId'}) as any
     }
     const pgQuery = async (ids: string[]) => {
-      return getKysely().selectFrom('OrganizationUser').selectAll().where('id', 'in', ids).execute()
+      return getKysely().selectFrom('TeamMember').selectAll().where('id', 'in', ids).execute()
     }
     const errors = await checkTableEq(
       rethinkQuery,
       pgQuery,
       {
         id: defaultEqFn,
-        suggestedTier: compareRValUndefinedAsNull,
-        inactive: defaultEqFn,
-        joinedAt: defaultEqFn,
-        orgId: defaultEqFn,
-        removedAt: defaultEqFn,
-        role: compareRValUndefinedAsNull,
+        isNotRemoved: compareRValUndefinedAsFalse,
+        isLead: compareRValUndefinedAsFalse,
+        isSpectatingPoker: compareRValUndefinedAsFalse,
+        email: defaultEqFn,
+        openDrawer: compareRValUndefinedAsNull,
+        picture: defaultEqFn,
+        preferredName: compareRValUndefinedAsNullAndTruncateRVal(100),
+        teamId: defaultEqFn,
         userId: defaultEqFn,
-        tier: defaultEqFn,
-        trialStartDate: compareRValUndefinedAsNull
+        createdAt: compareDateAlmostEqual,
+        updatedAt: compareDateAlmostEqual
       },
       maxErrors
     )
diff --git a/packages/server/postgres/migrations/1721356124871_TeamMember-phase2.ts b/packages/server/postgres/migrations/1721356124871_TeamMember-phase2.ts
new file mode 100644
index 00000000000..f88c3c6a97d
--- /dev/null
+++ b/packages/server/postgres/migrations/1721356124871_TeamMember-phase2.ts
@@ -0,0 +1,144 @@
+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()
+    })
+  })
+
+  // add a dummy date for nulls
+  const parabolEpoch = new Date('2016-06-01')
+  await r
+    .table('TeamMember')
+    .update((row) => ({
+      updatedAt: row('updatedAt').default(parabolEpoch),
+      createdAt: row('createdAt').default(parabolEpoch)
+    }))
+    .run()
+  const strDates = await r
+    .table('TeamMember')
+    .filter((row) => row('updatedAt').typeOf().eq('STRING'))
+    .pluck('updatedAt', 'id', 'createdAt')
+    .run()
+  const dateDates = strDates.map((d) => ({
+    id: d.id,
+    updatedAt: new Date(d.updatedAt),
+    createdAt: new Date(d.createdAt)
+  }))
+  // some dates are
+  await r(dateDates)
+    .forEach((row: any) => {
+      return r
+        .table('TeamMember')
+        .get(row('id'))
+        .update({updatedAt: row('updatedAt')})
+    })
+    .run()
+
+  try {
+    console.log('Adding index')
+    await r
+      .table('TeamMember')
+      .indexCreate('updatedAtId', (row: any) => [row('updatedAt'), row('id')])
+      .run()
+    await r.table('TeamMember').indexWait().run()
+  } catch {
+    // index already exists
+  }
+
+  await console.log('Adding index complete')
+  const MAX_PG_PARAMS = 65545
+  const PG_COLS = [
+    'id',
+    'isNotRemoved',
+    'isLead',
+    'isSpectatingPoker',
+    'email',
+    'openDrawer',
+    'picture',
+    'preferredName',
+    'teamId',
+    'userId',
+    'createdAt',
+    'updatedAt'
+  ] as const
+  type TeamMember = {
+    [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++) {
+    console.log('inserting row', i * BATCH_SIZE, String(curUpdatedAt), String(curId))
+    const rawRowsToInsert = (await r
+      .table('TeamMember')
+      .between([curUpdatedAt, curId], [r.maxval, r.maxval], {
+        index: 'updatedAtId',
+        leftBound: 'open',
+        rightBound: 'closed'
+      })
+      .orderBy({index: 'updatedAtId'})
+      .limit(BATCH_SIZE)
+      .pluck(...PG_COLS)
+      .run()) as TeamMember[]
+
+    const rowsToInsert = rawRowsToInsert.map((row) => {
+      const {preferredName, picture, ...rest} = row as any
+      return {
+        ...rest,
+        preferredName: preferredName.slice(0, 100),
+        picture: picture.slice(0, 2056)
+      }
+    })
+    if (rowsToInsert.length === 0) break
+    const lastRow = rowsToInsert[rowsToInsert.length - 1]
+    curUpdatedAt = lastRow.updatedAt
+    curId = lastRow.id
+    try {
+      await pg
+        .insertInto('TeamMember')
+        .values(rowsToInsert)
+        .onConflict((oc) => oc.doNothing())
+        .execute()
+    } catch (e) {
+      await Promise.all(
+        rowsToInsert.map(async (row) => {
+          try {
+            await pg
+              .insertInto('TeamMember')
+              .values(row)
+              .onConflict((oc) => oc.doNothing())
+              .execute()
+          } catch (e) {
+            if (e.constraint === 'fk_userId' || e.constraint === 'fk_teamId') {
+              console.log(`Skipping ${row.id} because it has no user/team`)
+              return
+            }
+            console.log(e, row)
+          }
+        })
+      )
+    }
+  }
+}
+
+export async function down() {
+  await connectRethinkDB()
+  try {
+    await r.table('TeamMember').indexDrop('updatedAtId').run()
+  } catch {
+    // index already dropped
+  }
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  await pg.deleteFrom('TeamMember').execute()
+}
diff --git a/packages/server/postgres/utils/checkEqBase.ts b/packages/server/postgres/utils/checkEqBase.ts
index bbe31117b3f..175d20a57a5 100644
--- a/packages/server/postgres/utils/checkEqBase.ts
+++ b/packages/server/postgres/utils/checkEqBase.ts
@@ -33,7 +33,7 @@ export const checkRowCount = async (tableName: string) => {
 }
 
 export async function checkTableEq(
-  rethinkQuery: (joinedAt: Date, id: string | number) => RSelection,
+  rethinkQuery: (updatedAt: Date, id: string | number) => RSelection,
   pgQuery: (ids: string[]) => Promise<PGDoc[] | null>,
   equalityMap: Record<string, (a: unknown, b: unknown) => boolean>,
   maxErrors: number | null | undefined
@@ -51,7 +51,7 @@ export async function checkTableEq(
       .run()) as RethinkDoc[]
     if (rethinkRows.length === 0) break
     const lastRow = rethinkRows[rethinkRows.length - 1]!
-    curUpdatedDate = lastRow.joinedAt
+    curUpdatedDate = lastRow.updatedAt
     curId = lastRow.id
     const ids = rethinkRows.map((t) => t.id)
     const pgRows = (await pgQuery(ids)) ?? []
diff --git a/packages/server/postgres/utils/rethinkEqualityFns.ts b/packages/server/postgres/utils/rethinkEqualityFns.ts
index 3d63e8381df..201afa28e9c 100644
--- a/packages/server/postgres/utils/rethinkEqualityFns.ts
+++ b/packages/server/postgres/utils/rethinkEqualityFns.ts
@@ -22,6 +22,11 @@ export const compareRealNumber = (rVal: unknown, pgVal: unknown) => {
   return answer
 }
 
+export const compareRValUndefinedAs =
+  (as: string | number | boolean | null | undefined) => (rVal: unknown, pgVal: unknown) => {
+    const normalizedRVal = rVal === undefined ? as : rVal
+    return defaultEqFn(normalizedRVal, pgVal)
+  }
 export const compareRValUndefinedAsNull = (rVal: unknown, pgVal: unknown) => {
   const normalizedRVal = rVal === undefined ? null : rVal
   return defaultEqFn(normalizedRVal, pgVal)
diff --git a/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts b/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
index 52b67b82600..dbe8589d6d8 100644
--- a/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
+++ b/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
@@ -72,6 +72,7 @@ afterEach(async () => {
 afterAll(async () => {
   await getKysely().destroy()
   getRedis().quit()
+  console.log('request to join destroy')
 })
 
 test('Only the biggest org with verified emails qualify', async () => {

From dbbf588069f49d870349c77dc59a5d79202964ef Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Tue, 23 Jul 2024 16:32:47 -0700
Subject: [PATCH 03/18] chore(release): release v7.39.1 (#10020)

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 6054f981be4..af120f4b997 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.39.0"
+  ".": "7.39.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a7739ff7b5..2d2ff9b9d19 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.39.1](https://github.com/ParabolInc/parabol/compare/v7.39.0...v7.39.1) (2024-07-23)
+
+
+### Changed
+
+* **rethinkdb:** TeamMember: Phase 2 ([#9993](https://github.com/ParabolInc/parabol/issues/9993)) ([90de32f](https://github.com/ParabolInc/parabol/commit/90de32f702849a92be28dff42188445947a54325))
+
 ## [7.39.0](https://github.com/ParabolInc/parabol/compare/v7.38.11...v7.39.0) (2024-07-23)
 
 
diff --git a/package.json b/package.json
index 7c1052a333a..72f16a26c6c 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.39.0",
+  "version": "7.39.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index c71da5ef114..07db583627b 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.39.0",
+  "version": "7.39.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.39.0"
+    "parabol-server": "7.39.1"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 1a7a040a775..f73ad247867 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.39.0",
+  "version": "7.39.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index 812dc94a797..b09be582a0e 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.39.0",
+  "version": "7.39.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 71a1e1dea06..8794d4de07f 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.39.0",
+  "version": "7.39.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.39.0",
-    "parabol-server": "7.39.0",
+    "parabol-client": "7.39.1",
+    "parabol-server": "7.39.1",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index a0cb0594b08..ef1d9c5acc4 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.39.0",
+  "version": "7.39.1",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index ec51fbe3381..34ca2fd235b 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.39.0",
+  "version": "7.39.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "openai": "^4.24.1",
     "openapi-fetch": "^0.9.7",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.39.0",
+    "parabol-client": "7.39.1",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 0bb8ead2adc52f64ad30ef57891791e1b3dd4ac1 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 24 Jul 2024 10:49:21 -0700
Subject: [PATCH 04/18] fix: bump pm2 version (#10027)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 package.json |   2 +-
 yarn.lock    | 573 +++++++++++++++++----------------------------------
 2 files changed, 193 insertions(+), 382 deletions(-)

diff --git a/package.json b/package.json
index 72f16a26c6c..3e6a45467c2 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.1",
+    "pm2": "^5.4.2",
     "postcss": "^8.4.21",
     "postcss-loader": "^7.0.2",
     "prettier": "^3.2.5",
diff --git a/yarn.lock b/yarn.lock
index 774e599c991..0e96a64ad3b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5451,36 +5451,6 @@
   dependencies:
     "@octokit/openapi-types" "^13.10.0"
 
-"@opencensus/core@0.0.9":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/@opencensus/core/-/core-0.0.9.tgz#b16f775435ee309433e4126af194d37313fc93b3"
-  integrity sha512-31Q4VWtbzXpVUd2m9JS6HEaPjlKvNMOiF7lWKNmXF84yUcgfAFL5re7/hjDmdyQbOp32oGc+RFV78jXIldVz6Q==
-  dependencies:
-    continuation-local-storage "^3.2.1"
-    log-driver "^1.2.7"
-    semver "^5.5.0"
-    shimmer "^1.2.0"
-    uuid "^3.2.1"
-
-"@opencensus/core@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@opencensus/core/-/core-0.0.8.tgz#df01f200c2d2fbfe14dae129a1a86fb87286db92"
-  integrity sha512-yUFT59SFhGMYQgX0PhoTR0LBff2BEhPrD9io1jWfF/VDbakRfs6Pq60rjv0Z7iaTav5gQlttJCX2+VPxFWCuoQ==
-  dependencies:
-    continuation-local-storage "^3.2.1"
-    log-driver "^1.2.7"
-    semver "^5.5.0"
-    shimmer "^1.2.0"
-    uuid "^3.2.1"
-
-"@opencensus/propagation-b3@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@opencensus/propagation-b3/-/propagation-b3-0.0.8.tgz#0751e6fd75f09400d9d3c419001e9e15a0df68e9"
-  integrity sha512-PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==
-  dependencies:
-    "@opencensus/core" "^0.0.8"
-    uuid "^3.2.1"
-
 "@opentelemetry/api@^1.0.0":
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.1.tgz#ff22eb2e5d476fbc2450a196e40dd243cc20c28f"
@@ -5635,9 +5605,9 @@
     fsevents "2.3.2"
 
 "@pm2/agent@~2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@pm2/agent/-/agent-2.0.1.tgz#0edffc54cd8ee2b12f90136264e7880f3f78c79d"
-  integrity sha512-QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@pm2/agent/-/agent-2.0.4.tgz#a6699a6c57741492129776eb5a7abc15e50672cb"
+  integrity sha512-n7WYvvTJhHLS2oBb1PjOtgLpMhgImOq8sXkPBw6smeg9LJBWZjiEgPKOpR8mn9UJZsB5P3W4V/MyvNnp31LKeA==
   dependencies:
     async "~3.2.0"
     chalk "~3.0.0"
@@ -5649,22 +5619,20 @@
     nssocket "0.6.0"
     pm2-axon "~4.0.1"
     pm2-axon-rpc "~0.7.0"
-    proxy-agent "~5.0.0"
-    semver "~7.2.0"
-    ws "~7.4.0"
+    proxy-agent "~6.3.0"
+    semver "~7.5.0"
+    ws "~7.5.10"
 
-"@pm2/io@~5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-5.0.0.tgz#623cbcaf6fe39375f20ac2e75497477a1b1ec5c5"
-  integrity sha512-3rToDVJaRoob5Lq8+7Q2TZFruoEkdORxwzFpZaqF4bmH6Bkd7kAbdPrI/z8X6k1Meq5rTtScM7MmDgppH6aLlw==
+"@pm2/io@~6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-6.0.1.tgz#300fefa485317f26e3bc348da061ca395a52149a"
+  integrity sha512-KiA+shC6sULQAr9mGZ1pg+6KVW9MF8NpG99x26Lf/082/Qy8qsTCtnJy+HQReW1A9Rdf0C/404cz0RZGZro+IA==
   dependencies:
-    "@opencensus/core" "0.0.9"
-    "@opencensus/propagation-b3" "0.0.8"
     async "~2.6.1"
     debug "~4.3.1"
     eventemitter2 "^6.3.1"
     require-in-the-middle "^5.0.0"
-    semver "6.3.0"
+    semver "~7.5.4"
     shimmer "^1.2.0"
     signal-exit "^3.0.3"
     tslib "1.9.3"
@@ -8810,7 +8778,7 @@ acorn-walk@^7.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.2.0:
+acorn-walk@^8.0.0, acorn-walk@^8.0.2:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
@@ -8825,7 +8793,7 @@ acorn@^7.0.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.0.4, acorn@^8.1.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.2, acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
@@ -8850,7 +8818,7 @@ addressparser@1.0.1:
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
   integrity sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=
 
-agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -8935,14 +8903,14 @@ ajv@^8.0.0, ajv@^8.10.0, ajv@^8.12.0, ajv@^8.6.0, ajv@^8.8.0, ajv@^8.9.0:
 amp-message@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/amp-message/-/amp-message-0.1.2.tgz#a78f1c98995087ad36192a41298e4db49e3dfc45"
-  integrity sha1-p48cmJlQh602GSpBKY5NtJ49/EU=
+  integrity sha512-JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg==
   dependencies:
     amp "0.3.1"
 
 amp@0.3.1, amp@~0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/amp/-/amp-0.3.1.tgz#6adf8d58a74f361e82c1fa8d389c079e139fc47d"
-  integrity sha1-at+NWKdPNh6CwfqNOJwHnhOfxH0=
+  integrity sha512-OwIuC4yZaRogHKiuU5WlMR5Xk/jAcpPtawWL05Gj8Lvm2F6mwoJt4O/bHI+DHwG79vWd+8OFYM4/BzYqyRd3qw==
 
 analytics-node@^6.0.0:
   version "6.2.0"
@@ -8959,9 +8927,9 @@ analytics-node@^6.0.0:
     uuid "^8.3.2"
 
 ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
@@ -9014,7 +8982,7 @@ any-promise@^1.0.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
 
-anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.0, anymatch@^3.0.3:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -9022,6 +8990,14 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 api@^5.0.7:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/api/-/api-5.0.8.tgz#a58e70f9efaf68318206521cae5f659e87035f4c"
@@ -9228,7 +9204,7 @@ ast-types@0.15.2:
   dependencies:
     tslib "^2.0.1"
 
-ast-types@^0.13.2, ast-types@^0.13.4:
+ast-types@^0.13.4:
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782"
   integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==
@@ -9240,14 +9216,6 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-listener@^0.6.0:
-  version "0.6.10"
-  resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
-  integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
-  dependencies:
-    semver "^5.3.0"
-    shimmer "^1.1.0"
-
 async-retry@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.1.tgz#139f31f8ddce50c0870b0ba558a6079684aaed55"
@@ -9262,7 +9230,12 @@ async@^2.6.3, async@~2.6.1:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.2.0, async@^3.2.3, async@~3.2.0:
+async@^3.2.0, async@~3.2.0:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+
+async@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
   integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
@@ -9611,9 +9584,9 @@ bin-links@^3.0.0:
     write-file-atomic "^4.0.0"
 
 binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
+  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
 bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
@@ -9627,12 +9600,12 @@ bl@^4.0.3, bl@^4.1.0:
 blessed@0.1.81:
   version "0.1.81"
   resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129"
-  integrity sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk=
+  integrity sha512-LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ==
 
 bodec@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/bodec/-/bodec-0.1.0.tgz#bc851555430f23c9f7650a75ef64c6a94c3418cc"
-  integrity sha1-vIUVVUMPI8n3ZQp172TGqUw0GMw=
+  integrity sha512-Ylo+MAo5BDUq1KA3f3R/MFhh+g8cnHmo8bz3YPGhI1znrMaf77ol1sfvYJzsw3nTE+Y2GryfDxBaR+AqpAkEHQ==
 
 body-parser@1.20.2:
   version "1.20.2"
@@ -9685,13 +9658,20 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
+braces@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
 browserslist@^4.14.5, browserslist@^4.21.1, browserslist@^4.21.4, browserslist@^4.21.9:
   version "4.21.10"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
@@ -10058,7 +10038,7 @@ charenc@0.0.2:
 charm@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
-  integrity sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=
+  integrity sha512-syedaZ9cPe7r3hoQA9twWYKu5AIyCswN5+szkmPBe9ccdLrj4bYaCnLVPTLd2kgVRc7+zoX4tyPgRnFKCj5YjQ==
 
 chart.js@^3.8.0:
   version "3.8.0"
@@ -10114,22 +10094,7 @@ chokidar@^3.3.1, chokidar@^3.4.0, chokidar@^3.5.1:
   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==
-  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.6.0:
+chokidar@^3.5.3, 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==
@@ -10531,7 +10496,7 @@ compute-lcm@^1.1.2:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^2.0.0:
   version "2.0.0"
@@ -10602,14 +10567,6 @@ content-type@~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"
-  integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
-  dependencies:
-    async-listener "^0.6.0"
-    emitter-listener "^1.1.1"
-
 conventional-changelog-angular@^5.0.12:
   version "5.0.13"
   resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c"
@@ -10954,7 +10911,7 @@ csstype@^3.0.2, csstype@^3.1.0:
 culvert@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/culvert/-/culvert-0.1.2.tgz#9502f5f0154a2d5a22a023e79f71cc936fa6ef6f"
-  integrity sha1-lQL18BVKLVoioCPnn3HMk2+m728=
+  integrity sha512-yi1x3EAWKjQTreYWeSd98431AV+IEE0qoDyOoaHJ7KJ21gv6HtBXHVLX74opVSGqcR8/AbjJBHAHpcOy2bj5Gg==
 
 d@1, d@^1.0.1:
   version "1.0.1"
@@ -10981,11 +10938,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-uri-to-buffer@3:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
-  integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
-
 data-uri-to-buffer@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz#540bd4c8753a25ee129035aebdedf63b078703c7"
@@ -11036,11 +10988,16 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-dayjs@^1.11.3, dayjs@~1.11.5:
+dayjs@^1.11.3:
   version "1.11.9"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.9.tgz#9ca491933fadd0a60a2c19f6c237c03517d71d1a"
   integrity sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==
 
+dayjs@~1.11.5:
+  version "1.11.12"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.12.tgz#5245226cc7f40a15bf52e0b99fd2a04669ccac1d"
+  integrity sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==
+
 dayjs@~1.8.24:
   version "1.8.36"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50"
@@ -11100,10 +11057,10 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+debug@4, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
   dependencies:
     ms "2.1.2"
 
@@ -11114,6 +11071,13 @@ debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.0, debug@^4.2.0, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -11166,7 +11130,7 @@ deep-extend@0.6.0, deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -11230,16 +11194,6 @@ defined@^1.0.0:
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf"
   integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==
 
-degenerator@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.1.tgz#7ef78ec0c8577a544477308ddf1d2d6e88d51f5b"
-  integrity sha512-LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ==
-  dependencies:
-    ast-types "^0.13.2"
-    escodegen "^1.8.1"
-    esprima "^4.0.0"
-    vm2 "^3.9.3"
-
 degenerator@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-5.0.1.tgz#9403bf297c6dad9a1ece409b37db27954f91f2f5"
@@ -11665,13 +11619,6 @@ email-addresses@^3.0.1:
   resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.1.0.tgz#cabf7e085cbdb63008a70319a74e6136188812fb"
   integrity sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==
 
-emitter-listener@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
-  integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
-  dependencies:
-    shimmer "^1.2.0"
-
 emittery@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
@@ -11895,18 +11842,6 @@ 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.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==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 escodegen@^2.0.0, escodegen@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
@@ -12063,7 +11998,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -12109,17 +12044,17 @@ eventemitter-asyncresource@^1.0.0:
 eventemitter2@5.0.1, eventemitter2@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452"
-  integrity sha1-YZegldX7a1folC9v1+qtY6CclFI=
+  integrity sha512-5EM1GHXycJBS6mauYAbVKT1cVs7POKWb2NXD4Vyt8dDqeZa7LaDK1/sjtL+Zb0lzTpSNil4596Dyu97hz37QLg==
 
 eventemitter2@^6.3.1:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
-  integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==
+  version "6.4.9"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.9.tgz#41f2750781b4230ed58827bc119d293471ecb125"
+  integrity sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==
 
 eventemitter2@~0.4.14:
   version "0.4.14"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
-  integrity sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=
+  integrity sha512-K7J4xq5xAD5jHsGM5ReWXRTFa3JRGofHiMcVgQ8PRwgWxzjHpMWCIzsmyf60+mh8KLsqYPcjUMa0AC4hd6lPyQ==
 
 eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.7"
@@ -12340,7 +12275,7 @@ fast-json-stringify@^5.7.0:
     json-schema-ref-resolver "^1.0.1"
     rfdc "^1.2.0"
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -12435,7 +12370,7 @@ fbjs@^0.8.15, fbjs@^3.0.0, fbjs@^3.0.2, fbjs@^3.0.4:
 fclone@1.0.11, fclone@~1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fclone/-/fclone-1.0.11.tgz#10e85da38bfea7fc599341c296ee1d77266ee640"
-  integrity sha1-EOhdo4v+p/xZk0HClu4ddyZu5kA=
+  integrity sha512-GDqVQezKzRABdeqflsgMr7ktzgF9CyS+p2oe0jJqUY6izSSbhPIQJDpoU4PtGcD7VPM9xh/dVrTu6z1nwgmEGw==
 
 fetch-har@^8.1.5:
   version "8.1.5"
@@ -12470,11 +12405,6 @@ file-loader@6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-file-uri-to-path@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba"
-  integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==
-
 filelist@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83"
@@ -12482,10 +12412,10 @@ filelist@^1.0.1:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.0.1, fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -12744,27 +12674,19 @@ fs-readdir-recursive@^1.1.0:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@2.3.2, fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@2.3.2, fsevents@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
-ftp@^0.3.10:
-  version "0.3.10"
-  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
-  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
-  dependencies:
-    readable-stream "1.1.x"
-    xregexp "2.0.0"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+fsevents@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.2:
+function-bind@^1.1.1, 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==
@@ -12920,18 +12842,6 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-get-uri@3:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c"
-  integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==
-  dependencies:
-    "@tootallnate/once" "1"
-    data-uri-to-buffer "3"
-    debug "4"
-    file-uri-to-path "2"
-    fs-extra "^8.1.0"
-    ftp "^0.3.10"
-
 get-uri@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.2.tgz#e019521646f4a8ff6d291fbaea2c46da204bb75b"
@@ -12963,7 +12873,7 @@ git-diff@^2.0.6:
 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"
-  integrity sha1-SbIV4kLr5Dqkx1Ybu6SZUhdSCA8=
+  integrity sha512-bLQypt14llVXBg0S0u8q8HmU7g9p3ysH+NvVlae5vILuUvs759665HvmR5+wb04KjHyjFcDRxdYb4kyNnluMUQ==
 
 git-raw-commits@^2.0.8:
   version "2.0.11"
@@ -12995,7 +12905,7 @@ git-semver-tags@^4.1.1:
 git-sha1@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/git-sha1/-/git-sha1-0.1.2.tgz#599ac192b71875825e13a445f3a6e05118c2f745"
-  integrity sha1-WZrBkrcYdYJeE6RF86bgURjC90U=
+  integrity sha512-2e/nZezdVlyCopOCYHeW0onkbZg7xP1Ad6pndPy1rCygeRykefUS6r7oA5cJRGEFvseiaz5a/qUHFVX1dd6Isg==
 
 git-up@^6.0.0:
   version "6.0.0"
@@ -13082,7 +12992,7 @@ glob@^10.3.7:
     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:
+glob@^7.0.0, glob@^7.0.3, 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"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -13438,11 +13348,9 @@ has-unicode@^2.0.0, has-unicode@^2.0.1:
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
 has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
+  integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
 
 hasown@^2.0.0:
   version "2.0.0"
@@ -13451,6 +13359,13 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
+hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  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"
@@ -13643,7 +13558,7 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
   integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
-http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
+http-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
   integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
@@ -13702,7 +13617,7 @@ http2-client@^1.2.5:
   resolved "https://registry.yarnpkg.com/http2-client/-/http2-client-1.3.5.tgz#20c9dc909e3cc98284dd20af2432c524086df181"
   integrity sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==
 
-https-proxy-agent@5, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
+https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -13895,12 +13810,12 @@ infer-owner@^1.0.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -14018,7 +13933,7 @@ ioredis@^5.2.3:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
-ip@^1.1.5, ip@^1.1.8:
+ip@^1.1.8:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396"
   integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ==
@@ -14107,13 +14022,20 @@ is-core-module@^2.13.0:
   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:
+is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.9.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
+  integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
+  dependencies:
+    hasown "^2.0.2"
+
 is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -14146,7 +14068,7 @@ is-extendable@^1.0.0:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
@@ -14425,7 +14347,7 @@ is-wsl@^3.1.0:
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isarray@~1.0.0:
   version "1.0.0"
@@ -14945,7 +14867,7 @@ jose@^4.11.4:
 js-git@^0.7.8:
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/js-git/-/js-git-0.7.8.tgz#52fa655ab61877d6f1079efc6534b554f31e5444"
-  integrity sha1-UvplWrYYd9bxB578ZTS1VPMeVEQ=
+  integrity sha512-+E5ZH/HeRnoc/LW0AmAyhU+mNcWBzAKE+30+IDMLSLbbK+Tdt02AdkOKq9u15rlJsDEGFqtgckc8ZM59LhhiUA==
   dependencies:
     bodec "^0.1.0"
     culvert "^0.1.2"
@@ -14965,7 +14887,7 @@ js-yaml@3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0:
+js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0, js-yaml@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
@@ -15141,7 +15063,7 @@ json-stringify-nice@^1.1.4:
 json-stringify-safe@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
 json-to-ast@^2.0.3:
   version "2.1.0"
@@ -15181,7 +15103,7 @@ jsonc-parser@3.2.0:
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -15344,7 +15266,7 @@ launch-editor@^2.6.1:
 lazy@~1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690"
-  integrity sha1-2qBoIGKCVCwIgojpdcKXwa53tpA=
+  integrity sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==
 
 lerna@^6.4.1:
   version "6.4.1"
@@ -15390,14 +15312,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 libbase64@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
@@ -15751,11 +15665,6 @@ lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-driver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
-  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
-
 log-symbols@^4.0.0, log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
@@ -16358,7 +16267,7 @@ modify-values@^1.0.0:
 module-details-from-path@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/module-details-from-path/-/module-details-from-path-1.0.3.tgz#114c949673e2a8a35e9d35788527aa37b679da2b"
-  integrity sha1-EUyUlnPiqKNenTV4hSeqN7Z52is=
+  integrity sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==
 
 moment@^2.29.3:
   version "2.29.4"
@@ -16510,7 +16419,7 @@ nest-graphql-endpoint@mattkrick/nest-graphql-endpoint#add-options:
     tslib "~2.3.1"
     typescript "^4.2.4"
 
-netmask@^2.0.1, netmask@^2.0.2:
+netmask@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
   integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
@@ -16892,7 +16801,7 @@ npmlog@^6.0.0, npmlog@^6.0.2:
 nssocket@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/nssocket/-/nssocket-0.6.0.tgz#59f96f6ff321566f33c70f7dbeeecdfdc07154fa"
-  integrity sha1-Wflvb/MhVm8zxw99vu7N/cBxVPo=
+  integrity sha512-a9GSOIql5IqgWJR3F/JXG4KpJTA3Z53Cj0MeMvGpglytB1nxE4PdFNC0jINe27CS7cGivoynwc054EzCcT3M3w==
   dependencies:
     eventemitter2 "~0.4.14"
     lazy "~1.0.11"
@@ -17152,7 +17061,7 @@ on-headers@~1.0.2:
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -17236,18 +17145,6 @@ opentracing@>=0.12.1:
   resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.5.tgz#891fa92cd90a24e64f99bc964370227310926c85"
   integrity sha512-XLKtEfHxqrWyF1fzxznsv78w3csW41ucHnjiKnfzZLD5FN8UBDZZL1i4q0FR29zjxXhm+2Hop+5Vr/b8tKIvEg==
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 optionator@^0.9.3:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
@@ -17429,21 +17326,6 @@ p-waterfall@^2.1.1:
   dependencies:
     p-reduce "^2.0.0"
 
-pac-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz#b718f76475a6a5415c2efbe256c1c971c84f635e"
-  integrity sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==
-  dependencies:
-    "@tootallnate/once" "1"
-    agent-base "6"
-    debug "4"
-    get-uri "3"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "5"
-    pac-resolver "^5.0.0"
-    raw-body "^2.2.0"
-    socks-proxy-agent "5"
-
 pac-proxy-agent@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz#6b9ddc002ec3ff0ba5fdf4a8a21d363bcc612d75"
@@ -17458,15 +17340,6 @@ pac-proxy-agent@^7.0.1:
     pac-resolver "^7.0.0"
     socks-proxy-agent "^8.0.2"
 
-pac-resolver@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.0.tgz#1d717a127b3d7a9407a16d6e1b012b13b9ba8dc0"
-  integrity sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==
-  dependencies:
-    degenerator "^3.0.1"
-    ip "^1.1.5"
-    netmask "^2.0.1"
-
 pac-resolver@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-7.0.0.tgz#79376f1ca26baf245b96b34c339d79bff25e900c"
@@ -17511,7 +17384,7 @@ pacote@^13.0.3, pacote@^13.6.1:
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
+  integrity sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==
 
 pako@^1.0.10, pako@^1.0.3, pako@~1.0.2:
   version "1.0.11"
@@ -17646,7 +17519,7 @@ path-extra@^1.0.2:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-is-inside@^1.0.2:
   version "1.0.2"
@@ -17809,9 +17682,9 @@ pidusage@^2.0.21:
     safe-buffer "^5.2.1"
 
 pidusage@~3.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-3.0.0.tgz#69108079724c9afdd958644b920bc40bac964044"
-  integrity sha512-8VJLToXhj+RYZGNVw8oxc7dS54iCQXUJ+MDFHezQ/fwF5B8W4OWodAMboc1wb08S/4LiHwAmkT4ohf/d3YPPsw==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-3.0.2.tgz#6faa5402b2530b3af2cf93d13bcf202889724a53"
+  integrity sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==
   dependencies:
     safe-buffer "^5.2.1"
 
@@ -17917,7 +17790,7 @@ pm2-deploy@~1.0.2:
 pm2-multimeter@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/pm2-multimeter/-/pm2-multimeter-0.1.2.tgz#1a1e55153d41a05534cea23cfe860abaa0eb4ace"
-  integrity sha1-Gh5VFT1BoFU0zqI8/oYKuqDrSs4=
+  integrity sha512-S+wT6XfyKfd7SJIBqRgOctGxaBzUOmVQzTAS+cg04TsEUObJVreha7lvCfX8zzGVr871XwCSnHUU7DQQ5xEsfA==
   dependencies:
     charm "~0.1.1"
 
@@ -17932,13 +17805,13 @@ pm2-sysmonit@^1.2.8:
     systeminformation "^5.7"
     tx2 "~1.0.4"
 
-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==
+pm2@^5.4.2:
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/pm2/-/pm2-5.4.2.tgz#34a50044cf772c5528d68e2713f84383ebb2e09b"
+  integrity sha512-ynVpBwZampRH3YWLwRepZpQ7X3MvpwLIaqIdFEeBYEhaXbHmEx2KqOdxGV4T54wvKBhH3LixvU1j1bK4/sq7Tw==
   dependencies:
     "@pm2/agent" "~2.0.0"
-    "@pm2/io" "~5.0.0"
+    "@pm2/io" "~6.0.1"
     "@pm2/js-api" "~0.8.0"
     "@pm2/pm2-version-check" latest
     async "~3.2.0"
@@ -17953,6 +17826,7 @@ pm2@^5.3.1:
     enquirer "2.3.6"
     eventemitter2 "5.0.1"
     fclone "1.0.11"
+    js-yaml "~4.1.0"
     mkdirp "1.0.4"
     needle "2.4.0"
     pidusage "~3.0"
@@ -17965,7 +17839,6 @@ pm2@^5.3.1:
     source-map-support "0.5.21"
     sprintf-js "1.1.2"
     vizion "~2.2.1"
-    yamljs "0.3.0"
   optionalDependencies:
     pm2-sysmonit "^1.2.8"
 
@@ -18119,11 +17992,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "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@^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"
@@ -18209,7 +18077,7 @@ promise@^7.1.1:
 promptly@^2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/promptly/-/promptly-2.2.0.tgz#2a13fa063688a2a5983b161fff0108a07d26fc74"
-  integrity sha1-KhP6BjaIoqWYOxYf/wEIoH0m/HQ=
+  integrity sha512-aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA==
   dependencies:
     read "^1.0.4"
 
@@ -18471,21 +18339,21 @@ proxy-agent@^6.4.0:
     proxy-from-env "^1.1.0"
     socks-proxy-agent "^8.0.2"
 
-proxy-agent@~5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-5.0.0.tgz#d31405c10d6e8431fde96cba7a0c027ce01d633b"
-  integrity sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==
+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==
   dependencies:
-    agent-base "^6.0.0"
-    debug "4"
-    http-proxy-agent "^4.0.0"
-    https-proxy-agent "^5.0.0"
-    lru-cache "^5.1.1"
-    pac-proxy-agent "^5.0.0"
-    proxy-from-env "^1.0.0"
-    socks-proxy-agent "^5.0.0"
+    agent-base "^7.0.2"
+    debug "^4.3.4"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.2"
+    lru-cache "^7.14.1"
+    pac-proxy-agent "^7.0.1"
+    proxy-from-env "^1.1.0"
+    socks-proxy-agent "^8.0.2"
 
-proxy-from-env@^1.0.0, proxy-from-env@^1.1.0:
+proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
@@ -18622,16 +18490,6 @@ raw-body@2.5.2:
     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==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-loader@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
@@ -18985,16 +18843,6 @@ read@1, read@^1.0.4, read@^1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@1.1.x:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -19270,13 +19118,13 @@ require-from-string@^2.0.2:
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-in-the-middle@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-5.1.0.tgz#b768f800377b47526d026bbf5a7f727f16eb412f"
-  integrity sha512-M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz#4b71e3cc7f59977100af9beb76bf2d056a5a6de2"
+  integrity sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==
   dependencies:
     debug "^4.1.1"
     module-details-from-path "^1.0.3"
-    resolve "^1.12.0"
+    resolve "^1.22.1"
 
 require-main-filename@^2.0.0:
   version "2.0.0"
@@ -19332,7 +19180,7 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
   integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
-resolve@^1.0.0, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.9.0:
+resolve@^1.0.0, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.9.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -19341,7 +19189,7 @@ 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:
+resolve@^1.1.6, resolve@^1.12.0:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -19552,11 +19400,16 @@ sanitizer@^0.1.3:
   resolved "https://registry.yarnpkg.com/sanitizer/-/sanitizer-0.1.3.tgz#d4f0af7475d9a7baf2a9e5a611718baa178a39e1"
   integrity sha1-1PCvdHXZp7ryqeWmEXGLqheKOeE=
 
-sax@>=0.6.0, sax@^1.2.4:
+sax@>=0.6.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
   integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
 
+sax@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
+  integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
+
 saxes@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
@@ -19624,16 +19477,11 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.6.0, semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -19646,7 +19494,7 @@ semver@7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
-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:
+semver@7.x, semver@^7.0.0, semver@^7.1.1, 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.5.0, 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==
@@ -19658,10 +19506,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@~7.2.0:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.3.tgz#3641217233c6382173c76bf2c7ecd1e1c16b0d8a"
-  integrity sha512-utbW9Z7ZxVvwiIWkdOMLOR9G/NFXh2aRucghkVrEMJWuC++r3lCkBC3LwqBinyHzGMAJxY5tn6VakZGHObq5ig==
+semver@^7.2:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
 send@0.18.0:
   version "0.18.0"
@@ -19820,7 +19668,7 @@ shelljs@^0.8.1:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shimmer@^1.1.0, shimmer@^1.2.0:
+shimmer@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
   integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
@@ -20000,15 +19848,6 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
-socks-proxy-agent@5, socks-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e"
-  integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "4"
-    socks "^2.3.3"
-
 socks-proxy-agent@^6.0.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
@@ -20036,7 +19875,7 @@ socks-proxy-agent@^8.0.2:
     debug "^4.3.4"
     socks "^2.7.1"
 
-socks@^2.3.3, socks@^2.6.2, socks@^2.7.1:
+socks@^2.6.2, socks@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
   integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
@@ -20204,7 +20043,7 @@ sprintf-js@1.1.2:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 ssh2-streams@0.4.10:
   version "0.4.10"
@@ -20430,11 +20269,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -20654,9 +20488,9 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 systeminformation@^5.7:
-  version "5.21.11"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.21.11.tgz#c1a0b2f0f338903bb7bc1759db9fcd34b7312360"
-  integrity sha512-dIJEGoP5W7k4JJGje/b+inJrOL5hV9LPsUi5ndBvJydI80CVEcu2DZYgt6prdRErDi2SA4SqYd/WMR4b+u34mA==
+  version "5.22.11"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.22.11.tgz#42be7b650ce0a8b940c06219a6647f6ab3f7a349"
+  integrity sha512-aLws5yi4KCHTb0BVvbodQY5bY8eW4asMRDTxTW46hqw9lGjACX6TlLdJrkdoHYRB0qs+MekqEq1zG7WDnWE8Ug==
 
 tailwind-merge@^1.13.2:
   version "1.13.2"
@@ -21230,11 +21064,16 @@ 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.6.2:
+tslib@^2.0.0, 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==
 
+tslib@^2.0.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+
 tslib@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
@@ -21260,7 +21099,7 @@ tunnel-agent@^0.6.0:
 tv4@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tv4/-/tv4-1.3.0.tgz#d020c846fadd50c855abb25ebaecc68fc10f7963"
-  integrity sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM=
+  integrity sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
@@ -21286,13 +21125,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -21660,7 +21492,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@^3.2.1, uuid@^3.3.2:
+uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -21788,14 +21620,6 @@ vizion@~2.2.1:
     ini "^1.3.5"
     js-git "^0.7.8"
 
-vm2@^3.9.3:
-  version "3.9.18"
-  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.18.tgz#d919848bee191a0410c5cc1c5aac58adfd03ce9a"
-  integrity sha512-iM7PchOElv6Uv6Q+0Hq7dcgDtWWT6SizYqVcvol+1WQc+E9HlgTCnPozbQNSP3yDV9oXHQOEQu530w2q/BCVZg==
-  dependencies:
-    acorn "^8.7.0"
-    acorn-walk "^8.2.0"
-
 vscode-apollo-relay@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/vscode-apollo-relay/-/vscode-apollo-relay-1.5.2.tgz#0893f56ba11debf85391aefa9241e8afd356c012"
@@ -22133,11 +21957,6 @@ 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:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
-
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -22342,7 +22161,7 @@ wrap-ansi@^8.1.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^2.3.0, write-file-atomic@^2.4.2:
   version "2.4.3"
@@ -22404,7 +22223,7 @@ write-pkg@^4.0.0:
     type-fest "^0.4.1"
     write-json-file "^3.2.0"
 
-ws@7.4.6, ws@~7.4.0:
+ws@7.4.6:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
@@ -22414,7 +22233,12 @@ ws@8.13.0, ws@^8.12.0, ws@^8.13.0, ws@^8.9.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
   integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
-ws@^7.0.0, ws@^7.3.1:
+ws@^7.0.0, ws@~7.5.10:
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
+
+ws@^7.3.1:
   version "7.5.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
   integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
@@ -22472,11 +22296,6 @@ xpath@0.0.32, xpath@^0.0.32:
   resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"
   integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==
 
-xregexp@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
-  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
-
 xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -22517,14 +22336,6 @@ yaml@^2.3.1:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
   integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
 
-yamljs@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b"
-  integrity sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==
-  dependencies:
-    argparse "^1.0.7"
-    glob "^7.0.5"
-
 yamux-js@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yamux-js/-/yamux-js-0.1.2.tgz#a157e4922f8f0393725955c352b418f16259fd48"

From 73a5881709f9345767c2a233cbe28716b6c3b8e1 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 24 Jul 2024 12:06:52 -0700
Subject: [PATCH 05/18] chore(rethinkdb): TeamMember: Phase 3 (#10003)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 codegen.json                                  |   4 +-
 packages/server/database/rethinkDriver.ts     |   5 -
 packages/server/database/types/TeamMember.ts  |  55 -----
 .../dataloader/foreignKeyLoaderMakers.ts      |  17 ++
 .../dataloader/primaryKeyLoaderMakers.ts      |   4 +
 .../rethinkForeignKeyLoaderMakers.ts          |  28 ---
 .../rethinkPrimaryKeyLoaderMakers.ts          |   1 -
 .../server/graphql/mutations/archiveTeam.ts   |  10 +-
 .../mutations/helpers/createTeamAndLeader.ts  |   5 +-
 .../mutations/helpers/removeTeamMember.ts     |  12 +-
 .../helpers/sendPokerMeetingRevoteEvent.ts    |   2 +-
 .../server/graphql/mutations/joinMeeting.ts   |   4 +-
 .../graphql/mutations/promoteToTeamLead.ts    |  10 -
 .../graphql/mutations/removeTeamMember.ts     |   8 +-
 .../graphql/mutations/setPokerSpectate.ts     |   7 +-
 .../graphql/mutations/startSprintPoker.ts     |   2 +-
 .../graphql/mutations/toggleTeamDrawer.ts     |  15 --
 .../private/mutations/changeEmailDomain.ts    |   7 -
 .../private/mutations/hardDeleteUser.ts       |   1 -
 .../graphql/private/mutations/updateEmail.ts  |  27 +--
 .../graphql/private/typeDefs/_legacy.graphql  |  17 --
 .../mutations/acceptRequestToJoinDomain.ts    |   4 +-
 .../public/mutations/updateUserProfile.ts     |  36 +--
 .../public/mutations/uploadUserImage.ts       |  31 +--
 .../RepoIntegrationQueryPayload.graphql       |  16 ++
 .../public/typeDefs/TeamMember.graphql        | 133 ++++++++++
 .../graphql/public/typeDefs/_legacy.graphql   |  17 --
 .../types/AcceptTeamInvitationPayload.ts      |   2 +-
 .../AddTeamMemberIntegrationAuthSuccess.ts    |   2 +-
 .../server/graphql/public/types/AgendaItem.ts |   2 +-
 .../server/graphql/public/types/Company.ts    |   2 +-
 .../public/types/JiraServerIntegration.ts     |   2 +-
 .../server/graphql/public/types/NewMeeting.ts |   2 +-
 .../public/types/NotifyTaskInvolves.ts        |   2 +-
 .../RemoveTeamMemberIntegrationAuthSuccess.ts |   2 +-
 .../public/types/RemoveTeamMemberPayload.ts   |   2 +-
 packages/server/graphql/public/types/Team.ts  |   2 +-
 .../server/graphql/public/types/TeamMember.ts | 101 ++++++++
 packages/server/graphql/queries/tasks.ts      |   3 +-
 packages/server/graphql/resolvers.ts          |   2 +-
 packages/server/graphql/types/Team.ts         |   2 +-
 packages/server/graphql/types/TeamMember.ts   | 228 +-----------------
 packages/server/postgres/types/index.d.ts     |   5 +-
 .../safeMutations/acceptTeamInvitation.ts     |   2 -
 .../safeMutations/insertNewTeamMember.ts      |  43 ----
 packages/server/utils/authorization.ts        |  16 --
 46 files changed, 339 insertions(+), 561 deletions(-)
 delete mode 100644 packages/server/database/types/TeamMember.ts
 create mode 100644 packages/server/graphql/public/typeDefs/RepoIntegrationQueryPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamMember.graphql
 delete mode 100644 packages/server/safeMutations/insertNewTeamMember.ts

diff --git a/codegen.json b/codegen.json
index 99f5a4b9baf..14c1806ab5f 100644
--- a/codegen.json
+++ b/codegen.json
@@ -111,7 +111,7 @@
           "NotifyTaskInvolves": "../../database/types/NotificationTaskInvolves#default",
           "NotifyTeamArchived": "../../database/types/NotificationTeamArchived#default",
           "Organization": "./types/Organization#OrganizationSource",
-          "OrganizationUser": "../../postgres/types/index#OrganizationUser",
+          "OrganizationUser": "../../postgres/types/index#OrganizationUser as OrganizationUserDB",
           "PokerMeeting": "../../database/types/MeetingPoker#default as MeetingPoker",
           "PokerMeetingMember": "../../database/types/MeetingPokerMeetingMember#default as PokerMeetingMemberDB",
           "PokerTemplate": "../../database/types/PokerTemplate#default as PokerTemplateDB",
@@ -145,7 +145,7 @@
           "TeamHealthPhase": "./types/TeamHealthPhase#TeamHealthPhaseSource",
           "TeamHealthStage": "./types/TeamHealthStage#TeamHealthStageSource",
           "TeamInvitation": "../../database/types/TeamInvitation#default",
-          "TeamMember": "../../database/types/TeamMember#default as TeamMemberDB",
+          "TeamMember": "../../postgres/types/index#TeamMember as TeamMember",
           "TeamMemberIntegrationAuthWebhook": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrationAuthOAuth1": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrationAuthOAuth2": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
diff --git a/packages/server/database/rethinkDriver.ts b/packages/server/database/rethinkDriver.ts
index a8aa3ddd709..713d255a085 100644
--- a/packages/server/database/rethinkDriver.ts
+++ b/packages/server/database/rethinkDriver.ts
@@ -2,7 +2,6 @@ import {MasterPool, r} from 'rethinkdb-ts'
 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 {AnyMeeting, AnyMeetingSettings, AnyMeetingTeamMember} from '../postgres/types/Meeting'
 import {ScheduledJobUnion} from '../types/custom'
 import getRethinkConfig from './getRethinkConfig'
@@ -156,10 +155,6 @@ export type RethinkSchema = {
     type: TeamInvitation
     index: 'email' | 'teamId' | 'token'
   }
-  TeamMember: {
-    type: TeamMember
-    index: 'teamId' | 'userId'
-  }
   TemplateDimension: {
     type: TemplateDimension
     index: 'teamId' | 'templateId' | 'scaleId'
diff --git a/packages/server/database/types/TeamMember.ts b/packages/server/database/types/TeamMember.ts
deleted file mode 100644
index 8ca3defbeb9..00000000000
--- a/packages/server/database/types/TeamMember.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
-import {TeamDrawer} from './../../../client/__generated__/ToggleTeamDrawerMutation.graphql'
-
-interface Input {
-  isNotRemoved?: boolean
-  isLead?: boolean
-  isSpectatingPoker?: boolean
-  email: string
-  openDrawer?: TeamDrawer
-  picture: string
-  preferredName: string
-  teamId: string
-  userId: string
-  updatedAt?: Date
-}
-
-export default class TeamMember {
-  id: string
-  isNotRemoved: boolean
-  isLead: boolean
-  isSpectatingPoker: boolean
-  email: string
-  openDrawer: TeamDrawer | null
-  picture: string
-  preferredName: string
-  teamId: string
-  userId: string
-  createdAt: Date
-  updatedAt: Date
-  constructor(input: Input) {
-    const {
-      teamId,
-      email,
-      isLead,
-      isNotRemoved,
-      openDrawer,
-      picture,
-      preferredName,
-      userId,
-      isSpectatingPoker
-    } = input
-    this.id = toTeamMemberId(teamId, userId)
-    this.teamId = teamId
-    this.email = email
-    this.openDrawer = openDrawer || null
-    this.isLead = isLead || false
-    this.isSpectatingPoker = isSpectatingPoker || false
-    this.isNotRemoved = isNotRemoved === undefined ? true : isNotRemoved
-    this.picture = picture
-    this.preferredName = preferredName
-    this.userId = userId
-    this.createdAt = new Date()
-    this.updatedAt = new Date()
-  }
-}
diff --git a/packages/server/dataloader/foreignKeyLoaderMakers.ts b/packages/server/dataloader/foreignKeyLoaderMakers.ts
index 2f6cb7daf09..67ba8f37cd8 100644
--- a/packages/server/dataloader/foreignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/foreignKeyLoaderMakers.ts
@@ -6,6 +6,23 @@ export const teamsByOrgIds = foreignKeyLoaderMaker('teams', 'orgId', (orgIds) =>
   selectTeams().where('orgId', 'in', orgIds).where('isArchived', '=', false).execute()
 )
 
+export const teamMembersByTeamId = foreignKeyLoaderMaker('teamMembers', 'teamId', (teamIds) =>
+  getKysely()
+    .selectFrom('TeamMember')
+    .selectAll()
+    .where('teamId', 'in', teamIds)
+    .where('isNotRemoved', '=', true)
+    .execute()
+)
+
+export const teamMembersByUserId = foreignKeyLoaderMaker('teamMembers', 'userId', (userIds) =>
+  getKysely()
+    .selectFrom('TeamMember')
+    .selectAll()
+    .where('userId', 'in', userIds)
+    .where('isNotRemoved', '=', true)
+    .execute()
+)
 export const discussionsByMeetingId = foreignKeyLoaderMaker(
   'discussions',
   'meetingId',
diff --git a/packages/server/dataloader/primaryKeyLoaderMakers.ts b/packages/server/dataloader/primaryKeyLoaderMakers.ts
index 5f199227b88..10b7d3c3530 100644
--- a/packages/server/dataloader/primaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/primaryKeyLoaderMakers.ts
@@ -146,3 +146,7 @@ export const saml = primaryKeyLoaderMaker((ids: readonly string[]) => {
 export const organizationUsers = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return getKysely().selectFrom('OrganizationUser').selectAll().where('id', 'in', ids).execute()
 })
+
+export const teamMembers = primaryKeyLoaderMaker((ids: readonly string[]) => {
+  return getKysely().selectFrom('TeamMember').selectAll().where('id', 'in', ids).execute()
+})
diff --git a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
index 913c7dcc87f..1fbc779c4cf 100644
--- a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
@@ -221,31 +221,3 @@ export const teamInvitationsByTeamId = new RethinkForeignKeyLoaderMaker(
       .run()
   }
 )
-
-export const teamMembersByTeamId = new RethinkForeignKeyLoaderMaker(
-  'teamMembers',
-  'teamId',
-  async (teamIds) => {
-    // tasksByUserId is expensive since we have to look up each team to check the team archive status
-    const r = await getRethink()
-    return r
-      .table('TeamMember')
-      .getAll(r.args(teamIds), {index: 'teamId'})
-      .filter({isNotRemoved: true})
-      .run()
-  }
-)
-
-export const teamMembersByUserId = new RethinkForeignKeyLoaderMaker(
-  'teamMembers',
-  'userId',
-  async (userIds) => {
-    // tasksByUserId is expensive since we have to look up each team to check the team archive status
-    const r = await getRethink()
-    return r
-      .table('TeamMember')
-      .getAll(r.args(userIds), {index: 'userId'})
-      .filter({isNotRemoved: true})
-      .run()
-  }
-)
diff --git a/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts b/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
index ef78ee05b50..8c7f70d9be0 100644
--- a/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
@@ -18,6 +18,5 @@ export const slackAuths = new RethinkPrimaryKeyLoaderMaker('SlackAuth')
 export const slackNotifications = new RethinkPrimaryKeyLoaderMaker('SlackNotification')
 export const suggestedActions = new RethinkPrimaryKeyLoaderMaker('SuggestedAction')
 export const tasks = new RethinkPrimaryKeyLoaderMaker('Task')
-export const teamMembers = new RethinkPrimaryKeyLoaderMaker('TeamMember')
 export const teamInvitations = new RethinkPrimaryKeyLoaderMaker('TeamInvitation')
 export const templateDimensions = new RethinkPrimaryKeyLoaderMaker('TemplateDimension')
diff --git a/packages/server/graphql/mutations/archiveTeam.ts b/packages/server/graphql/mutations/archiveTeam.ts
index aaa5ec888f6..6b447ab44c1 100644
--- a/packages/server/graphql/mutations/archiveTeam.ts
+++ b/packages/server/graphql/mutations/archiveTeam.ts
@@ -1,12 +1,13 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
+import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId'
 import {maybeRemoveRestrictions} from '../../billing/helpers/teamLimitsCheck'
 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, isUserOrgAdmin} from '../../utils/authorization'
+import {getUserId, isSuperUser, isUserOrgAdmin} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
@@ -35,13 +36,14 @@ export default {
 
     // AUTH
     const viewerId = getUserId(authToken)
-    const [teamLead, viewer, teamToArchive] = await Promise.all([
-      isTeamLead(viewerId, teamId, dataLoader),
+    const [teamMember, viewer, teamToArchive] = await Promise.all([
+      dataLoader.get('teamMembers').load(TeamMemberId.join(teamId, viewerId)),
       dataLoader.get('users').loadNonNull(viewerId),
       dataLoader.get('teams').loadNonNull(teamId)
     ])
+    const isTeamLead = teamMember?.isLead
     const isOrgAdmin = await isUserOrgAdmin(viewerId, teamToArchive.orgId, dataLoader)
-    if (!teamLead && !isSuperUser(authToken) && !isOrgAdmin) {
+    if (!isTeamLead && !isSuperUser(authToken) && !isOrgAdmin) {
       return standardError(new Error('Not team lead or org admin'), {userId: viewerId})
     }
 
diff --git a/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts b/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts
index b6a3f3c650a..92ca62973de 100644
--- a/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts
+++ b/packages/server/graphql/mutations/helpers/createTeamAndLeader.ts
@@ -9,7 +9,6 @@ import TimelineEventCreatedTeam from '../../../database/types/TimelineEventCreat
 import {DataLoaderInstance} from '../../../dataloader/RootDataLoader'
 import getKysely from '../../../postgres/getKysely'
 import IUser from '../../../postgres/types/IUser'
-import insertNewTeamMember from '../../../safeMutations/insertNewTeamMember'
 
 interface ValidNewTeam {
   id: string
@@ -68,9 +67,7 @@ export default async function createTeamAndLeader(
       .values(timelineEvent)
       .execute(),
     // add meeting settings
-    r.table('MeetingSettings').insert(meetingSettings).run(),
-    // denormalize common fields to team member
-    insertNewTeamMember(user, teamId, dataLoader)
+    r.table('MeetingSettings').insert(meetingSettings).run()
   ])
   dataLoader.clearAll(['teams', 'users', 'teamMembers', 'timelineEvents', 'meetingSettings'])
 }
diff --git a/packages/server/graphql/mutations/helpers/removeTeamMember.ts b/packages/server/graphql/mutations/helpers/removeTeamMember.ts
index eba334bec0c..d9b92314e63 100644
--- a/packages/server/graphql/mutations/helpers/removeTeamMember.ts
+++ b/packages/server/graphql/mutations/helpers/removeTeamMember.ts
@@ -47,18 +47,12 @@ const removeTeamMember = async (
       r.table('Task').getAll(teamId, {index: 'teamId'}).delete()
     ])
   } else if (isLead) {
+    // assign new leader, remove old leader flag
     await pg
       .updateTable('TeamMember')
       .set(({not}) => ({isLead: not('isLead')}))
       .where('id', 'in', [teamMemberId, teamLeader.id])
       .execute()
-    // assign new leader, remove old leader flag
-    await r({
-      newTeamLead: r.table('TeamMember').get(teamLeader.id).update({
-        isLead: true
-      }),
-      oldTeamLead: r.table('TeamMember').get(teamMemberId).update({isLead: false})
-    }).run()
   }
 
   await pg
@@ -68,10 +62,6 @@ const removeTeamMember = async (
     .execute()
   // assign active tasks to the team lead
   const {integratedTasksToArchive, reassignedTasks} = await r({
-    teamMember: r.table('TeamMember').get(teamMemberId).update({
-      isNotRemoved: false,
-      updatedAt: now
-    }),
     integratedTasksToArchive: r
       .table('Task')
       .getAll(userId, {index: 'userId'})
diff --git a/packages/server/graphql/mutations/helpers/sendPokerMeetingRevoteEvent.ts b/packages/server/graphql/mutations/helpers/sendPokerMeetingRevoteEvent.ts
index 2f736ae3770..9db1d61ab85 100644
--- a/packages/server/graphql/mutations/helpers/sendPokerMeetingRevoteEvent.ts
+++ b/packages/server/graphql/mutations/helpers/sendPokerMeetingRevoteEvent.ts
@@ -1,6 +1,6 @@
 import Meeting from '../../../database/types/Meeting'
 import MeetingMember from '../../../database/types/MeetingMember'
-import TeamMember from '../../../database/types/TeamMember'
+import {TeamMember} from '../../../postgres/types'
 import {analytics} from '../../../utils/analytics/analytics'
 import {DataLoaderWorker} from '../../graphql'
 
diff --git a/packages/server/graphql/mutations/joinMeeting.ts b/packages/server/graphql/mutations/joinMeeting.ts
index 6528c0e37db..7be33d39e2f 100644
--- a/packages/server/graphql/mutations/joinMeeting.ts
+++ b/packages/server/graphql/mutations/joinMeeting.ts
@@ -10,11 +10,11 @@ import Meeting from '../../database/types/Meeting'
 import MeetingRetrospective from '../../database/types/MeetingRetrospective'
 import PokerMeetingMember from '../../database/types/PokerMeetingMember'
 import RetroMeetingMember from '../../database/types/RetroMeetingMember'
-import TeamMember from '../../database/types/TeamMember'
 import TeamPromptMeetingMember from '../../database/types/TeamPromptMeetingMember'
 import TeamPromptResponseStage from '../../database/types/TeamPromptResponseStage'
 import UpdatesStage from '../../database/types/UpdatesStage'
 import insertDiscussions from '../../postgres/queries/insertDiscussions'
+import {TeamMember} from '../../postgres/types'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import getPhase from '../../utils/getPhase'
@@ -82,7 +82,7 @@ const joinMeeting = {
       return {error: {message: 'Not on the team'}}
     }
     const teamMemberId = toTeamMemberId(teamId, viewerId)
-    const teamMember = await dataLoader.get('teamMembers').load(teamMemberId)
+    const teamMember = await dataLoader.get('teamMembers').loadNonNull(teamMemberId)
     const meetingMember = createMeetingMember(meeting, teamMember)
     const {errors} = await r.table('MeetingMember').insert(meetingMember).run()
     // if this is called concurrently, only 1 will be error free
diff --git a/packages/server/graphql/mutations/promoteToTeamLead.ts b/packages/server/graphql/mutations/promoteToTeamLead.ts
index 68f9513bc3d..83cd3f9b4ca 100644
--- a/packages/server/graphql/mutations/promoteToTeamLead.ts
+++ b/packages/server/graphql/mutations/promoteToTeamLead.ts
@@ -1,7 +1,6 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId'
-import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isSuperUser, isUserOrgAdmin} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -27,7 +26,6 @@ export default {
     {teamId, userId}: {teamId: string; userId: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
     const operationId = dataLoader.share()
     const subOptions = {mutatorId, operationId}
@@ -61,14 +59,6 @@ export default {
       .where('id', 'in', [oldLeadTeamMemberId, promoteeOnTeam.id])
       .execute()
     dataLoader.clearAll('teamMembers')
-    await r({
-      teamLead: r.table('TeamMember').get(oldLeadTeamMemberId).update({
-        isLead: false
-      }),
-      promotee: r.table('TeamMember').get(promoteeOnTeam.id).update({
-        isLead: true
-      })
-    }).run()
 
     const data = {teamId, oldLeaderId: oldLeadTeamMemberId, newLeaderId: promoteeOnTeam.id}
     publish(SubscriptionChannel.TEAM, teamId, 'PromoteToTeamLeadPayload', data, subOptions)
diff --git a/packages/server/graphql/mutations/removeTeamMember.ts b/packages/server/graphql/mutations/removeTeamMember.ts
index f235589a70a..1e0f4feda90 100644
--- a/packages/server/graphql/mutations/removeTeamMember.ts
+++ b/packages/server/graphql/mutations/removeTeamMember.ts
@@ -1,7 +1,8 @@
 import {GraphQLID, GraphQLNonNull, GraphQLObjectType} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import fromTeamMemberId from 'parabol-client/utils/relay/fromTeamMemberId'
-import {getUserId, isTeamLead, isUserOrgAdmin} from '../../utils/authorization'
+import TeamMemberId from '../../../client/shared/gqlIds/TeamMemberId'
+import {getUserId, isUserOrgAdmin} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
@@ -31,10 +32,11 @@ export default {
     const viewerId = getUserId(authToken)
     const {userId, teamId} = fromTeamMemberId(teamMemberId)
     const team = await dataLoader.get('teams').loadNonNull(teamId)
-    const [isOrgAdmin, isViewerTeamLead] = await Promise.all([
+    const [isOrgAdmin, teamMember] = await Promise.all([
       isUserOrgAdmin(viewerId, team.orgId, dataLoader),
-      isTeamLead(viewerId, teamId, dataLoader)
+      dataLoader.get('teamMembers').loadNonNull(TeamMemberId.join(teamId, viewerId))
     ])
+    const isViewerTeamLead = teamMember?.isLead
     const isSelf = viewerId === userId
     if (!isSelf) {
       if (!isOrgAdmin && !isViewerTeamLead) {
diff --git a/packages/server/graphql/mutations/setPokerSpectate.ts b/packages/server/graphql/mutations/setPokerSpectate.ts
index 7f007738d8d..61b7fbf9868 100644
--- a/packages/server/graphql/mutations/setPokerSpectate.ts
+++ b/packages/server/graphql/mutations/setPokerSpectate.ts
@@ -32,7 +32,6 @@ const setPokerSpectate = {
     const r = await getRethink()
     const pg = getKysely()
     const viewerId = getUserId(authToken)
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {mutatorId, operationId}
 
@@ -68,11 +67,7 @@ const setPokerSpectate = {
       .where('id', '=', teamMemberId)
       .execute()
     await r({
-      meetingMember: r.table('MeetingMember').get(meetingMemberId).update({isSpectating}),
-      teamMember: r
-        .table('TeamMember')
-        .get(teamMemberId)
-        .update({isSpectatingPoker: isSpectating, updatedAt: now})
+      meetingMember: r.table('MeetingMember').get(meetingMemberId).update({isSpectating})
     }).run()
     dataLoader.clearAll('teamMembers')
     // mutate the dataLoader cache
diff --git a/packages/server/graphql/mutations/startSprintPoker.ts b/packages/server/graphql/mutations/startSprintPoker.ts
index b25cc5364de..bfeb3c72af1 100644
--- a/packages/server/graphql/mutations/startSprintPoker.ts
+++ b/packages/server/graphql/mutations/startSprintPoker.ts
@@ -163,7 +163,7 @@ export default {
     }
 
     const teamMemberId = toTeamMemberId(teamId, viewerId)
-    const teamMember = await dataLoader.get('teamMembers').load(teamMemberId)
+    const teamMember = await dataLoader.get('teamMembers').loadNonNull(teamMemberId)
     const {isSpectatingPoker} = teamMember
     const updates = {
       lastMeetingType: meetingType
diff --git a/packages/server/graphql/mutations/toggleTeamDrawer.ts b/packages/server/graphql/mutations/toggleTeamDrawer.ts
index aa9ae06abb2..5d922a8d718 100644
--- a/packages/server/graphql/mutations/toggleTeamDrawer.ts
+++ b/packages/server/graphql/mutations/toggleTeamDrawer.ts
@@ -1,6 +1,4 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
-import getRethink from '../../database/rethinkDriver'
-import {RValue} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import standardError from '../../utils/standardError'
@@ -27,7 +25,6 @@ const toggleTeamDrawer = {
     {teamId, teamDrawerType}: {teamId: string; teamDrawerType: TeamDrawer | null},
     {authToken}: GQLContext
   ) => {
-    const r = await getRethink()
     const pg = getKysely()
     const viewerId = getUserId(authToken)
 
@@ -47,18 +44,6 @@ const toggleTeamDrawer = {
       }))
       .where('id', '=', viewerTeamMemberId)
       .execute()
-    await r
-      .table('TeamMember')
-      .get(viewerTeamMemberId)
-      .update((teamMember: RValue) => ({
-        openDrawer: r.branch(
-          teamMember('openDrawer').default(null).eq(teamDrawerType),
-          null,
-          teamDrawerType
-        )
-      }))
-      .run()
-
     return {teamMemberId: viewerTeamMemberId}
   }
 }
diff --git a/packages/server/graphql/private/mutations/changeEmailDomain.ts b/packages/server/graphql/private/mutations/changeEmailDomain.ts
index 0365503d134..fc0a3c384e9 100644
--- a/packages/server/graphql/private/mutations/changeEmailDomain.ts
+++ b/packages/server/graphql/private/mutations/changeEmailDomain.ts
@@ -82,13 +82,6 @@ const changeEmailDomain: MutationResolvers['changeEmailDomain'] = async (
       .where('id', 'in', userIdsToUpdate)
       .returning('id')
       .execute(),
-    r
-      .table('TeamMember')
-      .filter((row: RDatum) => row('email').match(`@${normalizedOldDomain}$`))
-      .update((row: RDatum) => ({
-        email: row('email').split('@').nth(0).add(`@${normalizedNewDomain}`)
-      }))
-      .run(),
     r
       .table('Invoice')
       .filter((row: RDatum) =>
diff --git a/packages/server/graphql/private/mutations/hardDeleteUser.ts b/packages/server/graphql/private/mutations/hardDeleteUser.ts
index 7bc41619d2b..9037ff5a653 100644
--- a/packages/server/graphql/private/mutations/hardDeleteUser.ts
+++ b/packages/server/graphql/private/mutations/hardDeleteUser.ts
@@ -87,7 +87,6 @@ const hardDeleteUser: MutationResolvers['hardDeleteUser'] = async (
       .filter((row: RValue) => row('createdBy').eq(userIdToDelete))
       .update({createdBy: null})
       .run(),
-    teamMember: r.table('TeamMember').getAll(userIdToDelete, {index: 'userId'}).delete(),
     meetingMember: r.table('MeetingMember').getAll(userIdToDelete, {index: 'userId'}).delete(),
     notification: r.table('Notification').getAll(userIdToDelete, {index: 'userId'}).delete(),
     suggestedAction: r.table('SuggestedAction').getAll(userIdToDelete, {index: 'userId'}).delete(),
diff --git a/packages/server/graphql/private/mutations/updateEmail.ts b/packages/server/graphql/private/mutations/updateEmail.ts
index e06fe860c56..bd1f0766da9 100644
--- a/packages/server/graphql/private/mutations/updateEmail.ts
+++ b/packages/server/graphql/private/mutations/updateEmail.ts
@@ -1,10 +1,8 @@
-import getRethink from '../../../database/rethinkDriver'
 import getKysely from '../../../postgres/getKysely'
 import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
 import {MutationResolvers} from '../resolverTypes'
 
 const updateEmail: MutationResolvers['updateEmail'] = async (_source, {oldEmail, newEmail}) => {
-  const r = await getRethink()
   const pg = getKysely()
 
   // VALIDATION
@@ -19,23 +17,14 @@ const updateEmail: MutationResolvers['updateEmail'] = async (_source, {oldEmail,
 
   // RESOLUTION
   const {id: userId} = user
-  await Promise.all([
-    pg
-      .with('TeamMemberUpdate', (qc) =>
-        qc.updateTable('TeamMember').set({email: newEmail}).where('userId', '=', userId)
-      )
-      .updateTable('User')
-      .set({email: newEmail})
-      .where('id', '=', userId)
-      .execute(),
-    r
-      .table('TeamMember')
-      .getAll(userId, {index: 'userId'})
-      .update({
-        email: newEmail
-      })
-      .run()
-  ])
+  await pg
+    .with('TeamMemberUpdate', (qc) =>
+      qc.updateTable('TeamMember').set({email: newEmail}).where('userId', '=', userId)
+    )
+    .updateTable('User')
+    .set({email: newEmail})
+    .where('id', '=', userId)
+    .execute()
 
   return true
 }
diff --git a/packages/server/graphql/private/typeDefs/_legacy.graphql b/packages/server/graphql/private/typeDefs/_legacy.graphql
index d702b048134..48da89dfeff 100644
--- a/packages/server/graphql/private/typeDefs/_legacy.graphql
+++ b/packages/server/graphql/private/typeDefs/_legacy.graphql
@@ -989,23 +989,6 @@ enum MeetingTypeEnum {
   teamPrompt
 }
 
-"""
-The details associated with the possible repo and project integrations
-"""
-type RepoIntegrationQueryPayload {
-  error: StandardMutationError
-
-  """
-  true if the items returned are a subset of all the possible integration, else false (all possible integrations)
-  """
-  hasMore: Boolean!
-
-  """
-  All the integrations that are likely to be integrated
-  """
-  items: [RepoIntegration!]
-}
-
 """
 The scope of a shareable item
 """
diff --git a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
index 33a5ada82b6..e67a1728c9f 100644
--- a/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
+++ b/packages/server/graphql/public/mutations/acceptRequestToJoinDomain.ts
@@ -6,7 +6,6 @@ import TeamMemberId from '../../../../client/shared/gqlIds/TeamMemberId'
 import adjustUserCount from '../../../billing/helpers/adjustUserCount'
 import getKysely from '../../../postgres/getKysely'
 import {getUserById} from '../../../postgres/queries/getUsersByIds'
-import insertNewTeamMember from '../../../safeMutations/insertNewTeamMember'
 import {Logger} from '../../../utils/Logger'
 import RedisLock from '../../../utils/RedisLock'
 import {getUserId} from '../../../utils/authorization'
@@ -108,8 +107,7 @@ const acceptRequestToJoinDomain: MutationResolvers['acceptRequestToJoinDomain']
           openDrawer: 'manageTeam'
         })
         .onConflict((oc) => oc.column('id').doUpdateSet({isNotRemoved: true}))
-        .execute(),
-      insertNewTeamMember(user, teamId, dataLoader)
+        .execute()
     ])
 
     if (!organizationUser) {
diff --git a/packages/server/graphql/public/mutations/updateUserProfile.ts b/packages/server/graphql/public/mutations/updateUserProfile.ts
index 72816963520..759e6761ffa 100644
--- a/packages/server/graphql/public/mutations/updateUserProfile.ts
+++ b/packages/server/graphql/public/mutations/updateUserProfile.ts
@@ -1,7 +1,5 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import linkify from 'parabol-client/utils/linkify'
-import getRethink from '../../../database/rethinkDriver'
-import TeamMember from '../../../database/types/TeamMember'
 import getKysely from '../../../postgres/getKysely'
 import {analytics} from '../../../utils/analytics/analytics'
 import {getUserId, isAuthenticated} from '../../../utils/authorization'
@@ -14,7 +12,6 @@ const updateUserProfile: MutationResolvers['updateUserProfile'] = async (
   {updatedUser},
   {authToken, dataLoader, socketId: mutatorId}
 ) => {
-  const r = await getRethink()
   const pg = getKysely()
   const operationId = dataLoader.share()
   const subOptions = {operationId, mutatorId}
@@ -47,28 +44,17 @@ const updateUserProfile: MutationResolvers['updateUserProfile'] = async (
 
   // RESOLUTION
   // propagate denormalized changes to TeamMember
-  const updateObj = {
-    preferredName: normalizedPreferredName
-  }
-  await Promise.all([
-    pg
-      .with('TeamMemberUpdate', (qc) =>
-        qc
-          .updateTable('TeamMember')
-          .set({preferredName: normalizedPreferredName})
-          .where('userId', '=', userId)
-      )
-      .updateTable('User')
-      .set({preferredName: normalizedPreferredName})
-      .where('id', '=', userId)
-      .execute(),
-    r
-      .table('TeamMember')
-      .getAll(userId, {index: 'userId'})
-      .update(updateObj, {returnChanges: true})('changes')('new_val')
-      .default([])
-      .run() as unknown as TeamMember[]
-  ])
+  await pg
+    .with('TeamMemberUpdate', (qc) =>
+      qc
+        .updateTable('TeamMember')
+        .set({preferredName: normalizedPreferredName})
+        .where('userId', '=', userId)
+    )
+    .updateTable('User')
+    .set({preferredName: normalizedPreferredName})
+    .where('id', '=', userId)
+    .execute()
   dataLoader.clearAll(['users', 'teamMembers'])
 
   const [user, teamMembers] = await Promise.all([
diff --git a/packages/server/graphql/public/mutations/uploadUserImage.ts b/packages/server/graphql/public/mutations/uploadUserImage.ts
index 394f3053066..9208187d1f7 100644
--- a/packages/server/graphql/public/mutations/uploadUserImage.ts
+++ b/packages/server/graphql/public/mutations/uploadUserImage.ts
@@ -1,21 +1,18 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../../database/rethinkDriver'
 import getFileStoreManager from '../../../fileStorage/getFileStoreManager'
 import normalizeAvatarUpload from '../../../fileStorage/normalizeAvatarUpload'
 import validateAvatarUpload from '../../../fileStorage/validateAvatarUpload'
 import getKysely from '../../../postgres/getKysely'
-import updateUser from '../../../postgres/queries/updateUser'
 import {getUserId, isAuthenticated} from '../../../utils/authorization'
 import publish from '../../../utils/publish'
 import standardError from '../../../utils/standardError'
-import {MutationResolvers, TeamMember} from '../resolverTypes'
+import {MutationResolvers} from '../resolverTypes'
 
 const uploadUserImage: MutationResolvers['uploadUserImage'] = async (
   _,
   {file},
   {authToken, dataLoader, socketId: mutatorId}
 ) => {
-  const r = await getRethink()
   const pg = getKysely()
   const operationId = dataLoader.share()
   const subOptions = {operationId, mutatorId}
@@ -34,24 +31,14 @@ const uploadUserImage: MutationResolvers['uploadUserImage'] = async (
   const manager = getFileStoreManager()
   const publicLocation = await manager.putUserAvatar(normalBuffer, userId, normalExt)
 
-  await Promise.all([
-    pg
-      .with('TeamMemberUpdate', (qc) =>
-        qc.updateTable('TeamMember').set({picture: publicLocation}).where('userId', '=', userId)
-      )
-      .updateTable('User')
-      .set({picture: publicLocation})
-      .where('id', '=', userId)
-      .execute(),
-    r
-      .table('TeamMember')
-      .getAll(userId, {index: 'userId'})
-      .update({picture: publicLocation}, {returnChanges: true})('changes')('new_val')
-      .default([])
-      .run() as unknown as TeamMember[],
-
-    updateUser({picture: publicLocation}, userId)
-  ])
+  await pg
+    .with('TeamMemberUpdate', (qc) =>
+      qc.updateTable('TeamMember').set({picture: publicLocation}).where('userId', '=', userId)
+    )
+    .updateTable('User')
+    .set({picture: publicLocation})
+    .where('id', '=', userId)
+    .execute()
   dataLoader.clearAll(['users', 'teamMembers'])
   const teamMembers = await dataLoader.get('teamMembersByUserId').load(userId)
   const teamIds = teamMembers.map(({teamId}) => teamId)
diff --git a/packages/server/graphql/public/typeDefs/RepoIntegrationQueryPayload.graphql b/packages/server/graphql/public/typeDefs/RepoIntegrationQueryPayload.graphql
new file mode 100644
index 00000000000..9f8c653ee58
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RepoIntegrationQueryPayload.graphql
@@ -0,0 +1,16 @@
+"""
+The details associated with the possible repo and project integrations
+"""
+type RepoIntegrationQueryPayload {
+  error: StandardMutationError
+
+  """
+  true if the items returned are a subset of all the possible integration, else false (all possible integrations)
+  """
+  hasMore: Boolean
+
+  """
+  All the integrations that are likely to be integrated
+  """
+  items: [RepoIntegration!]
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamMember.graphql b/packages/server/graphql/public/typeDefs/TeamMember.graphql
new file mode 100644
index 00000000000..d442dd77214
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamMember.graphql
@@ -0,0 +1,133 @@
+"""
+A member of a team
+"""
+type TeamMember {
+  """
+  An ID for the teamMember. userId::teamId
+  """
+  id: ID!
+
+  """
+  The datetime the team member was created
+  """
+  createdAt: DateTime!
+
+  """
+  true if the user is a part of the team, false if they no longer are
+  """
+  isNotRemoved: Boolean
+
+  """
+  Is user a team lead?
+  """
+  isLead: Boolean!
+
+  """
+  true if the user prefers to not vote during a poker meeting
+  """
+  isSpectatingPoker: Boolean!
+
+  """
+  the type of drawer that is open in the team dash. Null if the drawer is closed
+  """
+  openDrawer: TeamDrawer
+
+  """
+  The user email
+  """
+  email: Email!
+
+  """
+  true if this team member belongs to the user that queried it
+  """
+  isSelf: Boolean!
+
+  """
+  The integrations that the team member has authorized. accessible by all
+  """
+  integrations: TeamMemberIntegrations!
+
+  """
+  The meeting specifics for the meeting the team member is currently in
+  """
+  meetingMember(meetingId: ID!): MeetingMember
+
+  """
+  The name of the assignee
+  """
+  preferredName: String!
+
+  """
+  The integrations that the team has previously used
+  """
+  prevUsedRepoIntegrations(
+    """
+    the number of repo integrations to return
+    """
+    first: Int!
+    after: DateTime
+  ): RepoIntegrationQueryPayload!
+
+  """
+  The integrations that the user would probably like to use
+  """
+  repoIntegrations(
+    """
+    the number of repo integrations to return
+    """
+    first: Int!
+    after: DateTime
+
+    """
+    true if we should fetch from the network, false if we should use the cache
+    """
+    networkOnly: Boolean!
+  ): RepoIntegrationQueryPayload!
+
+  """
+  Tasks owned by the team member
+  """
+  tasks(
+    first: Int
+
+    """
+    the datetime cursor
+    """
+    after: DateTime
+  ): TaskConnection
+
+  """
+  The team this team member belongs to
+  """
+  team: Team
+
+  """
+  foreign key to Team table
+  """
+  teamId: ID!
+
+  """
+  The user for the team member
+  """
+  user: User!
+
+  """
+  foreign key to User table
+  """
+  userId: ID!
+
+  """
+  All the integrations that the user could possibly use
+  """
+  allAvailableRepoIntegrations: [RepoIntegration!]!
+
+  """
+  Is user an admin of the team's org?
+  """
+  isOrgAdmin: Boolean!
+
+  """
+  url of user’s profile picture
+  """
+  picture: URL!
+}
diff --git a/packages/server/graphql/public/typeDefs/_legacy.graphql b/packages/server/graphql/public/typeDefs/_legacy.graphql
index a1fab0ffb5b..6550de57f6d 100644
--- a/packages/server/graphql/public/typeDefs/_legacy.graphql
+++ b/packages/server/graphql/public/typeDefs/_legacy.graphql
@@ -994,23 +994,6 @@ enum MeetingTypeEnum {
   teamPrompt
 }
 
-"""
-The details associated with the possible repo and project integrations
-"""
-type RepoIntegrationQueryPayload {
-  error: StandardMutationError
-
-  """
-  true if the items returned are a subset of all the possible integration, else false (all possible integrations)
-  """
-  hasMore: Boolean!
-
-  """
-  All the integrations that are likely to be integrated
-  """
-  items: [RepoIntegration!]
-}
-
 """
 An invitation and expiration
 """
diff --git a/packages/server/graphql/public/types/AcceptTeamInvitationPayload.ts b/packages/server/graphql/public/types/AcceptTeamInvitationPayload.ts
index 2babf18a1d4..1590a4b281b 100644
--- a/packages/server/graphql/public/types/AcceptTeamInvitationPayload.ts
+++ b/packages/server/graphql/public/types/AcceptTeamInvitationPayload.ts
@@ -19,7 +19,7 @@ const AcceptTeamInvitationPayload: AcceptTeamInvitationPayloadResolvers = {
     return teamId ? dataLoader.get('teams').loadNonNull(teamId) : null
   },
   teamMember: async ({teamMemberId}, _args, {dataLoader}: GQLContext) => {
-    return teamMemberId ? dataLoader.get('teamMembers').load(teamMemberId) : null
+    return teamMemberId ? dataLoader.get('teamMembers').loadNonNull(teamMemberId) : null
   },
   meeting: async ({meetingId}, _args, {dataLoader, authToken}) => {
     if (!meetingId) {
diff --git a/packages/server/graphql/public/types/AddTeamMemberIntegrationAuthSuccess.ts b/packages/server/graphql/public/types/AddTeamMemberIntegrationAuthSuccess.ts
index 24a623a2e02..5e0c14bd641 100644
--- a/packages/server/graphql/public/types/AddTeamMemberIntegrationAuthSuccess.ts
+++ b/packages/server/graphql/public/types/AddTeamMemberIntegrationAuthSuccess.ts
@@ -13,7 +13,7 @@ const AddTeamMemberIntegrationAuthSuccess: AddTeamMemberIntegrationAuthSuccessRe
   },
   teamMember: ({teamId, userId}, _args, {dataLoader}) => {
     const teamMemberId = toTeamMemberId(teamId, userId)
-    return dataLoader.get('teamMembers').load(teamMemberId)
+    return dataLoader.get('teamMembers').loadNonNull(teamMemberId)
   },
   user: async ({userId}, _args, {dataLoader}) => {
     return dataLoader.get('users').loadNonNull(userId)
diff --git a/packages/server/graphql/public/types/AgendaItem.ts b/packages/server/graphql/public/types/AgendaItem.ts
index 685ad8f290b..d924bba0d1a 100644
--- a/packages/server/graphql/public/types/AgendaItem.ts
+++ b/packages/server/graphql/public/types/AgendaItem.ts
@@ -3,7 +3,7 @@ import {AgendaItemResolvers} from '../resolverTypes'
 const AgendaItem: AgendaItemResolvers = {
   isActive: ({isActive}) => !!isActive,
   teamMember: async ({teamMemberId}, _args: unknown, {dataLoader}) => {
-    return dataLoader.get('teamMembers').load(teamMemberId)
+    return dataLoader.get('teamMembers').loadNonNull(teamMemberId)
   }
 }
 
diff --git a/packages/server/graphql/public/types/Company.ts b/packages/server/graphql/public/types/Company.ts
index 97ee27b50ec..d04004afed0 100644
--- a/packages/server/graphql/public/types/Company.ts
+++ b/packages/server/graphql/public/types/Company.ts
@@ -1,7 +1,7 @@
 import getRethink from '../../../database/rethinkDriver'
 import {RDatum, RValue} from '../../../database/stricterR'
 import AuthToken from '../../../database/types/AuthToken'
-import TeamMember from '../../../database/types/TeamMember'
+import {TeamMember} from '../../../postgres/types'
 import {getUserId} from '../../../utils/authorization'
 import errorFilter from '../../errorFilter'
 import {DataLoaderWorker} from '../../graphql'
diff --git a/packages/server/graphql/public/types/JiraServerIntegration.ts b/packages/server/graphql/public/types/JiraServerIntegration.ts
index 029a57cbcfb..a4690b2d070 100644
--- a/packages/server/graphql/public/types/JiraServerIntegration.ts
+++ b/packages/server/graphql/public/types/JiraServerIntegration.ts
@@ -1,9 +1,9 @@
 import IntegrationProviderId from '~/shared/gqlIds/IntegrationProviderId'
 import IntegrationRepoId from '~/shared/gqlIds/IntegrationRepoId'
-import TeamMember from '../../../database/types/TeamMember'
 import JiraServerRestManager from '../../../integrations/jiraServer/JiraServerRestManager'
 import {IntegrationProviderJiraServer} from '../../../postgres/queries/getIntegrationProvidersByIds'
 import getLatestIntegrationSearchQueries from '../../../postgres/queries/getLatestIntegrationSearchQueries'
+import {TeamMember} from '../../../postgres/types'
 import {getUserId} from '../../../utils/authorization'
 import standardError from '../../../utils/standardError'
 import {JiraServerIntegrationResolvers} from '../resolverTypes'
diff --git a/packages/server/graphql/public/types/NewMeeting.ts b/packages/server/graphql/public/types/NewMeeting.ts
index 030f8b42d06..d75bc19bceb 100644
--- a/packages/server/graphql/public/types/NewMeeting.ts
+++ b/packages/server/graphql/public/types/NewMeeting.ts
@@ -20,7 +20,7 @@ const NewMeeting: NewMeetingResolvers = {
   },
   facilitator: ({facilitatorUserId, teamId}, _args, {dataLoader}) => {
     const teamMemberId = toTeamMemberId(teamId, facilitatorUserId)
-    return dataLoader.get('teamMembers').load(teamMemberId)
+    return dataLoader.get('teamMembers').loadNonNull(teamMemberId)
   },
   locked: async ({endedAt, teamId}, _args, {authToken, dataLoader}) => {
     const viewerId = getUserId(authToken)
diff --git a/packages/server/graphql/public/types/NotifyTaskInvolves.ts b/packages/server/graphql/public/types/NotifyTaskInvolves.ts
index 3cbc20a861e..a5513dba45e 100644
--- a/packages/server/graphql/public/types/NotifyTaskInvolves.ts
+++ b/packages/server/graphql/public/types/NotifyTaskInvolves.ts
@@ -15,7 +15,7 @@ const NotifyTaskInvolves: NotifyTaskInvolvesResolvers = {
   },
 
   changeAuthor: ({changeAuthorId}, _args, {dataLoader}) => {
-    return dataLoader.get('teamMembers').load(changeAuthorId)
+    return dataLoader.get('teamMembers').loadNonNull(changeAuthorId)
   },
 
   team: ({teamId}, _args, {dataLoader}) => {
diff --git a/packages/server/graphql/public/types/RemoveTeamMemberIntegrationAuthSuccess.ts b/packages/server/graphql/public/types/RemoveTeamMemberIntegrationAuthSuccess.ts
index e722f61c18c..87263f1a50b 100644
--- a/packages/server/graphql/public/types/RemoveTeamMemberIntegrationAuthSuccess.ts
+++ b/packages/server/graphql/public/types/RemoveTeamMemberIntegrationAuthSuccess.ts
@@ -10,7 +10,7 @@ export type RemoveTeamMemberIntegrationAuthSuccessSource = {
 const RemoveTeamMemberIntegrationAuthSuccess: RemoveTeamMemberIntegrationAuthSuccessResolvers = {
   teamMember: ({teamId, userId}, _args, {dataLoader}) => {
     const teamMemberId = toTeamMemberId(teamId, userId)
-    return dataLoader.get('teamMembers').load(teamMemberId)
+    return dataLoader.get('teamMembers').loadNonNull(teamMemberId)
   },
   user: async ({userId}, _args, {dataLoader}) => {
     return dataLoader.get('users').loadNonNull(userId)
diff --git a/packages/server/graphql/public/types/RemoveTeamMemberPayload.ts b/packages/server/graphql/public/types/RemoveTeamMemberPayload.ts
index 6a4b13f5920..dedf7714255 100644
--- a/packages/server/graphql/public/types/RemoveTeamMemberPayload.ts
+++ b/packages/server/graphql/public/types/RemoveTeamMemberPayload.ts
@@ -15,7 +15,7 @@ export type RemoveTeamMemberPayloadSource = {
 
 const RemoveTeamMemberPayload: RemoveTeamMemberPayloadResolvers = {
   teamMember: async ({teamMemberId}, _args, {dataLoader}: GQLContext) => {
-    return dataLoader.get('teamMembers').load(teamMemberId)
+    return dataLoader.get('teamMembers').loadNonNull(teamMemberId)
   },
   team: async ({teamId}, _args, {dataLoader}) => {
     return dataLoader.get('teams').loadNonNull(teamId)
diff --git a/packages/server/graphql/public/types/Team.ts b/packages/server/graphql/public/types/Team.ts
index 4c13a4adc0f..d28e7a23ae5 100644
--- a/packages/server/graphql/public/types/Team.ts
+++ b/packages/server/graphql/public/types/Team.ts
@@ -37,7 +37,7 @@ const Team: TeamResolvers = {
     const viewerId = getUserId(authToken)
     if (!viewerId) return null
     const teamMemberId = toTeamMemberId(teamId, viewerId)
-    const teamMember = await dataLoader.get('teamMembers').load(teamMemberId)
+    const teamMember = await dataLoader.get('teamMembers').loadNonNull(teamMemberId)
     return teamMember
   },
   isViewerOnTeam: async ({id: teamId}, _args, {authToken}) => isTeamMember(authToken, teamId),
diff --git a/packages/server/graphql/public/types/TeamMember.ts b/packages/server/graphql/public/types/TeamMember.ts
index 0e3f6007670..477914e7a21 100644
--- a/packages/server/graphql/public/types/TeamMember.ts
+++ b/packages/server/graphql/public/types/TeamMember.ts
@@ -1,3 +1,15 @@
+import ms from 'ms'
+import isTaskPrivate from 'parabol-client/utils/isTaskPrivate'
+import MeetingMemberId from '../../../../client/shared/gqlIds/MeetingMemberId'
+import {getUserId} from '../../../utils/authorization'
+import getAllRepoIntegrationsRedisKey from '../../../utils/getAllRepoIntegrationsRedisKey'
+import getRedis from '../../../utils/getRedis'
+import standardError from '../../../utils/standardError'
+import connectionFromTasks from '../../queries/helpers/connectionFromTasks'
+import fetchAllRepoIntegrations from '../../queries/helpers/fetchAllRepoIntegrations'
+import getAllCachedRepoIntegrations from '../../queries/helpers/getAllCachedRepoIntegrations'
+import getPrevUsedRepoIntegrations from '../../queries/helpers/getPrevUsedRepoIntegrations'
+import {default as sortRepoIntegrations} from '../../queries/helpers/sortRepoIntegrations'
 import {TeamMemberResolvers} from '../resolverTypes'
 
 const TeamMember: TeamMemberResolvers = {
@@ -8,8 +20,97 @@ const TeamMember: TeamMemberResolvers = {
       .load({userId, orgId: team.orgId})
     return organizationUser?.role === 'ORG_ADMIN'
   },
+
   picture: async ({picture}, _args, {dataLoader}) => {
     return dataLoader.get('fileStoreAsset').load(picture)
+  },
+
+  isSelf: (source, _args, {authToken}) => {
+    const userId = getUserId(authToken)
+    return source.userId === userId
+  },
+
+  integrations: ({teamId, userId}) => {
+    return {teamId, userId}
+  },
+
+  meetingMember: async ({userId}, {meetingId}, {dataLoader}) => {
+    const meetingMemberId = MeetingMemberId.join(meetingId, userId)
+    return meetingId ? dataLoader.get('meetingMembers').load(meetingMemberId) : undefined
+  },
+
+  prevUsedRepoIntegrations: async ({teamId, userId}, {first}, context) => {
+    const {authToken, dataLoader} = context
+    const viewerId = getUserId(authToken)
+    if (userId !== viewerId) {
+      const user = await dataLoader.get('users').loadNonNull(userId)
+      const {tms} = user
+      const onTeam = authToken.tms.find((teamId) => tms.includes(teamId))
+      if (!onTeam) {
+        return standardError(new Error('Not on same team as user'), {userId: viewerId})
+      }
+    }
+    const prevUsedRepoIntegrations = await getPrevUsedRepoIntegrations(teamId)
+    if (!prevUsedRepoIntegrations) return {hasMore: false, items: []}
+    if (prevUsedRepoIntegrations.length > first) {
+      return {hasMore: true, items: prevUsedRepoIntegrations.slice(0, first)}
+    } else {
+      return {hasMore: false, items: prevUsedRepoIntegrations}
+    }
+  },
+
+  repoIntegrations: async ({teamId, userId}, {first, networkOnly}, context, info) => {
+    const {authToken, dataLoader} = context
+    const viewerId = getUserId(authToken)
+    if (userId !== viewerId) {
+      const user = await dataLoader.get('users').loadNonNull(userId)
+      const {tms} = user
+      const onTeam = authToken.tms.find((teamId) => tms.includes(teamId))
+      if (!onTeam) {
+        return standardError(new Error('Not on same team as user'), {userId: viewerId})
+      }
+    }
+    const [allCachedRepoIntegrations, prevUsedRepoIntegrations] = await Promise.all([
+      getAllCachedRepoIntegrations(teamId, viewerId),
+      getPrevUsedRepoIntegrations(teamId)
+    ])
+    const ignoreCache = networkOnly || !allCachedRepoIntegrations?.length
+    const allRepoIntegrations = ignoreCache
+      ? await fetchAllRepoIntegrations(teamId, userId, context, info)
+      : allCachedRepoIntegrations
+    if (ignoreCache) {
+      // create a new cache with newly fetched allRepoIntegrations
+      const redis = getRedis()
+      const allRepoIntegrationsKey = getAllRepoIntegrationsRedisKey(teamId, viewerId)
+      redis.set(allRepoIntegrationsKey, JSON.stringify(allRepoIntegrations), 'PX', ms('90d'))
+    }
+    const sortedRepoIntegrations = await sortRepoIntegrations(
+      allRepoIntegrations,
+      prevUsedRepoIntegrations
+    )
+    if (sortedRepoIntegrations.length > first) {
+      return {hasMore: true, items: sortedRepoIntegrations.slice(0, first)}
+    } else {
+      return {hasMore: false, items: sortedRepoIntegrations}
+    }
+  },
+
+  tasks: async ({teamId, userId}, _args, {dataLoader}) => {
+    const allTasks = await dataLoader.get('tasksByTeamId').load(teamId)
+    const publicTasksForUserId = allTasks.filter((task) => {
+      if (task.userId !== userId) return false
+      if (isTaskPrivate(task.tags)) return false
+      return true
+    })
+    return connectionFromTasks(publicTasksForUserId)
+  },
+
+  team: ({teamId}, _args, {dataLoader}) => {
+    return dataLoader.get('teams').loadNonNull(teamId)
+  },
+
+  user: ({userId}, _args, {dataLoader}) => {
+    return dataLoader.get('users').loadNonNull(userId)
   }
 }
 
diff --git a/packages/server/graphql/queries/tasks.ts b/packages/server/graphql/queries/tasks.ts
index ca5fd0cc4cd..ce47533ff7f 100644
--- a/packages/server/graphql/queries/tasks.ts
+++ b/packages/server/graphql/queries/tasks.ts
@@ -8,7 +8,6 @@ import {
 } from 'graphql'
 import isTaskPrivate from 'parabol-client/utils/isTaskPrivate'
 import Task from '../../database/types/Task'
-import TeamMember from '../../database/types/TeamMember'
 import {getUserId} from '../../utils/authorization'
 import standardError from '../../utils/standardError'
 import errorFilter from '../errorFilter'
@@ -32,7 +31,7 @@ const getValidUserIds = async (
   ).filter(errorFilter)
   const teamMembersOnValidTeams = teamMembersByUserIds
     .flat()
-    .filter((teamMember: TeamMember) => validTeamIds.includes(teamMember.teamId))
+    .filter((teamMember) => validTeamIds.includes(teamMember.teamId))
   const teamMemberUserIds = new Set(
     teamMembersOnValidTeams.map(({userId}: {userId: string}) => userId)
   )
diff --git a/packages/server/graphql/resolvers.ts b/packages/server/graphql/resolvers.ts
index 708f54a04db..1dac9a9f6fc 100644
--- a/packages/server/graphql/resolvers.ts
+++ b/packages/server/graphql/resolvers.ts
@@ -6,9 +6,9 @@ import GenericMeetingStage from '../database/types/GenericMeetingStage'
 import Meeting from '../database/types/Meeting'
 import Organization from '../database/types/Organization'
 import Task from '../database/types/Task'
-import TeamMember from '../database/types/TeamMember'
 import User from '../database/types/User'
 import {Loaders} from '../dataloader/RootDataLoader'
+import {TeamMember} from '../postgres/types'
 import {AnyMeeting} from '../postgres/types/Meeting'
 import {getUserId, isSuperUser, isUserBillingLeader} from '../utils/authorization'
 import {GQLContext} from './graphql'
diff --git a/packages/server/graphql/types/Team.ts b/packages/server/graphql/types/Team.ts
index f1c2ec71be7..a950e9412bd 100644
--- a/packages/server/graphql/types/Team.ts
+++ b/packages/server/graphql/types/Team.ts
@@ -153,7 +153,7 @@ const Team: GraphQLObjectType = new GraphQLObjectType<ITeam, GQLContext>({
         if (!isTeamMember(authToken, teamId)) return false
         const viewerId = getUserId(authToken)
         const teamMemberId = toTeamMemberId(teamId, viewerId)
-        const teamMember = await dataLoader.get('teamMembers').load(teamMemberId)
+        const teamMember = await dataLoader.get('teamMembers').loadNonNull(teamMemberId)
         return !!teamMember.isLead
       }
     },
diff --git a/packages/server/graphql/types/TeamMember.ts b/packages/server/graphql/types/TeamMember.ts
index eec91d60db0..97948c7b0ec 100644
--- a/packages/server/graphql/types/TeamMember.ts
+++ b/packages/server/graphql/types/TeamMember.ts
@@ -1,233 +1,9 @@
-import {
-  GraphQLBoolean,
-  GraphQLID,
-  GraphQLInt,
-  GraphQLNonNull,
-  GraphQLObjectType,
-  GraphQLString
-} from 'graphql'
-import ms from 'ms'
-import isTaskPrivate from 'parabol-client/utils/isTaskPrivate'
-import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
-import {getUserId} from '../../utils/authorization'
-import getAllRepoIntegrationsRedisKey from '../../utils/getAllRepoIntegrationsRedisKey'
-import getRedis from '../../utils/getRedis'
-import standardError from '../../utils/standardError'
+import {GraphQLObjectType} from 'graphql'
 import {GQLContext} from '../graphql'
-import connectionFromTasks from '../queries/helpers/connectionFromTasks'
-import fetchAllRepoIntegrations from '../queries/helpers/fetchAllRepoIntegrations'
-import getAllCachedRepoIntegrations from '../queries/helpers/getAllCachedRepoIntegrations'
-import getPrevUsedRepoIntegrations from '../queries/helpers/getPrevUsedRepoIntegrations'
-import {default as sortRepoIntegrations} from '../queries/helpers/sortRepoIntegrations'
-import {resolveTeam} from '../resolvers'
-import GraphQLEmailType from './GraphQLEmailType'
-import GraphQLISO8601Type from './GraphQLISO8601Type'
-import RepoIntegrationQueryPayload from './RepoIntegrationQueryPayload'
-import {TaskConnection} from './Task'
-import Team from './Team'
-import TeamDrawerEnum from './TeamDrawerEnum'
-import TeamMemberIntegrations from './TeamMemberIntegrations'
-import User from './User'
 
 const TeamMember = new GraphQLObjectType<any, GQLContext>({
   name: 'TeamMember',
-  description: 'A member of a team',
-  fields: () => ({
-    id: {
-      type: new GraphQLNonNull(GraphQLID),
-      description: 'An ID for the teamMember. userId::teamId'
-    },
-    createdAt: {
-      type: new GraphQLNonNull(GraphQLISO8601Type),
-      description: 'The datetime the team member was created'
-    },
-    isNotRemoved: {
-      type: GraphQLBoolean,
-      description: 'true if the user is a part of the team, false if they no longer are'
-    },
-    isLead: {
-      type: new GraphQLNonNull(GraphQLBoolean),
-      description: 'Is user a team lead?',
-      resolve: ({isLead}) => !!isLead
-    },
-    isSpectatingPoker: {
-      type: new GraphQLNonNull(GraphQLBoolean),
-      description: 'true if the user prefers to not vote during a poker meeting',
-      resolve: ({isSpectatingPoker}) => !!isSpectatingPoker
-    },
-    openDrawer: {
-      type: TeamDrawerEnum,
-      description: 'the type of drawer that is open in the team dash. Null if the drawer is closed'
-    },
-    /* denormalized from User */
-    email: {
-      type: new GraphQLNonNull(GraphQLEmailType),
-      description: 'The user email'
-    },
-    isSelf: {
-      type: new GraphQLNonNull(GraphQLBoolean),
-      description: 'true if this team member belongs to the user that queried it',
-      resolve: (source, _args: unknown, {authToken}) => {
-        const userId = getUserId(authToken)
-        return source.userId === userId
-      }
-    },
-    integrations: {
-      type: new GraphQLNonNull(TeamMemberIntegrations),
-      description: 'The integrations that the team member has authorized. accessible by all',
-      resolve: ({teamId, userId}) => {
-        return {teamId, userId}
-      }
-    },
-    meetingMember: {
-      type: require('./MeetingMember').default,
-      description: 'The meeting specifics for the meeting the team member is currently in',
-      args: {
-        meetingId: {
-          type: new GraphQLNonNull(GraphQLID)
-        }
-      },
-      resolve: async ({userId}, {meetingId}, {dataLoader}) => {
-        const meetingMemberId = toTeamMemberId(meetingId, userId)
-        return meetingId ? dataLoader.get('meetingMembers').load(meetingMemberId) : undefined
-      }
-    },
-    preferredName: {
-      type: new GraphQLNonNull(GraphQLString),
-      description: 'The name of the assignee'
-    },
-    prevUsedRepoIntegrations: {
-      description: 'The integrations that the team has previously used',
-      type: new GraphQLNonNull(RepoIntegrationQueryPayload),
-      args: {
-        first: {
-          type: new GraphQLNonNull(GraphQLInt),
-          description: 'the number of repo integrations to return'
-        },
-        after: {
-          type: GraphQLISO8601Type
-        }
-      },
-      resolve: async ({teamId, userId}: {teamId: string; userId: string}, {first}, context) => {
-        const {authToken, dataLoader} = context
-        const viewerId = getUserId(authToken)
-        if (userId !== viewerId) {
-          const user = await dataLoader.get('users').loadNonNull(userId)
-          const {tms} = user
-          const onTeam = authToken.tms.find((teamId) => tms.includes(teamId))
-          if (!onTeam) {
-            return standardError(new Error('Not on same team as user'), {userId: viewerId})
-          }
-        }
-        const prevUsedRepoIntegrations = await getPrevUsedRepoIntegrations(teamId)
-        if (!prevUsedRepoIntegrations) return []
-        if (prevUsedRepoIntegrations.length > first) {
-          return {hasMore: true, items: prevUsedRepoIntegrations.slice(0, first)}
-        } else {
-          return {hasMore: false, items: prevUsedRepoIntegrations}
-        }
-      }
-    },
-    repoIntegrations: {
-      description: 'The integrations that the user would probably like to use',
-      type: new GraphQLNonNull(RepoIntegrationQueryPayload),
-      args: {
-        first: {
-          type: new GraphQLNonNull(GraphQLInt),
-          description: 'the number of repo integrations to return'
-        },
-        after: {
-          type: GraphQLISO8601Type
-        },
-        networkOnly: {
-          type: new GraphQLNonNull(GraphQLBoolean),
-          description: 'true if we should fetch from the network, false if we should use the cache'
-        }
-      },
-      resolve: async (
-        {teamId, userId}: {teamId: string; userId: string},
-        {first, networkOnly},
-        context,
-        info
-      ) => {
-        const {authToken, dataLoader} = context
-        const viewerId = getUserId(authToken)
-        if (userId !== viewerId) {
-          const user = await dataLoader.get('users').loadNonNull(userId)
-          const {tms} = user
-          const onTeam = authToken.tms.find((teamId) => tms.includes(teamId))
-          if (!onTeam) {
-            return standardError(new Error('Not on same team as user'), {userId: viewerId})
-          }
-        }
-        const [allCachedRepoIntegrations, prevUsedRepoIntegrations] = await Promise.all([
-          getAllCachedRepoIntegrations(teamId, viewerId),
-          getPrevUsedRepoIntegrations(teamId)
-        ])
-        const ignoreCache = networkOnly || !allCachedRepoIntegrations?.length
-        const allRepoIntegrations = ignoreCache
-          ? await fetchAllRepoIntegrations(teamId, userId, context, info)
-          : allCachedRepoIntegrations
-        if (ignoreCache) {
-          // create a new cache with newly fetched allRepoIntegrations
-          const redis = getRedis()
-          const allRepoIntegrationsKey = getAllRepoIntegrationsRedisKey(teamId, viewerId)
-          redis.set(allRepoIntegrationsKey, JSON.stringify(allRepoIntegrations), 'PX', ms('90d'))
-        }
-        const sortedRepoIntegrations = await sortRepoIntegrations(
-          allRepoIntegrations,
-          prevUsedRepoIntegrations
-        )
-        if (sortedRepoIntegrations.length > first) {
-          return {hasMore: true, items: sortedRepoIntegrations.slice(0, first)}
-        } else {
-          return {hasMore: false, items: sortedRepoIntegrations}
-        }
-      }
-    },
-    tasks: {
-      type: TaskConnection,
-      description: 'Tasks owned by the team member',
-      args: {
-        first: {
-          type: GraphQLInt
-        },
-        after: {
-          type: GraphQLISO8601Type,
-          description: 'the datetime cursor'
-        }
-      },
-      resolve: async ({teamId, userId}, _args: unknown, {dataLoader}) => {
-        const allTasks = await dataLoader.get('tasksByTeamId').load(teamId)
-        const publicTasksForUserId = allTasks.filter((task) => {
-          if (task.userId !== userId) return false
-          if (isTaskPrivate(task.tags)) return false
-          return true
-        })
-        return connectionFromTasks(publicTasksForUserId)
-      }
-    },
-    team: {
-      type: Team,
-      description: 'The team this team member belongs to',
-      resolve: resolveTeam
-    },
-    teamId: {
-      type: new GraphQLNonNull(GraphQLID),
-      description: 'foreign key to Team table'
-    },
-    user: {
-      type: new GraphQLNonNull(User),
-      description: 'The user for the team member',
-      resolve({userId}, _args: unknown, {dataLoader}) {
-        return dataLoader.get('users').load(userId)
-      }
-    },
-    userId: {
-      type: new GraphQLNonNull(GraphQLID),
-      description: 'foreign key to User table'
-    }
-  })
+  fields: {}
 })
 
 export default TeamMember
diff --git a/packages/server/postgres/types/index.d.ts b/packages/server/postgres/types/index.d.ts
index cdc9adef2ad..558bc238192 100644
--- a/packages/server/postgres/types/index.d.ts
+++ b/packages/server/postgres/types/index.d.ts
@@ -1,3 +1,6 @@
 import {Selectable} from 'kysely'
-import {OrganizationUser as OrganizationUserPG} from '../pg.d'
+import {OrganizationUser as OrganizationUserPG, TeamMember as TeamMemberPG} from '../pg.d'
+
 export type OrganizationUser = Selectable<OrganizationUserPG>
+
+export type TeamMember = Selectable<TeamMemberPG>
diff --git a/packages/server/safeMutations/acceptTeamInvitation.ts b/packages/server/safeMutations/acceptTeamInvitation.ts
index 0be315f8a1f..587a4b68fdf 100644
--- a/packages/server/safeMutations/acceptTeamInvitation.ts
+++ b/packages/server/safeMutations/acceptTeamInvitation.ts
@@ -11,7 +11,6 @@ import {TeamSource} from '../graphql/public/types/Team'
 import getKysely from '../postgres/getKysely'
 import {Logger} from '../utils/Logger'
 import setUserTierForUserIds from '../utils/setUserTierForUserIds'
-import insertNewTeamMember from './insertNewTeamMember'
 
 const handleFirstAcceptedInvitation = async (
   team: TeamSource,
@@ -108,7 +107,6 @@ const acceptTeamInvitation = async (
       })
       .onConflict((oc) => oc.column('id').doUpdateSet({isNotRemoved: true}))
       .execute(),
-    insertNewTeamMember(user, teamId, dataLoader),
     r
       .table('TeamInvitation')
       .getAll(teamId, {index: 'teamId'})
diff --git a/packages/server/safeMutations/insertNewTeamMember.ts b/packages/server/safeMutations/insertNewTeamMember.ts
deleted file mode 100644
index 6a63ba6f0e1..00000000000
--- a/packages/server/safeMutations/insertNewTeamMember.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
-import getRethink from '../database/rethinkDriver'
-import TeamMember from '../database/types/TeamMember'
-import {DataLoaderInstance} from '../dataloader/RootDataLoader'
-import IUser from '../postgres/types/IUser'
-
-const insertNewTeamMember = async (user: IUser, teamId: string, dataLoader: DataLoaderInstance) => {
-  const r = await getRethink()
-  const now = new Date()
-  const {id: userId} = user
-  const teamMemberId = toTeamMemberId(teamId, userId)
-  const teamMembers = await dataLoader.get('teamMembersByTeamId').load(teamId)
-  const existingTeamMember = teamMembers.find((tm) => tm.userId === userId)
-  const teamMemberCount = teamMembers.length
-
-  if (!user) {
-    throw new Error('User does not exist')
-  }
-  if (existingTeamMember) {
-    existingTeamMember.isNotRemoved = true
-    existingTeamMember.updatedAt = now
-    await r.table('TeamMember').get(teamMemberId).replace(existingTeamMember).run()
-    dataLoader.clearAll('teamMembers')
-    return existingTeamMember
-  }
-
-  const {picture, preferredName, email} = user
-  const isLead = teamMemberCount === 0
-  const teamMember = new TeamMember({
-    teamId,
-    userId,
-    picture,
-    preferredName,
-    email,
-    isLead,
-    openDrawer: 'manageTeam'
-  })
-
-  await r.table('TeamMember').insert(teamMember).run()
-  return teamMember
-}
-
-export default insertNewTeamMember
diff --git a/packages/server/utils/authorization.ts b/packages/server/utils/authorization.ts
index d082ce15e78..c1aeeb41ac7 100644
--- a/packages/server/utils/authorization.ts
+++ b/packages/server/utils/authorization.ts
@@ -1,5 +1,3 @@
-import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
-import getRethink from '../database/rethinkDriver'
 import AuthToken from '../database/types/AuthToken'
 import {DataLoaderWorker} from '../graphql/graphql'
 import {OrganizationUser} from '../postgres/types'
@@ -22,20 +20,6 @@ export const isTeamMember = (authToken: AuthToken, teamId: string) => {
   return Array.isArray(tms) && tms.includes(teamId)
 }
 
-export const isTeamLead = async (userId: string, teamId: string, dataLoader: DataLoaderWorker) => {
-  const r = await getRethink()
-  const teamMemberId = toTeamMemberId(teamId, userId)
-  if (await r.table('TeamMember').get(teamMemberId)('isLead').default(false).run()) {
-    return true
-  }
-
-  const team = await dataLoader.get('teams').loadNonNull(teamId)
-  const organizationUser = await dataLoader
-    .get('organizationUsersByUserIdOrgId')
-    .load({userId, orgId: team.orgId})
-  return organizationUser?.role === 'ORG_ADMIN'
-}
-
 interface Options {
   clearCache?: boolean
 }

From 1e6c0b49254b1911f9730f81366349d2f9562a58 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 12:14:15 -0700
Subject: [PATCH 06/18] chore(release): release v7.39.2 (#10028)

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 af120f4b997..a999d60cc0b 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.39.1"
+  ".": "7.39.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d2ff9b9d19..09b9fa1731c 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.39.2](https://github.com/ParabolInc/parabol/compare/v7.39.1...v7.39.2) (2024-07-24)
+
+
+### Fixed
+
+* bump pm2 version ([#10027](https://github.com/ParabolInc/parabol/issues/10027)) ([0bb8ead](https://github.com/ParabolInc/parabol/commit/0bb8ead2adc52f64ad30ef57891791e1b3dd4ac1))
+
+
+### Changed
+
+* **rethinkdb:** TeamMember: Phase 3 ([#10003](https://github.com/ParabolInc/parabol/issues/10003)) ([73a5881](https://github.com/ParabolInc/parabol/commit/73a5881709f9345767c2a233cbe28716b6c3b8e1))
+
 ## [7.39.1](https://github.com/ParabolInc/parabol/compare/v7.39.0...v7.39.1) (2024-07-23)
 
 
diff --git a/package.json b/package.json
index 3e6a45467c2..7351040d65d 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.39.1",
+  "version": "7.39.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 07db583627b..8852d449624 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.39.1",
+  "version": "7.39.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.39.1"
+    "parabol-server": "7.39.2"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index f73ad247867..5ece805bce9 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.39.1",
+  "version": "7.39.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index b09be582a0e..e78210071f3 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.39.1",
+  "version": "7.39.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 8794d4de07f..0738c1b2524 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.39.1",
+  "version": "7.39.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.39.1",
-    "parabol-server": "7.39.1",
+    "parabol-client": "7.39.2",
+    "parabol-server": "7.39.2",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index ef1d9c5acc4..2626544317a 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.39.1",
+  "version": "7.39.2",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 34ca2fd235b..e8ed5217f59 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.39.1",
+  "version": "7.39.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "openai": "^4.24.1",
     "openapi-fetch": "^0.9.7",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.39.1",
+    "parabol-client": "7.39.2",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 0c6c8e79dfbbac93362b3db640b008e32ba701b3 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Wed, 24 Jul 2024 17:10:16 -0700
Subject: [PATCH 07/18] chore(rethinkdb): TemplateScale: One-shot (#10021)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 codegen.json                                  |   3 +
 .../components/SelectScaleDropdown.tsx        |  12 +-
 .../AddPokerTemplateScaleMutation.ts          |   1 +
 .../RemovePokerTemplateScaleMutation.ts       |   6 +-
 .../handlers/handleAddPokerTemplateScale.ts   |   4 +-
 packages/client/utils/dndNoise.ts             |   1 +
 packages/embedder/indexing/meetingTemplate.ts |   2 +-
 packages/server/database/rethinkDriver.ts     |  10 --
 .../server/database/types/TemplateScale.ts    |  48 ------
 .../server/dataloader/customRedisQueries.ts   |  16 --
 .../dataloader/foreignKeyLoaderMakers.ts      |   8 +
 .../dataloader/primaryKeyLoaderMakers.ts      |   5 +
 .../rethinkForeignKeyLoaderMakers.ts          |  14 --
 .../rethinkPrimaryKeyLoaderMakers.ts          |   1 -
 .../mutations/addPokerTemplateDimension.ts    |   9 +-
 .../mutations/addPokerTemplateScale.ts        | 124 ++++++++++-----
 .../mutations/addPokerTemplateScaleValue.ts   |  70 ++++----
 .../mutations/helpers/validateScaleValue.ts   |   9 +-
 .../mutations/movePokerTemplateScaleValue.ts  |  45 +++---
 .../mutations/removePokerTemplateScale.ts     |  20 ++-
 .../removePokerTemplateScaleValue.ts          |  31 ++--
 .../mutations/renamePokerTemplateScale.ts     |  37 ++---
 .../graphql/mutations/startSprintPoker.ts     |  23 +--
 .../updatePokerTemplateDimensionScale.ts      |   2 +-
 .../updatePokerTemplateScaleValue.ts          |  54 ++-----
 .../graphql/public/types/TemplateScale.ts     |  31 ++++
 .../graphql/public/types/TemplateScaleRef.ts  |  14 ++
 .../public/types/TemplateScaleValue.ts        |  16 ++
 packages/server/graphql/types/Team.ts         |  13 +-
 .../server/graphql/types/TemplateScale.ts     |  86 +---------
 .../server/graphql/types/TemplateScaleRef.ts  |  34 +---
 .../graphql/types/TemplateScaleValue.ts       |  34 ----
 .../1614030642692_refs-for-meetings.ts        |   5 +-
 ...698265600000_addPrioritizationTemplates.ts |   3 +-
 .../migrations/1721405703862_TemplateScale.ts | 149 ++++++++++++++++++
 .../queries/src/insertTemplateRefQuery.sql    |  11 --
 .../src/insertTemplateScaleRefQuery.sql       |  11 --
 packages/server/postgres/select.ts            |  18 +++
 packages/server/postgres/types/index.d.ts     |  20 ++-
 packages/server/utils/analytics/analytics.ts  |   4 +-
 packages/server/utils/sortOrder.ts            |  67 ++++++++
 41 files changed, 569 insertions(+), 502 deletions(-)
 delete mode 100644 packages/server/database/types/TemplateScale.ts
 create mode 100644 packages/server/graphql/public/types/TemplateScale.ts
 create mode 100644 packages/server/graphql/public/types/TemplateScaleRef.ts
 create mode 100644 packages/server/graphql/public/types/TemplateScaleValue.ts
 delete mode 100644 packages/server/graphql/types/TemplateScaleValue.ts
 create mode 100644 packages/server/postgres/migrations/1721405703862_TemplateScale.ts
 delete mode 100644 packages/server/postgres/queries/src/insertTemplateRefQuery.sql
 delete mode 100644 packages/server/postgres/queries/src/insertTemplateScaleRefQuery.sql
 create mode 100644 packages/server/postgres/select.ts
 create mode 100644 packages/server/utils/sortOrder.ts

diff --git a/codegen.json b/codegen.json
index 14c1806ab5f..00dd488587c 100644
--- a/codegen.json
+++ b/codegen.json
@@ -111,6 +111,9 @@
           "NotifyTaskInvolves": "../../database/types/NotificationTaskInvolves#default",
           "NotifyTeamArchived": "../../database/types/NotificationTeamArchived#default",
           "Organization": "./types/Organization#OrganizationSource",
+          "TemplateScaleValue": "./types/TemplateScaleValue#TemplateScaleValueSource as TemplateScaleValueSourceDB",
+          "TemplateScale": "../../postgres/types/index#TemplateScale as TemplateScaleDB",
+          "TemplateScaleRef": "../../postgres/types/index#TemplateScaleRef as TemplateScaleRefDB",
           "OrganizationUser": "../../postgres/types/index#OrganizationUser as OrganizationUserDB",
           "PokerMeeting": "../../database/types/MeetingPoker#default as MeetingPoker",
           "PokerMeetingMember": "../../database/types/MeetingPokerMeetingMember#default as PokerMeetingMemberDB",
diff --git a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
index 3d7e91864de..b557015c6e2 100644
--- a/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
+++ b/packages/client/modules/meeting/components/SelectScaleDropdown.tsx
@@ -59,6 +59,7 @@ const SelectScaleDropdown = (props: Props) => {
           scales {
             id
             isStarter
+            name
             ...ScaleDropdownMenuItem_scale
           }
         }
@@ -70,8 +71,11 @@ const SelectScaleDropdown = (props: Props) => {
   const {selectedScale, team} = dimension
   const {id: seletedScaleId} = selectedScale
   const {id: teamId, scales} = team
+  const sortedScales = scales.toSorted((a, b) => {
+    return a.isStarter !== b.isStarter ? (a.isStarter ? 1 : -1) : a.name.localeCompare(b.name)
+  })
   const defaultActiveIdx = useMemo(
-    () => scales.findIndex(({id}) => id === seletedScaleId),
+    () => sortedScales.findIndex(({id}) => id === seletedScaleId),
     [dimension]
   )
 
@@ -98,17 +102,17 @@ const SelectScaleDropdown = (props: Props) => {
       {...menuProps}
       defaultActiveIdx={defaultActiveIdx}
     >
-      {scales.map((scale) => (
+      {sortedScales.map((scale) => (
         <ScaleDropdownMenuItem
           key={scale.id}
           scale={scale}
           dimension={dimension}
-          scaleCount={scales.length}
+          scaleCount={sortedScales.length}
           closePortal={closePortal}
         />
       ))}
       <MenuItemHR key='HR1' />
-      {scales.length < Threshold.MAX_POKER_TEMPLATE_SCALES && (
+      {sortedScales.length < Threshold.MAX_POKER_TEMPLATE_SCALES && (
         <MenuItem
           key='create'
           label={
diff --git a/packages/client/mutations/AddPokerTemplateScaleMutation.ts b/packages/client/mutations/AddPokerTemplateScaleMutation.ts
index c45932bc919..3025395b4a6 100644
--- a/packages/client/mutations/AddPokerTemplateScaleMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateScaleMutation.ts
@@ -11,6 +11,7 @@ import handleAddPokerTemplateScale from './handlers/handleAddPokerTemplateScale'
 graphql`
   fragment AddPokerTemplateScaleMutation_scale on AddPokerTemplateScalePayload {
     scale {
+      ...ScaleDropdownMenuItem_scale
       id
       name
       values {
diff --git a/packages/client/mutations/RemovePokerTemplateScaleMutation.ts b/packages/client/mutations/RemovePokerTemplateScaleMutation.ts
index fd17762e834..a722a4dadab 100644
--- a/packages/client/mutations/RemovePokerTemplateScaleMutation.ts
+++ b/packages/client/mutations/RemovePokerTemplateScaleMutation.ts
@@ -11,9 +11,9 @@ graphql`
       ...ScaleDropdownMenuItem_scale
       id
       teamId
-    }
-    dimensions {
-      ...PokerTemplateScalePicker_dimension
+      dimensions {
+        ...PokerTemplateScalePicker_dimension
+      }
     }
   }
 `
diff --git a/packages/client/mutations/handlers/handleAddPokerTemplateScale.ts b/packages/client/mutations/handlers/handleAddPokerTemplateScale.ts
index 7955fa4178d..1dccb303025 100644
--- a/packages/client/mutations/handlers/handleAddPokerTemplateScale.ts
+++ b/packages/client/mutations/handlers/handleAddPokerTemplateScale.ts
@@ -1,5 +1,4 @@
 import {RecordProxy, RecordSourceSelectorProxy} from 'relay-runtime'
-import addNodeToArray from '../../utils/relay/addNodeToArray'
 
 const handleAddPokerTemplateScale = (
   newNode: RecordProxy | null,
@@ -9,7 +8,8 @@ const handleAddPokerTemplateScale = (
   const teamId = newNode.getValue('teamId') as string
   const team = store.get(teamId)
   if (!team) return
-  addNodeToArray(newNode, team, 'scales', 'teamId')
+  const existingScales = team.getLinkedRecords('scales') || []
+  team.setLinkedRecords([newNode, ...existingScales], 'scales')
 }
 
 export default handleAddPokerTemplateScale
diff --git a/packages/client/utils/dndNoise.ts b/packages/client/utils/dndNoise.ts
index 2758f4c19aa..7b7a1960c6d 100644
--- a/packages/client/utils/dndNoise.ts
+++ b/packages/client/utils/dndNoise.ts
@@ -1,3 +1,4 @@
+// DEPRECATED. Sorting by floats has resulted in a lot of bugs. Please use sortOrder.ts & sort lexicographically
 // return a little noise so we never have a sort order conflict between tasks
 export default function dndNoise() {
   return Math.random() / 1e15 - 5e-16
diff --git a/packages/embedder/indexing/meetingTemplate.ts b/packages/embedder/indexing/meetingTemplate.ts
index 63073f3bfa0..b2c65d0f9b4 100644
--- a/packages/embedder/indexing/meetingTemplate.ts
+++ b/packages/embedder/indexing/meetingTemplate.ts
@@ -41,7 +41,7 @@ const createTextFromPokerMeetingTemplate = async (
   const dimensionsText = (
     await Promise.all(
       dimensions.map(async ({name, description, scaleId}) => {
-        const scale = await dataLoader.get('templateScales').load(scaleId)
+        const scale = await dataLoader.get('templateScales').loadNonNull(scaleId)
         const scaleValues = scale.values.map(({label}) => label).join(', ')
         return `${name}\n${description ?? ''}\n${scale.name}\n${scaleValues}`
       })
diff --git a/packages/server/database/rethinkDriver.ts b/packages/server/database/rethinkDriver.ts
index 713d255a085..0e47dcf664c 100644
--- a/packages/server/database/rethinkDriver.ts
+++ b/packages/server/database/rethinkDriver.ts
@@ -13,7 +13,6 @@ import FailedAuthRequest from './types/FailedAuthRequest'
 import Invoice from './types/Invoice'
 import InvoiceItemHook from './types/InvoiceItemHook'
 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'
@@ -32,7 +31,6 @@ import SuggestedActionInviteYourTeam from './types/SuggestedActionInviteYourTeam
 import SuggestedActionTryTheDemo from './types/SuggestedActionTryTheDemo'
 import Task from './types/Task'
 import TemplateDimension from './types/TemplateDimension'
-import TemplateScale from './types/TemplateScale'
 
 export type RethinkSchema = {
   AgendaItem: {
@@ -118,10 +116,6 @@ export type RethinkSchema = {
     type: PushInvitation
     index: 'userId'
   }
-  MeetingTemplate: {
-    type: MeetingTemplate
-    index: 'teamId' | 'orgId'
-  }
   ScheduledJob: {
     type: ScheduledJobUnion
     index: 'runAt' | 'type'
@@ -159,10 +153,6 @@ export type RethinkSchema = {
     type: TemplateDimension
     index: 'teamId' | 'templateId' | 'scaleId'
   }
-  TemplateScale: {
-    type: TemplateScale
-    index: 'teamId'
-  }
 }
 
 export type DBType = {
diff --git a/packages/server/database/types/TemplateScale.ts b/packages/server/database/types/TemplateScale.ts
deleted file mode 100644
index edbf61b3df5..00000000000
--- a/packages/server/database/types/TemplateScale.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {PALETTE} from '../../../client/styles/paletteV3'
-import {PokerCards} from '../../../client/types/constEnums'
-import generateUID from '../../generateUID'
-import TemplateScaleValue from './TemplateScaleValue'
-
-export interface TemplateScaleInput {
-  teamId: string
-  sortOrder: number
-  name: string
-  values?: TemplateScaleValue[]
-  parentScaleId?: string
-  isStarter?: boolean
-  removedAt?: Date
-}
-
-const questionMarkCard = new TemplateScaleValue({
-  color: PALETTE.FUSCIA_400,
-  label: PokerCards.QUESTION_CARD as string
-})
-const passCard = new TemplateScaleValue({
-  color: PALETTE.GRAPE_500,
-  label: PokerCards.PASS_CARD as string
-})
-
-export default class TemplateScale {
-  id: string
-  createdAt = new Date()
-  name: string
-  sortOrder: number
-  values: TemplateScaleValue[]
-  teamId: string
-  updatedAt = new Date()
-  parentScaleId?: string
-  isStarter?: boolean
-  removedAt?: Date
-
-  constructor(input: TemplateScaleInput) {
-    const {name, sortOrder, values, teamId, parentScaleId, isStarter, removedAt} = input
-    this.id = generateUID()
-    this.sortOrder = sortOrder
-    this.name = name
-    this.values = values || [questionMarkCard, passCard]
-    this.teamId = teamId
-    this.parentScaleId = parentScaleId
-    this.isStarter = isStarter
-    this.removedAt = removedAt
-  }
-}
diff --git a/packages/server/dataloader/customRedisQueries.ts b/packages/server/dataloader/customRedisQueries.ts
index a461202ca5a..8ce3cd85ac7 100644
--- a/packages/server/dataloader/customRedisQueries.ts
+++ b/packages/server/dataloader/customRedisQueries.ts
@@ -50,22 +50,6 @@ const customRedisQueries = {
     )
 
     return publicTemplatesByType
-  },
-  starterScales: async (teamIds: string[]) => {
-    const r = await getRethink()
-
-    const starterScales = await Promise.all(
-      teamIds.map((teamId) => {
-        return r
-          .table('TemplateScale')
-          .getAll(teamId, {index: 'teamId'})
-          .filter({isStarter: true})
-          .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-          .run()
-      })
-    )
-
-    return starterScales
   }
 } as const
 
diff --git a/packages/server/dataloader/foreignKeyLoaderMakers.ts b/packages/server/dataloader/foreignKeyLoaderMakers.ts
index 67ba8f37cd8..58579aceec5 100644
--- a/packages/server/dataloader/foreignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/foreignKeyLoaderMakers.ts
@@ -1,4 +1,5 @@
 import getKysely from '../postgres/getKysely'
+import {selectTemplateScale} from '../postgres/select'
 import {foreignKeyLoaderMaker} from './foreignKeyLoaderMaker'
 import {selectOrganizations, selectRetroReflections, selectTeams} from './primaryKeyLoaderMakers'
 
@@ -124,3 +125,10 @@ export const organizationUsersByOrgId = foreignKeyLoaderMaker(
       .execute()
   }
 )
+
+export const scalesByTeamId = foreignKeyLoaderMaker('templateScales', 'teamId', async (teamIds) => {
+  return selectTemplateScale()
+    .where('teamId', 'in', teamIds)
+    .orderBy(['isStarter', 'name'])
+    .execute()
+})
diff --git a/packages/server/dataloader/primaryKeyLoaderMakers.ts b/packages/server/dataloader/primaryKeyLoaderMakers.ts
index 10b7d3c3530..0f9c8a053f9 100644
--- a/packages/server/dataloader/primaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/primaryKeyLoaderMakers.ts
@@ -7,6 +7,7 @@ import {getTeamPromptResponsesByIds} from '../postgres/queries/getTeamPromptResp
 import getTemplateRefsByIds from '../postgres/queries/getTemplateRefsByIds'
 import getTemplateScaleRefsByIds from '../postgres/queries/getTemplateScaleRefsByIds'
 import {getUsersByIds} from '../postgres/queries/getUsersByIds'
+import {selectTemplateScale} from '../postgres/select'
 import {primaryKeyLoaderMaker} from './primaryKeyLoaderMaker'
 
 export const users = primaryKeyLoaderMaker(getUsersByIds)
@@ -150,3 +151,7 @@ export const organizationUsers = primaryKeyLoaderMaker((ids: readonly string[])
 export const teamMembers = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return getKysely().selectFrom('TeamMember').selectAll().where('id', 'in', ids).execute()
 })
+
+export const templateScales = primaryKeyLoaderMaker((ids: readonly string[]) => {
+  return selectTemplateScale().where('TemplateScale.id', 'in', ids).execute()
+})
diff --git a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
index 1fbc779c4cf..bdd7d47e595 100644
--- a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
@@ -116,20 +116,6 @@ export const meetingMembersByUserId = new RethinkForeignKeyLoaderMaker(
   }
 )
 
-export const scalesByTeamId = new RethinkForeignKeyLoaderMaker(
-  'templateScales',
-  'teamId',
-  async (teamIds) => {
-    const r = await getRethink()
-    return r
-      .table('TemplateScale')
-      .getAll(r.args(teamIds), {index: 'teamId'})
-      .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-      .orderBy('sortOrder')
-      .run()
-  }
-)
-
 export const templateDimensionsByTemplateId = new RethinkForeignKeyLoaderMaker(
   'templateDimensions',
   'templateId',
diff --git a/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts b/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
index 8c7f70d9be0..cf77db7ba68 100644
--- a/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
@@ -13,7 +13,6 @@ export const meetingMembers = new RethinkPrimaryKeyLoaderMaker('MeetingMember')
 export const newMeetings = new RethinkPrimaryKeyLoaderMaker('NewMeeting')
 export const newFeatures = new RethinkPrimaryKeyLoaderMaker('NewFeature')
 export const notifications = new RethinkPrimaryKeyLoaderMaker('Notification')
-export const templateScales = new RethinkPrimaryKeyLoaderMaker('TemplateScale')
 export const slackAuths = new RethinkPrimaryKeyLoaderMaker('SlackAuth')
 export const slackNotifications = new RethinkPrimaryKeyLoaderMaker('SlackNotification')
 export const suggestedActions = new RethinkPrimaryKeyLoaderMaker('SuggestedAction')
diff --git a/packages/server/graphql/mutations/addPokerTemplateDimension.ts b/packages/server/graphql/mutations/addPokerTemplateDimension.ts
index ff1d5a1e2ef..41fed4f6b99 100644
--- a/packages/server/graphql/mutations/addPokerTemplateDimension.ts
+++ b/packages/server/graphql/mutations/addPokerTemplateDimension.ts
@@ -54,13 +54,8 @@ const addPokerTemplateDimension = {
     // RESOLUTION
     const sortOrder =
       Math.max(0, ...activeDimensions.map((dimension) => dimension.sortOrder)) + 1 + dndNoise()
-
-    const availableScales = await r
-      .table('TemplateScale')
-      .filter({teamId})
-      .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-      .orderBy(r.desc('updatedAt'))
-      .run()
+    const rawAvailableScales = await dataLoader.get('scalesByTeamId').load(teamId)
+    const availableScales = rawAvailableScales.sort((a, b) => (a.updatedAt > b.updatedAt ? -1 : 1))
     const defaultScaleId =
       availableScales.length > 0
         ? availableScales.map((teamScale) => teamScale.id)[0]
diff --git a/packages/server/graphql/mutations/addPokerTemplateScale.ts b/packages/server/graphql/mutations/addPokerTemplateScale.ts
index fdb38242b46..f4c7f69dc91 100644
--- a/packages/server/graphql/mutations/addPokerTemplateScale.ts
+++ b/packages/server/graphql/mutations/addPokerTemplateScale.ts
@@ -1,12 +1,12 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
-import {SubscriptionChannel, Threshold} from 'parabol-client/types/constEnums'
-import dndNoise from 'parabol-client/utils/dndNoise'
-import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
-import TemplateScale from '../../database/types/TemplateScale'
+import {PokerCards, SubscriptionChannel, Threshold} from 'parabol-client/types/constEnums'
+import {PALETTE} from '../../../client/styles/paletteV3'
+import generateUID from '../../generateUID'
+import getKysely from '../../postgres/getKysely'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
+import {positionAfter} from '../../utils/sortOrder'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import AddPokerTemplateScalePayload from '../types/AddPokerTemplateScalePayload'
@@ -27,7 +27,7 @@ const addPokerTemplateScale = {
     {parentScaleId, teamId}: {parentScaleId?: string | null; teamId: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
+    const pg = getKysely()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
     const viewerId = getUserId(authToken)
@@ -39,11 +39,7 @@ const addPokerTemplateScale = {
 
     // VALIDATION
     const [activeScales, viewer] = await Promise.all([
-      r
-        .table('TemplateScale')
-        .getAll(teamId, {index: 'teamId'})
-        .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-        .run(),
+      dataLoader.get('scalesByTeamId').load(teamId),
       dataLoader.get('users').loadNonNull(viewerId)
     ])
     if (activeScales.length >= Threshold.MAX_POKER_TEMPLATE_SCALES) {
@@ -51,12 +47,11 @@ const addPokerTemplateScale = {
     }
 
     // RESOLUTION
-    let newScale
-    const sortOrder = Math.max(0, ...activeScales.map((scale) => scale.sortOrder)) + 1 + dndNoise()
+    let newScaleId: string | undefined
+    let newScaleName: string
+
     if (parentScaleId) {
-      const parentScale = (await dataLoader
-        .get('templateScales')
-        .load(parentScaleId)) as TemplateScale
+      const parentScale = await dataLoader.get('templateScales').load(parentScaleId)
       if (!parentScale) {
         return standardError(new Error('Parent scale not found'), {userId: viewerId})
       }
@@ -67,34 +62,79 @@ const addPokerTemplateScale = {
       }
       const {name} = parentScale
       const copyName = `${name} Copy`
-      const existingCopyCount = await r
-        .table('TemplateScale')
-        .getAll(teamId, {index: 'teamId'})
-        .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-        .filter((row: RDatum) => row('name').match(`^${copyName}`) as any)
-        .count()
-        .run()
-      const newName = existingCopyCount === 0 ? copyName : `${copyName} #${existingCopyCount + 1}`
-      newScale = new TemplateScale({
-        sortOrder,
-        name: newName,
-        teamId,
-        parentScaleId,
-        values: parentScale.values
-      })
+      const re = new RegExp(`^${copyName}`)
+      const existingCopyCount = activeScales.filter(({name}) => name.match(re)).length
+      newScaleName = existingCopyCount === 0 ? copyName : `${copyName} #${existingCopyCount + 1}`
+      const res = await pg
+        .with('TemplateScaleInsert', (qc) =>
+          qc
+            .insertInto('TemplateScale')
+            .values({
+              id: generateUID(),
+              name: newScaleName,
+              teamId,
+              parentScaleId
+            })
+            .returning(['id', 'parentScaleId'])
+        )
+        .insertInto('TemplateScaleValue')
+        .columns(['templateScaleId', 'sortOrder', 'color', 'label'])
+        .expression(({selectFrom}) =>
+          selectFrom('TemplateScaleValue')
+            .innerJoin(
+              'TemplateScaleInsert',
+              'TemplateScaleValue.templateScaleId',
+              'TemplateScaleInsert.parentScaleId'
+            )
+            .select(({ref}) => [
+              ref('TemplateScaleInsert.id').as('templateScaleId'),
+              ref('TemplateScaleValue.sortOrder').as('sortOrder'),
+              ref('TemplateScaleValue.color').as('color'),
+              ref('TemplateScaleValue.label').as('label')
+            ])
+        )
+        .returning('TemplateScaleValue.templateScaleId')
+        .executeTakeFirstOrThrow()
+      newScaleId = res.templateScaleId
     } else {
-      newScale = new TemplateScale({
-        sortOrder,
-        name: `*New Scale #${activeScales.length + 1}`,
-        teamId
-      })
+      newScaleName = `*New Scale #${activeScales.length + 1}`
+      const res = await pg
+        .with('TemplateScaleInsert', (qc) =>
+          qc
+            .insertInto('TemplateScale')
+            .values({
+              id: generateUID(),
+              name: newScaleName,
+              teamId
+            })
+            .returning('id as templateScaleId')
+        )
+        .insertInto('TemplateScaleValue')
+        .values(({selectFrom}) => [
+          {
+            templateScaleId: selectFrom('TemplateScaleInsert').select('templateScaleId'),
+            color: PALETTE.FUSCIA_400,
+            label: PokerCards.QUESTION_CARD as string,
+            sortOrder: positionAfter('')
+          },
+          {
+            templateScaleId: selectFrom('TemplateScaleInsert').select('templateScaleId'),
+            color: PALETTE.GRAPE_500,
+            label: PokerCards.PASS_CARD as string,
+            sortOrder: positionAfter(positionAfter(''))
+          }
+        ])
+        .returning('templateScaleId')
+        .executeTakeFirstOrThrow()
+      newScaleId = res.templateScaleId
     }
-
-    await r.table('TemplateScale').insert(newScale).run()
-
-    const scaleId = newScale.id
-    const data = {scaleId}
-    analytics.scaleMetrics(viewer, newScale, parentScaleId ? 'Scale Cloned' : 'Scale Created')
+    dataLoader.clearAll('templateScales')
+    const data = {scaleId: newScaleId}
+    analytics.scaleMetrics(
+      viewer,
+      {id: newScaleId, name: newScaleName, teamId},
+      parentScaleId ? 'Scale Cloned' : 'Scale Created'
+    )
     publish(SubscriptionChannel.TEAM, teamId, 'AddPokerTemplateScalePayload', data, subOptions)
     return data
   }
diff --git a/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts b/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts
index 3470e9418dc..2d379081848 100644
--- a/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts
@@ -1,20 +1,15 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
-import TemplateScale from '../../database/types/TemplateScale'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
+import {getSortOrder} from '../../utils/sortOrder'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import AddPokerTemplateScaleValuePayload from '../types/AddPokerTemplateScaleValuePayload'
 import AddTemplateScaleInput, {AddTemplateScaleInputType} from '../types/AddTemplateScaleInput'
-import {
-  validateColorValue,
-  validateScaleLabel,
-  validateScaleLabelValueUniqueness
-} from './helpers/validateScaleValue'
+import {validateColorValue, validateScaleLabel} from './helpers/validateScaleValue'
 
 const addPokerTemplateScaleValue = {
   description: 'Add a new scale value for a scale in a poker template',
@@ -40,7 +35,7 @@ const addPokerTemplateScaleValue = {
     const viewerId = getUserId(authToken)
 
     // AUTH
-    const existingScale = await r.table('TemplateScale').get(scaleId).run()
+    const existingScale = await dataLoader.get('templateScales').load(scaleId)
     if (!existingScale || existingScale.removedAt) {
       return standardError(new Error('Did not find an active scale'), {userId: viewerId})
     }
@@ -56,48 +51,39 @@ const addPokerTemplateScaleValue = {
     if (!validateScaleLabel(label)) {
       return standardError(new Error('Invalid scale label'), {userId: viewerId})
     }
-
-    const updatedScale = await r
-      .table('TemplateScale')
-      .get(scaleId)
-      .update(
-        (row: RDatum<TemplateScale>) => ({
-          // Append at the end of the sub-array (minus ? and Pass)
-          values: row('values').insertAt(row('values').count().sub(2), scaleValue),
-          updatedAt: now
-        }),
-        {returnChanges: true}
-      )('changes')(0)('new_val')
-      .default(null)
-      .run()
-
-    if (updatedScale && !validateScaleLabelValueUniqueness(updatedScale.values)) {
-      // updated values and/or labels are not unique, rolling back
-      await r
-        .table('TemplateScale')
-        .get(scaleId)
-        .update({
-          values: existingScale.values,
-          updatedAt: existingScale.updatedAt
+    const {values} = existingScale
+    const endCardIdx = values.findIndex(({label}) => ['?', 'Pass'].includes(label))
+    const sortOrder = getSortOrder(values, endCardIdx + 1, endCardIdx)
+    try {
+      await pg
+        .insertInto('TemplateScaleValue')
+        .values({
+          templateScaleId: scaleId,
+          color,
+          label,
+          sortOrder
         })
-        .run()
-      return standardError(new Error('Scale labels and/or numerical values are not unique'), {
-        userId: viewerId
-      })
+        .execute()
+    } catch (e) {
+      if ((e as any).constraint === 'TemplateScaleValue_templateScaleId_label_key') {
+        return {error: {message: 'Scale labels and/or numerical values are not unique'}}
+      }
+      return {error: {message: 'Could not add scale value'}}
     }
-
+    dataLoader.clearAll('templateScales')
     // mark all templates using this scale as updated
     const updatedDimensions = await r
       .table('TemplateDimension')
       .getAll(scaleId, {index: 'scaleId'})
       .run()
     const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    await pg
-      .updateTable('MeetingTemplate')
-      .set({updatedAt: now})
-      .where('id', 'in', updatedTemplateIds)
-      .execute()
-
+    if (updatedTemplateIds.length) {
+      await pg
+        .updateTable('MeetingTemplate')
+        .set({updatedAt: now})
+        .where('id', 'in', updatedTemplateIds)
+        .execute()
+    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/helpers/validateScaleValue.ts b/packages/server/graphql/mutations/helpers/validateScaleValue.ts
index 908c19fb3d1..60fc93e91ff 100644
--- a/packages/server/graphql/mutations/helpers/validateScaleValue.ts
+++ b/packages/server/graphql/mutations/helpers/validateScaleValue.ts
@@ -1,7 +1,6 @@
 import toArray from 'lodash.toarray'
 import palettePickerOptions from '../../../../client/styles/palettePickerOptions'
 import {Threshold} from '../../../../client/types/constEnums'
-import TemplateScaleValue from '../../../database/types/TemplateScaleValue'
 
 const validateColorValue = (color: string) => {
   const validHexes = palettePickerOptions.map(({hex}) => hex)
@@ -14,10 +13,4 @@ const validateScaleLabel = (label: string) => {
   return 0 < labelArr.length && labelArr.length <= Threshold.POKER_SCALE_VALUE_MAX_LENGTH
 }
 
-const validateScaleLabelValueUniqueness = (scaleValues: TemplateScaleValue[]) => {
-  const labelList = scaleValues.map((scaleValue) => scaleValue.label)
-
-  return new Set(labelList).size === labelList.length
-}
-
-export {validateColorValue, validateScaleLabel, validateScaleLabelValueUniqueness}
+export {validateColorValue, validateScaleLabel}
diff --git a/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts b/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts
index 6da4d67829d..d445953c1ed 100644
--- a/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts
@@ -1,10 +1,10 @@
 import {GraphQLID, GraphQLInt, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
-import {RValue} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
+import {getSortOrder} from '../../utils/sortOrder'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import MovePokerTemplateScaleValuePayload from '../types/MovePokerTemplateScaleValuePayload'
@@ -36,7 +36,7 @@ const movePokerTemplateScaleValue = {
     const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {mutatorId, operationId}
-    const scale = await r.table('TemplateScale').get(scaleId).run()
+    const scale = await dataLoader.get('templateScales').load(scaleId)
 
     //AUTH
     if (!scale || scale.removedAt) {
@@ -47,39 +47,38 @@ const movePokerTemplateScaleValue = {
     }
 
     // VALIDATION
-    if (index < 0 || index >= scale.values.length - 2) {
-      return standardError(new Error('Invalid index to move to'), {userId: viewerId})
-    }
-    const scaleValueIndex = scale.values.findIndex((scaleValue) => scaleValue.label === label)
-    if (scaleValueIndex === -1) {
+    const itemIdx = scale.values.findIndex((scaleValue) => scaleValue.label === label)
+    if (itemIdx === -1) {
       return standardError(new Error('Did not find an existing scale value to move'), {
         userId: viewerId
       })
     }
+    if (index < 0 || index >= scale.values.length - 2) {
+      return standardError(new Error('Invalid index to move to'), {userId: viewerId})
+    }
 
     // RESOLUTION
-    await r
-      .table('TemplateScale')
-      .get(scaleId)
-      .update((row: RValue) => ({
-        values: row('values')
-          .deleteAt(scaleValueIndex)
-          .insertAt(index, scale.values[scaleValueIndex]),
-        updatedAt: now
-      }))
-      .run()
+    const sortOrder = getSortOrder(scale.values, itemIdx, index)
+    await pg
+      .updateTable('TemplateScaleValue')
+      .set({sortOrder})
+      .where('templateScaleId', '=', scale.id)
+      .where('label', '=', label)
+      .execute()
+    dataLoader.clearAll('templateScales')
     // mark all templates using this scale as updated
     const updatedDimensions = await r
       .table('TemplateDimension')
       .getAll(scaleId, {index: 'scaleId'})
       .run()
     const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    await pg
-      .updateTable('MeetingTemplate')
-      .set({updatedAt: now})
-      .where('id', 'in', updatedTemplateIds)
-      .execute()
-
+    if (updatedTemplateIds.length) {
+      await pg
+        .updateTable('MeetingTemplate')
+        .set({updatedAt: now})
+        .where('id', 'in', updatedTemplateIds)
+        .execute()
+    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/removePokerTemplateScale.ts b/packages/server/graphql/mutations/removePokerTemplateScale.ts
index b56255592f4..fd2b48a35f4 100644
--- a/packages/server/graphql/mutations/removePokerTemplateScale.ts
+++ b/packages/server/graphql/mutations/removePokerTemplateScale.ts
@@ -1,4 +1,5 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
+import {sql} from 'kysely'
 import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
 import {RDatum} from '../../database/stricterR'
@@ -40,7 +41,11 @@ const removePokerTemplateScale = {
     }
 
     // RESOLUTION
-    await r.table('TemplateScale').get(scaleId).update({removedAt: now, updatedAt: now}).run()
+    await pg
+      .updateTable('TemplateScale')
+      .set({removedAt: sql`CURRENT_TIMESTAMP`})
+      .where('id', '=', scaleId)
+      .execute()
 
     const nextDefaultScaleId = SprintPokerDefaults.DEFAULT_SCALE_ID
     const dimensions = await r
@@ -60,12 +65,13 @@ const removePokerTemplateScale = {
       .run()
     // mark templates as updated
     const updatedTemplateIds = dimensions.map(({templateId}: any) => templateId)
-    await pg
-      .updateTable('MeetingTemplate')
-      .set({updatedAt: now})
-      .where('id', 'in', updatedTemplateIds)
-      .execute()
-
+    if (updatedTemplateIds.length) {
+      await pg
+        .updateTable('MeetingTemplate')
+        .set({updatedAt: now})
+        .where('id', 'in', updatedTemplateIds)
+        .execute()
+    }
     const data = {scaleId, dimensions}
     publish(SubscriptionChannel.TEAM, teamId, 'RemovePokerTemplateScalePayload', data, subOptions)
     return data
diff --git a/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts b/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts
index 9caecbfeab5..739ed5ce0ea 100644
--- a/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts
@@ -1,7 +1,6 @@
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
-import {RValue} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -33,7 +32,7 @@ const removePokerTemplateScaleValue = {
     const viewerId = getUserId(authToken)
 
     // AUTH
-    const scale = await r.table('TemplateScale').get(scaleId).run()
+    const scale = await dataLoader.get('templateScales').load(scaleId)
     if (!scale || scale.removedAt) {
       return standardError(new Error('Did not find an active scale'), {userId: viewerId})
     }
@@ -51,27 +50,25 @@ const removePokerTemplateScaleValue = {
     }
 
     // RESOLUTION
-    await r
-      .table('TemplateScale')
-      .get(scaleId)
-      .update((row: RValue) => ({
-        values: row('values').deleteAt(row('values').offsetsOf(oldScaleValue).nth(0)),
-        updatedAt: now
-      }))
-      .run()
-
+    await pg
+      .deleteFrom('TemplateScaleValue')
+      .where('templateScaleId', '=', scaleId)
+      .where('label', '=', label)
+      .execute()
+    dataLoader.clearAll('templateScales')
     // mark all templates using this scale as updated
     const updatedDimensions = await r
       .table('TemplateDimension')
       .getAll(scaleId, {index: 'scaleId'})
       .run()
     const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    await pg
-      .updateTable('MeetingTemplate')
-      .set({updatedAt: now})
-      .where('id', 'in', updatedTemplateIds)
-      .execute()
-
+    if (updatedTemplateIds.length) {
+      await pg
+        .updateTable('MeetingTemplate')
+        .set({updatedAt: now})
+        .where('id', 'in', updatedTemplateIds)
+        .execute()
+    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/renamePokerTemplateScale.ts b/packages/server/graphql/mutations/renamePokerTemplateScale.ts
index f9b42c50778..6d2ce4eea06 100644
--- a/packages/server/graphql/mutations/renamePokerTemplateScale.ts
+++ b/packages/server/graphql/mutations/renamePokerTemplateScale.ts
@@ -1,7 +1,6 @@
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -30,7 +29,7 @@ const renamePokerTemplateScale = {
     const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
-    const scale = await r.table('TemplateScale').get(scaleId).run()
+    const scale = await dataLoader.get('templateScales').load(scaleId)
     const viewerId = getUserId(authToken)
 
     // AUTH
@@ -46,37 +45,31 @@ const renamePokerTemplateScale = {
     const trimmedName = name.trim().slice(0, 50)
     const normalizedName = trimmedName || 'Unnamed Scale'
 
-    const allScales = await r
-      .table('TemplateScale')
-      .getAll(teamId, {index: 'teamId'})
-      .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-      .run()
+    const allScales = await dataLoader.get('scalesByTeamId').load(teamId)
     if (allScales.find((scale) => scale.name === normalizedName)) {
       return standardError(new Error('Duplicate name scale'), {userId: viewerId})
     }
 
     // RESOLUTION
-    await r
-      .table('TemplateScale')
-      .get(scaleId)
-      .update({
-        name: normalizedName,
-        updatedAt: now
-      })
-      .run()
-
+    await pg
+      .updateTable('TemplateScale')
+      .set({name: normalizedName})
+      .where('id', '=', scaleId)
+      .execute()
+    dataLoader.clearAll('templateScales')
     // mark all templates using this scale as updated
     const updatedDimensions = await r
       .table('TemplateDimension')
       .getAll(scaleId, {index: 'scaleId'})
       .run()
     const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    await pg
-      .updateTable('MeetingTemplate')
-      .set({updatedAt: now})
-      .where('id', 'in', updatedTemplateIds)
-      .execute()
-
+    if (updatedTemplateIds.length) {
+      await pg
+        .updateTable('MeetingTemplate')
+        .set({updatedAt: now})
+        .where('id', 'in', updatedTemplateIds)
+        .execute()
+    }
     const data = {scaleId}
     publish(SubscriptionChannel.TEAM, teamId, 'RenamePokerTemplateScalePayload', data, subOptions)
     return data
diff --git a/packages/server/graphql/mutations/startSprintPoker.ts b/packages/server/graphql/mutations/startSprintPoker.ts
index bfeb3c72af1..3b7b7766c32 100644
--- a/packages/server/graphql/mutations/startSprintPoker.ts
+++ b/packages/server/graphql/mutations/startSprintPoker.ts
@@ -6,9 +6,7 @@ import MeetingPoker from '../../database/types/MeetingPoker'
 import MeetingSettingsPoker from '../../database/types/MeetingSettingsPoker'
 import PokerMeetingMember from '../../database/types/PokerMeetingMember'
 import generateUID from '../../generateUID'
-import getPg from '../../postgres/getPg'
-import {insertTemplateRefQuery} from '../../postgres/queries/generated/insertTemplateRefQuery'
-import {insertTemplateScaleRefQuery} from '../../postgres/queries/generated/insertTemplateScaleRefQuery'
+import getKysely from '../../postgres/getKysely'
 import updateMeetingTemplateLastUsedAt from '../../postgres/queries/updateMeetingTemplateLastUsedAt'
 import updateTeamByTeamId from '../../postgres/queries/updateTeamByTeamId'
 import {MeetingTypeEnum} from '../../postgres/types/Meeting'
@@ -27,7 +25,7 @@ import isStartMeetingLocked from './helpers/isStartMeetingLocked'
 import {IntegrationNotifier} from './helpers/notifications/IntegrationNotifier'
 
 const freezeTemplateAsRef = async (templateId: string, dataLoader: DataLoaderWorker) => {
-  const pg = getPg()
+  const pg = getKysely()
   const [template, dimensions] = await Promise.all([
     dataLoader.get('meetingTemplates').loadNonNull(templateId),
     dataLoader.get('templateDimensionsByTemplateId').load(templateId)
@@ -39,7 +37,7 @@ const freezeTemplateAsRef = async (templateId: string, dataLoader: DataLoaderWor
     isValid
   )
   const templateScales = uniqueScales.map(({name, values}) => {
-    const scale = {name, values}
+    const scale = {name, values: values.map(({color, label}) => ({color, label}))}
     const {id, str} = getHashAndJSON(scale)
     return {id, scale: str}
   })
@@ -59,10 +57,17 @@ const freezeTemplateAsRef = async (templateId: string, dataLoader: DataLoaderWor
   }
   const {id: templateRefId, str: templateRefStr} = getHashAndJSON(templateRef)
   const ref = {id: templateRefId, template: templateRefStr}
-  await Promise.all([
-    insertTemplateScaleRefQuery.run({templateScales}, pg),
-    insertTemplateRefQuery.run({ref}, pg)
-  ])
+  await pg
+    .with('TemplateScaleRefUpsert', (qc) =>
+      qc
+        .insertInto('TemplateScaleRef')
+        .values(templateScales)
+        .onConflict((oc) => oc.doNothing())
+    )
+    .insertInto('TemplateRef')
+    .values(ref)
+    .onConflict((oc) => oc.doNothing())
+    .execute()
   return templateRefId
 }
 
diff --git a/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts b/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts
index 479eba4abfb..af6c5dc86d3 100644
--- a/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts
+++ b/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts
@@ -42,7 +42,7 @@ const updatePokerTemplateDimensionScale = {
     }
 
     // VALIDATION
-    const scale = await r.table('TemplateScale').get(scaleId).run()
+    const scale = await dataLoader.get('templateScales').load(scaleId)
     if (!scale || scale.removedAt || (!scale.isStarter && scale.teamId !== teamId)) {
       return standardError(new Error('Scale not found'), {userId: viewerId})
     }
diff --git a/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts b/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts
index 64ce07cab26..b19dbd65478 100644
--- a/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts
@@ -2,7 +2,6 @@ import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import isSpecialPokerLabel from 'parabol-client/utils/isSpecialPokerLabel'
 import getRethink from '../../database/rethinkDriver'
-import {RValue} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -10,11 +9,7 @@ import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import TemplateScaleInput, {TemplateScaleInputType} from '../types/TemplateScaleInput'
 import UpdatePokerTemplateScaleValuePayload from '../types/UpdatePokerTemplateScaleValuePayload'
-import {
-  validateColorValue,
-  validateScaleLabel,
-  validateScaleLabelValueUniqueness
-} from './helpers/validateScaleValue'
+import {validateColorValue, validateScaleLabel} from './helpers/validateScaleValue'
 
 const updatePokerTemplateScaleValue = {
   description: 'Update the label, numerical value or color of a scale value in a scale',
@@ -51,7 +46,7 @@ const updatePokerTemplateScaleValue = {
     const viewerId = getUserId(authToken)
 
     // AUTH
-    const existingScale = await r.table('TemplateScale').get(scaleId).run()
+    const existingScale = await dataLoader.get('templateScales').load(scaleId)
     if (!existingScale || existingScale.removedAt) {
       return standardError(new Error('Did not find an active scale'), {userId: viewerId})
     }
@@ -83,31 +78,13 @@ const updatePokerTemplateScaleValue = {
     if (!isSpecialPokerLabel(label) && !validateScaleLabel(label)) {
       return standardError(new Error('Invalid scale label'), {userId: viewerId})
     }
-
-    await r
-      .table('TemplateScale')
-      .get(scaleId)
-      .update((row: RValue) => ({
-        values: row('values').changeAt(oldScaleValueIndex, newScaleValue),
-        updatedAt: now
-      }))
-      .run()
-    const updatedScale = await r.table('TemplateScale').get(scaleId).run()
-
-    if (!validateScaleLabelValueUniqueness(updatedScale.values)) {
-      // updated values or labels are not unique, rolling back
-      await r
-        .table('TemplateScale')
-        .get(scaleId)
-        .update({
-          values: existingScale.values,
-          updatedAt: existingScale.updatedAt
-        })
-        .run()
-      return standardError(new Error('Scale labels and/or numerical values are not unique'), {
-        userId: viewerId
-      })
-    }
+    await pg
+      .updateTable('TemplateScaleValue')
+      .set({label, color})
+      .where('templateScaleId', '=', scaleId)
+      .where('label', '=', oldScaleLabel)
+      .execute()
+    dataLoader.clearAll('templateScales')
 
     // mark all templates using this scale as updated
     const updatedDimensions = await r
@@ -115,12 +92,13 @@ const updatePokerTemplateScaleValue = {
       .getAll(scaleId, {index: 'scaleId'})
       .run()
     const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    await pg
-      .updateTable('MeetingTemplate')
-      .set({updatedAt: now})
-      .where('id', 'in', updatedTemplateIds)
-      .execute()
-
+    if (updatedTemplateIds.length) {
+      await pg
+        .updateTable('MeetingTemplate')
+        .set({updatedAt: now})
+        .where('id', 'in', updatedTemplateIds)
+        .execute()
+    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/public/types/TemplateScale.ts b/packages/server/graphql/public/types/TemplateScale.ts
new file mode 100644
index 00000000000..44b3e15b292
--- /dev/null
+++ b/packages/server/graphql/public/types/TemplateScale.ts
@@ -0,0 +1,31 @@
+import getRethink from '../../../database/rethinkDriver'
+import {RDatum} from '../../../database/stricterR'
+import {TemplateScaleResolvers} from '../resolverTypes'
+
+const TemplateScale: TemplateScaleResolvers = {
+  isActive: ({removedAt}) => !removedAt,
+  team: ({teamId}, _args, {dataLoader}) => {
+    return dataLoader.get('teams').loadNonNull(teamId)
+  },
+
+  dimensions: async ({id: scaleId, teamId}) => {
+    const r = await getRethink()
+    return r
+      .table('TemplateDimension')
+      .getAll(teamId, {index: 'teamId'})
+      .filter((row: RDatum) =>
+        row('removedAt').default(null).eq(null).and(row('scaleId').eq(scaleId))
+      )
+      .run()
+  },
+
+  values: ({id, values}) => {
+    return values.map((value, index) => ({
+      ...value,
+      scaleId: id,
+      sortOrder: index
+    }))
+  }
+}
+
+export default TemplateScale
diff --git a/packages/server/graphql/public/types/TemplateScaleRef.ts b/packages/server/graphql/public/types/TemplateScaleRef.ts
new file mode 100644
index 00000000000..97280282825
--- /dev/null
+++ b/packages/server/graphql/public/types/TemplateScaleRef.ts
@@ -0,0 +1,14 @@
+import {TemplateScaleRefResolvers} from '../resolverTypes'
+
+const TemplateScaleRef: TemplateScaleRefResolvers = {
+  values: ({id, values}) => {
+    return values.map(({color, label}, index) => ({
+      color,
+      label,
+      scaleId: id,
+      sortOrder: index
+    }))
+  }
+}
+
+export default TemplateScaleRef
diff --git a/packages/server/graphql/public/types/TemplateScaleValue.ts b/packages/server/graphql/public/types/TemplateScaleValue.ts
new file mode 100644
index 00000000000..4e3ac6836f0
--- /dev/null
+++ b/packages/server/graphql/public/types/TemplateScaleValue.ts
@@ -0,0 +1,16 @@
+import {TemplateScaleValueResolvers} from '../resolverTypes'
+
+export type TemplateScaleValueSource = {
+  color: string
+  label: string
+  sortOrder: number
+  scaleId: string
+}
+
+const TemplateScaleValue: TemplateScaleValueResolvers = {
+  id: ({scaleId, label}) => {
+    return `${scaleId}:${label}`
+  }
+}
+
+export default TemplateScaleValue
diff --git a/packages/server/graphql/types/Team.ts b/packages/server/graphql/types/Team.ts
index a950e9412bd..f6bf14bb400 100644
--- a/packages/server/graphql/types/Team.ts
+++ b/packages/server/graphql/types/Team.ts
@@ -13,9 +13,9 @@ import getRethink from '../../database/rethinkDriver'
 import MassInvitationDB from '../../database/types/MassInvitation'
 import Task from '../../database/types/Task'
 import ITeam from '../../database/types/Team'
-import db from '../../db'
 import {getUserId, isSuperUser, isTeamMember, isUserBillingLeader} from '../../utils/authorization'
 import standardError from '../../utils/standardError'
+import isValid from '../isValid'
 import connectionFromTasks from '../queries/helpers/connectionFromTasks'
 import {GQLContext} from './../graphql'
 import AgendaItem from './AgendaItem'
@@ -204,13 +204,10 @@ const Team: GraphQLObjectType = new GraphQLObjectType<ITeam, GQLContext>({
       type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(TemplateScale))),
       description: 'The list of scales this team can use',
       resolve: async ({id: teamId}: {id: string}, {}, {dataLoader}: GQLContext) => {
-        const activeTeamScales = await dataLoader.get('scalesByTeamId').load(teamId)
-        const publicScales = await db.read('starterScales', 'aGhostTeam')
-        const activeScales = [...activeTeamScales, ...publicScales]
-        const uniqueScales = activeScales.filter(
-          (scale, index) => index === activeScales.findIndex((obj) => obj.id === scale.id)
-        )
-        return uniqueScales
+        const availableScales = await dataLoader
+          .get('scalesByTeamId')
+          .loadMany([teamId, 'aGhostTeam'])
+        return availableScales.filter(isValid).flat()
       }
     },
     activeMeetings: {
diff --git a/packages/server/graphql/types/TemplateScale.ts b/packages/server/graphql/types/TemplateScale.ts
index 0f42590aba3..66859e8a47c 100644
--- a/packages/server/graphql/types/TemplateScale.ts
+++ b/packages/server/graphql/types/TemplateScale.ts
@@ -1,88 +1,8 @@
-import {
-  GraphQLBoolean,
-  GraphQLID,
-  GraphQLList,
-  GraphQLNonNull,
-  GraphQLObjectType,
-  GraphQLString
-} from 'graphql'
-import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
-import TemplateScaleDB from '../../database/types/TemplateScale'
-import {GQLContext} from '../graphql'
-import {resolveTeam} from '../resolvers'
-import GraphQLISO8601Type from './GraphQLISO8601Type'
-import Team from './Team'
-import TemplateDimension from './TemplateDimension'
-import TemplateScaleValue from './TemplateScaleValue'
+import {GraphQLObjectType} from 'graphql'
 
-const TemplateScale = new GraphQLObjectType<TemplateScaleDB, GQLContext>({
+const TemplateScale = new GraphQLObjectType({
   name: 'TemplateScale',
-  description: 'A team-specific template scale.',
-  fields: () => ({
-    id: {
-      type: new GraphQLNonNull(GraphQLID),
-      description: 'shortid'
-    },
-    createdAt: {
-      type: new GraphQLNonNull(GraphQLISO8601Type)
-    },
-    isActive: {
-      type: new GraphQLNonNull(GraphQLBoolean),
-      resolve: ({removedAt}) => !removedAt,
-      description: 'true if the scale is currently used by the team, else false'
-    },
-    isStarter: {
-      type: new GraphQLNonNull(GraphQLBoolean),
-      resolve: ({isStarter}) => !!isStarter,
-      description: 'True if this is a starter/default scale; false otherwise'
-    },
-    removedAt: {
-      type: GraphQLISO8601Type,
-      description: 'The datetime that the scale was removed. Null if it has not been removed.'
-    },
-    teamId: {
-      type: new GraphQLNonNull(GraphQLID),
-      description: 'foreign key. use the team field'
-    },
-    team: {
-      type: new GraphQLNonNull(Team),
-      description: 'The team that owns this template scale',
-      resolve: resolveTeam
-    },
-    updatedAt: {
-      type: new GraphQLNonNull(GraphQLISO8601Type)
-    },
-    name: {
-      type: new GraphQLNonNull(GraphQLString),
-      description: 'The title of the scale used in the template'
-    },
-    dimensions: {
-      type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(TemplateDimension))),
-      description: 'The dimensions currently using this scale',
-      resolve: async ({id: scaleId, teamId}) => {
-        const r = await getRethink()
-        return r
-          .table('TemplateDimension')
-          .getAll(teamId, {index: 'teamId'})
-          .filter((row: RDatum) =>
-            row('removedAt').default(null).eq(null).and(row('scaleId').eq(scaleId))
-          )
-          .run()
-      }
-    },
-    values: {
-      type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(TemplateScaleValue))),
-      description: 'The values used in this scale',
-      resolve: ({id, values}) => {
-        return values.map((value, index) => ({
-          ...value,
-          scaleId: id,
-          sortOrder: index
-        }))
-      }
-    }
-  })
+  fields: {}
 })
 
 export default TemplateScale
diff --git a/packages/server/graphql/types/TemplateScaleRef.ts b/packages/server/graphql/types/TemplateScaleRef.ts
index 8d706c98625..78ab520da42 100644
--- a/packages/server/graphql/types/TemplateScaleRef.ts
+++ b/packages/server/graphql/types/TemplateScaleRef.ts
@@ -1,36 +1,8 @@
-import {GraphQLID, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLString} from 'graphql'
-import {GQLContext} from '../graphql'
-import GraphQLISO8601Type from './GraphQLISO8601Type'
-import TemplateScaleValue from './TemplateScaleValue'
+import {GraphQLObjectType} from 'graphql'
 
-const TemplateScaleRef = new GraphQLObjectType<any, GQLContext>({
+const TemplateScaleRef = new GraphQLObjectType({
   name: 'TemplateScaleRef',
-  description: 'An immutable version of TemplateScale to be shared across all users',
-  fields: () => ({
-    id: {
-      type: new GraphQLNonNull(GraphQLID),
-      description: 'md5 hash'
-    },
-    createdAt: {
-      type: new GraphQLNonNull(GraphQLISO8601Type)
-    },
-    name: {
-      type: new GraphQLNonNull(GraphQLString),
-      description: 'The title of the scale used in the template'
-    },
-    values: {
-      type: new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(TemplateScaleValue))),
-      description: 'The values used in this scale',
-      resolve: ({id, values}) => {
-        return values.map(({color, label}: {color: string; label: string}, index: number) => ({
-          color,
-          label,
-          scaleId: id,
-          sortOrder: index
-        }))
-      }
-    }
-  })
+  fields: {}
 })
 
 export default TemplateScaleRef
diff --git a/packages/server/graphql/types/TemplateScaleValue.ts b/packages/server/graphql/types/TemplateScaleValue.ts
deleted file mode 100644
index e9dfc193629..00000000000
--- a/packages/server/graphql/types/TemplateScaleValue.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {GraphQLID, GraphQLInt, GraphQLNonNull, GraphQLObjectType, GraphQLString} from 'graphql'
-import {GQLContext} from '../graphql'
-
-const TemplateScaleValue = new GraphQLObjectType<any, GQLContext>({
-  name: 'TemplateScaleValue',
-  description: 'A value for a scale.',
-  fields: () => ({
-    id: {
-      type: new GraphQLNonNull(GraphQLID),
-      resolve: ({scaleId, label}) => {
-        return `${scaleId}:${label}`
-      }
-    },
-    scaleId: {
-      description: 'The id of the scale this value belongs to',
-      type: new GraphQLNonNull(GraphQLID)
-    },
-    color: {
-      description: 'The color used to visually group a scale value',
-      type: new GraphQLNonNull(GraphQLString)
-    },
-    label: {
-      description: 'The label for this value, e.g., XS, M, L',
-      type: new GraphQLNonNull(GraphQLString)
-    },
-
-    sortOrder: {
-      type: new GraphQLNonNull(GraphQLInt),
-      description: 'the order of the scale value in this scale'
-    }
-  })
-})
-
-export default TemplateScaleValue
diff --git a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
index 152c5c99793..b024cd537d8 100644
--- a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
+++ b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
@@ -8,7 +8,6 @@ import {RValue, r} from 'rethinkdb-ts'
 import {parse} from 'url'
 import MeetingPoker from '../../database/types/MeetingPoker'
 import TemplateDimension from '../../database/types/TemplateDimension'
-import TemplateScale from '../../database/types/TemplateScale'
 import {insertTemplateRefQuery, insertTemplateScaleRefQuery} from '../generatedMigrationHelpers'
 import getPgConfig from '../getPgConfig'
 
@@ -58,11 +57,11 @@ export async function up(): Promise<void> {
     .run()) as {
     id: string
     name: string
-    dimensions: (TemplateDimension & {scale: TemplateScale})[]
+    dimensions: (TemplateDimension & {scale: any})[]
   }[]
 
   const uniqueScaleIdSet = new Set<string>()
-  const uniqueScales = [] as TemplateScale[]
+  const uniqueScales = [] as any[]
   dimensionsByTemplateId.forEach((group) => {
     const {dimensions} = group
     dimensions.forEach((dimension) => {
diff --git a/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts b/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts
index a73875ad16c..49bf054d3bd 100644
--- a/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts
+++ b/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts
@@ -3,7 +3,6 @@ import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
 import connectRethinkDB from '../../database/connectRethinkDB'
 import TemplateDimension from '../../database/types/TemplateDimension'
-import TemplateScale from '../../database/types/TemplateScale'
 import getPgConfig from '../getPgConfig'
 import getPgp from '../getPgp'
 
@@ -46,7 +45,7 @@ const getTemplateIllustrationUrl = (filename: string) => {
   throw new Error('Mssing Env: FILE_STORE_PROVIDER')
 }
 
-const MOSCOW_SCALE_CONFIG: TemplateScale = {
+const MOSCOW_SCALE_CONFIG = {
   createdAt,
   id: 'moscowScale',
   isStarter: true,
diff --git a/packages/server/postgres/migrations/1721405703862_TemplateScale.ts b/packages/server/postgres/migrations/1721405703862_TemplateScale.ts
new file mode 100644
index 00000000000..7926e454beb
--- /dev/null
+++ b/packages/server/postgres/migrations/1721405703862_TemplateScale.ts
@@ -0,0 +1,149 @@
+import {Kysely, PostgresDialect, sql} from 'kysely'
+import {Client} from 'pg'
+import {r} from 'rethinkdb-ts'
+import connectRethinkDB from '../../database/connectRethinkDB'
+import getPg from '../getPg'
+import getPgConfig from '../getPgConfig'
+
+const START_CHAR_CODE = 32
+const END_CHAR_CODE = 126
+
+export function positionAfter(pos: string) {
+  for (let i = pos.length - 1; i >= 0; i--) {
+    const curCharCode = pos.charCodeAt(i)
+    if (curCharCode < END_CHAR_CODE) {
+      return pos.substr(0, i) + String.fromCharCode(curCharCode + 1)
+    }
+  }
+  return pos + String.fromCharCode(START_CHAR_CODE + 1)
+}
+
+export async function up() {
+  await connectRethinkDB()
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  await sql`
+  DO $$
+  BEGIN
+    CREATE TABLE IF NOT EXISTS "TemplateScale" (
+      "id" VARCHAR(100) PRIMARY KEY,
+      "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+      "name" VARCHAR(50) NOT NULL,
+      "teamId" VARCHAR(100) NOT NULL,
+      "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+      "parentScaleId" VARCHAR(100),
+      "isStarter" BOOLEAN NOT NULL DEFAULT FALSE,
+      "removedAt" TIMESTAMP WITH TIME ZONE,
+      CONSTRAINT "fk_teamId"
+        FOREIGN KEY("teamId")
+          REFERENCES "Team"("id")
+          ON DELETE CASCADE
+    );
+    CREATE INDEX IF NOT EXISTS "idx_TemplateScale_teamId" ON "TemplateScale"("teamId") WHERE "removedAt" IS NULL;
+    DROP TRIGGER IF EXISTS "update_TemplateScale_updatedAt" ON "TemplateScale";
+    CREATE TRIGGER "update_TemplateScale_updatedAt" BEFORE UPDATE ON "TemplateScale" FOR EACH ROW EXECUTE PROCEDURE "set_updatedAt"();
+
+    CREATE TABLE IF NOT EXISTS "TemplateScaleValue" (
+      "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+      "templateScaleId" VARCHAR(100) NOT NULL,
+      "sortOrder" VARCHAR(64) NOT NULL COLLATE "C",
+      "color" VARCHAR(9) NOT NULL,
+      "label" VARCHAR(18) NOT NULL,
+      UNIQUE ("templateScaleId","label"),
+      CONSTRAINT "fk_templateScaleId"
+        FOREIGN KEY("templateScaleId")
+          REFERENCES "TemplateScale"("id")
+          ON DELETE CASCADE
+    );
+    CREATE INDEX IF NOT EXISTS "idx_TemplateScaleValue_templateScaleId" ON "TemplateScaleValue"("templateScaleId");
+    CREATE OR REPLACE FUNCTION "set_TemplateScale_updatedAt"()
+      RETURNS TRIGGER AS $t$
+      BEGIN
+          -- Update the updatedAt column in TemplateScale
+          UPDATE "TemplateScale"
+          SET "updatedAt" = CURRENT_TIMESTAMP
+          WHERE id = NEW."templateScaleId";
+          RETURN NEW;
+      END;
+      $t$ LANGUAGE plpgsql;
+    CREATE TRIGGER "update_TemplateScale_updatedAt_from_TemplateScaleValue"
+    AFTER INSERT OR UPDATE OR DELETE ON "TemplateScaleValue"
+    FOR EACH ROW
+    EXECUTE FUNCTION "set_TemplateScale_updatedAt"();
+  END $$;
+`.execute(pg)
+
+  const rTemplateScales = await r.table('TemplateScale').coerceTo('array').run()
+  const templateScaleValues = [] as {
+    templateScaleId: string
+    sortOrder: string
+    color: string
+    label: string
+  }[]
+  const templateScales = rTemplateScales.map((templateScale) => {
+    const {id, createdAt, name, teamId, updatedAt, parentScaleId, isStarter, removedAt, values} =
+      templateScale
+    let curSortOrder = ''
+    const templateVals = values?.map((value) => {
+      const sortOrder = positionAfter(curSortOrder)
+      curSortOrder = sortOrder
+      return {
+        templateScaleId: id,
+        sortOrder,
+        color: value.color,
+        label: value.label.slice(0, 8)
+      }
+    })
+    templateScaleValues.push(...templateVals)
+    return {id, createdAt, name, teamId, updatedAt, parentScaleId, isStarter, removedAt}
+  })
+
+  const chunk = (arr: any[], size: number) =>
+    Array.from({length: Math.ceil(arr.length / size)}, (_, i) =>
+      arr.slice(i * size, i * size + size)
+    )
+
+  const valueChunks = chunk(templateScaleValues, 10000)
+
+  await pg.insertInto('TemplateScale').values(templateScales).execute()
+  await Promise.all(
+    valueChunks.map(async (chunk) => {
+      try {
+        return await pg.insertInto('TemplateScaleValue').values(chunk).execute()
+      } catch (e) {
+        await Promise.all(
+          chunk.map(async (row) => {
+            try {
+              await pg
+                .insertInto('TemplateScaleValue')
+                .values(row)
+                .onConflict((oc) => oc.doNothing())
+                .execute()
+            } catch (e) {
+              console.log(e, row)
+            }
+          })
+        )
+      }
+    })
+  )
+
+  await pg.schema
+    .alterTable('TemplateScale')
+    .addForeignKeyConstraint('fk_parentScaleId', ['parentScaleId'], 'TemplateScale', ['id'])
+    .onDelete('set null')
+    .execute()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DROP TABLE IF EXISTS "TemplateScaleValue";
+    DROP TABLE IF EXISTS "TemplateScale";
+    ` /* Do undo magic */)
+  await client.end()
+}
diff --git a/packages/server/postgres/queries/src/insertTemplateRefQuery.sql b/packages/server/postgres/queries/src/insertTemplateRefQuery.sql
deleted file mode 100644
index f0da3dc65ca..00000000000
--- a/packages/server/postgres/queries/src/insertTemplateRefQuery.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-  @name insertTemplateRefQuery
-  @param ref -> (id, template)
-*/
-INSERT INTO "TemplateRef" (
-  "id",
-  "template"
-)
-VALUES :ref
-ON CONFLICT (id)
-DO NOTHING;
diff --git a/packages/server/postgres/queries/src/insertTemplateScaleRefQuery.sql b/packages/server/postgres/queries/src/insertTemplateScaleRefQuery.sql
deleted file mode 100644
index 68e8aca0ab5..00000000000
--- a/packages/server/postgres/queries/src/insertTemplateScaleRefQuery.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-  @name insertTemplateScaleRefQuery
-  @param templateScales -> ((id, scale)...)
-*/
-INSERT INTO "TemplateScaleRef" (
-  "id",
-  "scale"
-)
-VALUES :templateScales
-ON CONFLICT (id)
-DO NOTHING;
diff --git a/packages/server/postgres/select.ts b/packages/server/postgres/select.ts
new file mode 100644
index 00000000000..59af2b66533
--- /dev/null
+++ b/packages/server/postgres/select.ts
@@ -0,0 +1,18 @@
+import {sql} from 'kysely'
+import getKysely from './getKysely'
+
+export const selectTemplateScale = () => {
+  return getKysely()
+    .selectFrom('TemplateScale')
+    .where('removedAt', 'is', null)
+    .leftJoin('TemplateScaleValue', 'TemplateScale.id', 'TemplateScaleValue.templateScaleId')
+    .groupBy('TemplateScale.id')
+    .selectAll('TemplateScale')
+    .select(() => [
+      sql<
+        {color: string; label: string; sortOrder: string}[]
+      >`json_agg(json_build_object('color', "TemplateScaleValue".color, 'label', "TemplateScaleValue".label, 'sortOrder', "TemplateScaleValue"."sortOrder") ORDER BY "TemplateScaleValue"."sortOrder")`.as(
+        'values'
+      )
+    ])
+}
diff --git a/packages/server/postgres/types/index.d.ts b/packages/server/postgres/types/index.d.ts
index 558bc238192..ea5fcd37de1 100644
--- a/packages/server/postgres/types/index.d.ts
+++ b/packages/server/postgres/types/index.d.ts
@@ -1,6 +1,22 @@
-import {Selectable} from 'kysely'
-import {OrganizationUser as OrganizationUserPG, TeamMember as TeamMemberPG} from '../pg.d'
+import {SelectQueryBuilder, Selectable} from 'kysely'
+import {
+  OrganizationUser as OrganizationUserPG,
+  TeamMember as TeamMemberPG,
+  TemplateScaleRef as TemplateScaleRefPG
+} from '../pg.d'
+import {selectTemplateScale} from '../select'
+
+type ExtractTypeFromQueryBuilderSelect<T extends (...args: any[]) => any> =
+  ReturnType<T> extends SelectQueryBuilder<infer _A, infer _B, infer X> ? X : never
 
 export type OrganizationUser = Selectable<OrganizationUserPG>
 
 export type TeamMember = Selectable<TeamMemberPG>
+
+export type TemplateScale = ExtractTypeFromQueryBuilderSelect<typeof selectTemplateScale>
+
+// TODO refactor getTemplateScaleRefsByIds to kysely
+export type TemplateScaleRef = Selectable<TemplateScaleRefPG> & {
+  name: string
+  values: {color: string; label: string}[]
+}
diff --git a/packages/server/utils/analytics/analytics.ts b/packages/server/utils/analytics/analytics.ts
index 741e73ab6ab..61f672d9931 100644
--- a/packages/server/utils/analytics/analytics.ts
+++ b/packages/server/utils/analytics/analytics.ts
@@ -8,12 +8,12 @@ import MeetingTemplate from '../../database/types/MeetingTemplate'
 import {Reactable, ReactableEnum} from '../../database/types/Reactable'
 import {SlackNotificationEventEnum} from '../../database/types/SlackNotification'
 import {TaskServiceEnum} from '../../database/types/Task'
-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'
+import {TemplateScale} from '../../postgres/types'
 import {MeetingTypeEnum} from '../../postgres/types/Meeting'
 import {MeetingSeries} from '../../postgres/types/MeetingSeries'
 import {AmplitudeAnalytics} from './amplitude/AmplitudeAnalytics'
@@ -413,7 +413,7 @@ class Analytics {
 
   scaleMetrics = (
     user: AnalyticsUser,
-    scale: TemplateScale,
+    scale: Pick<TemplateScale, 'id' | 'name' | 'teamId'>,
     eventName: 'Scale Created' | 'Scale Cloned'
   ) => {
     this.track(user, eventName, {
diff --git a/packages/server/utils/sortOrder.ts b/packages/server/utils/sortOrder.ts
new file mode 100644
index 00000000000..aa03d336ded
--- /dev/null
+++ b/packages/server/utils/sortOrder.ts
@@ -0,0 +1,67 @@
+// https://www.figma.com/blog/realtime-editing-of-ordered-sequences/#fractional-indexing/
+// https://steve.dignam.xyz/2020/03/31/practical-ordering/
+// Creates a sortOrder that is a string of characters that can be compared lexicographically
+// This is beneficial because each change results in 1 update to the DB & there is no rebalancing necessary
+// WARNING: the lexicographical sort assumes a C collation (i.e. compare strings via ASCII code)
+// CloudSQL assumes a utf-8 (byte-code) comparision by default, so make sure the column is collated correctly!
+
+const START_CHAR_CODE = 32
+const END_CHAR_CODE = 126
+
+export function positionBefore(pos: string) {
+  for (let i = pos.length - 1; i >= 0; i--) {
+    const curCharCode = pos.charCodeAt(i)
+    if (curCharCode > START_CHAR_CODE + 1) {
+      return pos.substr(0, i) + String.fromCharCode(curCharCode - 1)
+    }
+  }
+  return (
+    pos.substr(0, pos.length - 1) +
+    String.fromCharCode(START_CHAR_CODE) +
+    String.fromCharCode(END_CHAR_CODE)
+  )
+}
+export function positionAfter(pos: string) {
+  for (let i = pos.length - 1; i >= 0; i--) {
+    const curCharCode = pos.charCodeAt(i)
+    if (curCharCode < END_CHAR_CODE) {
+      return pos.substr(0, i) + String.fromCharCode(curCharCode + 1)
+    }
+  }
+  return pos + String.fromCharCode(START_CHAR_CODE + 1)
+}
+
+function avg(a: number, b: number) {
+  return Math.trunc((a + b) / 2)
+}
+
+function positionBetween(firstPos: string, secondPos: string) {
+  let flag = false
+  let position = ''
+  const maxLength = Math.max(firstPos.length, secondPos.length)
+  for (let i = 0; i < maxLength; i++) {
+    const lower = i < firstPos.length ? firstPos.charCodeAt(i) : START_CHAR_CODE
+    const upper = i < secondPos.length && !flag ? secondPos.charCodeAt(i) : END_CHAR_CODE
+    if (lower === upper) {
+      position += String.fromCharCode(lower)
+    } else if (upper - lower > 1) {
+      position += String.fromCharCode(avg(lower, upper))
+      flag = false
+      break
+    } else {
+      position += String.fromCharCode(lower)
+      flag = true
+    }
+  }
+  if (!flag) return position
+  return position + String.fromCharCode(avg(START_CHAR_CODE, END_CHAR_CODE))
+}
+
+export function getSortOrder(arr: {sortOrder: string}[], fromIdx: number, toIdx: number) {
+  const secondPosIdx = fromIdx < toIdx ? toIdx + 1 : toIdx
+  const firstPos = arr[secondPosIdx - 1]?.sortOrder
+  const secondPos = arr[secondPosIdx]?.sortOrder
+  if (firstPos && secondPos) return positionBetween(firstPos, secondPos)
+  if (secondPos) return positionBefore(secondPos)
+  return positionAfter(firstPos || '')
+}

From 88a3539e6f75a140e2ba4e1e15b23d71c865f945 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:21:59 -0700
Subject: [PATCH 08/18] chore(release): release v7.39.3 (#10031)

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 a999d60cc0b..2f8093d94f6 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.39.2"
+  ".": "7.39.3"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09b9fa1731c..6654a361cd2 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.39.3](https://github.com/ParabolInc/parabol/compare/v7.39.2...v7.39.3) (2024-07-25)
+
+
+### Changed
+
+* **rethinkdb:** TemplateScale: One-shot ([#10021](https://github.com/ParabolInc/parabol/issues/10021)) ([0c6c8e7](https://github.com/ParabolInc/parabol/commit/0c6c8e79dfbbac93362b3db640b008e32ba701b3))
+
 ## [7.39.2](https://github.com/ParabolInc/parabol/compare/v7.39.1...v7.39.2) (2024-07-24)
 
 
diff --git a/package.json b/package.json
index 7351040d65d..94dd7ffa721 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.39.2",
+  "version": "7.39.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index 8852d449624..a48ced587a5 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.39.2",
+  "version": "7.39.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.39.2"
+    "parabol-server": "7.39.3"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 5ece805bce9..00da4eecb33 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.39.2",
+  "version": "7.39.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index e78210071f3..a5258421eac 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.39.2",
+  "version": "7.39.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 0738c1b2524..1623ef6af34 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.39.2",
+  "version": "7.39.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.39.2",
-    "parabol-server": "7.39.2",
+    "parabol-client": "7.39.3",
+    "parabol-server": "7.39.3",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 2626544317a..95a50e4e3af 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.39.2",
+  "version": "7.39.3",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index e8ed5217f59..f9156cd8334 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.39.2",
+  "version": "7.39.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "openai": "^4.24.1",
     "openapi-fetch": "^0.9.7",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.39.2",
+    "parabol-client": "7.39.3",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From fa52c4638629fcf9c5c3453798d1320b9d8da2dd Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Thu, 25 Jul 2024 12:46:37 +0200
Subject: [PATCH 09/18] fix: Disable SAML on downgrade to starter (#10026)

---
 .../graphql/mutations/helpers/resolveDowngradeToStarter.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts b/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts
index 8e44110824c..86d5fcc0a4b 100644
--- a/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts
+++ b/packages/server/graphql/mutations/helpers/resolveDowngradeToStarter.ts
@@ -38,7 +38,7 @@ const resolveDowngradeToStarter = async (
       .execute(),
     pg
       .updateTable('SAML')
-      .set({metadata: null, lastUpdatedBy: user.id})
+      .set({metadata: null, url: null, lastUpdatedBy: user.id})
       .where('orgId', '=', orgId)
       .execute(),
     updateTeamByOrgId(

From 2dd490ac75578f73d7a7b3e1f8ccfb1cd2164884 Mon Sep 17 00:00:00 2001
From: Terry Acker <ackernaut@gmail.com>
Date: Thu, 25 Jul 2024 10:36:38 -0500
Subject: [PATCH 10/18] feat: nav updates (#9973)

---
 .../components/DashNavList/DashNavList.tsx    | 97 ++++++++----------
 .../DashNavList/DashNavListTeams.tsx          |  6 +-
 .../components/DashNavList/DashNavMenu.tsx    | 98 -------------------
 .../components/Dashboard/DashSidebar.tsx      | 19 ++--
 .../components/Dashboard/LeftDashNavItem.tsx  | 10 +-
 .../Dashboard/MobileDashSidebar.tsx           | 27 +++--
 .../components/SideBarStartMeetingButton.tsx  |  4 +-
 .../components/Organization/OrgNav.tsx        | 18 ++--
 8 files changed, 83 insertions(+), 196 deletions(-)
 delete mode 100644 packages/client/components/DashNavList/DashNavMenu.tsx

diff --git a/packages/client/components/DashNavList/DashNavList.tsx b/packages/client/components/DashNavList/DashNavList.tsx
index 33a61b06965..bda7d56a650 100644
--- a/packages/client/components/DashNavList/DashNavList.tsx
+++ b/packages/client/components/DashNavList/DashNavList.tsx
@@ -1,17 +1,14 @@
 import styled from '@emotion/styled'
+import {ManageAccounts} 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 {DashNavList_organization$key} from '../../__generated__/DashNavList_organization.graphql'
-import {TierEnum} from '../../__generated__/InvoiceHeader_invoice.graphql'
-import useBreakpoint from '../../hooks/useBreakpoint'
-import {Breakpoint} from '../../types/constEnums'
-import {upperFirst} from '../../utils/upperFirst'
-import LeftDashNavItem from '../Dashboard/LeftDashNavItem'
-import BaseTag from '../Tag/BaseTag'
+import {TierEnum} from '../../__generated__/OrganizationSubscription.graphql'
+import {Tooltip} from '../../ui/Tooltip/Tooltip'
+import {TooltipContent} from '../../ui/Tooltip/TooltipContent'
+import {TooltipTrigger} from '../../ui/Tooltip/TooltipTrigger'
 import DashNavListTeams from './DashNavListTeams'
-import DashNavMenu from './DashNavMenu'
 
 const EmptyTeams = styled('div')({
   fontSize: 16,
@@ -20,22 +17,13 @@ const EmptyTeams = styled('div')({
   textAlign: 'center'
 })
 
-const StyledLeftDashNavItem = styled(LeftDashNavItem)<{isViewerOnTeam: boolean}>(
-  ({isViewerOnTeam}) => ({
-    color: isViewerOnTeam ? PALETTE.SLATE_700 : PALETTE.SLATE_600,
-    borderRadius: 44,
-    paddingLeft: 15
-  })
-)
-
-const Tag = styled(BaseTag)<{tier: TierEnum | null}>(({tier}) => ({
-  backgroundColor:
-    tier === 'enterprise' ? PALETTE.SKY_500 : tier === 'team' ? PALETTE.GOLD_300 : PALETTE.JADE_400,
-  color: tier === 'team' ? PALETTE.GRAPE_700 : PALETTE.WHITE
-}))
+const StyledIcon = styled(ManageAccounts)({
+  height: 18,
+  width: 18
+})
 
 interface Props {
-  organizationsRef: DashNavList_organization$key | null
+  organizationsRef: DashNavList_organization$key
   onClick?: () => void
 }
 
@@ -45,7 +33,6 @@ const DashNavList = (props: Props) => {
     graphql`
       fragment DashNavList_organization on Organization @relay(plural: true) {
         ...DashNavListTeams_organization
-        ...DashNavMenu_organization
         id
         name
         tier
@@ -56,44 +43,42 @@ const DashNavList = (props: Props) => {
     `,
     organizationsRef
   )
-  const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
-  const teams = organizations?.flatMap((org) => org.viewerTeams)
+
+  const TierEnumValues: TierEnum[] = ['enterprise', 'team', 'starter']
+
+  const sortedOrgs = organizations.toSorted((a, b) => {
+    const aTier = TierEnumValues.indexOf(a.tier)
+    const bTier = TierEnumValues.indexOf(b.tier)
+    return aTier < bTier ? -1 : aTier > bTier ? 1 : a.name.localeCompare(b.name)
+  })
+
+  const teams = organizations.flatMap((org) => org.viewerTeams)
 
   if (teams?.length === 0) {
-    return <EmptyTeams>It appears you are not a member of any team!</EmptyTeams>
+    return <EmptyTeams>{'It appears you are not a member of any team!'}</EmptyTeams>
   }
 
   return (
-    <div className='w-full p-2 lg:pt-4'>
-      {organizations?.map((org) => (
-        <div key={org.id} className='mb-3 w-full rounded-lg border border-solid border-slate-400'>
-          <div
-            className={
-              org.viewerTeams.length > 0 ? `border-b border-solid border-slate-300 p-2` : 'p-2'
-            }
-          >
-            <div className='flex flex-wrap items-center pb-1'>
-              <div className='flex min-w-0 flex-1 flex-wrap items-center justify-between'>
-                <span className='pl-2 text-base font-semibold leading-6 text-slate-700'>
-                  {org.name}
-                </span>
-                <div className='flex w-auto justify-end px-0 text-right'>
-                  <Tag tier={org.tier}>{upperFirst(org.tier)}</Tag>
-                </div>
-              </div>
-            </div>
-            {isDesktop ? (
-              <DashNavMenu organizationRef={org} />
-            ) : (
-              <StyledLeftDashNavItem
-                className={'bg-transparent'}
-                icon={'manageAccounts'}
-                isViewerOnTeam
-                onClick={onClick}
-                href={`/me/organizations/${org.id}/billing`}
-                label={'Settings & Members'}
-              />
-            )}
+    <div className='w-full p-3 pt-4 pb-0'>
+      {sortedOrgs.map((org) => (
+        <div key={org.id} className='w-full pb-4'>
+          <div className='mb-1 flex min-w-0 flex-1 flex-wrap items-center justify-between'>
+            <span className='flex-1 pl-3 text-base font-semibold leading-6 text-slate-700'>
+              {org.name}
+            </span>
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <a
+                  className='flex h-8 w-8 items-center justify-center rounded-full hover:bg-slate-300'
+                  href={`/me/organizations/${org.id}/billing`}
+                >
+                  <StyledIcon />
+                </a>
+              </TooltipTrigger>
+              <TooltipContent side='bottom' align='center' sideOffset={4}>
+                {'Settings & Members'}
+              </TooltipContent>
+            </Tooltip>
           </div>
           <DashNavListTeams onClick={onClick} organizationRef={org} />
         </div>
diff --git a/packages/client/components/DashNavList/DashNavListTeams.tsx b/packages/client/components/DashNavList/DashNavListTeams.tsx
index 3c9e22099bb..560567cdb79 100644
--- a/packages/client/components/DashNavList/DashNavListTeams.tsx
+++ b/packages/client/components/DashNavList/DashNavListTeams.tsx
@@ -12,7 +12,7 @@ const StyledLeftDashNavItem = styled(LeftDashNavItem)<{isPublicTeams?: boolean}>
   ({isPublicTeams}) => ({
     color: isPublicTeams ? PALETTE.SLATE_600 : PALETTE.SLATE_700,
     borderRadius: 44,
-    paddingLeft: 15
+    paddingLeft: 16
   })
 )
 
@@ -61,7 +61,7 @@ const DashNavListTeams = (props: Props) => {
 
   if (!viewerTeams.length) return null
   return (
-    <div className='p-2'>
+    <div>
       {viewerTeams.map((team) => {
         return (
           <StyledLeftDashNavItem
@@ -75,7 +75,7 @@ const DashNavListTeams = (props: Props) => {
       })}
       {publicTeamsCount > 0 && (
         <StyledLeftDashNavItem
-          className='bg-white pl-11 lg:bg-slate-200'
+          className='bg-white pl-[46px] lg:bg-slate-200'
           onClick={handleClick}
           isPublicTeams
           label={`View ${publicTeamsCount} ${plural(publicTeamsCount, 'Public Team', 'Public Teams')}`}
diff --git a/packages/client/components/DashNavList/DashNavMenu.tsx b/packages/client/components/DashNavList/DashNavMenu.tsx
deleted file mode 100644
index 43fdb660221..00000000000
--- a/packages/client/components/DashNavList/DashNavMenu.tsx
+++ /dev/null
@@ -1,98 +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 {DashNavMenu_organization$key} from '../../__generated__/DashNavMenu_organization.graphql'
-import {PALETTE} from '../../styles/paletteV3'
-import {Menu} from '../../ui/Menu/Menu'
-import {MenuContent} from '../../ui/Menu/MenuContent'
-import {MenuItem} from '../../ui/Menu/MenuItem'
-import LeftDashNavItem from '../Dashboard/LeftDashNavItem'
-
-const StyledLeftDashNavItem = styled(LeftDashNavItem)<{isViewerOnTeam: boolean}>(
-  ({isViewerOnTeam}) => ({
-    color: isViewerOnTeam ? PALETTE.SLATE_700 : PALETTE.SLATE_600,
-    borderRadius: 44,
-    paddingLeft: 15
-  })
-)
-
-type Props = {
-  organizationRef: DashNavMenu_organization$key
-}
-
-const DashNavMenu = (props: Props) => {
-  const {organizationRef} = props
-  const history = useHistory()
-  const org = useFragment(
-    graphql`
-      fragment DashNavMenu_organization on Organization {
-        id
-        tier
-      }
-    `,
-    organizationRef
-  )
-  const {id: orgId, tier} = org
-  const menuItems = [
-    {
-      label: (
-        <>
-          Plans & Billing{' '}
-          {tier === 'starter' && (
-            <>
-              •&nbsp;<span className='text-sky-500'>Upgrade</span>
-            </>
-          )}
-        </>
-      ),
-      href: `/me/organizations/${orgId}/billing`
-    },
-    {
-      label: 'Teams',
-      href: `/me/organizations/${orgId}/teams`
-    },
-    {
-      label: 'Members',
-      href: `/me/organizations/${orgId}/members`
-    },
-    {
-      label: 'Organization Settings',
-      href: `/me/organizations/${orgId}/settings`
-    },
-    {
-      label: 'Authentication',
-      href: `/me/organizations/${orgId}/authentication`
-    }
-  ]
-
-  const handleMenuItemClick = (href: string) => {
-    history.push(href)
-  }
-
-  return (
-    <Menu
-      trigger={
-        <div>
-          <StyledLeftDashNavItem
-            className={'bg-transparent'}
-            icon={'manageAccounts'}
-            isViewerOnTeam
-            label={'Settings & Members'}
-          />
-        </div>
-      }
-    >
-      <MenuContent side='right' align='center' sideOffset={20}>
-        {menuItems.map((item) => (
-          <MenuItem key={item.href} onClick={() => handleMenuItemClick(item.href)}>
-            {item.label}
-          </MenuItem>
-        ))}
-      </MenuContent>
-    </Menu>
-  )
-}
-
-export default DashNavMenu
diff --git a/packages/client/components/Dashboard/DashSidebar.tsx b/packages/client/components/Dashboard/DashSidebar.tsx
index e919517f9e4..fb7ee5afdd9 100644
--- a/packages/client/components/Dashboard/DashSidebar.tsx
+++ b/packages/client/components/Dashboard/DashSidebar.tsx
@@ -4,7 +4,6 @@ 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 {
   AUTHENTICATION_PAGE,
@@ -40,7 +39,7 @@ const NavMain = styled('div')({
 
 const NavItem = styled(LeftDashNavItem)({
   borderRadius: 44,
-  paddingLeft: 15
+  paddingLeft: 16
 })
 
 const NavList = styled(DashNavList)({
@@ -56,14 +55,6 @@ const Wrapper = styled('div')({
   flexDirection: 'column'
 })
 
-const OrgName = styled('div')({
-  color: PALETTE.SLATE_600,
-  fontWeight: 600,
-  fontSize: 12,
-  lineHeight: '16px',
-  padding: '8px 16px'
-})
-
 interface Props {
   isOpen: boolean
   viewerRef: DashSidebar_viewer$key | null
@@ -107,7 +98,11 @@ const DashSidebar = (props: Props) => {
                   label={'Organizations'}
                   exact
                 />
-                <OrgName>{name}</OrgName>
+                <div className='mb-1 mt-4 flex min-h-[32px] items-center'>
+                  <span className='flex-1 pl-3 text-base font-semibold leading-6 text-slate-700'>
+                    {name}
+                  </span>
+                </div>
                 <NavItem
                   icon={'creditScore'}
                   href={`/me/organizations/${orgId}/${BILLING_PAGE}`}
@@ -146,7 +141,7 @@ const DashSidebar = (props: Props) => {
       <SideBarStartMeetingButton isOpen={isOpen} />
       <Nav isOpen={isOpen}>
         <Contents>
-          <div className='border-x border-solid border-[transparent] px-4'>
+          <div className='px-3'>
             <NavItem icon={'forum'} href={'/meetings'} label={'Meetings'} />
             <NavItem icon={'timeline'} href={'/me'} label={'History'} exact />
             <NavItem icon={'playlist_add_check'} href={'/me/tasks'} label={'Tasks'} />
diff --git a/packages/client/components/Dashboard/LeftDashNavItem.tsx b/packages/client/components/Dashboard/LeftDashNavItem.tsx
index 9cb7ac3b6c7..205c428b4ba 100644
--- a/packages/client/components/Dashboard/LeftDashNavItem.tsx
+++ b/packages/client/components/Dashboard/LeftDashNavItem.tsx
@@ -26,21 +26,21 @@ const NavItem = styled(PlainButton)<{isActive: boolean}>(({isActive}) => ({
   alignItems: 'center',
   backgroundColor: isActive ? PALETTE.SLATE_300 : undefined,
   borderRadius: 4,
-  color: isActive ? PALETTE.SLATE_900 : PALETTE.SLATE_800,
+  color: PALETTE.SLATE_900,
   display: 'flex',
   fontSize: NavSidebar.FONT_SIZE,
-  fontWeight: 600,
+  fontWeight: isActive ? 600 : 400,
   lineHeight: NavSidebar.LINE_HEIGHT,
   marginBottom: 2,
   marginTop: 2,
   paddingBottom: 5,
-  paddingRight: 8,
+  paddingRight: 12,
   paddingTop: 5,
   textDecoration: 'none',
   transition: `background-color 100ms ease-in`,
   userSelect: 'none',
   width: '100%',
-  ':hover': {
+  ':hover, :focus, :active': {
     backgroundColor: PALETTE.SLATE_300
   }
 }))
@@ -50,7 +50,7 @@ const StyledIcon = styled('div')<{isActive: boolean}>(({isActive}) => ({
   height: 18,
   width: 18,
   color: isActive ? PALETTE.SLATE_700 : PALETTE.SLATE_600,
-  marginRight: 11
+  marginRight: 12
 }))
 
 const Label = styled('div')({
diff --git a/packages/client/components/Dashboard/MobileDashSidebar.tsx b/packages/client/components/Dashboard/MobileDashSidebar.tsx
index ae214705b9e..0b097cafb1e 100644
--- a/packages/client/components/Dashboard/MobileDashSidebar.tsx
+++ b/packages/client/components/Dashboard/MobileDashSidebar.tsx
@@ -57,22 +57,17 @@ const Nav = styled('nav')({
   width: '100%'
 })
 
-const OrgName = styled('div')({
-  paddingTop: 8,
-  paddingLeft: 15,
-  fontWeight: 600,
-  fontSize: 12,
-  lineHeight: '24px',
-  color: PALETTE.SLATE_500
+const TopNavItemsWrap = styled('div')({
+  padding: '10px 12px'
 })
 
 const NavItemsWrap = styled('div')({
-  padding: '8px 17px' // add 1 to 16 to match nav section border
+  padding: '10px 12px 0'
 })
 
 const NavItem = styled(LeftDashNavItem)({
   borderRadius: 44,
-  paddingLeft: 15
+  paddingLeft: 16
 })
 
 const DashHR = styled('div')({
@@ -121,7 +116,7 @@ const MobileDashSidebar = (props: Props) => {
         <StandardHub handleMenuClick={handleMenuClick} viewer={viewer} />
         <NavBlock>
           <Nav>
-            <NavItemsWrap>
+            <TopNavItemsWrap>
               <NavItem
                 onClick={handleMenuClick}
                 icon={'userSettings'}
@@ -135,7 +130,7 @@ const MobileDashSidebar = (props: Props) => {
                 label={'Sign Out'}
                 exact
               />
-            </NavItemsWrap>
+            </TopNavItemsWrap>
             <DashHR />
             <NavItemsWrap>
               <NavItem
@@ -145,7 +140,11 @@ const MobileDashSidebar = (props: Props) => {
                 label={'Organizations'}
                 exact
               />
-              <OrgName>{name}</OrgName>
+              <div className='mb-1 mt-4 flex min-h-[32px] items-center'>
+                <span className='flex-1 pl-3 text-base font-semibold leading-6 text-slate-700'>
+                  {name}
+                </span>
+              </div>
               <NavItem
                 onClick={handleMenuClick}
                 icon={'creditScore'}
@@ -194,7 +193,7 @@ const MobileDashSidebar = (props: Props) => {
       <StandardHub handleMenuClick={handleMenuClick} viewer={viewer} />
       <NavBlock>
         <Nav>
-          <NavItemsWrap>
+          <TopNavItemsWrap>
             <NavItem
               onClick={handleMenuClick}
               icon={'userSettings'}
@@ -208,7 +207,7 @@ const MobileDashSidebar = (props: Props) => {
               label={'Sign Out'}
               exact
             />
-          </NavItemsWrap>
+          </TopNavItemsWrap>
           <DashHR />
           <NavItemsWrap>
             <NavItem
diff --git a/packages/client/components/SideBarStartMeetingButton.tsx b/packages/client/components/SideBarStartMeetingButton.tsx
index 8fde0c1e8f0..ce2a3d9830a 100644
--- a/packages/client/components/SideBarStartMeetingButton.tsx
+++ b/packages/client/components/SideBarStartMeetingButton.tsx
@@ -9,7 +9,7 @@ const Button = styled(FlatPrimaryButton)<{isOpen: boolean}>(({isOpen}) => ({
   height: 40,
   overflow: 'hidden',
   padding: 0,
-  width: isOpen ? 200 : 40,
+  width: isOpen ? 232 : 40,
   marginTop: 16,
   marginBottom: 14, // account for nav margin 2px
   transition: `all 300ms ${BezierCurve.DECELERATE}`,
@@ -36,7 +36,7 @@ const SideBarStartMeetingButton = ({isOpen}: {isOpen: boolean}) => {
     history.push('/activity-library')
   }
   return (
-    <div className='border-x border-solid border-[transparent] px-4'>
+    <div className='px-3'>
       <Button isOpen={isOpen} onClick={onClick}>
         <MeetingIcon />
         <MeetingLabel isOpen={isOpen}>Add Meeting</MeetingLabel>
diff --git a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
index ab2ebbbe9ab..daa57242100 100644
--- a/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
+++ b/packages/client/modules/userDashboard/components/Organization/OrgNav.tsx
@@ -6,13 +6,13 @@ 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'
 
 const Wrapper = styled('div')({
   display: 'flex',
   fontSize: 14,
   padding: '16px 0px',
-  maxWidth: ElementWidth.PANEL_WIDTH
+  maxWidth: '100%',
+  overflow: 'hidden'
 })
 
 const StyledIcon = styled('div')({
@@ -26,13 +26,19 @@ const NavigateNextIcon = styled(NavigateNext)({
   color: PALETTE.SLATE_900
 })
 
-const NavItemLabel = styled('span')<{isCurrent?: boolean}>(({isCurrent}) => ({
+const NavLabel = styled('span')<{isCurrent?: boolean}>(({isCurrent}) => ({
   fontWeight: isCurrent ? 600 : 400,
+  textWrap: 'nowrap',
   '&:hover': {
     cursor: isCurrent ? 'default' : 'pointer'
   }
 }))
 
+const OrgLabel = styled(NavLabel)({
+  overflow: 'hidden',
+  textOverflow: 'ellipsis'
+})
+
 type Props = {
   organizationRef: OrgNav_organization$key
 }
@@ -52,15 +58,15 @@ const OrgNav = (props: Props) => {
 
   return (
     <Wrapper>
-      <NavItemLabel onClick={() => history.push('/meetings')}>Dashboard</NavItemLabel>
+      <NavLabel onClick={() => history.push('/meetings')}>Dashboard</NavLabel>
       <StyledIcon>
         <NavigateNextIcon />
       </StyledIcon>
-      <NavItemLabel onClick={() => history.push('/me/organizations')}>Organization</NavItemLabel>
+      <NavLabel onClick={() => history.push('/me/organizations')}>Organization</NavLabel>
       <StyledIcon>
         <NavigateNextIcon />
       </StyledIcon>
-      <NavItemLabel isCurrent>{`${name}'s Org`}</NavItemLabel>
+      <OrgLabel isCurrent>{`${name}'s Org`}</OrgLabel>
     </Wrapper>
   )
 }

From f8b029d60b78e50e8afa5f0a0f44c863afce753a Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 25 Jul 2024 10:35:24 -0700
Subject: [PATCH 11/18] chore(SDL): refactor _legacy.graphql into individual
 typeDefs (#10019)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .../typeDefs/ChangeEmailDomainPayload.graphql |    4 +
 .../typeDefs/ChangeEmailDomainSuccess.graphql |   11 +
 .../typeDefs/DomainCountPayload.graphql       |   11 +
 .../DraftEnterpriseInvoicePayload.graphql     |    8 +
 .../private/typeDefs/EndTrialPayload.graphql  |    4 +
 .../private/typeDefs/EndTrialSuccess.graphql  |   11 +
 .../FlagConversionModalPayload.graphql        |    8 +
 .../typeDefs/FlagOverLimitPayload.graphql     |    8 +
 .../private/typeDefs/LoginsPayload.graphql    |   11 +
 .../MessageAllSlackUsersPayload.graphql       |    4 +
 .../MessageAllSlackUsersSuccess.graphql       |   11 +
 .../typeDefs/MessageSlackUserError.graphql    |   11 +
 .../graphql/private/typeDefs/Mutation.graphql |  530 ++
 .../OrganizationFeatureFlagsEnum.graphql      |   17 +
 ...{ping.graphql => PingableServices.graphql} |    9 +-
 .../typeDefs/ProcessRecurrencePayload.graphql |    4 +
 .../typeDefs/ProcessRecurrenceSuccess.graphql |   11 +
 .../graphql/private/typeDefs/Query.graphql    |  136 +
 .../RemoveAllSlackAuthsPayload.graphql        |    4 +
 .../RemoveAllSlackAuthsSuccess.graphql        |   11 +
 .../RemoveAuthIdentityPayload.graphql         |    4 +
 .../RemoveAuthIdentitySuccess.graphql         |    6 +
 .../SetIsFreeMeetingTemplatePayload.graphql   |    1 +
 .../SetIsFreeMeetingTemplateSuccess.graphql   |    6 +
 .../private/typeDefs/SignupsPayload.graphql   |   11 +
 .../typeDefs/StartTrialPayload.graphql        |    4 +
 .../typeDefs/StartTrialSuccess.graphql        |    6 +
 .../ToggleAllowInsightsPayload.graphql        |    4 +
 .../ToggleAllowInsightsSuccess.graphql        |    6 +
 .../UpdateOrgFeatureFlagPayload.graphql       |    1 +
 .../UpdateOrgFeatureFlagSuccess.graphql       |    6 +
 .../typeDefs/UpdateWatchlistPayload.graphql   |    4 +
 .../typeDefs/UpdateWatchlistSuccess.graphql   |    6 +
 .../typeDefs/VerifyDomainPayload.graphql      |    4 +
 .../typeDefs/VerifyDomainSuccess.graphql      |    6 +
 .../graphql/private/typeDefs/_legacy.graphql  | 1803 ----
 .../typeDefs/changeEmailDomain.graphql        |   33 -
 .../graphql/private/typeDefs/endTrial.graphql |   28 -
 .../private/typeDefs/flagOverLimit.graphql    |   25 -
 .../private/typeDefs/loginSAML.graphql        |   16 -
 .../graphql/private/typeDefs/logins.graphql   |   40 -
 .../typeDefs/processRecurrence.graphql        |   23 -
 .../typeDefs/removeAuthIdentity.graphql       |   33 -
 .../typeDefs/setIsFreeMeetingTemplate.graphql |   19 -
 .../private/typeDefs/startTrial.graphql       |   23 -
 .../typeDefs/stripeInvoicePaid.graphql        |   11 -
 .../private/typeDefs/suProOrgInfo.graphql     |    8 -
 .../typeDefs/toggleAllowInsights.graphql      |   31 -
 .../private/typeDefs/updateEmail.graphql      |   16 -
 .../typeDefs/updateOrgFeatureFlag.graphql     |   47 -
 .../private/typeDefs/verifyDomain.graphql     |   38 -
 .../AcceptRequestToJoinDomainPayload.graphql  |    4 +
 .../AcceptRequestToJoinDomainSuccess.graphql  |    6 +
 ...ql => AcceptTeamInvitationPayload.graphql} |   28 -
 .../public/typeDefs/ActionMeeting.graphql     |    1 -
 .../typeDefs/ActionMeetingMember.graphql      |   38 +
 .../typeDefs/ActionMeetingSettings.graphql    |   26 +
 .../typeDefs/AddAgendaItemPayload.graphql     |   10 +
 ...ApprovedOrganizationDomainsPayload.graphql |    1 +
 ...ApprovedOrganizationDomainsSuccess.graphql |    8 +
 .../typeDefs/AddAtlassianAuthPayload.graphql  |   19 +
 .../public/typeDefs/AddCommentInput.graphql   |   18 +
 .../public/typeDefs/AddCommentPayload.graphql |    4 +
 .../public/typeDefs/AddCommentSuccess.graphql |   11 +
 .../typeDefs/AddGitHubAuthPayload.graphql     |   18 +
 .../AddIntegrationProviderInput.graphql       |   39 +
 .../AddIntegrationProviderPayload.graphql     |    4 +
 .../AddIntegrationProviderSuccess.graphql     |   16 +
 .../typeDefs/AddNewFeaturePayload.graphql     |    6 +
 .../public/typeDefs/AddOrDeleteEnum.graphql   |    7 +
 .../public/typeDefs/AddOrgPayload.graphql     |   20 +
 .../public/typeDefs/AddPokerTemplate.graphql  |   31 -
 .../AddPokerTemplateDimensionPayload.graphql  |    4 +
 .../typeDefs/AddPokerTemplatePayload.graphql  |    4 +
 .../AddPokerTemplateScalePayload.graphql      |    4 +
 .../AddPokerTemplateScaleValuePayload.graphql |    4 +
 .../typeDefs/AddPokerTemplateSuccess.graphql  |   11 +
 .../AddReactjiToReactablePayload.graphql      |    4 -
 .../AddReactjiToReactableSuccess.graphql      |    3 +
 .../AddReactjiToReflectionSuccess.graphql     |    6 +
 .../typeDefs/AddReflectTemplate.graphql       |   31 -
 .../AddReflectTemplatePayload.graphql         |    4 +
 .../AddReflectTemplatePromptPayload.graphql   |    4 +
 .../AddReflectTemplateSuccess.graphql         |   11 +
 .../typeDefs/AddSlackAuthPayload.graphql      |   13 +
 ...ddTeamMemberIntegrationAuthPayload.graphql |    4 +
 ...ddTeamMemberIntegrationAuthSuccess.graphql |   21 +
 .../public/typeDefs/AddTeamPayload.graphql    |   19 +
 .../typeDefs/AddTemplateScaleInput.graphql    |   14 +
 .../AddTranscriptionBotPayload.graphql        |    4 +
 .../AddTranscriptionBotSuccess.graphql        |    6 +
 .../public/typeDefs/AgendaItem.graphql        |   10 +-
 .../public/typeDefs/AgendaItemsPhase.graphql  |   17 +
 .../public/typeDefs/AgendaItemsStage.graphql  |  111 +
 .../ArchiveOrganizationPayload.graphql        |   10 +
 .../typeDefs/ArchiveTeamPayload.graphql       |   19 +
 .../ArchiveTimelineEventPayload.graphql       |    4 +
 .../ArchiveTimelineEventSuccess.graphql       |    6 +
 .../graphql/public/typeDefs/AreaEnum.graphql  |    8 +
 .../public/typeDefs/AuthIdentity.graphql      |   10 +
 .../typeDefs/AuthIdentityGoogle.graphql       |   15 +
 .../public/typeDefs/AuthIdentityLocal.graphql |   10 +
 .../typeDefs/AuthIdentityMicrosoft.graphql    |   15 +
 .../typeDefs/AuthIdentityTypeEnum.graphql     |    8 +
 .../public/typeDefs/AuthTokenPayload.graphql  |    9 +
 .../public/typeDefs/AutogroupPayload.graphql  |    4 +
 .../typeDefs/AutogroupReflectionGroup.graphql |   14 +
 .../public/typeDefs/AutogroupSuccess.graphql  |    3 +
 .../typeDefs/AzureDevOpsWorkItem.graphql      |   31 -
 .../AzureDevOpsWorkItemConnection.graphql     |   19 +
 .../typeDefs/AzureDevOpsWorkItemEdge.graphql  |   10 +
 .../typeDefs/BatchArchiveTasksPayload.graphql |    4 +
 .../typeDefs/BatchArchiveTasksSuccess.graphql |   11 +
 .../public/typeDefs/CanAccessEntity.graphql   |    5 +
 .../public/typeDefs/ChangeSourceEnum.graphql  |    8 +
 .../typeDefs/ChangeTaskTeamPayload.graphql    |    9 +
 .../public/typeDefs/CheckInPhase.graphql      |   27 +
 .../public/typeDefs/CheckInStage.graphql      |  110 +
 .../graphql/public/typeDefs/Comment.graphql   |   74 +
 .../public/typeDefs/CommentorDetails.graphql  |   14 +
 .../graphql/public/typeDefs/Coupon.graphql    |   24 +
 .../typeDefs/CreateAgendaItemInput.graphql    |   27 +
 .../typeDefs/CreateGcalEventInput.graphql     |   12 +-
 .../CreateImposterTokenPayload.graphql        |   13 +
 .../CreateMassInvitationPayload.graphql       |    4 +
 .../CreateMassInvitationSuccess.graphql       |    6 +
 ...reateOAuth1AuthorizationURLPayload.graphql |   11 +
 .../public/typeDefs/CreatePollInput.graphql   |   21 +
 .../public/typeDefs/CreatePollPayload.graphql |    4 +
 .../public/typeDefs/CreatePollSuccess.graphql |   11 +
 .../typeDefs/CreateReflectionInput.graphql    |   13 +
 .../typeDefs/CreateReflectionPayload.graphql  |   16 +
 .../CreateStripeSubscriptionPayload.graphql   |    4 +
 .../CreateStripeSubscriptionSuccess.graphql   |    6 +
 .../public/typeDefs/CreateTaskInput.graphql   |   29 +
 .../CreateTaskIntegrationInput.graphql        |   11 +
 .../CreateTaskIntegrationPayload.graphql      |    4 +
 .../public/typeDefs/CreateTaskPayload.graphql |    5 +
 .../public/typeDefs/CreditCard.graphql        |   19 +
 .../graphql/public/typeDefs/DateTime.graphql  |    1 +
 .../typeDefs/DeleteCommentPayload.graphql     |    4 +
 .../typeDefs/DeleteCommentSuccess.graphql     |    8 +
 .../public/typeDefs/DeleteTaskPayload.graphql |    8 +
 .../public/typeDefs/DeleteUserPayload.graphql |    3 +
 .../DenyPushInvitationPayload.graphql         |    5 +
 .../typeDefs/DisconnectSocketPayload.graphql  |    6 +
 .../public/typeDefs/DiscussPhase.graphql      |   17 +
 .../public/typeDefs/Discussion.graphql        |   63 +
 .../typeDefs/DiscussionThreadStage.graphql    |   14 +
 .../typeDefs/DiscussionTopicTypeEnum.graphql  |   11 +
 .../typeDefs/DismissNewFeaturePayload.graphql |    3 +
 .../DismissSuggestedActionPayload.graphql     |   13 +
 .../DowngradeToStarterPayload.graphql         |   13 +
 .../DragDiscussionTopicPayload.graphql        |    5 +
 .../DragEstimatingTaskPayload.graphql         |    4 +
 .../DragEstimatingTaskSuccess.graphql         |    6 +
 .../DragReflectionDropTargetTypeEnum.graphql  |    7 +
 .../typeDefs/EditCommentingPayload.graphql    |    4 +
 .../typeDefs/EditCommentingSuccess.graphql    |   11 +
 .../typeDefs/EditReflectionPayload.graphql    |   14 +
 .../public/typeDefs/EditTaskPayload.graphql   |   10 +
 .../graphql/public/typeDefs/Email.graphql     |    1 +
 .../EmailPasswordResetPayload.graphql         |    4 +
 .../EmailPasswordResetSuccess.graphql         |    6 +
 .../graphql/public/typeDefs/Emoji.graphql     |    4 +
 .../public/typeDefs/EndCheckInPayload.graphql |    4 +
 .../public/typeDefs/EndCheckInSuccess.graphql |   25 +
 .../EndDraggingReflectionPayload.graphql      |   39 +
 .../typeDefs/EndRetrospectivePayload.graphql  |    4 +
 .../typeDefs/EndRetrospectiveSuccess.graphql  |   19 +
 .../typeDefs/EndSprintPokerPayload.graphql    |    4 +
 .../typeDefs/EndSprintPokerSuccess.graphql    |   11 +
 .../typeDefs/EndTeamPromptPayload.graphql     |    4 +
 ...t.graphql => EndTeamPromptSuccess.graphql} |    0
 .../public/typeDefs/ErrorPayload.graphql      |    3 +
 .../public/typeDefs/EstimatePhase.graphql     |   17 +
 .../public/typeDefs/EstimateStage.graphql     |  160 +
 .../public/typeDefs/EstimateUserScore.graphql |   29 +
 .../graphql/public/typeDefs/File.graphql      |    4 +
 .../public/typeDefs/FixedActivity.graphql     |   80 +
 .../FlagReadyToAdvancePayload.graphql         |    4 +
 .../FlagReadyToAdvanceSuccess.graphql         |   11 +
 .../public/typeDefs/GcalVideoTypeEnum.graphql |    7 +
 .../typeDefs/GenericMeetingPhase.graphql      |   17 +
 .../typeDefs/GenericMeetingStage.graphql      |   95 +
 .../typeDefs/GetDemoEntitiesPayload.graphql   |    4 +
 .../GetTemplateSuggestionPayload.graphql      |    4 +
 .../GetTemplateSuggestionSuccess.graphql      |   11 +
 .../public/typeDefs/GitLabIntegration.graphql |   31 -
 .../GitLabIntegrationConnection.graphql       |   19 +
 .../typeDefs/GitLabIntegrationEdge.graphql    |   10 +
 .../typeDefs/GoogleAnalyzedEntity.graphql     |   16 +
 .../GroupPhaseCompletePayload.graphql         |   16 +
 .../typeDefs/InactivateUserPayload.graphql    |    8 +
 .../typeDefs/IntegrationProvider.graphql      |   44 +
 ...ntegrationProviderAuthStrategyEnum.graphql |    9 +
 ...tegrationProviderEditableScopeEnum.graphql |    8 +
 ...grationProviderMetadataInputOAuth1.graphql |   19 +
 ...grationProviderMetadataInputOAuth2.graphql |   24 +
 ...rationProviderMetadataInputWebhook.graphql |    9 +
 .../IntegrationProviderOAuth1.graphql         |   49 +
 .../IntegrationProviderOAuth2.graphql         |   59 +
 .../IntegrationProviderScopeEnum.graphql      |    8 +
 .../IntegrationProviderServiceEnum.graphql    |   13 +
 .../IntegrationProviderWebhook.graphql        |   49 +
 .../InvalidateSessionsPayload.graphql         |    8 +
 .../typeDefs/InviteToTeamPayload.graphql      |   28 +
 .../graphql/public/typeDefs/Invoice.graphql   |  104 +
 .../public/typeDefs/InvoiceConnection.graphql |   14 +
 .../public/typeDefs/InvoiceEdge.graphql       |   10 +
 .../public/typeDefs/InvoiceLineItem.graphql   |   34 +
 .../typeDefs/InvoiceLineItemDetails.graphql   |   34 +
 .../typeDefs/InvoiceLineItemEnum.graphql      |    9 +
 .../public/typeDefs/InvoiceStatusEnum.graphql |    9 +
 .../typeDefs/JiraDimensionField.graphql       |   41 +
 .../graphql/public/typeDefs/JiraIssue.graphql |   51 -
 .../typeDefs/JiraIssueConnection.graphql      |   19 +
 .../public/typeDefs/JiraIssueEdge.graphql     |   10 +
 .../public/typeDefs/JiraIssueField.graphql    |   14 +
 ...ssueMissingEstimationFieldHintEnum.graphql |    4 +
 .../typeDefs/JiraRemoteAvatarUrls.graphql     |    9 +
 .../JiraRemoteProjectCategory.graphql         |    9 +
 .../typeDefs/JiraSearchQueryInput.graphql     |   21 +
 .../public/typeDefs/JiraServerIssue.graphql   |   56 -
 .../JiraServerIssueConnection.graphql         |   19 +
 .../typeDefs/JiraServerIssueEdge.graphql      |   10 +
 .../JiraServerSearchQueryInput.graphql        |    5 +
 .../typeDefs/JoinMeetingPayload.graphql       |    4 +
 .../typeDefs/JoinMeetingSuccess.graphql       |    8 +
 .../public/typeDefs/MassInvitation.graphql    |   15 +
 .../typeDefs/MassInvitationPayload.graphql    |   18 +
 .../public/typeDefs/MeetingEngagement.graphql |    6 +
 .../public/typeDefs/MeetingGreeting.graphql   |   11 +
 .../public/typeDefs/MeetingMember.graphql     |   28 +
 .../MeetingStageTimeLimitPayload.graphql      |    6 +
 .../public/typeDefs/MeetingStat.graphql       |    5 +
 .../MeetingSubscriptionPayload.graphql        |   50 +
 .../public/typeDefs/MeetingTemplate.graphql   |  344 -
 .../MeetingTemplateConnection.graphql         |   14 +
 .../typeDefs/MeetingTemplateEdge.graphql      |   14 +
 .../public/typeDefs/MeetingTypeEnum.graphql   |    9 +
 .../ModifyCheckInQuestionPayload.graphql      |    4 +
 .../ModifyCheckInQuestionSuccess.graphql      |    3 +
 .../public/typeDefs/ModifyType.graphql        |    5 +
 .../MovePokerTemplateDimensionPayload.graphql |    4 +
 ...MovePokerTemplateScaleValuePayload.graphql |    4 +
 ...MovePokerTemplateScaleValueSuccess.graphql |    6 +
 .../MoveReflectTemplatePromptPayload.graphql  |    4 +
 .../graphql/public/typeDefs/Mutation.graphql  | 2018 ++++
 .../typeDefs/NavigateMeetingPayload.graphql   |   24 +
 .../typeDefs/NewFeatureBroadcast.graphql      |   21 +
 .../public/typeDefs/NewMeeting.graphql        |    1 -
 .../typeDefs/NewMeetingCheckInPayload.graphql |    5 +
 .../public/typeDefs/NewMeetingPhase.graphql   |   14 +
 .../typeDefs/NewMeetingPhaseTypeEnum.graphql  |   20 +
 .../public/typeDefs/NewMeetingStage.graphql   |   95 +
 .../NewMeetingTeamMemberStage.graphql         |   19 +
 .../public/typeDefs/NewTeamInput.graphql      |   11 +
 .../public/typeDefs/NextPeriodCharges.graphql |   29 +
 .../public/typeDefs/Notification.graphql      |   22 +
 .../typeDefs/NotificationConnection.graphql   |   14 +
 .../public/typeDefs/NotificationEdge.graphql  |   10 +
 .../public/typeDefs/NotificationEnum.graphql  |   20 +
 ...tificationMeetingStageTimeLimitEnd.graphql |   35 +
 .../typeDefs/NotificationStatusEnum.graphql   |    8 +
 .../NotificationSubscriptionPayload.graphql   |   30 +
 .../NotificationTeamInvitation.graphql        |   41 +
 .../public/typeDefs/NotifyKickedOut.graphql   |   45 +
 .../typeDefs/NotifyPaymentRejected.graphql    |   27 +
 .../typeDefs/NotifyPromoteToOrgLeader.graphql |   27 +
 ...graphql => NotifyRequestToJoinOrg.graphql} |    0
 .../typeDefs/NotifyTaskInvolves.graphql       |   56 +
 .../typeDefs/NotifyTeamArchived.graphql       |   31 +
 .../OldUpdateCreditCardPayload.graphql        |   13 +
 .../OldUpgradeToTeamTierPayload.graphql       |   23 +
 .../public/typeDefs/OrgUserCount.graphql      |   11 +
 .../public/typeDefs/OrgUserRole.graphql       |    7 +
 .../public/typeDefs/Organization.graphql      |   29 -
 .../typeDefs/OrganizationFeatureFlags.graphql |   17 +
 .../OrganizationSubscriptionPayload.graphql   |   15 +
 .../public/typeDefs/OrganizationUser.graphql  |   51 +-
 .../OrganizationUserConnection.graphql        |   14 +
 .../typeDefs/OrganizationUserEdge.graphql     |   14 +
 .../typeDefs/ParseSAMLMetadataPayload.graphql |    1 +
 .../typeDefs/ParseSAMLMetadataSuccess.graphql |    3 +
 .../public/typeDefs/PayLaterPayload.graphql   |   13 +
 .../PersistGitHubSearchQueryPayload.graphql   |    4 +
 .../PersistGitHubSearchQuerySuccess.graphql   |   16 +
 ...rsistIntegrationSearchQueryPayload.graphql |    1 +
 ...rsistIntegrationSearchQuerySuccess.graphql |    5 +
 .../PersistJiraSearchQueryPayload.graphql     |    4 +
 .../PersistJiraSearchQuerySuccess.graphql     |    6 +
 .../typeDefs/PhaseCompletePayload.graphql     |   16 +
 .../PokerAnnounceDeckHoverPayload.graphql     |    4 +
 .../PokerAnnounceDeckHoverSuccess.graphql     |   12 +
 .../public/typeDefs/PokerMeeting.graphql      |   73 +-
 .../typeDefs/PokerMeetingMember.graphql       |   33 +
 .../typeDefs/PokerMeetingSettings.graphql     |   65 +
 .../PokerResetDimensionPayload.graphql        |    4 +
 .../PokerResetDimensionSuccess.graphql        |    6 +
 .../typeDefs/PokerRevealVotesPayload.graphql  |    4 +
 .../typeDefs/PokerRevealVotesSuccess.graphql  |    6 +
 .../public/typeDefs/PokerTemplate.graphql     |   91 +
 .../typeDefs/PokerTemplateConnection.graphql  |   14 +
 ...eDimensionUpdateDescriptionPayload.graphql |    4 +
 .../public/typeDefs/PokerTemplateEdge.graphql |   14 +
 .../graphql/public/typeDefs/Poll.graphql      |   79 +
 .../public/typeDefs/PollOption.graphql        |   39 +
 .../public/typeDefs/PollOptionInput.graphql   |    6 +
 ...romoteNewMeetingFacilitatorPayload.graphql |   14 +
 .../typeDefs/PromoteToTeamLeadPayload.graphql |    6 +
 .../typeDefs/PushInvitationPayload.graphql    |    6 +
 .../graphql/public/typeDefs/Query.graphql     |   12 +-
 .../graphql/public/typeDefs/RRule.graphql     |    3 +
 .../graphql/public/typeDefs/Reactable.graphql |   14 +
 .../public/typeDefs/ReactableEnum.graphql     |    8 +
 .../typeDefs/ReasonToDowngradeEnum.graphql    |   10 +
 .../public/typeDefs/ReflectPhase.graphql      |   32 +
 .../ReflectPhaseCompletePayload.graphql       |   11 +
 .../public/typeDefs/ReflectPrompt.graphql     |   56 +
 .../public/typeDefs/ReflectTemplate.graphql   |   87 +
 .../ReflectTemplateConnection.graphql         |   14 +
 .../typeDefs/ReflectTemplateEdge.graphql      |   14 +
 ...latePromptUpdateDescriptionPayload.graphql |    4 +
 ...platePromptUpdateGroupColorPayload.graphql |    4 +
 .../typeDefs/ReflectionGroupSortEnum.graphql  |    7 +
 .../typeDefs/RemoteReflectionDrag.graphql     |   49 +
 .../typeDefs/RemoveAgendaItemPayload.graphql  |   10 +
 ...ApprovedOrganizationDomainsPayload.graphql |    6 +
 ...ApprovedOrganizationDomainsSuccess.graphql |    6 +
 .../RemoveAtlassianAuthPayload.graphql        |   14 +
 .../typeDefs/RemoveGitHubAuthPayload.graphql  |   14 +
 .../RemoveIntegrationProviderPayload.graphql  |    4 +
 .../RemoveIntegrationProviderSuccess.graphql  |   11 +
 ...emoveIntegrationSearchQueryPayload.graphql |    4 +
 ...emoveIntegrationSearchQuerySuccess.graphql |    5 +
 .../typeDefs/RemoveOrgUserPayload.graphql     |   39 +
 ...emovePokerTemplateDimensionPayload.graphql |    5 +
 .../RemovePokerTemplatePayload.graphql        |    5 +
 .../RemovePokerTemplateScalePayload.graphql   |    9 +
 ...movePokerTemplateScaleValuePayload.graphql |    4 +
 .../RemoveReflectTemplatePayload.graphql      |    5 +
 ...RemoveReflectTemplatePromptPayload.graphql |    5 +
 .../typeDefs/RemoveReflectionPayload.graphql  |   10 +
 .../typeDefs/RemoveSlackAuthPayload.graphql   |   14 +
 ...veTeamMemberIntegrationAuthPayload.graphql |    4 +
 ...veTeamMemberIntegrationAuthSuccess.graphql |   11 +
 .../typeDefs/RemoveTeamMemberPayload.graphql  |   28 +
 .../typeDefs/RenameMeetingPayload.graphql     |    4 +
 .../typeDefs/RenameMeetingSuccess.graphql     |    6 +
 .../RenameMeetingTemplatePayload.graphql      |    4 +
 ...enamePokerTemplateDimensionPayload.graphql |    4 +
 .../RenamePokerTemplatePayload.graphql        |    4 +
 .../RenamePokerTemplateScalePayload.graphql   |    4 +
 ...RenameReflectTemplatePromptPayload.graphql |    4 +
 .../RequestToJoinDomainPayload.graphql        |    4 +
 .../RequestToJoinDomainSuccess.graphql        |    6 +
 .../typeDefs/ResetPasswordPayload.graphql     |   14 +
 .../ResetReflectionGroupsPayload.graphql      |    4 +
 .../ResetReflectionGroupsSuccess.graphql      |    3 +
 ...setRetroMeetingToGroupStagePayload.graphql |    4 +
 .../public/typeDefs/RetroDiscussStage.graphql |  120 +
 .../typeDefs/RetroReflectionGroup.graphql     |   87 +
 .../typeDefs/RetrospectiveMeeting.graphql     |   32 -
 .../RetrospectiveMeetingMember.graphql        |   34 +
 .../RetrospectiveMeetingSettings.graphql      |   90 +
 .../RevealTeamHealthVotesPayload.graphql      |    1 +
 .../RevealTeamHealthVotesSuccess.graphql      |    5 +
 .../graphql/public/typeDefs/SAML.graphql      |    6 -
 .../typeDefs/SelectTemplatePayload.graphql    |    4 +
 .../public/typeDefs/ServiceEnum.graphql       |   10 +
 .../public/typeDefs/ServiceField.graphql      |   14 +
 .../typeDefs/SetAppLocationPayload.graphql    |    4 +
 .../typeDefs/SetAppLocationSuccess.graphql    |    6 +
 .../SetDefaultSlackChannelPayload.graphql     |    4 +
 .../SetDefaultSlackChannelSuccess.graphql     |   11 +
 .../SetMeetingSettingsPayload.graphql         |    4 +
 .../SetNotificationStatusPayload.graphql      |    8 +
 .../typeDefs/SetOrgUserRolePayload.graphql    |    4 +
 .../typeDefs/SetOrgUserRoleSuccess.graphql    |    5 +
 .../typeDefs/SetPhaseFocusPayload.graphql     |    5 +
 .../typeDefs/SetPokerSpectatePayload.graphql  |    4 +
 .../typeDefs/SetPokerSpectateSuccess.graphql  |   14 +
 .../SetSlackNotificationPayload.graphql       |    9 +
 .../typeDefs/SetStageTimerPayload.graphql     |    8 +
 .../typeDefs/SetTaskEstimatePayload.graphql   |    4 +
 .../typeDefs/SetTaskEstimateSuccess.graphql   |    8 +
 .../typeDefs/SetTaskHighlightPayload.graphql  |    4 +
 .../typeDefs/SetTaskHighlightSuccess.graphql  |   16 +
 .../typeDefs/SetTeamHealthVotePayload.graphql |    1 +
 .../typeDefs/SetTeamHealthVoteSuccess.graphql |    5 +
 .../public/typeDefs/ShareTopicPayload.graphql |    4 +
 .../public/typeDefs/ShareTopicSuccess.graphql |    6 +
 .../public/typeDefs/SharingScopeEnum.graphql  |    8 +
 .../public/typeDefs/SlackNotification.graphql |   15 +
 .../SlackNotificationEventEnum.graphql        |   11 +
 .../SlackNotificationEventTypeEnum.graphql    |   14 +
 .../typeDefs/StandardMutationError.graphql    |   11 +
 .../typeDefs/StartCheckInPayload.graphql      |    4 +
 .../typeDefs/StartCheckInSuccess.graphql      |    6 +
 .../StartDraggingReflectionPayload.graphql    |   13 +
 .../StartRetrospectivePayload.graphql         |    4 +
 .../StartRetrospectiveSuccess.graphql         |    6 +
 .../typeDefs/StartSprintPokerPayload.graphql  |    4 +
 .../typeDefs/StartSprintPokerSuccess.graphql  |   11 +
 .../typeDefs/StartTeamPromptPayload.graphql   |    4 +
 .../typeDefs/StartTeamPromptSuccess.graphql   |   16 +
 .../typeDefs/StripeFailPaymentPayload.graphql |    9 +
 .../public/typeDefs/Subscription.graphql      |    7 +
 .../public/typeDefs/Subscriptions.graphql     |  195 -
 .../public/typeDefs/SuggestedAction.graphql   |   39 +
 .../SuggestedActionCreateNewTeam.graphql      |   39 +
 .../SuggestedActionInviteYourTeam.graphql     |   49 +
 .../SuggestedActionTryActionMeeting.graphql   |   49 +
 .../SuggestedActionTryRetroMeeting.graphql    |   49 +
 .../SuggestedActionTryTheDemo.graphql         |   39 +
 .../typeDefs/SuggestedActionTypeEnum.graphql  |   10 +
 .../graphql/public/typeDefs/Task.graphql      |  154 +
 .../public/typeDefs/TaskConnection.graphql    |   14 +
 .../graphql/public/typeDefs/TaskEdge.graphql  |   10 +
 .../public/typeDefs/TaskEditorDetails.graphql |   11 +
 .../public/typeDefs/TaskEstimate.graphql      |   59 +
 .../public/typeDefs/TaskEstimateInput.graphql |   14 +
 .../public/typeDefs/TaskIntegration.graphql   |    3 +
 .../typeDefs/TaskInvolvementType.graphql      |    7 +
 .../public/typeDefs/TaskServiceEnum.graphql   |   11 +
 .../public/typeDefs/TaskStatusEnum.graphql    |    9 +
 .../typeDefs/TaskSubscriptionPayload.graphql  |   12 +
 .../graphql/public/typeDefs/Team.graphql      |   43 +-
 .../public/typeDefs/TeamDrawer.graphql        |    7 +
 .../public/typeDefs/TeamHealthPhase.graphql   |    3 -
 .../public/typeDefs/TeamHealthStage.graphql   |    1 -
 .../public/typeDefs/TeamInsights.graphql      |   19 -
 .../public/typeDefs/TeamInvitation.graphql    |   59 +
 .../typeDefs/TeamInvitationErrorEnum.graphql  |   10 +
 .../typeDefs/TeamInvitationPayload.graphql    |   19 +
 .../typeDefs/TeamMeetingSettings.graphql      |   26 +
 .../public/typeDefs/TeamNotification.graphql  |    4 +
 .../public/typeDefs/TeamPromptMeeting.graphql |   50 +-
 .../typeDefs/TeamPromptMeetingMember.graphql  |   28 +
 .../TeamPromptMeetingSettings.graphql         |   26 +
 .../typeDefs/TeamPromptResponse.graphql       |   54 +
 .../typeDefs/TeamPromptResponseStage.graphql  |  115 +
 .../typeDefs/TeamPromptResponsesPhase.graphql |   17 +
 .../graphql/public/typeDefs/TeamStat.graphql  |    4 +
 .../typeDefs/TeamSubscriptionPayload.graphql  |   76 +
 .../public/typeDefs/TemplateDimension.graphql |   66 +
 .../typeDefs/TemplateDimensionRef.graphql     |   26 +
 .../public/typeDefs/TemplateScale.graphql     |   51 +
 .../typeDefs/TemplateScaleInput.graphql       |   14 +
 .../public/typeDefs/TemplateScaleRef.graphql  |   20 +
 .../typeDefs/TemplateScaleValue.graphql       |   26 +
 .../public/typeDefs/Threadable.graphql        |   54 +
 .../typeDefs/ThreadableConnection.graphql     |   19 +
 .../public/typeDefs/ThreadableEdge.graphql    |   10 +
 .../graphql/public/typeDefs/TierEnum.graphql  |    8 +
 .../public/typeDefs/TimelineEvent.graphql     |   64 +
 ...imelineEventCompletedActionMeeting.graphql |   74 +
 ...TimelineEventCompletedRetroMeeting.graphql |   74 +
 .../typeDefs/TimelineEventConnection.graphql  |   14 +
 .../public/typeDefs/TimelineEventEdge.graphql |   10 +
 .../public/typeDefs/TimelineEventEnum.graphql |   11 +
 .../TimelineEventJoinedParabol.graphql        |   64 +
 .../TimelineEventPokerComplete.graphql        |   74 +
 .../typeDefs/TimelineEventTeamCreated.graphql |   64 +
 .../ToggleFavoriteTemplatePayload.graphql     |    1 +
 .../ToggleFavoriteTemplateSuccess.graphql     |    6 +
 .../ToggleSummaryEmailPayload.graphql         |    4 +
 .../ToggleSummaryEmailSuccess.graphql         |    6 +
 .../typeDefs/ToggleTeamDrawerPayload.graphql  |    4 +
 .../typeDefs/ToggleTeamDrawerSuccess.graphql  |    3 +
 .../public/typeDefs/TopRetroTemplate.graphql  |    6 +
 .../public/typeDefs/TranscriptBlock.graphql   |   14 +
 .../graphql/public/typeDefs/URL.graphql       |    1 +
 .../typeDefs/UpdateAgendaItemInput.graphql    |   26 +
 .../typeDefs/UpdateAgendaItemPayload.graphql  |   10 +
 .../typeDefs/UpdateAutoJoinPayload.graphql    |    4 +
 .../typeDefs/UpdateAutoJoinSuccess.graphql    |    6 +
 ...teAzureDevOpsDimensionFieldPayload.graphql |    4 +
 ...eAzureDevOpsDimensionFieldSuccess.graphql} |    0
 .../UpdateCommentContentPayload.graphql       |    4 +
 .../UpdateCommentContentSuccess.graphql       |    6 +
 .../typeDefs/UpdateCreditCardPayload.graphql  |    4 +
 .../typeDefs/UpdateCreditCardSuccess.graphql  |   16 +
 .../UpdateDimensionFieldPayload.graphql       |   13 -
 .../UpdateDimensionFieldSuccess.graphql       |   10 +
 .../typeDefs/UpdateDragLocationInput.graphql  |   41 +
 .../UpdateDragLocationPayload.graphql         |    7 +
 .../typeDefs/UpdateFeatureFlagPayload.graphql |   13 +
 .../UpdateGitHubDimensionFieldPayload.graphql |    4 +
 .../UpdateGitHubDimensionFieldSuccess.graphql |   10 +
 .../UpdateGitLabDimensionFieldPayload.graphql |    1 +
 .../UpdateGitLabDimensionFieldSuccess.graphql |    6 +
 .../UpdateIntegrationProviderInput.graphql    |   24 +
 .../UpdateIntegrationProviderPayload.graphql  |    4 +
 .../UpdateIntegrationProviderSuccess.graphql  |   16 +
 .../UpdateMeetingPromptPayload.graphql        |    4 +
 .../UpdateMeetingPromptSuccess.graphql        |    8 +
 .../UpdateMeetingTemplatePayload.graphql      |    4 +
 .../UpdateMeetingTemplateSuccess.graphql      |    6 +
 .../UpdateNewCheckInQuestionPayload.graphql   |    4 +
 .../public/typeDefs/UpdateOrgInput.graphql    |   11 +
 .../public/typeDefs/UpdateOrgPayload.graphql  |    8 +
 .../UpdatePokerScopeItemInput.graphql         |   16 +
 .../typeDefs/UpdatePokerScopePayload.graphql  |    4 +
 .../typeDefs/UpdatePokerScopeSuccess.graphql  |   11 +
 ...PokerTemplateDimensionScalePayload.graphql |    4 +
 ...datePokerTemplateScaleValuePayload.graphql |    4 +
 .../UpdateRecurrenceSettingsPayload.graphql   |    4 +
 .../UpdateRecurrenceSettingsSuccess.graphql   |    6 +
 .../UpdateReflectionContentPayload.graphql    |    5 +
 .../UpdateReflectionGroupTitlePayload.graphql |    5 +
 .../UpdateRetroMaxVotesPayload.graphql        |    4 +
 .../UpdateRetroMaxVotesSuccess.graphql        |    6 +
 .../typeDefs/UpdateTaskDueDatePayload.graphql |    4 +
 .../public/typeDefs/UpdateTaskInput.graphql   |   14 +
 .../public/typeDefs/UpdateTaskPayload.graphql |   10 +
 .../typeDefs/UpdateTeamNamePayload.graphql    |    4 +
 .../UpdateTemplateCategoryPayload.graphql     |    4 +
 .../UpdateTemplateCategorySuccess.graphql     |    6 +
 .../UpdateTemplateScopePayload.graphql        |    4 +
 .../UpdateTemplateScopeSuccess.graphql        |   16 +
 .../typeDefs/UpdateUserProfileInput.graphql   |    6 +
 .../typeDefs/UpdateUserProfilePayload.graphql |    9 +
 ...on.graphql => UpdatedNotification.graphql} |    0
 .../public/typeDefs/UpdatedTeamInput.graphql  |   13 +
 .../public/typeDefs/UpdatesPhase.graphql      |   17 +
 .../public/typeDefs/UpdatesStage.graphql      |  110 +
 .../typeDefs/UpgradeToTeamTierPayload.graphql |    4 +
 ...aphql => UpgradeToTeamTierSuccess.graphql} |   15 +-
 .../typeDefs/UploadIdPMetadataPayload.graphql |    1 +
 .../typeDefs/UploadIdPMetadataSuccess.graphql |    3 +
 .../UpsertTeamPromptResponsePayload.graphql   |    1 +
 .../UpsertTeamPromptResponseSuccess.graphql   |   14 +
 .../graphql/public/typeDefs/User.graphql      |  151 +-
 .../public/typeDefs/UserFeatureFlags.graphql  |   11 +
 .../public/typeDefs/UserFlagEnum.graphql      |   11 +
 .../public/typeDefs/UserLogInPayload.graphql  |    1 +
 .../public/typeDefs/UserTiersCount.graphql    |   20 +
 .../VerifiedInvitationPayload.graphql         |   46 +
 .../typeDefs/VoteForPokerStoryPayload.graphql |    4 +
 .../typeDefs/VoteForPokerStorySuccess.graphql |    6 +
 .../VoteForReflectionGroupPayload.graphql     |   11 +
 .../typeDefs/VotePhaseCompletePayload.graphql |    6 +
 .../graphql/public/typeDefs/_legacy.graphql   | 8121 -----------------
 .../{github.graphql => _xGitHub.graphql}      |    0
 .../{gitlab.graphql => _xGitLab.graphql}      |    0
 .../acceptRequestToJoinDomain.graphql         |   28 -
 .../addApprovedOrganizationDomains.graphql    |   35 -
 .../typeDefs/addReactjiToReactable.graphql    |   31 -
 .../addTeamMemberIntegrationAuth.graphql      |   51 -
 .../typeDefs/addTranscriptionBot.graphql      |   18 -
 .../graphql/public/typeDefs/autogroup.graphql |   15 -
 .../public/typeDefs/batchArchiveTasks.graphql |   27 -
 .../typeDefs/createImposterToken.graphql      |   30 -
 .../typeDefs/createStripeSubscription.graphql |   18 -
 .../public/typeDefs/generateGroups.graphql    |    6 -
 .../typeDefs/getTemplateSuggestion.graphql    |   28 -
 .../public/typeDefs/loginWithGoogle.graphql   |   26 -
 .../typeDefs/loginWithMicrosoft.graphql       |   26 -
 .../public/typeDefs/loginWithPassword.graphql |    6 -
 .../typeDefs/modifyCheckInQuestion.graphql    |   25 -
 .../persistIntegrationSearchQuery.graphql     |   22 -
 .../removeApprovedOrganizationDomains.graphql |   29 -
 .../removeIntegrationSearchQuery.graphql      |   23 -
 .../removeTeamMemberIntegrationAuth.graphql   |   50 -
 .../typeDefs/requestToJoinDomain.graphql      |   18 -
 .../typeDefs/resetReflectionGroups.graphql    |   15 -
 .../typeDefs/revealTeamHealthVotes.graphql    |   11 -
 .../typeDefs/setMeetingSettings.graphql       |   27 -
 .../public/typeDefs/setOrgUserRole.graphql    |   24 -
 .../public/typeDefs/setTeamHealthVote.graphql |   17 -
 .../public/typeDefs/shareTopic.graphql        |   33 -
 .../typeDefs/signUpWithPassword.graphql       |   24 -
 .../public/typeDefs/startCheckIn.graphql      |   31 -
 .../typeDefs/startRetrospective.graphql       |   35 -
 .../public/typeDefs/startTeamPrompt.graphql   |   43 -
 .../typeDefs/toggleFavoriteTemplate.graphql   |   20 -
 .../typeDefs/toggleSummaryEmail.graphql       |   18 -
 .../public/typeDefs/updateAutoJoin.graphql    |   27 -
 .../public/typeDefs/updateCreditCard.graphql  |   35 -
 .../public/typeDefs/updateFeatureFlag.graphql |   65 -
 .../updateGitLabDimensionField.graphql        |   32 -
 .../typeDefs/updateJiraDimensionField.graphql |   26 -
 .../updateJiraServerDimensionField.graphql    |   28 -
 .../typeDefs/updateMeetingPrompt.graphql      |   30 -
 .../typeDefs/updateMeetingTemplate.graphql    |   27 -
 .../graphql/public/typeDefs/updateOrg.graphql |   32 -
 .../typeDefs/updateRecurrenceSettings.graphql |   36 -
 .../typeDefs/updateTemplateCategory.graphql   |   27 -
 .../public/typeDefs/updateUserProfile.graphql |   25 -
 .../public/typeDefs/uploadIdPMetadata.graphql |   22 -
 .../public/typeDefs/uploadOrgImage.graphql    |   16 -
 .../public/typeDefs/uploadUserImage.graphql   |   11 -
 .../typeDefs/upsertTeamPromptResponse.graphql |   37 -
 .../public/typeDefs/verifyEmail.graphql       |   11 -
 596 files changed, 11047 insertions(+), 12693 deletions(-)
 create mode 100644 packages/server/graphql/private/typeDefs/ChangeEmailDomainPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/ChangeEmailDomainSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/DomainCountPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/DraftEnterpriseInvoicePayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/EndTrialPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/EndTrialSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/FlagConversionModalPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/FlagOverLimitPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/LoginsPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/MessageAllSlackUsersPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/MessageAllSlackUsersSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/MessageSlackUserError.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/Mutation.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/OrganizationFeatureFlagsEnum.graphql
 rename packages/server/graphql/private/typeDefs/{ping.graphql => PingableServices.graphql} (73%)
 create mode 100644 packages/server/graphql/private/typeDefs/ProcessRecurrencePayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/ProcessRecurrenceSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/Query.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/RemoveAuthIdentityPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/RemoveAuthIdentitySuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplatePayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplateSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/SignupsPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/StartTrialPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/StartTrialSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/ToggleAllowInsightsPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/ToggleAllowInsightsSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/UpdateWatchlistPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/UpdateWatchlistSuccess.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/VerifyDomainPayload.graphql
 create mode 100644 packages/server/graphql/private/typeDefs/VerifyDomainSuccess.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/_legacy.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/changeEmailDomain.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/endTrial.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/flagOverLimit.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/loginSAML.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/logins.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/processRecurrence.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/removeAuthIdentity.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/setIsFreeMeetingTemplate.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/startTrial.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/stripeInvoicePaid.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/suProOrgInfo.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/toggleAllowInsights.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/updateEmail.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
 delete mode 100644 packages/server/graphql/private/typeDefs/verifyDomain.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainSuccess.graphql
 rename packages/server/graphql/public/typeDefs/{acceptTeamInvitation.graphql => AcceptTeamInvitationPayload.graphql} (53%)
 create mode 100644 packages/server/graphql/public/typeDefs/ActionMeetingMember.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ActionMeetingSettings.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddAgendaItemPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddAtlassianAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddCommentInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddCommentPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddCommentSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddGitHubAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddIntegrationProviderInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddIntegrationProviderPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddIntegrationProviderSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddNewFeaturePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddOrDeleteEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddOrgPayload.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddPokerTemplateDimensionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddPokerTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddPokerTemplateScalePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddPokerTemplateScaleValuePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddPokerTemplateSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddReactjiToReactableSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddReactjiToReflectionSuccess.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddReflectTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddReflectTemplatePromptPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddReflectTemplateSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddSlackAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddTeamPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddTemplateScaleInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddTranscriptionBotPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AddTranscriptionBotSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AgendaItemsPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AgendaItemsStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ArchiveOrganizationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ArchiveTeamPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ArchiveTimelineEventPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ArchiveTimelineEventSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AreaEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AuthIdentity.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AuthIdentityGoogle.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AuthIdentityLocal.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AuthIdentityMicrosoft.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AuthIdentityTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AuthTokenPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AutogroupPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AutogroupReflectionGroup.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AutogroupSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/BatchArchiveTasksPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/BatchArchiveTasksSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CanAccessEntity.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ChangeSourceEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ChangeTaskTeamPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CheckInPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CheckInStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Comment.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CommentorDetails.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Coupon.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateAgendaItemInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateImposterTokenPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateMassInvitationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateMassInvitationSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateOAuth1AuthorizationURLPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreatePollInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreatePollPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreatePollSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateReflectionInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateReflectionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateStripeSubscriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateStripeSubscriptionSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateTaskInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateTaskIntegrationInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateTaskIntegrationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreateTaskPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/CreditCard.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DateTime.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DeleteCommentPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DeleteCommentSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DeleteTaskPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DeleteUserPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DenyPushInvitationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DisconnectSocketPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DiscussPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Discussion.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DiscussionThreadStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DiscussionTopicTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DismissNewFeaturePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DismissSuggestedActionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DowngradeToStarterPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DragDiscussionTopicPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DragEstimatingTaskPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DragEstimatingTaskSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/DragReflectionDropTargetTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EditCommentingPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EditCommentingSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EditReflectionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EditTaskPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Email.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EmailPasswordResetPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EmailPasswordResetSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Emoji.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndCheckInPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndCheckInSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndDraggingReflectionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndRetrospectivePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndRetrospectiveSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndSprintPokerPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndSprintPokerSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EndTeamPromptPayload.graphql
 rename packages/server/graphql/public/typeDefs/{endTeamPrompt.graphql => EndTeamPromptSuccess.graphql} (100%)
 create mode 100644 packages/server/graphql/public/typeDefs/ErrorPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EstimatePhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EstimateStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/EstimateUserScore.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/File.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/FixedActivity.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/FlagReadyToAdvancePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/FlagReadyToAdvanceSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GcalVideoTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GenericMeetingPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GenericMeetingStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GetDemoEntitiesPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GetTemplateSuggestionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GetTemplateSuggestionSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GitLabIntegrationConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GitLabIntegrationEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GoogleAnalyzedEntity.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/GroupPhaseCompletePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InactivateUserPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProvider.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderAuthStrategyEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderEditableScopeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth1.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth2.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputWebhook.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderOAuth1.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderOAuth2.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderScopeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderServiceEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/IntegrationProviderWebhook.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InvalidateSessionsPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InviteToTeamPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Invoice.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InvoiceConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InvoiceEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InvoiceLineItem.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InvoiceLineItemDetails.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InvoiceLineItemEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/InvoiceStatusEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraDimensionField.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraIssueConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraIssueEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraIssueField.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraIssueMissingEstimationFieldHintEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraRemoteAvatarUrls.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraRemoteProjectCategory.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraSearchQueryInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraServerIssueConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraServerIssueEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JiraServerSearchQueryInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JoinMeetingPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/JoinMeetingSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MassInvitation.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MassInvitationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingEngagement.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingGreeting.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingMember.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingStageTimeLimitPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingStat.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingSubscriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingTemplateConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingTemplateEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MeetingTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ModifyCheckInQuestionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ModifyCheckInQuestionSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ModifyType.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MovePokerTemplateDimensionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValuePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValueSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/MoveReflectTemplatePromptPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Mutation.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NavigateMeetingPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NewFeatureBroadcast.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NewMeetingCheckInPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NewMeetingPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NewMeetingPhaseTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NewMeetingStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NewMeetingTeamMemberStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NewTeamInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NextPeriodCharges.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Notification.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotificationConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotificationEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotificationEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotificationMeetingStageTimeLimitEnd.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotificationStatusEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotificationSubscriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotificationTeamInvitation.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotifyKickedOut.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotifyPaymentRejected.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotifyPromoteToOrgLeader.graphql
 rename packages/server/graphql/public/typeDefs/{NotifyReqestToJoinOrg.graphql => NotifyRequestToJoinOrg.graphql} (100%)
 create mode 100644 packages/server/graphql/public/typeDefs/NotifyTaskInvolves.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/NotifyTeamArchived.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OldUpdateCreditCardPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OldUpgradeToTeamTierPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OrgUserCount.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OrgUserRole.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OrganizationFeatureFlags.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OrganizationSubscriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OrganizationUserConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/OrganizationUserEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ParseSAMLMetadataPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ParseSAMLMetadataSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PayLaterPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PersistGitHubSearchQueryPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PersistGitHubSearchQuerySuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PersistIntegrationSearchQueryPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PersistIntegrationSearchQuerySuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PersistJiraSearchQueryPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PersistJiraSearchQuerySuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PhaseCompletePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerMeetingMember.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerMeetingSettings.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerResetDimensionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerResetDimensionSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerRevealVotesPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerRevealVotesSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerTemplate.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerTemplateConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerTemplateDimensionUpdateDescriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PokerTemplateEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Poll.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PollOption.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PollOptionInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PromoteNewMeetingFacilitatorPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PromoteToTeamLeadPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/PushInvitationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Reactable.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReactableEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReasonToDowngradeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectPhaseCompletePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectPrompt.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectTemplate.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectTemplateConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectTemplateEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateDescriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateGroupColorPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ReflectionGroupSortEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoteReflectionDrag.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveAgendaItemPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveAtlassianAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveGitHubAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveIntegrationProviderPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveIntegrationProviderSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQueryPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQuerySuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveOrgUserPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemovePokerTemplateDimensionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemovePokerTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemovePokerTemplateScalePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemovePokerTemplateScaleValuePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveReflectTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveReflectTemplatePromptPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveReflectionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveSlackAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RemoveTeamMemberPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RenameMeetingPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RenameMeetingSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RenameMeetingTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RenamePokerTemplateDimensionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RenamePokerTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RenamePokerTemplateScalePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RenameReflectTemplatePromptPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RequestToJoinDomainPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RequestToJoinDomainSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ResetPasswordPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ResetReflectionGroupsPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ResetReflectionGroupsSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ResetRetroMeetingToGroupStagePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RetroDiscussStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RetroReflectionGroup.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RetrospectiveMeetingMember.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RetrospectiveMeetingSettings.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RevealTeamHealthVotesPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/RevealTeamHealthVotesSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SelectTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ServiceEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ServiceField.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetAppLocationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetAppLocationSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetDefaultSlackChannelPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetDefaultSlackChannelSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetMeetingSettingsPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetNotificationStatusPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetOrgUserRolePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetOrgUserRoleSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetPhaseFocusPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetPokerSpectatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetPokerSpectateSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetSlackNotificationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetStageTimerPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetTaskEstimatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetTaskEstimateSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetTaskHighlightPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetTaskHighlightSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetTeamHealthVotePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SetTeamHealthVoteSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ShareTopicPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ShareTopicSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SharingScopeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SlackNotification.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SlackNotificationEventEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SlackNotificationEventTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StandardMutationError.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartCheckInPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartCheckInSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartDraggingReflectionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartRetrospectivePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartRetrospectiveSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartSprintPokerPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartSprintPokerSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartTeamPromptPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StartTeamPromptSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/StripeFailPaymentPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Subscription.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/Subscriptions.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SuggestedAction.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SuggestedActionCreateNewTeam.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SuggestedActionInviteYourTeam.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SuggestedActionTryActionMeeting.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SuggestedActionTryRetroMeeting.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SuggestedActionTryTheDemo.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/SuggestedActionTypeEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Task.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskEditorDetails.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskEstimate.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskEstimateInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskIntegration.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskInvolvementType.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskServiceEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskStatusEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TaskSubscriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamDrawer.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamInvitation.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamInvitationErrorEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamInvitationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamMeetingSettings.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamNotification.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamPromptMeetingMember.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamPromptMeetingSettings.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamPromptResponse.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamPromptResponseStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamPromptResponsesPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamStat.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TeamSubscriptionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TemplateDimension.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TemplateDimensionRef.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TemplateScale.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TemplateScaleInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TemplateScaleRef.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TemplateScaleValue.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/Threadable.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ThreadableConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ThreadableEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TierEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEvent.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventCompletedActionMeeting.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventCompletedRetroMeeting.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventConnection.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventEdge.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventJoinedParabol.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventPokerComplete.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TimelineEventTeamCreated.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ToggleFavoriteTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ToggleFavoriteTemplateSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ToggleSummaryEmailPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ToggleSummaryEmailSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ToggleTeamDrawerPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/ToggleTeamDrawerSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TopRetroTemplate.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/TranscriptBlock.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/URL.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateAgendaItemInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateAgendaItemPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateAutoJoinPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateAutoJoinSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateAzureDevOpsDimensionFieldPayload.graphql
 rename packages/server/graphql/public/typeDefs/{updateAzureDevOpsDimensionField.graphql => UpdateAzureDevOpsDimensionFieldSuccess.graphql} (100%)
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateCommentContentPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateCommentContentSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateCreditCardPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateCreditCardSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateDimensionFieldSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateDragLocationInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateDragLocationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateFeatureFlagPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateIntegrationProviderInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateIntegrationProviderPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateIntegrationProviderSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateMeetingPromptPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateMeetingPromptSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateMeetingTemplatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateMeetingTemplateSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateNewCheckInQuestionPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateOrgInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateOrgPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatePokerScopeItemInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatePokerScopePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatePokerScopeSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatePokerTemplateDimensionScalePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatePokerTemplateScaleValuePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateReflectionContentPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateReflectionGroupTitlePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTaskDueDatePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTaskInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTaskPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTeamNamePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTemplateCategoryPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTemplateCategorySuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTemplateScopePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateTemplateScopeSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateUserProfileInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdateUserProfilePayload.graphql
 rename packages/server/graphql/public/typeDefs/{UpatedNotification.graphql => UpdatedNotification.graphql} (100%)
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatedTeamInput.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatesPhase.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpdatesStage.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpgradeToTeamTierPayload.graphql
 rename packages/server/graphql/public/typeDefs/{upgradeToTeamTier.graphql => UpgradeToTeamTierSuccess.graphql} (57%)
 create mode 100644 packages/server/graphql/public/typeDefs/UploadIdPMetadataPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UploadIdPMetadataSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpsertTeamPromptResponsePayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UpsertTeamPromptResponseSuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UserFeatureFlags.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UserFlagEnum.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/UserTiersCount.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/VerifiedInvitationPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/VoteForPokerStoryPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/VoteForPokerStorySuccess.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/VoteForReflectionGroupPayload.graphql
 create mode 100644 packages/server/graphql/public/typeDefs/VotePhaseCompletePayload.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/_legacy.graphql
 rename packages/server/graphql/public/typeDefs/{github.graphql => _xGitHub.graphql} (100%)
 rename packages/server/graphql/public/typeDefs/{gitlab.graphql => _xGitLab.graphql} (100%)
 delete mode 100644 packages/server/graphql/public/typeDefs/acceptRequestToJoinDomain.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/addApprovedOrganizationDomains.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/addReactjiToReactable.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/addTeamMemberIntegrationAuth.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/addTranscriptionBot.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/autogroup.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/batchArchiveTasks.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/createImposterToken.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/createStripeSubscription.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/generateGroups.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/getTemplateSuggestion.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/loginWithGoogle.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/loginWithMicrosoft.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/loginWithPassword.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/modifyCheckInQuestion.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/persistIntegrationSearchQuery.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/removeIntegrationSearchQuery.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/removeTeamMemberIntegrationAuth.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/requestToJoinDomain.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/resetReflectionGroups.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/revealTeamHealthVotes.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/setMeetingSettings.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/setOrgUserRole.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/setTeamHealthVote.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/shareTopic.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/signUpWithPassword.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/startCheckIn.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/startRetrospective.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/startTeamPrompt.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/toggleFavoriteTemplate.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/toggleSummaryEmail.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateAutoJoin.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateCreditCard.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateGitLabDimensionField.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateJiraDimensionField.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateJiraServerDimensionField.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateMeetingPrompt.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateOrg.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateRecurrenceSettings.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateTemplateCategory.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/updateUserProfile.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/uploadIdPMetadata.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/uploadOrgImage.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/uploadUserImage.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/upsertTeamPromptResponse.graphql
 delete mode 100644 packages/server/graphql/public/typeDefs/verifyEmail.graphql

diff --git a/packages/server/graphql/private/typeDefs/ChangeEmailDomainPayload.graphql b/packages/server/graphql/private/typeDefs/ChangeEmailDomainPayload.graphql
new file mode 100644
index 00000000000..8312d47fdb5
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/ChangeEmailDomainPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for changeEmailDomain, which could be an error
+"""
+union ChangeEmailDomainPayload = ErrorPayload | ChangeEmailDomainSuccess
diff --git a/packages/server/graphql/private/typeDefs/ChangeEmailDomainSuccess.graphql b/packages/server/graphql/private/typeDefs/ChangeEmailDomainSuccess.graphql
new file mode 100644
index 00000000000..7dd04d71e98
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/ChangeEmailDomainSuccess.graphql
@@ -0,0 +1,11 @@
+type ChangeEmailDomainSuccess {
+  """
+  The users whose domains were changed
+  """
+  usersUpdated: [User!]!
+
+  """
+  Users whose domains were not changed as they were already in the new domain
+  """
+  usersNotUpdated: [User!]!
+}
diff --git a/packages/server/graphql/private/typeDefs/DomainCountPayload.graphql b/packages/server/graphql/private/typeDefs/DomainCountPayload.graphql
new file mode 100644
index 00000000000..7085736f700
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/DomainCountPayload.graphql
@@ -0,0 +1,11 @@
+type DomainCountPayload {
+  """
+  the email domain
+  """
+  domain: ID!
+
+  """
+  the sum total
+  """
+  total: Int!
+}
diff --git a/packages/server/graphql/private/typeDefs/DraftEnterpriseInvoicePayload.graphql b/packages/server/graphql/private/typeDefs/DraftEnterpriseInvoicePayload.graphql
new file mode 100644
index 00000000000..83c241db6f3
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/DraftEnterpriseInvoicePayload.graphql
@@ -0,0 +1,8 @@
+type DraftEnterpriseInvoicePayload {
+  error: StandardMutationError
+
+  """
+  The updated organization
+  """
+  organization: Organization
+}
diff --git a/packages/server/graphql/private/typeDefs/EndTrialPayload.graphql b/packages/server/graphql/private/typeDefs/EndTrialPayload.graphql
new file mode 100644
index 00000000000..ff06dc50d82
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/EndTrialPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for endTrial, which could be an error
+"""
+union EndTrialPayload = ErrorPayload | EndTrialSuccess
diff --git a/packages/server/graphql/private/typeDefs/EndTrialSuccess.graphql b/packages/server/graphql/private/typeDefs/EndTrialSuccess.graphql
new file mode 100644
index 00000000000..2da06369c5b
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/EndTrialSuccess.graphql
@@ -0,0 +1,11 @@
+type EndTrialSuccess {
+  """
+  The updated organization
+  """
+  organization: Organization!
+
+  """
+  The start time of the ended trial
+  """
+  trialStartDate: DateTime
+}
diff --git a/packages/server/graphql/private/typeDefs/FlagConversionModalPayload.graphql b/packages/server/graphql/private/typeDefs/FlagConversionModalPayload.graphql
new file mode 100644
index 00000000000..87ac2a62b8e
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/FlagConversionModalPayload.graphql
@@ -0,0 +1,8 @@
+type FlagConversionModalPayload {
+  error: StandardMutationError
+
+  """
+  the org with the limit added or removed
+  """
+  org: Organization
+}
diff --git a/packages/server/graphql/private/typeDefs/FlagOverLimitPayload.graphql b/packages/server/graphql/private/typeDefs/FlagOverLimitPayload.graphql
new file mode 100644
index 00000000000..836c5c5beb2
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/FlagOverLimitPayload.graphql
@@ -0,0 +1,8 @@
+type FlagOverLimitPayload {
+  error: StandardMutationError
+
+  """
+  the users with the limit added or removed
+  """
+  users: [User!]
+}
diff --git a/packages/server/graphql/private/typeDefs/LoginsPayload.graphql b/packages/server/graphql/private/typeDefs/LoginsPayload.graphql
new file mode 100644
index 00000000000..050f469785a
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/LoginsPayload.graphql
@@ -0,0 +1,11 @@
+type LoginsPayload {
+  """
+  the total number of records
+  """
+  total: Int!
+
+  """
+  The total broken down by email domain
+  """
+  byDomain: [DomainCountPayload!]!
+}
diff --git a/packages/server/graphql/private/typeDefs/MessageAllSlackUsersPayload.graphql b/packages/server/graphql/private/typeDefs/MessageAllSlackUsersPayload.graphql
new file mode 100644
index 00000000000..22612fa4b2b
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/MessageAllSlackUsersPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for MessageAllSlackUsersPayload
+"""
+union MessageAllSlackUsersPayload = ErrorPayload | MessageAllSlackUsersSuccess
diff --git a/packages/server/graphql/private/typeDefs/MessageAllSlackUsersSuccess.graphql b/packages/server/graphql/private/typeDefs/MessageAllSlackUsersSuccess.graphql
new file mode 100644
index 00000000000..c09591763ba
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/MessageAllSlackUsersSuccess.graphql
@@ -0,0 +1,11 @@
+type MessageAllSlackUsersSuccess {
+  """
+  A list of the Parabol user ids that have been sent a direct message in Slack
+  """
+  messagedUserIds: [ID!]!
+
+  """
+  Slack messages that failed to send
+  """
+  errors: [MessageSlackUserError!]
+}
diff --git a/packages/server/graphql/private/typeDefs/MessageSlackUserError.graphql b/packages/server/graphql/private/typeDefs/MessageSlackUserError.graphql
new file mode 100644
index 00000000000..7927560d4fd
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/MessageSlackUserError.graphql
@@ -0,0 +1,11 @@
+"""
+An error from sending a message to a Slack user
+"""
+type MessageSlackUserError {
+  userId: ID!
+
+  """
+  The error message received from Slack
+  """
+  error: String!
+}
diff --git a/packages/server/graphql/private/typeDefs/Mutation.graphql b/packages/server/graphql/private/typeDefs/Mutation.graphql
new file mode 100644
index 00000000000..0c96e5e2c37
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/Mutation.graphql
@@ -0,0 +1,530 @@
+type Mutation {
+  """
+  Updates the user email
+  """
+  updateEmail(
+    """
+    User current email
+    """
+    oldEmail: Email!
+
+    """
+    User new email
+    """
+    newEmail: Email!
+  ): Boolean!
+
+  """
+  broadcast a new feature to the entire userbase
+  """
+  addNewFeature(
+    """
+    The text of the action button in the snackbar
+    """
+    actionButtonCopy: String!
+
+    """
+    The description of the new feature
+    """
+    snackbarMessage: String!
+
+    """
+    The permalink to the blog post describing the new feature
+    """
+    url: String!
+  ): AddNewFeaturePayload
+
+  """
+  automatically pause users that have been inactive for 30 days. returns the number of users paused
+  """
+  autopauseUsers: Int
+
+  """
+  copies all the records from RethinkDB for a list of organizations
+  """
+  backupOrganization(orgIds: [ID!]!): String!
+
+  """
+  check equality of a table between rethinkdb and postgres
+  """
+  checkRethinkPgEquality(
+    """
+    The table name to be compared
+    """
+    tableName: String!
+
+    """
+    How many errors should be returned
+    """
+    maxErrors: Int
+
+    """
+    Whether the output should be written to file
+    """
+    writeToFile: Boolean
+  ): String!
+
+  """
+  a server-side mutation called when a client connects
+  """
+  connectSocket(
+    """
+    The ID of the server this socket is connected to
+    """
+    socketInstanceId: ID!
+  ): User!
+
+  """
+  profile the CPU
+  """
+  profileCPU: String
+
+  """
+  a server-side mutation called when a client disconnects
+  """
+  disconnectSocket(
+    """
+    the userId to disconnect
+    """
+    userId: ID!
+  ): DisconnectSocketPayload
+
+  """
+  Create a stripe customer & subscription in stripe, send them an invoice for an enterprise license
+  """
+  draftEnterpriseInvoice(
+    """
+    the org requesting the upgrade
+    """
+    orgId: ID!
+
+    """
+    The number of users the license grants the organization
+    """
+    quantity: Int!
+
+    """
+    Email address of billing leader, if different from the org billing leader
+    """
+    email: ID
+
+    """
+    The email address for Accounts Payable. Use only if the invoice will be sent to a non-user!
+    """
+    apEmail: ID
+
+    """
+    the stripe id of the plan in stripe, if not using the default plan
+    """
+    plan: ID
+  ): DraftEnterpriseInvoicePayload
+
+  """
+  dump the memory heap to a file
+  """
+  dumpHeap(
+    """
+    must pass true to make it work
+    """
+    isDangerous: Boolean!
+  ): String
+
+  """
+  add/remove a flag on an org asking them to pay
+  """
+  flagConversionModal(
+    """
+    true to turn the modal on, false to turn it off
+    """
+    active: Boolean!
+
+    """
+    the orgId to toggle the flag for
+    """
+    orgId: ID!
+  ): FlagConversionModalPayload
+
+  """
+  hard deletes a user and all its associated objects
+  """
+  hardDeleteUser(
+    """
+    a userId
+    """
+    userId: ID
+
+    """
+    the user email
+    """
+    email: ID
+
+    """
+    the reason why the user wants to delete their account
+    """
+    reasonText: String
+  ): DeleteUserPayload!
+
+  """
+  Lock/Unlock teams, flagging them as unpaid/paid. Return true if successful
+  """
+  lockTeams(
+    """
+    List of teams to target
+    """
+    teamIds: [ID!]!
+
+    """
+    true to unlock the teams, false to lock
+    """
+    isPaid: Boolean!
+
+    """
+    The HTML to show if isPaid is false
+    """
+    message: String
+  ): Boolean!
+
+  """
+  Send a message to all authorised Slack users
+  """
+  messageAllSlackUsers(
+    """
+    The slack message that will be sent to all Slack users
+    """
+    message: String!
+  ): MessageAllSlackUsersPayload!
+
+  """
+  Remove Slack integrations for all users
+  """
+  removeAllSlackAuths: RemoveAllSlackAuthsPayload!
+
+  """
+  schedule upcoming jobs to be run
+  """
+  runScheduledJobs(
+    """
+    Queue up all jobs that are scheduled to run within this many seconds
+    """
+    seconds: Int!
+  ): Int
+
+  """
+  Send summary emails of unread notifications to all users who have not been seen within the last 24 hours
+  """
+  sendBatchNotificationEmails: [String]
+
+  """
+  send an email to organizations including all the users that were added in the current billing cycle
+  """
+  sendUpcomingInvoiceEmails: [String]
+
+  """
+  manually set the domain that the organization belongs to
+  """
+  setOrganizationDomain(
+    """
+    The unique identifier for the organization
+    """
+    orgId: ID!
+
+    """
+    The top level domain of the company. Usually the part after the "@" in their email address
+    """
+    domain: ID!
+  ): Boolean!
+
+  """
+  When stripe tells us an invoice is ready, create a pretty version
+  """
+  stripeCreateInvoice(
+    """
+    The stripe invoice ID
+    """
+    invoiceId: ID!
+  ): Boolean
+
+  """
+  When stripe tells us an invoice payment failed, update it in our DB
+  """
+  stripeFailPayment(
+    """
+    The stripe invoice ID
+    """
+    invoiceId: ID!
+  ): StripeFailPaymentPayload
+
+  """
+  When stripe tells us an invoice payment was successful, update it in our DB
+  """
+  stripeSucceedPayment(
+    """
+    The stripe invoice ID
+    """
+    invoiceId: ID!
+  ): Boolean
+
+  """
+  When stripe tells us a credit card was updated, update the details in our own DB
+  """
+  stripeUpdateCreditCard(
+    """
+    The stripe customer ID, or stripeId
+    """
+    customerId: ID!
+  ): Boolean
+
+  """
+  When stripe tells us a subscription was updated, update the details in our own DB
+  """
+  stripeCreateSubscription(
+    """
+    The stripe customer ID, or stripeId
+    """
+    customerId: ID!
+
+    """
+    The stripe subscription ID
+    """
+    subscriptionId: ID!
+  ): Boolean
+
+  """
+  When stripe tells us a subscription was deleted, update the details in our own DB
+  """
+  stripeDeleteSubscription(
+    """
+    The stripe customer ID, or stripeId
+    """
+    customerId: ID!
+
+    """
+    The stripe subscription ID
+    """
+    subscriptionId: ID!
+  ): Boolean
+
+  """
+  When a new invoiceitem is sent from stripe, tag it with metadata
+  """
+  stripeUpdateInvoiceItem(
+    """
+    The stripe invoice ID
+    """
+    invoiceItemId: ID!
+  ): Boolean
+
+  """
+  An invice has been sent from stripe, meaning it is finalized
+  """
+  stripeInvoiceFinalized(
+    """
+    The stripe invoice ID
+    """
+    invoiceId: ID!
+  ): Boolean
+
+  """
+  add/remove user(s) to/from the watchlist so that we start/stop recording their sessions
+  """
+  updateWatchlist(
+    """
+    a list of email addresses of users whose sessions we want to start/stop recording
+    """
+    emails: [String!]
+
+    """
+    add/remove the entire domain to/from the watchlist. The part of the email after the @
+    """
+    domain: String
+
+    """
+    true if the user should be added to the watchlist, false if not
+    """
+    includeInWatchlist: Boolean!
+  ): UpdateWatchlistPayload!
+
+  """
+  Updates Atlassian OAuth tokens that haven't been updated since the date specified in input
+  """
+  updateOAuthRefreshTokens(
+    """
+    Threshold date for `updatedAt` from AtlassianAuth
+    """
+    updatedBefore: DateTime!
+  ): Int
+
+  """
+  Change a company's domain so that affected users can only log in with the new domain
+  """
+  changeEmailDomain(
+    """
+    The company's old domain that we want to change
+    """
+    oldDomain: String!
+
+    """
+    The new domain that we're changing to
+    """
+    newDomain: String!
+  ): ChangeEmailDomainPayload!
+
+  """
+  Ends the trial for an org iff there is an active trial.
+  """
+  endTrial(
+    """
+    ID of the org on which to end the trial
+    """
+    orgId: ID!
+  ): EndTrialPayload!
+
+  """
+  add/remove a flag on a user saying they are over the free tier
+  """
+  flagOverLimit(
+    """
+    The text body of the over limit message, null to remove the previous value
+    """
+    copy: String = ""
+
+    """
+    the user orgId that went over the limit
+    """
+    orgId: ID!
+  ): FlagOverLimitPayload
+
+  """
+  Log in using SAML single sign on (SSO)
+  """
+  loginSAML(
+    """
+    The querystring provided by the IdP including SAMLResponse and RelayState
+    """
+    queryString: String!
+
+    """
+    The name of the SAML identifier. The slug used in the redirect URL
+    """
+    samlName: ID!
+  ): UserLogInPayload!
+
+  """
+  Processes recurrence for meetings that should start and end.
+  """
+  processRecurrence: ProcessRecurrencePayload!
+
+  """
+  Remove the auth identity for users with a specific domain. Example use case: signed up with Gmail but they're deleting their Google account
+  """
+  removeAuthIdentity(
+    """
+    Change the auth identity for users with this domain
+    """
+    domain: String!
+
+    """
+    The type of auth to remove
+    """
+    identityType: AuthIdentityTypeEnum!
+
+    """
+    Add a local auth with a dummy hashed password
+    """
+    addLocal: Boolean!
+  ): RemoveAuthIdentityPayload!
+
+  """
+  Set the isFree tier on a meeting template to determine if it's accessible to free users
+  """
+  setIsFreeMeetingTemplate(
+    isFree: Boolean!
+    templateIds: [ID!]
+    templateNames: [String!]
+  ): SetIsFreeMeetingTemplatePayload!
+
+  """
+  Starts a free trial for the org iff the org is on a free tier.
+  """
+  startTrial(
+    """
+    ID of the org on which to start the trial
+    """
+    orgId: ID!
+  ): StartTrialPayload!
+
+  """
+  When stripe tells us an invoice is paid (inside or outside of stripe), update it in our DB
+  """
+  stripeInvoicePaid(
+    """
+    The stripe invoice ID
+    """
+    invoiceId: ID!
+  ): Boolean
+
+  """
+  Allow or deny the User to view insights for the provided domain
+  """
+  toggleAllowInsights(
+    """
+    The tier we are squeezing the user to upgrade to. If null, will unset previous value
+    """
+    suggestedTier: TierEnum
+
+    """
+    The domain (e.g. parabol.co) that the user should be able to view insights on
+    """
+    domain: String!
+
+    """
+    emails to give the insights priviledge to
+    """
+    emails: [String!]!
+  ): ToggleAllowInsightsPayload!
+
+  """
+  Give some organizations advanced features in a flag
+  """
+  updateOrgFeatureFlag(
+    """
+    a list of organization ids
+    """
+    orgIds: [String!]!
+
+    """
+    the flag that you want to give to the organization
+    """
+    flag: OrganizationFeatureFlagsEnum!
+
+    """
+    whether or not you want to give the organization the flag
+    """
+    addFlag: Boolean!
+  ): UpdateOrgFeatureFlagPayload!
+
+  """
+  Describe the mutation here
+  """
+  verifyDomain(
+    """
+    Add the following domains to the list that org has control over. A domain is usually the part after the @ of their email.
+    """
+    addDomains: [ID!]
+
+    """
+    organization id. If the record already exists, this will overwite the value
+    """
+    orgId: ID!
+
+    """
+    The name of the company, used as a slug in signon URLs. Usually the domain without the tld
+    """
+    slug: ID!
+
+    """
+    A list of domains to remove from the control of the org. Useful if you previously added the incorrect domains
+    """
+    removeDomains: [ID!]
+  ): VerifyDomainPayload!
+}
diff --git a/packages/server/graphql/private/typeDefs/OrganizationFeatureFlagsEnum.graphql b/packages/server/graphql/private/typeDefs/OrganizationFeatureFlagsEnum.graphql
new file mode 100644
index 00000000000..c464347283c
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/OrganizationFeatureFlagsEnum.graphql
@@ -0,0 +1,17 @@
+"""
+A flag to give an individual organization super powers
+"""
+enum OrganizationFeatureFlagsEnum {
+  noAISummary
+  standupAISummary
+  noPromptToJoinOrg
+  suggestGroups
+  zoomTranscription
+  shareSummary
+  teamsLimit
+  noTeamInsights
+  singleColumnStandups
+  publicTeams
+  aiTemplate
+  relatedDiscussions
+}
diff --git a/packages/server/graphql/private/typeDefs/ping.graphql b/packages/server/graphql/private/typeDefs/PingableServices.graphql
similarity index 73%
rename from packages/server/graphql/private/typeDefs/ping.graphql
rename to packages/server/graphql/private/typeDefs/PingableServices.graphql
index a5fac9c81f4..8fe88d9e09c 100644
--- a/packages/server/graphql/private/typeDefs/ping.graphql
+++ b/packages/server/graphql/private/typeDefs/PingableServices.graphql
@@ -3,19 +3,14 @@ type PingableServices {
   Response time for RethinkDB (in milliseconds) -1 if unreachable after 5 seconds
   """
   rethinkdb: Int!
+
   """
   Response time for Postgres (in milliseconds) -1 if unreachable after 5 seconds
   """
   postgres: Int!
+
   """
   Response time for Redis (in milliseconds) -1 if unreachable after 5 seconds
   """
   redis: Int!
 }
-
-extend type Query {
-  """
-  Ping various services to determine response time & availability
-  """
-  ping: PingableServices!
-}
diff --git a/packages/server/graphql/private/typeDefs/ProcessRecurrencePayload.graphql b/packages/server/graphql/private/typeDefs/ProcessRecurrencePayload.graphql
new file mode 100644
index 00000000000..cad4ee5dbc1
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/ProcessRecurrencePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for processRecurrence, which could be an error
+"""
+union ProcessRecurrencePayload = ErrorPayload | ProcessRecurrenceSuccess
diff --git a/packages/server/graphql/private/typeDefs/ProcessRecurrenceSuccess.graphql b/packages/server/graphql/private/typeDefs/ProcessRecurrenceSuccess.graphql
new file mode 100644
index 00000000000..a16ddbc4565
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/ProcessRecurrenceSuccess.graphql
@@ -0,0 +1,11 @@
+type ProcessRecurrenceSuccess {
+  """
+  Number of meetings that were ended because of this mutation.
+  """
+  meetingsEnded: Int!
+
+  """
+  Number of meetings that were started because of this mutation.
+  """
+  meetingsStarted: Int!
+}
diff --git a/packages/server/graphql/private/typeDefs/Query.graphql b/packages/server/graphql/private/typeDefs/Query.graphql
new file mode 100644
index 00000000000..e03d9be4f6e
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/Query.graphql
@@ -0,0 +1,136 @@
+"""
+This file was generated from before we moved to SDL-driven development
+It's HUGE, and editing it directly could result in a headache.
+Please don't add anything to this file.
+Instead, add your new types to their own typeDef file
+"""
+type Query {
+  """
+  Get the number of logins, optionally broken down by domain
+  """
+  logins(
+    """
+    only include users whose accounts were created after this date
+    """
+    after: DateTime
+
+    """
+    if true, only include active users, else count all users
+    """
+    isActive: Boolean = false
+  ): LoginsPayload!
+
+  """
+  Ping various services to determine response time & availability
+  """
+  ping: PingableServices!
+
+  """
+  All the info about a specific company
+  """
+  company(
+    """
+    the top level doamin for a company (e.g. parabol.co)
+    """
+    domain: ID
+
+    """
+    if domain is not provided, the userId that belongs to the company
+    """
+    userId: ID
+  ): Company
+
+  """
+  Post signup and login metrics to slack
+  """
+  dailyPulse(
+    """
+    the earliest time to run the query
+    """
+    after: DateTime!
+
+    """
+    the email that holds the credentials to the channelId
+    """
+    email: String!
+
+    """
+    the ID of channel to post to
+    """
+    channelId: ID!
+  ): Boolean
+
+  """
+  Check if this server is alive (an example query).
+  """
+  pingActionTick: String
+  suCountTiersForUser(
+    """
+    the user for which you want the count of tier membership
+    """
+    userId: ID!
+  ): UserTiersCount
+  suUserCount(
+    """
+    which tier of org shall we count?
+    """
+    tier: TierEnum = team
+  ): Int
+  suOrgCount(
+    """
+    the minimum number of users within the org to count it
+    """
+    minOrgSize: Int = 2
+
+    """
+    which tier of org shall we count?
+    """
+    tier: TierEnum = team
+  ): Int
+
+  """
+  Dig into a user by providing the email or userId
+  """
+  user(
+    """
+    the email of the user
+    """
+    email: String
+
+    """
+    the ID of the user
+    """
+    userId: ID
+  ): User
+
+  """
+  Dig into many users by providing the userId
+  """
+  users(
+    """
+    a list of userIds
+    """
+    userIds: [ID!]!
+  ): [User]!
+
+  """
+  Get the number of signups, optionally broken down by domain
+  """
+  signups(
+    """
+    only include users whose accounts were created after this date
+    """
+    after: DateTime
+
+    """
+    if true, only include active users, else count all users
+    """
+    isActive: Boolean = false
+  ): SignupsPayload!
+  suProOrgInfo(
+    """
+    should organizations without active users be included?
+    """
+    includeInactive: Boolean! = false
+  ): [Organization!]
+}
diff --git a/packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsPayload.graphql b/packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsPayload.graphql
new file mode 100644
index 00000000000..86228334d8a
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for RemoveAllSlackAuthsPayload
+"""
+union RemoveAllSlackAuthsPayload = ErrorPayload | RemoveAllSlackAuthsSuccess
diff --git a/packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsSuccess.graphql b/packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsSuccess.graphql
new file mode 100644
index 00000000000..4185d7e9197
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/RemoveAllSlackAuthsSuccess.graphql
@@ -0,0 +1,11 @@
+type RemoveAllSlackAuthsSuccess {
+  """
+  Response from removing all Slack auths
+  """
+  slackAuthRes: String!
+
+  """
+  Response from removing all Slack notifications
+  """
+  slackNotificationRes: String!
+}
diff --git a/packages/server/graphql/private/typeDefs/RemoveAuthIdentityPayload.graphql b/packages/server/graphql/private/typeDefs/RemoveAuthIdentityPayload.graphql
new file mode 100644
index 00000000000..340c766687e
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/RemoveAuthIdentityPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for removeAuthIdentity, which could be an error
+"""
+union RemoveAuthIdentityPayload = ErrorPayload | RemoveAuthIdentitySuccess
diff --git a/packages/server/graphql/private/typeDefs/RemoveAuthIdentitySuccess.graphql b/packages/server/graphql/private/typeDefs/RemoveAuthIdentitySuccess.graphql
new file mode 100644
index 00000000000..b859ca5b605
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/RemoveAuthIdentitySuccess.graphql
@@ -0,0 +1,6 @@
+type RemoveAuthIdentitySuccess {
+  """
+  The users who had their auth identity removed
+  """
+  users: [User!]!
+}
diff --git a/packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplatePayload.graphql b/packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplatePayload.graphql
new file mode 100644
index 00000000000..4e8ae099215
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplatePayload.graphql
@@ -0,0 +1 @@
+union SetIsFreeMeetingTemplatePayload = ErrorPayload | SetIsFreeMeetingTemplateSuccess
diff --git a/packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplateSuccess.graphql b/packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplateSuccess.graphql
new file mode 100644
index 00000000000..0ce9fe46e5f
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/SetIsFreeMeetingTemplateSuccess.graphql
@@ -0,0 +1,6 @@
+type SetIsFreeMeetingTemplateSuccess {
+  """
+  The meeting templates that have been updated
+  """
+  updatedTemplates: [MeetingTemplate!]!
+}
diff --git a/packages/server/graphql/private/typeDefs/SignupsPayload.graphql b/packages/server/graphql/private/typeDefs/SignupsPayload.graphql
new file mode 100644
index 00000000000..e53bbec20c0
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/SignupsPayload.graphql
@@ -0,0 +1,11 @@
+type SignupsPayload {
+  """
+  the total number of signups for the given time range
+  """
+  total: Int!
+
+  """
+  The total broken down by email domain
+  """
+  byDomain: [DomainCountPayload!]!
+}
diff --git a/packages/server/graphql/private/typeDefs/StartTrialPayload.graphql b/packages/server/graphql/private/typeDefs/StartTrialPayload.graphql
new file mode 100644
index 00000000000..08e71909056
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/StartTrialPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for startTrial, which could be an error
+"""
+union StartTrialPayload = ErrorPayload | StartTrialSuccess
diff --git a/packages/server/graphql/private/typeDefs/StartTrialSuccess.graphql b/packages/server/graphql/private/typeDefs/StartTrialSuccess.graphql
new file mode 100644
index 00000000000..3324b723199
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/StartTrialSuccess.graphql
@@ -0,0 +1,6 @@
+type StartTrialSuccess {
+  """
+  The updated organization
+  """
+  organization: Organization!
+}
diff --git a/packages/server/graphql/private/typeDefs/ToggleAllowInsightsPayload.graphql b/packages/server/graphql/private/typeDefs/ToggleAllowInsightsPayload.graphql
new file mode 100644
index 00000000000..be410ac6cbc
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/ToggleAllowInsightsPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for toggleAllowInsights, which could be an error
+"""
+union ToggleAllowInsightsPayload = ErrorPayload | ToggleAllowInsightsSuccess
diff --git a/packages/server/graphql/private/typeDefs/ToggleAllowInsightsSuccess.graphql b/packages/server/graphql/private/typeDefs/ToggleAllowInsightsSuccess.graphql
new file mode 100644
index 00000000000..14037bf7a69
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/ToggleAllowInsightsSuccess.graphql
@@ -0,0 +1,6 @@
+type ToggleAllowInsightsSuccess {
+  """
+  How many records were updated
+  """
+  organizationUsersAffected: Int!
+}
diff --git a/packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagPayload.graphql b/packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagPayload.graphql
new file mode 100644
index 00000000000..cc79b4a21d3
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagPayload.graphql
@@ -0,0 +1 @@
+union UpdateOrgFeatureFlagPayload = ErrorPayload | UpdateOrgFeatureFlagSuccess
diff --git a/packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagSuccess.graphql b/packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagSuccess.graphql
new file mode 100644
index 00000000000..e3bf3b86821
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/UpdateOrgFeatureFlagSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateOrgFeatureFlagSuccess {
+  """
+  the organizations given the super power
+  """
+  updatedOrganizations: [Organization]
+}
diff --git a/packages/server/graphql/private/typeDefs/UpdateWatchlistPayload.graphql b/packages/server/graphql/private/typeDefs/UpdateWatchlistPayload.graphql
new file mode 100644
index 00000000000..6031516d840
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/UpdateWatchlistPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdateWatchlistPayload
+"""
+union UpdateWatchlistPayload = ErrorPayload | UpdateWatchlistSuccess
diff --git a/packages/server/graphql/private/typeDefs/UpdateWatchlistSuccess.graphql b/packages/server/graphql/private/typeDefs/UpdateWatchlistSuccess.graphql
new file mode 100644
index 00000000000..2ff55c0b682
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/UpdateWatchlistSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateWatchlistSuccess {
+  """
+  true if the mutation was successfully executed
+  """
+  success: Boolean
+}
diff --git a/packages/server/graphql/private/typeDefs/VerifyDomainPayload.graphql b/packages/server/graphql/private/typeDefs/VerifyDomainPayload.graphql
new file mode 100644
index 00000000000..511b6eb9193
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/VerifyDomainPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for verifyDomain, which could be an error
+"""
+union VerifyDomainPayload = ErrorPayload | VerifyDomainSuccess
diff --git a/packages/server/graphql/private/typeDefs/VerifyDomainSuccess.graphql b/packages/server/graphql/private/typeDefs/VerifyDomainSuccess.graphql
new file mode 100644
index 00000000000..6ea44065cec
--- /dev/null
+++ b/packages/server/graphql/private/typeDefs/VerifyDomainSuccess.graphql
@@ -0,0 +1,6 @@
+type VerifyDomainSuccess {
+  """
+  Describe the first return field here
+  """
+  saml: SAML!
+}
diff --git a/packages/server/graphql/private/typeDefs/_legacy.graphql b/packages/server/graphql/private/typeDefs/_legacy.graphql
deleted file mode 100644
index 48da89dfeff..00000000000
--- a/packages/server/graphql/private/typeDefs/_legacy.graphql
+++ /dev/null
@@ -1,1803 +0,0 @@
-"""
-This file was generated from before we moved to SDL-driven development
-It's HUGE, and editing it directly could result in a headache.
-Please don't add anything to this file.
-Instead, add your new types to their own typeDef file
-"""
-type Query {
-  """
-  Get the number of logins, optionally broken down by domain
-  """
-  logins(
-    """
-    only include users whose accounts were created after this date
-    """
-    after: DateTime
-
-    """
-    if true, only include active users, else count all users
-    """
-    isActive: Boolean = false
-  ): LoginsPayload!
-
-  """
-  Ping various services to determine response time & availability
-  """
-  ping: PingableServices!
-
-  """
-  All the info about a specific company
-  """
-  company(
-    """
-    the top level doamin for a company (e.g. parabol.co)
-    """
-    domain: ID
-
-    """
-    if domain is not provided, the userId that belongs to the company
-    """
-    userId: ID
-  ): Company
-
-  """
-  Post signup and login metrics to slack
-  """
-  dailyPulse(
-    """
-    the earliest time to run the query
-    """
-    after: DateTime!
-
-    """
-    the email that holds the credentials to the channelId
-    """
-    email: String!
-
-    """
-    the ID of channel to post to
-    """
-    channelId: ID!
-  ): Boolean
-
-  """
-  Check if this server is alive (an example query).
-  """
-  pingActionTick: String
-  suCountTiersForUser(
-    """
-    the user for which you want the count of tier membership
-    """
-    userId: ID!
-  ): UserTiersCount
-  suUserCount(
-    """
-    which tier of org shall we count?
-    """
-    tier: TierEnum = team
-  ): Int
-
-  suOrgCount(
-    """
-    the minimum number of users within the org to count it
-    """
-    minOrgSize: Int = 2
-
-    """
-    which tier of org shall we count?
-    """
-    tier: TierEnum = team
-  ): Int
-
-  """
-  Dig into a user by providing the email or userId
-  """
-  user(
-    """
-    the email of the user
-    """
-    email: String
-
-    """
-    the ID of the user
-    """
-    userId: ID
-  ): User
-
-  """
-  Dig into many users by providing the userId
-  """
-  users(
-    """
-    a list of userIds
-    """
-    userIds: [ID!]!
-  ): [User]!
-
-  """
-  Get the number of signups, optionally broken down by domain
-  """
-  signups(
-    """
-    only include users whose accounts were created after this date
-    """
-    after: DateTime
-
-    """
-    if true, only include active users, else count all users
-    """
-    isActive: Boolean = false
-  ): SignupsPayload!
-}
-
-type LoginsPayload {
-  """
-  the total number of records
-  """
-  total: Int!
-
-  """
-  The total broken down by email domain
-  """
-  byDomain: [DomainCountPayload!]!
-}
-
-type DomainCountPayload {
-  """
-  the email domain
-  """
-  domain: ID!
-
-  """
-  the sum total
-  """
-  total: Int!
-}
-
-type PingableServices {
-  """
-  Response time for RethinkDB (in milliseconds) -1 if unreachable after 5 seconds
-  """
-  rethinkdb: Int!
-
-  """
-  Response time for Postgres (in milliseconds) -1 if unreachable after 5 seconds
-  """
-  postgres: Int!
-
-  """
-  Response time for Redis (in milliseconds) -1 if unreachable after 5 seconds
-  """
-  redis: Int!
-}
-
-type Mutation {
-  """
-  Updates the user email
-  """
-  updateEmail(
-    """
-    User current email
-    """
-    oldEmail: Email!
-
-    """
-    User new email
-    """
-    newEmail: Email!
-  ): Boolean!
-
-  """
-  broadcast a new feature to the entire userbase
-  """
-  addNewFeature(
-    """
-    The text of the action button in the snackbar
-    """
-    actionButtonCopy: String!
-
-    """
-    The description of the new feature
-    """
-    snackbarMessage: String!
-
-    """
-    The permalink to the blog post describing the new feature
-    """
-    url: String!
-  ): AddNewFeaturePayload
-
-  """
-  automatically pause users that have been inactive for 30 days. returns the number of users paused
-  """
-  autopauseUsers: Int
-
-  """
-  copies all the records from RethinkDB for a list of organizations
-  """
-  backupOrganization(orgIds: [ID!]!): String!
-
-  """
-  check equality of a table between rethinkdb and postgres
-  """
-  checkRethinkPgEquality(
-    """
-    The table name to be compared
-    """
-    tableName: String!
-
-    """
-    How many errors should be returned
-    """
-    maxErrors: Int
-
-    """
-    Whether the output should be written to file
-    """
-    writeToFile: Boolean
-  ): String!
-
-  """
-  a server-side mutation called when a client connects
-  """
-  connectSocket(
-    """
-    The ID of the server this socket is connected to
-    """
-    socketInstanceId: ID!
-  ): User!
-
-  """
-  profile the CPU
-  """
-  profileCPU: String
-
-  """
-  a server-side mutation called when a client disconnects
-  """
-  disconnectSocket(
-    """
-    the userId to disconnect
-    """
-    userId: ID!
-  ): DisconnectSocketPayload
-
-  """
-  Create a stripe customer & subscription in stripe, send them an invoice for an enterprise license
-  """
-  draftEnterpriseInvoice(
-    """
-    the org requesting the upgrade
-    """
-    orgId: ID!
-
-    """
-    The number of users the license grants the organization
-    """
-    quantity: Int!
-
-    """
-    Email address of billing leader, if different from the org billing leader
-    """
-    email: ID
-
-    """
-    The email address for Accounts Payable. Use only if the invoice will be sent to a non-user!
-    """
-    apEmail: ID
-
-    """
-    the stripe id of the plan in stripe, if not using the default plan
-    """
-    plan: ID
-  ): DraftEnterpriseInvoicePayload
-
-  """
-  dump the memory heap to a file
-  """
-  dumpHeap(
-    """
-    must pass true to make it work
-    """
-    isDangerous: Boolean!
-  ): String
-
-  """
-  add/remove a flag on an org asking them to pay
-  """
-  flagConversionModal(
-    """
-    true to turn the modal on, false to turn it off
-    """
-    active: Boolean!
-
-    """
-    the orgId to toggle the flag for
-    """
-    orgId: ID!
-  ): FlagConversionModalPayload
-
-  """
-  hard deletes a user and all its associated objects
-  """
-  hardDeleteUser(
-    """
-    a userId
-    """
-    userId: ID
-
-    """
-    the user email
-    """
-    email: ID
-
-    """
-    the reason why the user wants to delete their account
-    """
-    reasonText: String
-  ): DeleteUserPayload!
-
-  """
-  Lock/Unlock teams, flagging them as unpaid/paid. Return true if successful
-  """
-  lockTeams(
-    """
-    List of teams to target
-    """
-    teamIds: [ID!]!
-
-    """
-    true to unlock the teams, false to lock
-    """
-    isPaid: Boolean!
-
-    """
-    The HTML to show if isPaid is false
-    """
-    message: String
-  ): Boolean!
-
-  """
-  Send a message to all authorised Slack users
-  """
-  messageAllSlackUsers(
-    """
-    The slack message that will be sent to all Slack users
-    """
-    message: String!
-  ): MessageAllSlackUsersPayload!
-
-  """
-  Remove Slack integrations for all users
-  """
-  removeAllSlackAuths: RemoveAllSlackAuthsPayload!
-
-  """
-  schedule upcoming jobs to be run
-  """
-  runScheduledJobs(
-    """
-    Queue up all jobs that are scheduled to run within this many seconds
-    """
-    seconds: Int!
-  ): Int
-
-  """
-  Send summary emails of unread notifications to all users who have not been seen within the last 24 hours
-  """
-  sendBatchNotificationEmails: [String]
-
-  """
-  send an email to organizations including all the users that were added in the current billing cycle
-  """
-  sendUpcomingInvoiceEmails: [String]
-
-  """
-  manually set the domain that the organization belongs to
-  """
-  setOrganizationDomain(
-    """
-    The unique identifier for the organization
-    """
-    orgId: ID!
-
-    """
-    The top level domain of the company. Usually the part after the "@" in their email address
-    """
-    domain: ID!
-  ): Boolean!
-
-  """
-  When stripe tells us an invoice is ready, create a pretty version
-  """
-  stripeCreateInvoice(
-    """
-    The stripe invoice ID
-    """
-    invoiceId: ID!
-  ): Boolean
-
-  """
-  When stripe tells us an invoice payment failed, update it in our DB
-  """
-  stripeFailPayment(
-    """
-    The stripe invoice ID
-    """
-    invoiceId: ID!
-  ): StripeFailPaymentPayload
-
-  """
-  When stripe tells us an invoice payment was successful, update it in our DB
-  """
-  stripeSucceedPayment(
-    """
-    The stripe invoice ID
-    """
-    invoiceId: ID!
-  ): Boolean
-
-  """
-  When stripe tells us a credit card was updated, update the details in our own DB
-  """
-  stripeUpdateCreditCard(
-    """
-    The stripe customer ID, or stripeId
-    """
-    customerId: ID!
-  ): Boolean
-
-  """
-  When stripe tells us a subscription was updated, update the details in our own DB
-  """
-  stripeCreateSubscription(
-    """
-    The stripe customer ID, or stripeId
-    """
-    customerId: ID!
-    """
-    The stripe subscription ID
-    """
-    subscriptionId: ID!
-  ): Boolean
-
-  """
-  When stripe tells us a subscription was deleted, update the details in our own DB
-  """
-  stripeDeleteSubscription(
-    """
-    The stripe customer ID, or stripeId
-    """
-    customerId: ID!
-    """
-    The stripe subscription ID
-    """
-    subscriptionId: ID!
-  ): Boolean
-
-  """
-  When a new invoiceitem is sent from stripe, tag it with metadata
-  """
-  stripeUpdateInvoiceItem(
-    """
-    The stripe invoice ID
-    """
-    invoiceItemId: ID!
-  ): Boolean
-
-  """
-  An invice has been sent from stripe, meaning it is finalized
-  """
-  stripeInvoiceFinalized(
-    """
-    The stripe invoice ID
-    """
-    invoiceId: ID!
-  ): Boolean
-
-  """
-  add/remove user(s) to/from the watchlist so that we start/stop recording their sessions
-  """
-  updateWatchlist(
-    """
-    a list of email addresses of users whose sessions we want to start/stop recording
-    """
-    emails: [String!]
-
-    """
-    add/remove the entire domain to/from the watchlist. The part of the email after the @
-    """
-    domain: String
-
-    """
-    true if the user should be added to the watchlist, false if not
-    """
-    includeInWatchlist: Boolean!
-  ): UpdateWatchlistPayload!
-
-  """
-  Updates Atlassian OAuth tokens that haven't been updated since the date specified in input
-  """
-  updateOAuthRefreshTokens(
-    """
-    Threshold date for `updatedAt` from AtlassianAuth
-    """
-    updatedBefore: DateTime!
-  ): Int
-}
-
-"""
-An authentication provider configuration
-"""
-interface IntegrationProvider {
-  """
-  The provider's unique identifier
-  """
-  id: ID!
-
-  """
-  The team that created the provider. "aGhostTeam" if global
-  """
-  teamId: ID!
-
-  """
-  The timestamp the provider was created
-  """
-  createdAt: DateTime!
-
-  """
-  The timestamp the token was updated at
-  """
-  updatedAt: DateTime!
-
-  """
-  The name of the integration service (GitLab, Mattermost, etc)
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  The kind of token used by this provider (OAuth2, PAT, Webhook)
-  """
-  authStrategy: IntegrationProviderAuthStrategyEnum!
-
-  """
-  The scope this provider configuration was created at (globally, org-wide, or by the team)
-  """
-  scope: IntegrationProviderScopeEnum!
-
-  """
-  true if the provider configuration should be used
-  """
-  isActive: Boolean!
-}
-
-scalar DateTime
-
-"""
-The name of the service of the Integration Provider
-"""
-enum IntegrationProviderServiceEnum {
-  jira
-  github
-  gitlab
-  mattermost
-  jiraServer
-  azureDevOps
-}
-
-"""
-The kind of token provided by the service
-"""
-enum IntegrationProviderAuthStrategyEnum {
-  oauth1
-  oauth2
-  pat
-  webhook
-}
-
-"""
-The scope this provider was created on (globally, org-wide, or on the team)
-"""
-enum IntegrationProviderScopeEnum {
-  global
-  org
-  team
-}
-
-scalar URL
-
-"""
-An authentication strategy to log in to Parabol
-"""
-interface AuthIdentity {
-  """
-  true if the email address using this strategy is verified, else false
-  """
-  isEmailVerified: Boolean!
-  type: AuthIdentityTypeEnum!
-}
-
-"""
-The types of authentication strategies
-"""
-enum AuthIdentityTypeEnum {
-  LOCAL
-  GOOGLE
-}
-
-interface NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [NewMeetingStage!]!
-}
-
-"""
-The phase of the meeting
-"""
-enum NewMeetingPhaseTypeEnum {
-  lobby
-  checkin
-  updates
-  firstcall
-  agendaitems
-  lastcall
-  reflect
-  group
-  vote
-  discuss
-  SUMMARY
-  SCOPE
-  ESTIMATE
-  RESPONSES
-}
-
-"""
-An instance of a meeting phase item. On the client, this usually represents a single view
-"""
-interface NewMeetingStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-}
-
-"""
-An item that can be put in a thread
-"""
-interface Threadable {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  The rich text body of the item
-  """
-  content: String!
-
-  """
-  The timestamp the item was created
-  """
-  createdAt: DateTime!
-
-  """
-  The userId that created the item
-  """
-  createdBy: ID
-
-  """
-  The user that created the item
-  """
-  createdByUser: User
-
-  """
-  the replies to this threadable item
-  """
-  replies: [Threadable!]!
-
-  """
-  The FK of the discussion this task was created in. Null if task was not created in a discussion
-  """
-  discussionId: ID
-
-  """
-  the parent, if this threadable is a reply, else null
-  """
-  threadParentId: ID
-
-  """
-  the order of this threadable, relative to threadParentId
-  """
-  threadSortOrder: Float
-
-  """
-  The timestamp the item was updated
-  """
-  updatedAt: DateTime!
-}
-
-"""
-The suggested repos and projects a user can integrate with
-"""
-interface RepoIntegration {
-  id: ID!
-  service: IntegrationProviderServiceEnum!
-}
-
-"""
-The right drawer types available on the team dashboard
-"""
-enum TeamDrawer {
-  agenda
-  manageTeam
-}
-
-scalar Email
-
-"""
-A connection to a list of items.
-"""
-type JiraIssueConnection {
-  """
-  Page info with cursors
-  """
-  pageInfo: PageInfo
-
-  """
-  A list of edges.
-  """
-  edges: [JiraIssueEdge!]!
-
-  """
-  An error with the connection, if any
-  """
-  error: StandardMutationError
-}
-
-"""
-An edge in a connection.
-"""
-type JiraIssueEdge {
-  """
-  The item at the end of the edge
-  """
-  node: JiraIssue!
-  cursor: String
-}
-
-interface TaskIntegration {
-  id: ID!
-}
-
-type StandardMutationError {
-  """
-  The title of the error
-  """
-  title: String
-
-  """
-  The full error
-  """
-  message: String!
-}
-
-
-"""
-The auth credentials for a token, specific to a team member
-"""
-interface TeamMemberIntegrationAuth {
-  """
-  The token's unique identifier
-  """
-  id: ID!
-
-  """
-  The team that the token is linked to
-  """
-  teamId: ID!
-
-  """
-  The timestamp the token was created
-  """
-  createdAt: DateTime!
-
-  """
-  The timestamp the token was updated at
-  """
-  updatedAt: DateTime!
-
-  """
-  The GQL GUID of the DB providerId foreign key
-  """
-  providerId: ID!
-
-  """
-  The service this token is associated with, denormalized from the provider
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  true if the token configuration should be used
-  """
-  isActive: Boolean!
-
-  """
-  The provider to connect to
-  """
-  provider: IntegrationProvider!
-}
-
-
-
-
-"""
-The event that triggers a slack notification
-"""
-enum SlackNotificationEventEnum {
-  meetingStart
-  meetingEnd
-  MEETING_STAGE_TIME_LIMIT_END
-  MEETING_STAGE_TIME_LIMIT_START
-}
-
-"""
-The type of event for a slack notification
-"""
-enum SlackNotificationEventTypeEnum {
-  """
-  notification that concerns the whole team
-  """
-  team
-
-  """
-  notification that concerns a single member on the team
-  """
-  member
-}
-
-"""
-All the user details for a specific meeting
-"""
-interface MeetingMember {
-  """
-  A composite of userId::meetingId
-  """
-  id: ID!
-
-  """
-  true if present, false if absent, else null
-  """
-  isCheckedIn: Boolean
-    @deprecated(
-      reason: "Members are checked in when they enter the meeting now & not created beforehand"
-    )
-  meetingId: ID!
-  meetingType: MeetingTypeEnum!
-  teamId: ID!
-  teamMember: TeamMember!
-  user: User!
-  userId: ID!
-
-  """
-  The last time a meeting was updated (stage completed, finished, etc)
-  """
-  updatedAt: DateTime!
-}
-
-"""
-The type of meeting
-"""
-enum MeetingTypeEnum {
-  action
-  retrospective
-  poker
-  teamPrompt
-}
-
-"""
-The scope of a shareable item
-"""
-enum SharingScopeEnum {
-  TEAM
-  ORGANIZATION
-  PUBLIC
-}
-
-"""
-The team settings for a specific type of meeting
-"""
-interface TeamMeetingSettings {
-  id: ID!
-
-  """
-  The type of meeting these settings apply to
-  """
-  meetingType: MeetingTypeEnum!
-
-  """
-  The broad phase types that will be addressed during the meeting
-  """
-  phaseTypes: [NewMeetingPhaseTypeEnum!]!
-
-  """
-  FK
-  """
-  teamId: ID!
-
-  """
-  The team these settings belong to
-  """
-  team: Team!
-}
-
-"""
-The pay tier of the team
-"""
-enum TierEnum {
-  starter
-  team
-  enterprise
-}
-
-"""
-A grouping of organizations. Automatically grouped by top level domain of each
-"""
-type Company {
-  """
-  the top level domain
-  """
-  id: ID!
-
-  """
-  the number of active teams across all organizations
-  """
-  activeTeamCount: Int!
-
-  """
-  the number of active users across all organizations
-  """
-  activeUserCount: Int!
-
-  """
-  the last time any team in the organization started a meeting, null if no meetings were ever run
-  """
-  lastMetAt: DateTime
-
-  """
-  the total number of meetings started across all teams on all organizations
-  """
-  meetingCount: Int!
-
-  """
-  the longest monthly streak for meeting at least once per month for any team in the company
-  """
-  monthlyTeamStreakMax: Int!
-
-  """
-  Get the list of all organizations that belong to the company
-  """
-  organizations: [Organization!]!
-
-  """
-  The highest tier for any organization within the company
-  """
-  tier: TierEnum!
-
-  """
-  the total number of users across all organizations
-  """
-  userCount: Int!
-}
-
-"""
-The role of the org user
-"""
-enum OrgUserRole {
-  BILLING_LEADER
-}
-
-type OrgUserCount {
-  """
-  The number of orgUsers who have an inactive flag
-  """
-  inactiveUserCount: Int!
-
-  """
-  The number of orgUsers who do not have an inactive flag
-  """
-  activeUserCount: Int!
-}
-
-"""
-The source that a change to a record came in through
-"""
-enum ChangeSourceEnum {
-  meeting
-  task
-  external
-}
-
-type TaskEditorDetails {
-  """
-  The userId of the person editing the task
-  """
-  userId: ID!
-
-  """
-  The name of the userId editing the task
-  """
-  preferredName: String!
-}
-
-"""
-The status of the task
-"""
-enum TaskStatusEnum {
-  active
-  stuck
-  done
-  future
-}
-
-"""
-A big picture line item
-"""
-enum InvoiceLineItemEnum {
-  ADDED_USERS
-  INACTIVITY_ADJUSTMENTS
-  OTHER_ADJUSTMENTS
-  REMOVED_USERS
-}
-
-"""
-The payment status of the invoice
-"""
-enum InvoiceStatusEnum {
-  PENDING
-  PAID
-  FAILED
-  UPCOMING
-}
-
-"""
-A past event that is important to the viewer
-"""
-interface SuggestedAction {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the action was created at
-  """
-  createdAt: DateTime!
-
-  """
-  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
-  """
-  priority: Float
-
-  """
-  * The timestamp the action was removed at
-  """
-  removedAt: DateTime!
-
-  """
-  The specific type of suggested action
-  """
-  type: SuggestedActionTypeEnum!
-
-  """
-  * The userId this action is for
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-The specific type of the suggested action
-"""
-enum SuggestedActionTypeEnum {
-  inviteYourTeam
-  tryTheDemo
-  tryRetroMeeting
-  createNewTeam
-  tryActionMeeting
-}
-
-"""
-A past event that is important to the viewer
-"""
-interface TimelineEvent {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the event was created at
-  """
-  createdAt: DateTime!
-
-  """
-  the number of times the user has interacted with (ie clicked) this event
-  """
-  interactionCount: Int!
-
-  """
-  true if the timeline event is active, false if archived
-  """
-  isActive: Boolean!
-
-  """
-  The orgId this event is associated with. Null if not traceable to one org
-  """
-  orgId: ID
-
-  """
-  The organization this event is associated with
-  """
-  organization: Organization
-
-  """
-  the number of times the user has seen this event
-  """
-  seenCount: Int!
-
-  """
-  The teamId this event is associated with. Null if not traceable to one team
-  """
-  teamId: ID
-
-  """
-  The team that can see this event
-  """
-  team: Team
-
-  """
-  The specific type of event
-  """
-  type: TimelineEventEnum!
-
-  """
-  * The userId that can see this event
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-The specific type of event
-"""
-enum TimelineEventEnum {
-  retroComplete
-  actionComplete
-  joinedParabol
-  createdTeam
-  POKER_COMPLETE
-  TEAM_PROMPT_COMPLETE
-}
-
-"""
-The topic being discussed
-"""
-enum DiscussionTopicTypeEnum {
-  agendaItem
-  reflectionGroup
-  task
-  teamPromptResponse
-  githubIssue
-  jiraIssue
-}
-
-interface Notification {
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-}
-
-"""
-The status of the notification interaction
-"""
-enum NotificationStatusEnum {
-  UNREAD
-  READ
-  CLICKED
-}
-
-"""
-The kind of notification
-"""
-enum NotificationEnum {
-  KICKED_OUT
-  PAYMENT_REJECTED
-  PROMOTE_TO_BILLING_LEADER
-  TEAM_INVITATION
-  TEAM_ARCHIVED
-  TASK_INVOLVES
-  MEETING_STAGE_TIME_LIMIT_END
-  TEAMS_LIMIT_EXCEEDED
-  TEAMS_LIMIT_REMINDER
-  PROMPT_TO_JOIN_ORG
-  REQUEST_TO_JOIN_ORG
-}
-
-"""
-An item that can have reactjis
-"""
-interface Reactable {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  All the reactjis for the given reflection
-  """
-  reactjis: [Reactji!]!
-}
-
-type GoogleAnalyzedEntity {
-  """
-  The lemma (dictionary entry) of the entity name. Fancy way of saying the singular form of the name, if plural.
-  """
-  lemma: String!
-
-  """
-  The name of the entity. Usually 1 or 2 words. Always a noun, sometimes a proper noun.
-  """
-  name: String!
-
-  """
-  The salience of the entity in the provided text. The salience of all entities always sums to 1
-  """
-  salience: Float!
-}
-
-"""
-An instance of a meeting phase item. On the client, this usually represents a single view
-"""
-interface NewMeetingTeamMemberStage {
-  """
-  The meeting member that is the focus for this phase item
-  """
-  meetingMember: MeetingMember!
-
-  """
-  foreign key. use teamMember
-  """
-  teamMemberId: ID!
-
-  """
-  The team member that is the focus for this phase item
-  """
-  teamMember: TeamMember!
-}
-
-type MeetingGreeting {
-  """
-  The foreign-language greeting
-  """
-  content: String!
-
-  """
-  The source language for the greeting
-  """
-  language: String!
-}
-
-"""
-A meeting template that can be shared across team, orgnization and public
-"""
-interface MeetingTemplate {
-  """
-  shortid
-  """
-  id: ID!
-  createdAt: DateTime!
-
-  """
-  True if template can be used, else false
-  """
-  isActive: Boolean!
-
-  """
-  The time of the meeting the template was last used
-  """
-  lastUsedAt: DateTime
-
-  """
-  The name of the template
-  """
-  name: String!
-
-  """
-  *Foreign key. The organization that owns the team that created the template
-  """
-  orgId: ID!
-
-  """
-  Who can see this template
-  """
-  scope: SharingScopeEnum!
-
-  """
-  *Foreign key. The team this template belongs to
-  """
-  teamId: ID!
-
-  """
-  The team this template belongs to
-  """
-  team: Team!
-
-  """
-  The type of the template
-  """
-  type: MeetingTypeEnum!
-  updatedAt: DateTime!
-}
-
-"""
-A meeting stage that includes a discussion thread
-"""
-interface DiscussionThreadStage {
-  """
-  The ID to find the discussion that goes in the stage
-  """
-  discussionId: ID!
-
-  """
-  The discussion about the stage
-  """
-  discussion: Discussion!
-}
-
-"""
-The meeting phase where each of the team members can respond to prompts
-"""
-type TeamPromptResponsesPhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [TeamPromptResponseStage!]!
-}
-
-"""
-The stage where the single team member responds to a prompt
-"""
-type TeamPromptResponseStage implements NewMeetingStage & DiscussionThreadStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-
-  """
-  The ID to find the discussion that goes in the stage
-  """
-  discussionId: ID!
-
-  """
-  The discussion about the stage
-  """
-  discussion: Discussion!
-
-  """
-  The response to the prompt
-  """
-  response: TeamPromptResponse!
-}
-
-"""
-A response of a single team member in a team prompt
-"""
-type TeamPromptResponse implements Reactable {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  All the reactjis for the given reflection
-  """
-  reactjis: [Reactji!]!
-
-  """
-  Id of the user who created the team prompt response
-  """
-  userId: ID!
-
-  """
-  The user who created the response
-  """
-  user: User
-
-  """
-  the content of the response
-  """
-  content: String!
-
-  """
-  the plain text content of the response
-  """
-  plaintextContent: String!
-
-  """
-  the shared sort order for reponses
-  """
-  sortOrder: Float!
-
-  """
-  The team this response belongs to
-  """
-  team: Team!
-}
-
-interface TeamNotification {
-  id: ID
-  type: NotificationEnum
-}
-
-"""
-sorts for the reflection group. default is sortOrder. sorting by voteCount filters out items without votes.
-"""
-enum ReflectionGroupSortEnum {
-  voteCount
-  stageOrder
-}
-
-"""
-A count of the number of account tiers a user belongs to.
-"""
-type UserTiersCount {
-  """
-  The number of starter orgs the user is active upon
-  """
-  tierStarterCount: Int
-
-  """
-  The number of team orgs the user is active upon
-  """
-  tierTeamCount: Int
-
-  """
-  The number of pro orgs the user holds the role of Billing Leader
-  """
-  tierTeamBillingLeaderCount: Int
-  user: User
-}
-
-type SignupsPayload {
-  """
-  the total number of signups for the given time range
-  """
-  total: Int!
-
-  """
-  The total broken down by email domain
-  """
-  byDomain: [DomainCountPayload!]!
-}
-
-type AddNewFeaturePayload {
-  """
-  the new feature broadcast
-  """
-  newFeature: NewFeatureBroadcast
-}
-
-type DisconnectSocketPayload {
-  """
-  The user that disconnected
-  """
-  user: User
-}
-
-type DraftEnterpriseInvoicePayload {
-  error: StandardMutationError
-
-  """
-  The updated organization
-  """
-  organization: Organization
-}
-
-type FlagConversionModalPayload {
-  error: StandardMutationError
-
-  """
-  the org with the limit added or removed
-  """
-  org: Organization
-}
-
-type DeleteUserPayload {
-  error: StandardMutationError
-}
-
-type ErrorPayload {
-  error: StandardMutationError!
-}
-
-"""
-Return object for MessageAllSlackUsersPayload
-"""
-union MessageAllSlackUsersPayload = ErrorPayload | MessageAllSlackUsersSuccess
-
-type MessageAllSlackUsersSuccess {
-  """
-  A list of the Parabol user ids that have been sent a direct message in Slack
-  """
-  messagedUserIds: [ID!]!
-
-  """
-  Slack messages that failed to send
-  """
-  errors: [MessageSlackUserError!]
-}
-
-"""
-An error from sending a message to a Slack user
-"""
-type MessageSlackUserError {
-  userId: ID!
-
-  """
-  The error message received from Slack
-  """
-  error: String!
-}
-
-"""
-Return object for RemoveAllSlackAuthsPayload
-"""
-union RemoveAllSlackAuthsPayload = ErrorPayload | RemoveAllSlackAuthsSuccess
-
-type RemoveAllSlackAuthsSuccess {
-  """
-  Response from removing all Slack auths
-  """
-  slackAuthRes: String!
-
-  """
-  Response from removing all Slack notifications
-  """
-  slackNotificationRes: String!
-}
-
-type StripeFailPaymentPayload {
-  error: StandardMutationError
-  organization: Organization
-
-  """
-  The notification to a billing leader stating the payment was rejected
-  """
-  notification: NotifyPaymentRejected!
-}
-
-"""
-Return object for UpdateWatchlistPayload
-"""
-union UpdateWatchlistPayload = ErrorPayload | UpdateWatchlistSuccess
-
-type UpdateWatchlistSuccess {
-  """
-  true if the mutation was successfully executed
-  """
-  success: Boolean
-}
diff --git a/packages/server/graphql/private/typeDefs/changeEmailDomain.graphql b/packages/server/graphql/private/typeDefs/changeEmailDomain.graphql
deleted file mode 100644
index 8e43836d4e3..00000000000
--- a/packages/server/graphql/private/typeDefs/changeEmailDomain.graphql
+++ /dev/null
@@ -1,33 +0,0 @@
-extend type Mutation {
-  """
-  Change a company's domain so that affected users can only log in with the new domain
-  """
-  changeEmailDomain(
-    """
-    The company's old domain that we want to change
-    """
-    oldDomain: String!
-
-    """
-    The new domain that we're changing to
-    """
-    newDomain: String!
-  ): ChangeEmailDomainPayload!
-}
-
-"""
-Return value for changeEmailDomain, which could be an error
-"""
-union ChangeEmailDomainPayload = ErrorPayload | ChangeEmailDomainSuccess
-
-type ChangeEmailDomainSuccess {
-  """
-  The users whose domains were changed
-  """
-  usersUpdated: [User!]!
-
-  """
-  Users whose domains were not changed as they were already in the new domain
-  """
-  usersNotUpdated: [User!]!
-}
diff --git a/packages/server/graphql/private/typeDefs/endTrial.graphql b/packages/server/graphql/private/typeDefs/endTrial.graphql
deleted file mode 100644
index 200565c65d3..00000000000
--- a/packages/server/graphql/private/typeDefs/endTrial.graphql
+++ /dev/null
@@ -1,28 +0,0 @@
-extend type Mutation {
-  """
-  Ends the trial for an org iff there is an active trial.
-  """
-  endTrial(
-    """
-    ID of the org on which to end the trial
-    """
-    orgId: ID!
-  ): EndTrialPayload!
-}
-
-"""
-Return value for endTrial, which could be an error
-"""
-union EndTrialPayload = ErrorPayload | EndTrialSuccess
-
-type EndTrialSuccess {
-  """
-  The updated organization
-  """
-  organization: Organization!
-
-  """
-  The start time of the ended trial
-  """
-  trialStartDate: DateTime
-}
diff --git a/packages/server/graphql/private/typeDefs/flagOverLimit.graphql b/packages/server/graphql/private/typeDefs/flagOverLimit.graphql
deleted file mode 100644
index 9e53a0d636d..00000000000
--- a/packages/server/graphql/private/typeDefs/flagOverLimit.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-extend type Mutation {
-  """
-  add/remove a flag on a user saying they are over the free tier
-  """
-  flagOverLimit(
-    """
-    The text body of the over limit message, null to remove the previous value
-    """
-    copy: String = ""
-
-    """
-    the user orgId that went over the limit
-    """
-    orgId: ID!
-  ): FlagOverLimitPayload
-}
-
-type FlagOverLimitPayload {
-  error: StandardMutationError
-
-  """
-  the users with the limit added or removed
-  """
-  users: [User!]
-}
diff --git a/packages/server/graphql/private/typeDefs/loginSAML.graphql b/packages/server/graphql/private/typeDefs/loginSAML.graphql
deleted file mode 100644
index 047944b7768..00000000000
--- a/packages/server/graphql/private/typeDefs/loginSAML.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-extend type Mutation {
-  """
-  Log in using SAML single sign on (SSO)
-  """
-  loginSAML(
-    """
-    The querystring provided by the IdP including SAMLResponse and RelayState
-    """
-    queryString: String!
-
-    """
-    The name of the SAML identifier. The slug used in the redirect URL
-    """
-    samlName: ID!
-  ): UserLogInPayload!
-}
diff --git a/packages/server/graphql/private/typeDefs/logins.graphql b/packages/server/graphql/private/typeDefs/logins.graphql
deleted file mode 100644
index ca9277ffe62..00000000000
--- a/packages/server/graphql/private/typeDefs/logins.graphql
+++ /dev/null
@@ -1,40 +0,0 @@
-extend type Query {
-  """
-  Get the number of logins, optionally broken down by domain
-  """
-  logins(
-    """
-    only include users whose accounts were created after this date
-    """
-    after: DateTime
-
-    """
-    if true, only include active users, else count all users
-    """
-    isActive: Boolean = false
-  ): LoginsPayload!
-}
-
-type LoginsPayload {
-  """
-  the total number of records
-  """
-  total: Int!
-
-  """
-  The total broken down by email domain
-  """
-  byDomain: [DomainCountPayload!]!
-}
-
-type DomainCountPayload {
-  """
-  the email domain
-  """
-  domain: ID!
-
-  """
-  the sum total
-  """
-  total: Int!
-}
diff --git a/packages/server/graphql/private/typeDefs/processRecurrence.graphql b/packages/server/graphql/private/typeDefs/processRecurrence.graphql
deleted file mode 100644
index f5ea962baaa..00000000000
--- a/packages/server/graphql/private/typeDefs/processRecurrence.graphql
+++ /dev/null
@@ -1,23 +0,0 @@
-extend type Mutation {
-  """
-  Processes recurrence for meetings that should start and end.
-  """
-  processRecurrence: ProcessRecurrencePayload!
-}
-
-"""
-Return value for processRecurrence, which could be an error
-"""
-union ProcessRecurrencePayload = ErrorPayload | ProcessRecurrenceSuccess
-
-type ProcessRecurrenceSuccess {
-  """
-  Number of meetings that were ended because of this mutation.
-  """
-  meetingsEnded: Int!
-
-  """
-  Number of meetings that were started because of this mutation.
-  """
-  meetingsStarted: Int!
-}
diff --git a/packages/server/graphql/private/typeDefs/removeAuthIdentity.graphql b/packages/server/graphql/private/typeDefs/removeAuthIdentity.graphql
deleted file mode 100644
index 8acff50605e..00000000000
--- a/packages/server/graphql/private/typeDefs/removeAuthIdentity.graphql
+++ /dev/null
@@ -1,33 +0,0 @@
-extend type Mutation {
-  """
-  Remove the auth identity for users with a specific domain. Example use case: signed up with Gmail but they're deleting their Google account
-  """
-  removeAuthIdentity(
-    """
-    Change the auth identity for users with this domain
-    """
-    domain: String!
-
-    """
-    The type of auth to remove
-    """
-    identityType: AuthIdentityTypeEnum!
-
-    """
-    Add a local auth with a dummy hashed password
-    """
-    addLocal: Boolean!
-  ): RemoveAuthIdentityPayload!
-}
-
-"""
-Return value for removeAuthIdentity, which could be an error
-"""
-union RemoveAuthIdentityPayload = ErrorPayload | RemoveAuthIdentitySuccess
-
-type RemoveAuthIdentitySuccess {
-  """
-  The users who had their auth identity removed
-  """
-  users: [User!]!
-}
diff --git a/packages/server/graphql/private/typeDefs/setIsFreeMeetingTemplate.graphql b/packages/server/graphql/private/typeDefs/setIsFreeMeetingTemplate.graphql
deleted file mode 100644
index 2ad89f74c16..00000000000
--- a/packages/server/graphql/private/typeDefs/setIsFreeMeetingTemplate.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-extend type Mutation {
-  """
-  Set the isFree tier on a meeting template to determine if it's accessible to free users
-  """
-  setIsFreeMeetingTemplate(
-    isFree: Boolean!
-    templateIds: [ID!]
-    templateNames: [String!]
-  ): SetIsFreeMeetingTemplatePayload!
-}
-
-union SetIsFreeMeetingTemplatePayload = ErrorPayload | SetIsFreeMeetingTemplateSuccess
-
-type SetIsFreeMeetingTemplateSuccess {
-  """
-  The meeting templates that have been updated
-  """
-  updatedTemplates: [MeetingTemplate!]!
-}
diff --git a/packages/server/graphql/private/typeDefs/startTrial.graphql b/packages/server/graphql/private/typeDefs/startTrial.graphql
deleted file mode 100644
index 5b51c754da0..00000000000
--- a/packages/server/graphql/private/typeDefs/startTrial.graphql
+++ /dev/null
@@ -1,23 +0,0 @@
-extend type Mutation {
-  """
-  Starts a free trial for the org iff the org is on a free tier.
-  """
-  startTrial(
-    """
-    ID of the org on which to start the trial
-    """
-    orgId: ID!
-  ): StartTrialPayload!
-}
-
-"""
-Return value for startTrial, which could be an error
-"""
-union StartTrialPayload = ErrorPayload | StartTrialSuccess
-
-type StartTrialSuccess {
-  """
-  The updated organization
-  """
-  organization: Organization!
-}
diff --git a/packages/server/graphql/private/typeDefs/stripeInvoicePaid.graphql b/packages/server/graphql/private/typeDefs/stripeInvoicePaid.graphql
deleted file mode 100644
index adaa12c3324..00000000000
--- a/packages/server/graphql/private/typeDefs/stripeInvoicePaid.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-extend type Mutation {
-  """
-  When stripe tells us an invoice is paid (inside or outside of stripe), update it in our DB
-  """
-  stripeInvoicePaid(
-    """
-    The stripe invoice ID
-    """
-    invoiceId: ID!
-  ): Boolean
-}
diff --git a/packages/server/graphql/private/typeDefs/suProOrgInfo.graphql b/packages/server/graphql/private/typeDefs/suProOrgInfo.graphql
deleted file mode 100644
index 3b073ab43d2..00000000000
--- a/packages/server/graphql/private/typeDefs/suProOrgInfo.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-extend type Query {
-  suProOrgInfo(
-    """
-    should organizations without active users be included?
-    """
-    includeInactive: Boolean! = false
-  ): [Organization!]
-}
diff --git a/packages/server/graphql/private/typeDefs/toggleAllowInsights.graphql b/packages/server/graphql/private/typeDefs/toggleAllowInsights.graphql
deleted file mode 100644
index 76996c7f27e..00000000000
--- a/packages/server/graphql/private/typeDefs/toggleAllowInsights.graphql
+++ /dev/null
@@ -1,31 +0,0 @@
-extend type Mutation {
-  """
-  Allow or deny the User to view insights for the provided domain
-  """
-  toggleAllowInsights(
-    """
-    The tier we are squeezing the user to upgrade to. If null, will unset previous value
-    """
-    suggestedTier: TierEnum
-    """
-    The domain (e.g. parabol.co) that the user should be able to view insights on
-    """
-    domain: String!
-    """
-    emails to give the insights priviledge to
-    """
-    emails: [String!]!
-  ): ToggleAllowInsightsPayload!
-}
-
-"""
-Return value for toggleAllowInsights, which could be an error
-"""
-union ToggleAllowInsightsPayload = ErrorPayload | ToggleAllowInsightsSuccess
-
-type ToggleAllowInsightsSuccess {
-  """
-  How many records were updated
-  """
-  organizationUsersAffected: Int!
-}
diff --git a/packages/server/graphql/private/typeDefs/updateEmail.graphql b/packages/server/graphql/private/typeDefs/updateEmail.graphql
deleted file mode 100644
index 29a6d770756..00000000000
--- a/packages/server/graphql/private/typeDefs/updateEmail.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-extend type Mutation {
-  """
-  Updates the user email
-  """
-  updateEmail(
-    """
-    User current email
-    """
-    oldEmail: Email!
-
-    """
-    User new email
-    """
-    newEmail: Email!
-  ): Boolean!
-}
diff --git a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql b/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
deleted file mode 100644
index 095acdd2fd7..00000000000
--- a/packages/server/graphql/private/typeDefs/updateOrgFeatureFlag.graphql
+++ /dev/null
@@ -1,47 +0,0 @@
-"""
-A flag to give an individual organization super powers
-"""
-enum OrganizationFeatureFlagsEnum {
-  noAISummary
-  standupAISummary
-  noPromptToJoinOrg
-  suggestGroups
-  zoomTranscription
-  shareSummary
-  teamsLimit
-  noTeamInsights
-  singleColumnStandups
-  publicTeams
-  aiTemplate
-  relatedDiscussions
-}
-
-extend type Mutation {
-  """
-  Give some organizations advanced features in a flag
-  """
-  updateOrgFeatureFlag(
-    """
-    a list of organization ids
-    """
-    orgIds: [String!]!
-
-    """
-    the flag that you want to give to the organization
-    """
-    flag: OrganizationFeatureFlagsEnum!
-    """
-    whether or not you want to give the organization the flag
-    """
-    addFlag: Boolean!
-  ): UpdateOrgFeatureFlagPayload!
-}
-
-union UpdateOrgFeatureFlagPayload = ErrorPayload | UpdateOrgFeatureFlagSuccess
-
-type UpdateOrgFeatureFlagSuccess {
-  """
-  the organizations given the super power
-  """
-  updatedOrganizations: [Organization]
-}
diff --git a/packages/server/graphql/private/typeDefs/verifyDomain.graphql b/packages/server/graphql/private/typeDefs/verifyDomain.graphql
deleted file mode 100644
index c3d7560d69c..00000000000
--- a/packages/server/graphql/private/typeDefs/verifyDomain.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-extend type Mutation {
-  """
-  Describe the mutation here
-  """
-  verifyDomain(
-    """
-    Add the following domains to the list that org has control over. A domain is usually the part after the @ of their email.
-    """
-    addDomains: [ID!]
-
-    """
-    organization id. If the record already exists, this will overwite the value
-    """
-    orgId: ID!
-
-    """
-    The name of the company, used as a slug in signon URLs. Usually the domain without the tld
-    """
-    slug: ID!
-
-    """
-    A list of domains to remove from the control of the org. Useful if you previously added the incorrect domains
-    """
-    removeDomains: [ID!]
-  ): VerifyDomainPayload!
-}
-
-"""
-Return value for verifyDomain, which could be an error
-"""
-union VerifyDomainPayload = ErrorPayload | VerifyDomainSuccess
-
-type VerifyDomainSuccess {
-  """
-  Describe the first return field here
-  """
-  saml: SAML!
-}
diff --git a/packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainPayload.graphql b/packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainPayload.graphql
new file mode 100644
index 00000000000..7b32eb75057
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for acceptRequestToJoinDomain, which could be an error
+"""
+union AcceptRequestToJoinDomainPayload = ErrorPayload | AcceptRequestToJoinDomainSuccess
diff --git a/packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainSuccess.graphql b/packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainSuccess.graphql
new file mode 100644
index 00000000000..106ac1da84c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AcceptRequestToJoinDomainSuccess.graphql
@@ -0,0 +1,6 @@
+type AcceptRequestToJoinDomainSuccess {
+  """
+  Viewer
+  """
+  viewer: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/acceptTeamInvitation.graphql b/packages/server/graphql/public/typeDefs/AcceptTeamInvitationPayload.graphql
similarity index 53%
rename from packages/server/graphql/public/typeDefs/acceptTeamInvitation.graphql
rename to packages/server/graphql/public/typeDefs/AcceptTeamInvitationPayload.graphql
index 0499e4df44e..eb4e76a08d3 100644
--- a/packages/server/graphql/public/typeDefs/acceptTeamInvitation.graphql
+++ b/packages/server/graphql/public/typeDefs/AcceptTeamInvitationPayload.graphql
@@ -1,20 +1,3 @@
-extend type Mutation {
-  """
-  Redeem an invitation token for a logged in user
-  """
-  acceptTeamInvitation(
-    """
-    The invitation token or mass invitation code
-    """
-    invitationToken: ID!
-
-    """
-    the notification clicked to accept, if any
-    """
-    notificationId: ID
-  ): AcceptTeamInvitationPayload!
-}
-
 type AcceptTeamInvitationPayload {
   error: StandardMutationError
 
@@ -49,14 +32,3 @@ type AcceptTeamInvitationPayload {
   """
   teamLead: User
 }
-
-"""
-The reason the invitation failed
-"""
-enum TeamInvitationErrorEnum {
-  accepted
-  expired
-  notFound
-  restrictedDomain
-  unverifiedEmail
-}
diff --git a/packages/server/graphql/public/typeDefs/ActionMeeting.graphql b/packages/server/graphql/public/typeDefs/ActionMeeting.graphql
index 8b855e1bad0..352e865a8a1 100644
--- a/packages/server/graphql/public/typeDefs/ActionMeeting.graphql
+++ b/packages/server/graphql/public/typeDefs/ActionMeeting.graphql
@@ -66,7 +66,6 @@ type ActionMeeting implements NewMeeting {
   The meeting series this meeting is associated with if the meeting is recurring
   """
   meetingSeries: MeetingSeries
-
   meetingType: MeetingTypeEnum!
 
   """
diff --git a/packages/server/graphql/public/typeDefs/ActionMeetingMember.graphql b/packages/server/graphql/public/typeDefs/ActionMeetingMember.graphql
new file mode 100644
index 00000000000..778af0db013
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ActionMeetingMember.graphql
@@ -0,0 +1,38 @@
+"""
+All the meeting specifics for a user in a action meeting
+"""
+type ActionMeetingMember implements MeetingMember {
+  """
+  A composite of userId::meetingId
+  """
+  id: ID!
+
+  """
+  true if present, false if absent, else null
+  """
+  isCheckedIn: Boolean
+    @deprecated(
+      reason: "Members are checked in when they enter the meeting now & not created beforehand"
+    )
+  meetingId: ID!
+  meetingType: MeetingTypeEnum!
+  teamId: ID!
+  teamMember: TeamMember!
+  user: User!
+  userId: ID!
+
+  """
+  The last time a meeting was updated (stage completed, finished, etc)
+  """
+  updatedAt: DateTime!
+
+  """
+  The tasks marked as done in the meeting
+  """
+  doneTasks: [Task!]!
+
+  """
+  The tasks assigned to members during the meeting
+  """
+  tasks: [Task!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/ActionMeetingSettings.graphql b/packages/server/graphql/public/typeDefs/ActionMeetingSettings.graphql
new file mode 100644
index 00000000000..d637b8bec9c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ActionMeetingSettings.graphql
@@ -0,0 +1,26 @@
+"""
+The action-specific meeting settings
+"""
+type ActionMeetingSettings implements TeamMeetingSettings {
+  id: ID!
+
+  """
+  The type of meeting these settings apply to
+  """
+  meetingType: MeetingTypeEnum!
+
+  """
+  The broad phase types that will be addressed during the meeting
+  """
+  phaseTypes: [NewMeetingPhaseTypeEnum!]!
+
+  """
+  FK
+  """
+  teamId: ID!
+
+  """
+  The team these settings belong to
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddAgendaItemPayload.graphql b/packages/server/graphql/public/typeDefs/AddAgendaItemPayload.graphql
new file mode 100644
index 00000000000..b1298211f82
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddAgendaItemPayload.graphql
@@ -0,0 +1,10 @@
+type AddAgendaItemPayload {
+  error: StandardMutationError
+  agendaItem: AgendaItem
+  meetingId: ID
+
+  """
+  The meeting with the updated agenda item, if any
+  """
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsPayload.graphql b/packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsPayload.graphql
new file mode 100644
index 00000000000..046e00f1906
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsPayload.graphql
@@ -0,0 +1 @@
+union AddApprovedOrganizationDomainsPayload = ErrorPayload | AddApprovedOrganizationDomainsSuccess
diff --git a/packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsSuccess.graphql b/packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsSuccess.graphql
new file mode 100644
index 00000000000..b871178530b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddApprovedOrganizationDomainsSuccess.graphql
@@ -0,0 +1,8 @@
+type AddApprovedOrganizationDomainsSuccess {
+  orgId: ID!
+
+  """
+  Organization with the updated approvals
+  """
+  organization: Organization!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddAtlassianAuthPayload.graphql b/packages/server/graphql/public/typeDefs/AddAtlassianAuthPayload.graphql
new file mode 100644
index 00000000000..e759912f3fa
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddAtlassianAuthPayload.graphql
@@ -0,0 +1,19 @@
+type AddAtlassianAuthPayload {
+  error: StandardMutationError
+
+  """
+  The newly created auth
+  """
+  atlassianIntegration: AtlassianIntegration
+  teamId: ID
+
+  """
+  The team member with the updated atlassianAuth
+  """
+  teamMember: TeamMember
+
+  """
+  The user with updated atlassianAuth
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/AddCommentInput.graphql b/packages/server/graphql/public/typeDefs/AddCommentInput.graphql
new file mode 100644
index 00000000000..d9c2ef2b1ed
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddCommentInput.graphql
@@ -0,0 +1,18 @@
+input AddCommentInput {
+  """
+  A stringified draft-js document containing thoughts
+  """
+  content: String!
+
+  """
+  true if the comment should be anonymous
+  """
+  isAnonymous: Boolean
+
+  """
+  foreign key for the discussion this was created in
+  """
+  discussionId: ID!
+  threadSortOrder: Float!
+  threadParentId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/AddCommentPayload.graphql b/packages/server/graphql/public/typeDefs/AddCommentPayload.graphql
new file mode 100644
index 00000000000..5e41bb978e0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddCommentPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for AddCommentPayload
+"""
+union AddCommentPayload = ErrorPayload | AddCommentSuccess
diff --git a/packages/server/graphql/public/typeDefs/AddCommentSuccess.graphql b/packages/server/graphql/public/typeDefs/AddCommentSuccess.graphql
new file mode 100644
index 00000000000..a7de4a414d7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddCommentSuccess.graphql
@@ -0,0 +1,11 @@
+type AddCommentSuccess {
+  """
+  the comment just created
+  """
+  comment: Comment!
+
+  """
+  The id of the meeting where the comment was added
+  """
+  meetingId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddGitHubAuthPayload.graphql b/packages/server/graphql/public/typeDefs/AddGitHubAuthPayload.graphql
new file mode 100644
index 00000000000..e784459424a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddGitHubAuthPayload.graphql
@@ -0,0 +1,18 @@
+type AddGitHubAuthPayload {
+  error: StandardMutationError
+
+  """
+  The newly created auth
+  """
+  githubIntegration: GitHubIntegration
+
+  """
+  The team member with the updated auth
+  """
+  teamMember: TeamMember
+
+  """
+  The user with updated githubAuth
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/AddIntegrationProviderInput.graphql b/packages/server/graphql/public/typeDefs/AddIntegrationProviderInput.graphql
new file mode 100644
index 00000000000..9799c973ca9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddIntegrationProviderInput.graphql
@@ -0,0 +1,39 @@
+"""
+An Integration Provider configuration
+"""
+input AddIntegrationProviderInput {
+  """
+  The team that the token is linked to
+  """
+  teamId: ID!
+
+  """
+  The service this provider is associated with
+  """
+  service: IntegrationProviderServiceEnum!
+
+  """
+  The kind of token used by this provider
+  """
+  authStrategy: IntegrationProviderAuthStrategyEnum!
+
+  """
+  The scope this provider configuration was created at (org-wide, or by the team)
+  """
+  scope: IntegrationProviderEditableScopeEnum!
+
+  """
+  Webhook provider metadata, has to be non-null if token type is webhook, refactor once we get https://github.com/graphql/graphql-spec/pull/825
+  """
+  webhookProviderMetadataInput: IntegrationProviderMetadataInputWebhook
+
+  """
+  OAuth1 provider metadata, has to be non-null if token type is OAuth1, refactor once we get https://github.com/graphql/graphql-spec/pull/825
+  """
+  oAuth1ProviderMetadataInput: IntegrationProviderMetadataInputOAuth1
+
+  """
+  OAuth2 provider metadata, has to be non-null if token type is OAuth2, refactor once we get https://github.com/graphql/graphql-spec/pull/825
+  """
+  oAuth2ProviderMetadataInput: IntegrationProviderMetadataInputOAuth2
+}
diff --git a/packages/server/graphql/public/typeDefs/AddIntegrationProviderPayload.graphql b/packages/server/graphql/public/typeDefs/AddIntegrationProviderPayload.graphql
new file mode 100644
index 00000000000..eb84bb95381
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddIntegrationProviderPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for AddIntegrationProviderPayload
+"""
+union AddIntegrationProviderPayload = ErrorPayload | AddIntegrationProviderSuccess
diff --git a/packages/server/graphql/public/typeDefs/AddIntegrationProviderSuccess.graphql b/packages/server/graphql/public/typeDefs/AddIntegrationProviderSuccess.graphql
new file mode 100644
index 00000000000..d5cecb305c8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddIntegrationProviderSuccess.graphql
@@ -0,0 +1,16 @@
+type AddIntegrationProviderSuccess {
+  """
+  The provider that was added
+  """
+  provider: IntegrationProvider!
+
+  """
+  Id of the team with the updated Integration Provider
+  """
+  teamId: ID!
+
+  """
+  The team with the updated Integration Provider
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddNewFeaturePayload.graphql b/packages/server/graphql/public/typeDefs/AddNewFeaturePayload.graphql
new file mode 100644
index 00000000000..0d3a72e658f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddNewFeaturePayload.graphql
@@ -0,0 +1,6 @@
+type AddNewFeaturePayload {
+  """
+  the new feature broadcast
+  """
+  newFeature: NewFeatureBroadcast
+}
diff --git a/packages/server/graphql/public/typeDefs/AddOrDeleteEnum.graphql b/packages/server/graphql/public/typeDefs/AddOrDeleteEnum.graphql
new file mode 100644
index 00000000000..08a3a517aa1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddOrDeleteEnum.graphql
@@ -0,0 +1,7 @@
+"""
+Option to add or delete
+"""
+enum AddOrDeleteEnum {
+  ADD
+  DELETE
+}
diff --git a/packages/server/graphql/public/typeDefs/AddOrgPayload.graphql b/packages/server/graphql/public/typeDefs/AddOrgPayload.graphql
new file mode 100644
index 00000000000..089d1b76840
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddOrgPayload.graphql
@@ -0,0 +1,20 @@
+type AddOrgPayload {
+  organization: Organization
+  error: StandardMutationError
+
+  """
+  The new auth token sent to the mutator
+  """
+  authToken: ID
+  team: Team
+
+  """
+  The teamMember that just created the new team, if this is a creation
+  """
+  teamMember: TeamMember
+
+  """
+  The ID of the suggestion to create a new team
+  """
+  removedSuggestedActionId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql b/packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql
deleted file mode 100644
index e9c6926d8eb..00000000000
--- a/packages/server/graphql/public/typeDefs/AddPokerTemplate.graphql
+++ /dev/null
@@ -1,31 +0,0 @@
-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/AddPokerTemplateDimensionPayload.graphql b/packages/server/graphql/public/typeDefs/AddPokerTemplateDimensionPayload.graphql
new file mode 100644
index 00000000000..87017a779b4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddPokerTemplateDimensionPayload.graphql
@@ -0,0 +1,4 @@
+type AddPokerTemplateDimensionPayload {
+  error: StandardMutationError
+  dimension: TemplateDimension
+}
diff --git a/packages/server/graphql/public/typeDefs/AddPokerTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/AddPokerTemplatePayload.graphql
new file mode 100644
index 00000000000..4fe6f8145dd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddPokerTemplatePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for addPokerTemplate, which could be an error
+"""
+union AddPokerTemplatePayload = ErrorPayload | AddPokerTemplateSuccess
diff --git a/packages/server/graphql/public/typeDefs/AddPokerTemplateScalePayload.graphql b/packages/server/graphql/public/typeDefs/AddPokerTemplateScalePayload.graphql
new file mode 100644
index 00000000000..f83ac09e193
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddPokerTemplateScalePayload.graphql
@@ -0,0 +1,4 @@
+type AddPokerTemplateScalePayload {
+  error: StandardMutationError
+  scale: TemplateScale
+}
diff --git a/packages/server/graphql/public/typeDefs/AddPokerTemplateScaleValuePayload.graphql b/packages/server/graphql/public/typeDefs/AddPokerTemplateScaleValuePayload.graphql
new file mode 100644
index 00000000000..bbaa22c06c1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddPokerTemplateScaleValuePayload.graphql
@@ -0,0 +1,4 @@
+type AddPokerTemplateScaleValuePayload {
+  error: StandardMutationError
+  scale: TemplateScale
+}
diff --git a/packages/server/graphql/public/typeDefs/AddPokerTemplateSuccess.graphql b/packages/server/graphql/public/typeDefs/AddPokerTemplateSuccess.graphql
new file mode 100644
index 00000000000..f6f41203e8e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddPokerTemplateSuccess.graphql
@@ -0,0 +1,11 @@
+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/AddReactjiToReactablePayload.graphql b/packages/server/graphql/public/typeDefs/AddReactjiToReactablePayload.graphql
index 3c0c3daca4f..d82e6a7f1c7 100644
--- a/packages/server/graphql/public/typeDefs/AddReactjiToReactablePayload.graphql
+++ b/packages/server/graphql/public/typeDefs/AddReactjiToReactablePayload.graphql
@@ -1,5 +1 @@
-type AddReactjiToReactableSuccess {
-  reactable: Reactable!
-}
-
 union AddReactjiToReactablePayload = AddReactjiToReactableSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/AddReactjiToReactableSuccess.graphql b/packages/server/graphql/public/typeDefs/AddReactjiToReactableSuccess.graphql
new file mode 100644
index 00000000000..e282468d53a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddReactjiToReactableSuccess.graphql
@@ -0,0 +1,3 @@
+type AddReactjiToReactableSuccess {
+  reactable: Reactable!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddReactjiToReflectionSuccess.graphql b/packages/server/graphql/public/typeDefs/AddReactjiToReflectionSuccess.graphql
new file mode 100644
index 00000000000..d3838f46b4c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddReactjiToReflectionSuccess.graphql
@@ -0,0 +1,6 @@
+type AddReactjiToReflectionSuccess {
+  """
+  the reflection with the updated list of reactjis
+  """
+  reflection: RetroReflection!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql b/packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql
deleted file mode 100644
index ec7e1660e91..00000000000
--- a/packages/server/graphql/public/typeDefs/AddReflectTemplate.graphql
+++ /dev/null
@@ -1,31 +0,0 @@
-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/AddReflectTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/AddReflectTemplatePayload.graphql
new file mode 100644
index 00000000000..adfb645a643
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddReflectTemplatePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for addReflectTemplate, which could be an error
+"""
+union AddReflectTemplatePayload = ErrorPayload | AddReflectTemplateSuccess
diff --git a/packages/server/graphql/public/typeDefs/AddReflectTemplatePromptPayload.graphql b/packages/server/graphql/public/typeDefs/AddReflectTemplatePromptPayload.graphql
new file mode 100644
index 00000000000..f44c50c5040
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddReflectTemplatePromptPayload.graphql
@@ -0,0 +1,4 @@
+type AddReflectTemplatePromptPayload {
+  error: StandardMutationError
+  prompt: ReflectPrompt
+}
diff --git a/packages/server/graphql/public/typeDefs/AddReflectTemplateSuccess.graphql b/packages/server/graphql/public/typeDefs/AddReflectTemplateSuccess.graphql
new file mode 100644
index 00000000000..e4304f70633
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddReflectTemplateSuccess.graphql
@@ -0,0 +1,11 @@
+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/AddSlackAuthPayload.graphql b/packages/server/graphql/public/typeDefs/AddSlackAuthPayload.graphql
new file mode 100644
index 00000000000..c53bdcd0f63
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddSlackAuthPayload.graphql
@@ -0,0 +1,13 @@
+type AddSlackAuthPayload {
+  error: StandardMutationError
+
+  """
+  The newly created auth
+  """
+  slackIntegration: SlackIntegration
+
+  """
+  The user with updated slackAuth
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthPayload.graphql b/packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthPayload.graphql
new file mode 100644
index 00000000000..e3aa0d2cc8b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for AddTeamMemberIntegrationAuthPayload
+"""
+union AddTeamMemberIntegrationAuthPayload = ErrorPayload | AddTeamMemberIntegrationAuthSuccess
diff --git a/packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthSuccess.graphql b/packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthSuccess.graphql
new file mode 100644
index 00000000000..ef2038da809
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddTeamMemberIntegrationAuthSuccess.graphql
@@ -0,0 +1,21 @@
+type AddTeamMemberIntegrationAuthSuccess {
+  """
+  The auth that was just added
+  """
+  integrationAuth: TeamMemberIntegrationAuth!
+
+  """
+  The service this provider is associated with
+  """
+  service: IntegrationProviderServiceEnum!
+
+  """
+  The team member with the updated auth
+  """
+  teamMember: TeamMember!
+
+  """
+  The user who updated TeamMemberIntegrationAuth object
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddTeamPayload.graphql b/packages/server/graphql/public/typeDefs/AddTeamPayload.graphql
new file mode 100644
index 00000000000..98a7ce2a3fb
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddTeamPayload.graphql
@@ -0,0 +1,19 @@
+type AddTeamPayload {
+  error: StandardMutationError
+
+  """
+  The new auth token sent to the mutator
+  """
+  authToken: ID
+  team: Team
+
+  """
+  The teamMember that just created the new team, if this is a creation
+  """
+  teamMember: TeamMember
+
+  """
+  The ID of the suggestion to create a new team
+  """
+  removedSuggestedActionId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/AddTemplateScaleInput.graphql b/packages/server/graphql/public/typeDefs/AddTemplateScaleInput.graphql
new file mode 100644
index 00000000000..035a1e18b1a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddTemplateScaleInput.graphql
@@ -0,0 +1,14 @@
+"""
+Input for adding a new scale
+"""
+input AddTemplateScaleInput {
+  """
+  The color used to visually group a scale value
+  """
+  color: String!
+
+  """
+  The label for this value, e.g., XS, M, L
+  """
+  label: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/AddTranscriptionBotPayload.graphql b/packages/server/graphql/public/typeDefs/AddTranscriptionBotPayload.graphql
new file mode 100644
index 00000000000..547db274161
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddTranscriptionBotPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for addTranscriptionBot, which could be an error
+"""
+union AddTranscriptionBotPayload = ErrorPayload | AddTranscriptionBotSuccess
diff --git a/packages/server/graphql/public/typeDefs/AddTranscriptionBotSuccess.graphql b/packages/server/graphql/public/typeDefs/AddTranscriptionBotSuccess.graphql
new file mode 100644
index 00000000000..00972023cfd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AddTranscriptionBotSuccess.graphql
@@ -0,0 +1,6 @@
+type AddTranscriptionBotSuccess {
+  """
+  The Parabol meeting where the videoMeetingURL and recallBotId were added
+  """
+  meeting: RetrospectiveMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/AgendaItem.graphql b/packages/server/graphql/public/typeDefs/AgendaItem.graphql
index ec96cfa59ba..a2871a78b03 100644
--- a/packages/server/graphql/public/typeDefs/AgendaItem.graphql
+++ b/packages/server/graphql/public/typeDefs/AgendaItem.graphql
@@ -2,6 +2,11 @@
 A request placeholder that will likely turn into 1 or more tasks
 """
 type AgendaItem {
+  """
+  The team member that created the agenda item
+  """
+  teamMember: TeamMember!
+
   """
   The unique agenda item id teamId::shortid
   """
@@ -56,9 +61,4 @@ type AgendaItem {
   The timestamp the agenda item was updated
   """
   updatedAt: DateTime
-
-  """
-  The team member that created the agenda item
-  """
-  teamMember: TeamMember!
 }
diff --git a/packages/server/graphql/public/typeDefs/AgendaItemsPhase.graphql b/packages/server/graphql/public/typeDefs/AgendaItemsPhase.graphql
new file mode 100644
index 00000000000..07becc2220f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AgendaItemsPhase.graphql
@@ -0,0 +1,17 @@
+"""
+The meeting phase where all team members discuss the topics with the most votes
+"""
+type AgendaItemsPhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [AgendaItemsStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/AgendaItemsStage.graphql b/packages/server/graphql/public/typeDefs/AgendaItemsStage.graphql
new file mode 100644
index 00000000000..ca4e0b558aa
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AgendaItemsStage.graphql
@@ -0,0 +1,111 @@
+"""
+The stage where the team discusses a single agenda item
+"""
+type AgendaItemsStage implements NewMeetingStage & DiscussionThreadStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+
+  """
+  The ID to find the discussion that goes in the stage
+  """
+  discussionId: ID!
+
+  """
+  The discussion about the stage
+  """
+  discussion: Discussion!
+
+  """
+  The id of the agenda item this relates to
+  """
+  agendaItemId: ID!
+  agendaItem: AgendaItem!
+}
diff --git a/packages/server/graphql/public/typeDefs/ArchiveOrganizationPayload.graphql b/packages/server/graphql/public/typeDefs/ArchiveOrganizationPayload.graphql
new file mode 100644
index 00000000000..325c4021709
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ArchiveOrganizationPayload.graphql
@@ -0,0 +1,10 @@
+type ArchiveOrganizationPayload {
+  error: StandardMutationError
+  orgId: ID
+  teams: [Team!]
+
+  """
+  all the suggested actions that never happened
+  """
+  removedSuggestedActionIds: [ID]
+}
diff --git a/packages/server/graphql/public/typeDefs/ArchiveTeamPayload.graphql b/packages/server/graphql/public/typeDefs/ArchiveTeamPayload.graphql
new file mode 100644
index 00000000000..0b87aacb525
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ArchiveTeamPayload.graphql
@@ -0,0 +1,19 @@
+type ArchiveTeamPayload {
+  error: StandardMutationError
+  team: Team
+
+  """
+  A notification explaining that the team was archived and removed from view
+  """
+  notification: NotifyTeamArchived
+
+  """
+  all the suggested actions that never happened
+  """
+  removedSuggestedActionIds: [ID]
+
+  """
+  A list of the ids of templates created by a team
+  """
+  teamTemplateIds: [ID!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/ArchiveTimelineEventPayload.graphql b/packages/server/graphql/public/typeDefs/ArchiveTimelineEventPayload.graphql
new file mode 100644
index 00000000000..d1ce1100d39
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ArchiveTimelineEventPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for ArchiveTimelineEventPayload
+"""
+union ArchiveTimelineEventPayload = ErrorPayload | ArchiveTimelineEventSuccess
diff --git a/packages/server/graphql/public/typeDefs/ArchiveTimelineEventSuccess.graphql b/packages/server/graphql/public/typeDefs/ArchiveTimelineEventSuccess.graphql
new file mode 100644
index 00000000000..ea756fb26c9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ArchiveTimelineEventSuccess.graphql
@@ -0,0 +1,6 @@
+type ArchiveTimelineEventSuccess {
+  """
+  the archived timelineEvent
+  """
+  timelineEvent: TimelineEvent!
+}
diff --git a/packages/server/graphql/public/typeDefs/AreaEnum.graphql b/packages/server/graphql/public/typeDefs/AreaEnum.graphql
new file mode 100644
index 00000000000..a0bdf39d941
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AreaEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The part of the site that is calling the mutation
+"""
+enum AreaEnum {
+  meeting
+  teamDash
+  userDash
+}
diff --git a/packages/server/graphql/public/typeDefs/AuthIdentity.graphql b/packages/server/graphql/public/typeDefs/AuthIdentity.graphql
new file mode 100644
index 00000000000..65278ff4390
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AuthIdentity.graphql
@@ -0,0 +1,10 @@
+"""
+An authentication strategy to log in to Parabol
+"""
+interface AuthIdentity {
+  """
+  true if the email address using this strategy is verified, else false
+  """
+  isEmailVerified: Boolean!
+  type: AuthIdentityTypeEnum!
+}
diff --git a/packages/server/graphql/public/typeDefs/AuthIdentityGoogle.graphql b/packages/server/graphql/public/typeDefs/AuthIdentityGoogle.graphql
new file mode 100644
index 00000000000..16905a880b4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AuthIdentityGoogle.graphql
@@ -0,0 +1,15 @@
+"""
+An authentication strategy using Google
+"""
+type AuthIdentityGoogle implements AuthIdentity {
+  """
+  true if the email address using this strategy is verified, else false
+  """
+  isEmailVerified: Boolean!
+  type: AuthIdentityTypeEnum!
+
+  """
+  The googleID for this strategy
+  """
+  id: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/AuthIdentityLocal.graphql b/packages/server/graphql/public/typeDefs/AuthIdentityLocal.graphql
new file mode 100644
index 00000000000..1915b869fd7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AuthIdentityLocal.graphql
@@ -0,0 +1,10 @@
+"""
+An authentication strategy using an email & password
+"""
+type AuthIdentityLocal implements AuthIdentity {
+  """
+  true if the email address using this strategy is verified, else false
+  """
+  isEmailVerified: Boolean!
+  type: AuthIdentityTypeEnum!
+}
diff --git a/packages/server/graphql/public/typeDefs/AuthIdentityMicrosoft.graphql b/packages/server/graphql/public/typeDefs/AuthIdentityMicrosoft.graphql
new file mode 100644
index 00000000000..d0fd4d7a538
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AuthIdentityMicrosoft.graphql
@@ -0,0 +1,15 @@
+"""
+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!
+}
diff --git a/packages/server/graphql/public/typeDefs/AuthIdentityTypeEnum.graphql b/packages/server/graphql/public/typeDefs/AuthIdentityTypeEnum.graphql
new file mode 100644
index 00000000000..293ed34d851
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AuthIdentityTypeEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The types of authentication strategies
+"""
+enum AuthIdentityTypeEnum {
+  LOCAL
+  GOOGLE
+  MICROSOFT
+}
diff --git a/packages/server/graphql/public/typeDefs/AuthTokenPayload.graphql b/packages/server/graphql/public/typeDefs/AuthTokenPayload.graphql
new file mode 100644
index 00000000000..e2e02448daa
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AuthTokenPayload.graphql
@@ -0,0 +1,9 @@
+"""
+An auth token provided by Parabol to the client
+"""
+type AuthTokenPayload {
+  """
+  The encoded JWT
+  """
+  id: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/AutogroupPayload.graphql b/packages/server/graphql/public/typeDefs/AutogroupPayload.graphql
new file mode 100644
index 00000000000..b5ebc5f28ef
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AutogroupPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for autogroup, which could be an error
+"""
+union AutogroupPayload = ErrorPayload | AutogroupSuccess
diff --git a/packages/server/graphql/public/typeDefs/AutogroupReflectionGroup.graphql b/packages/server/graphql/public/typeDefs/AutogroupReflectionGroup.graphql
new file mode 100644
index 00000000000..1a1ed843222
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AutogroupReflectionGroup.graphql
@@ -0,0 +1,14 @@
+"""
+A suggested reflection group created by OpenAI'
+"""
+type AutogroupReflectionGroup {
+  """
+  The smart title for the reflection group created by OpenAI
+  """
+  groupTitle: String!
+
+  """
+  The ids of the reflections in the group
+  """
+  reflectionIds: [ID!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/AutogroupSuccess.graphql b/packages/server/graphql/public/typeDefs/AutogroupSuccess.graphql
new file mode 100644
index 00000000000..17104ea779e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AutogroupSuccess.graphql
@@ -0,0 +1,3 @@
+type AutogroupSuccess {
+  meeting: RetrospectiveMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItem.graphql b/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItem.graphql
index 9a95773dec4..047876a2fa8 100644
--- a/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItem.graphql
+++ b/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItem.graphql
@@ -47,34 +47,3 @@ type AzureDevOpsWorkItem implements TaskIntegration {
   """
   descriptionHTML: String!
 }
-
-"""
-A connection to a list of items.
-"""
-type AzureDevOpsWorkItemConnection {
-  """
-  Page info with cursors coerced to ISO8601 dates
-  """
-  pageInfo: PageInfoDateCursor
-
-  """
-  A list of edges.
-  """
-  edges: [AzureDevOpsWorkItemEdge!]!
-
-  """
-  An error with the connection, if any
-  """
-  error: StandardMutationError
-}
-
-"""
-An edge in a connection.
-"""
-type AzureDevOpsWorkItemEdge {
-  """
-  The item at the end of the edge
-  """
-  node: AzureDevOpsWorkItem!
-  cursor: DateTime
-}
diff --git a/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemConnection.graphql b/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemConnection.graphql
new file mode 100644
index 00000000000..98b4eccd038
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemConnection.graphql
@@ -0,0 +1,19 @@
+"""
+A connection to a list of items.
+"""
+type AzureDevOpsWorkItemConnection {
+  """
+  Page info with cursors coerced to ISO8601 dates
+  """
+  pageInfo: PageInfoDateCursor
+
+  """
+  A list of edges.
+  """
+  edges: [AzureDevOpsWorkItemEdge!]!
+
+  """
+  An error with the connection, if any
+  """
+  error: StandardMutationError
+}
diff --git a/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemEdge.graphql b/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemEdge.graphql
new file mode 100644
index 00000000000..7b8b3d225c7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/AzureDevOpsWorkItemEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type AzureDevOpsWorkItemEdge {
+  """
+  The item at the end of the edge
+  """
+  node: AzureDevOpsWorkItem!
+  cursor: DateTime
+}
diff --git a/packages/server/graphql/public/typeDefs/BatchArchiveTasksPayload.graphql b/packages/server/graphql/public/typeDefs/BatchArchiveTasksPayload.graphql
new file mode 100644
index 00000000000..64003ba723f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/BatchArchiveTasksPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for batchArchiveTasks, which could be an error
+"""
+union BatchArchiveTasksPayload = ErrorPayload | BatchArchiveTasksSuccess
diff --git a/packages/server/graphql/public/typeDefs/BatchArchiveTasksSuccess.graphql b/packages/server/graphql/public/typeDefs/BatchArchiveTasksSuccess.graphql
new file mode 100644
index 00000000000..10a59551c31
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/BatchArchiveTasksSuccess.graphql
@@ -0,0 +1,11 @@
+type BatchArchiveTasksSuccess {
+  """
+  the id of achived tasks
+  """
+  archivedTaskIds: [ID!]
+
+  """
+  the archived tasks
+  """
+  archivedTasks: [Task!]
+}
diff --git a/packages/server/graphql/public/typeDefs/CanAccessEntity.graphql b/packages/server/graphql/public/typeDefs/CanAccessEntity.graphql
new file mode 100644
index 00000000000..cca77ece4dd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CanAccessEntity.graphql
@@ -0,0 +1,5 @@
+enum CanAccessEntity {
+  Team
+  Meeting
+  Organization
+}
diff --git a/packages/server/graphql/public/typeDefs/ChangeSourceEnum.graphql b/packages/server/graphql/public/typeDefs/ChangeSourceEnum.graphql
new file mode 100644
index 00000000000..b543c6683f9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ChangeSourceEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The source that a change to a record came in through
+"""
+enum ChangeSourceEnum {
+  meeting
+  task
+  external
+}
diff --git a/packages/server/graphql/public/typeDefs/ChangeTaskTeamPayload.graphql b/packages/server/graphql/public/typeDefs/ChangeTaskTeamPayload.graphql
new file mode 100644
index 00000000000..4fdfbb66f6a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ChangeTaskTeamPayload.graphql
@@ -0,0 +1,9 @@
+type ChangeTaskTeamPayload {
+  error: StandardMutationError
+  task: Task
+
+  """
+  the taskId sent to a user who is not on the new team so they can remove it from their client
+  """
+  removedTaskId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/CheckInPhase.graphql b/packages/server/graphql/public/typeDefs/CheckInPhase.graphql
new file mode 100644
index 00000000000..fb37bf8146c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CheckInPhase.graphql
@@ -0,0 +1,27 @@
+"""
+The meeting phase where all team members check in one-by-one
+"""
+type CheckInPhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [CheckInStage!]!
+
+  """
+  The checkIn greeting (fun language)
+  """
+  checkInGreeting: MeetingGreeting!
+
+  """
+  The checkIn question of the week (draft-js format)
+  """
+  checkInQuestion: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/CheckInStage.graphql b/packages/server/graphql/public/typeDefs/CheckInStage.graphql
new file mode 100644
index 00000000000..c9f29488552
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CheckInStage.graphql
@@ -0,0 +1,110 @@
+"""
+A stage that focuses on a single team member
+"""
+type CheckInStage implements NewMeetingStage & NewMeetingTeamMemberStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+
+  """
+  The meeting member that is the focus for this phase item
+  """
+  meetingMember: MeetingMember!
+
+  """
+  foreign key. use teamMember
+  """
+  teamMemberId: ID!
+
+  """
+  The team member that is the focus for this phase item
+  """
+  teamMember: TeamMember!
+}
diff --git a/packages/server/graphql/public/typeDefs/Comment.graphql b/packages/server/graphql/public/typeDefs/Comment.graphql
new file mode 100644
index 00000000000..eadc0fe6fd3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Comment.graphql
@@ -0,0 +1,74 @@
+"""
+A comment on a thread
+"""
+type Comment implements Reactable & Threadable {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  The rich text body of the item, if inactive, a tombstone text
+  """
+  content: String!
+
+  """
+  The timestamp the item was created
+  """
+  createdAt: DateTime!
+
+  """
+  The userId that created the item, null if anonymous
+  """
+  createdBy: ID
+
+  """
+  The user that created the item, null if anonymous
+  """
+  createdByUser: User
+
+  """
+  the replies to this threadable item
+  """
+  replies: [Threadable!]!
+
+  """
+  The FK of the discussion this task was created in. Null if task was not created in a discussion
+  """
+  discussionId: ID
+
+  """
+  the parent, if this threadable is a reply, else null
+  """
+  threadParentId: ID
+
+  """
+  the order of this threadable, relative to threadParentId
+  """
+  threadSortOrder: Float
+
+  """
+  The timestamp the item was updated
+  """
+  updatedAt: DateTime!
+
+  """
+  All the reactjis for the given reflection
+  """
+  reactjis: [Reactji!]!
+
+  """
+  true if the agenda item has not been processed or deleted
+  """
+  isActive: Boolean!
+
+  """
+  true if the comment is anonymous, else false
+  """
+  isAnonymous: Boolean!
+
+  """
+  true if the viewer wrote this comment, else false
+  """
+  isViewerComment: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/CommentorDetails.graphql b/packages/server/graphql/public/typeDefs/CommentorDetails.graphql
new file mode 100644
index 00000000000..34964fd23fe
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CommentorDetails.graphql
@@ -0,0 +1,14 @@
+"""
+The user that is commenting
+"""
+type CommentorDetails {
+  """
+  The userId of the person commenting
+  """
+  id: ID!
+
+  """
+  The preferred name of the user commenting
+  """
+  preferredName: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/Coupon.graphql b/packages/server/graphql/public/typeDefs/Coupon.graphql
new file mode 100644
index 00000000000..4e32dd49e01
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Coupon.graphql
@@ -0,0 +1,24 @@
+"""
+The discount coupon from Stripe, if any
+"""
+type Coupon {
+  """
+  The ID of the discount coupon from Stripe
+  """
+  id: String!
+
+  """
+  The amount off the invoice, if any
+  """
+  amountOff: Int
+
+  """
+  The name of the discount coupon from Stripe
+  """
+  name: String!
+
+  """
+  The percent off the invoice, if any
+  """
+  percentOff: Int
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateAgendaItemInput.graphql b/packages/server/graphql/public/typeDefs/CreateAgendaItemInput.graphql
new file mode 100644
index 00000000000..d04e556d7de
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateAgendaItemInput.graphql
@@ -0,0 +1,27 @@
+input CreateAgendaItemInput {
+  """
+  The content of the agenda item
+  """
+  content: String!
+
+  """
+  True if the agenda item has been pinned
+  """
+  pinned: Boolean!
+  teamId: ID!
+
+  """
+  The team member ID of the person creating the agenda item
+  """
+  teamMemberId: ID!
+
+  """
+  The sort order of the agenda item in the list
+  """
+  sortOrder: Float
+
+  """
+  The meeting ID of the agenda item
+  """
+  meetingId: String
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateGcalEventInput.graphql b/packages/server/graphql/public/typeDefs/CreateGcalEventInput.graphql
index 634041f5edd..78435a97ac8 100644
--- a/packages/server/graphql/public/typeDefs/CreateGcalEventInput.graphql
+++ b/packages/server/graphql/public/typeDefs/CreateGcalEventInput.graphql
@@ -3,20 +3,24 @@ input CreateGcalEventInput {
   The start timestamp of the event
   """
   startTimestamp: Int!
+
   """
   The end timestamp of the event
   """
   endTimestamp: Int!
+
   """
   The timezone of the event
   """
   timeZone: String!
-  """
-  The type of video call to added to the gcal event. If not provided, no video call will be added
-  """
-  videoType: GcalVideoTypeEnum
+
   """
   The emails that will be invited to the gcal event. If not provided, the no one will be invited
   """
   invitees: [Email!]
+
+  """
+  The type of video call to added to the gcal event. If not provided, no video call will be added
+  """
+  videoType: GcalVideoTypeEnum
 }
diff --git a/packages/server/graphql/public/typeDefs/CreateImposterTokenPayload.graphql b/packages/server/graphql/public/typeDefs/CreateImposterTokenPayload.graphql
new file mode 100644
index 00000000000..2c25a4ef8d3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateImposterTokenPayload.graphql
@@ -0,0 +1,13 @@
+type CreateImposterTokenPayload {
+  error: StandardMutationError
+
+  """
+  The new JWT
+  """
+  authToken: ID
+
+  """
+  The user you have assumed
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateMassInvitationPayload.graphql b/packages/server/graphql/public/typeDefs/CreateMassInvitationPayload.graphql
new file mode 100644
index 00000000000..647992c174a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateMassInvitationPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for CreateMassInvitationPayload
+"""
+union CreateMassInvitationPayload = ErrorPayload | CreateMassInvitationSuccess
diff --git a/packages/server/graphql/public/typeDefs/CreateMassInvitationSuccess.graphql b/packages/server/graphql/public/typeDefs/CreateMassInvitationSuccess.graphql
new file mode 100644
index 00000000000..d351bdd564f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateMassInvitationSuccess.graphql
@@ -0,0 +1,6 @@
+type CreateMassInvitationSuccess {
+  """
+  the team with the updated mass inivtation
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateOAuth1AuthorizationURLPayload.graphql b/packages/server/graphql/public/typeDefs/CreateOAuth1AuthorizationURLPayload.graphql
new file mode 100644
index 00000000000..7873eb934f7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateOAuth1AuthorizationURLPayload.graphql
@@ -0,0 +1,11 @@
+"""
+Authorization URL constructed after creating a new request token
+"""
+type CreateOAuth1AuthorizationURLPayload {
+  error: StandardMutationError
+
+  """
+  Authorization URL including oauth_token to start authorization flow
+  """
+  url: String
+}
diff --git a/packages/server/graphql/public/typeDefs/CreatePollInput.graphql b/packages/server/graphql/public/typeDefs/CreatePollInput.graphql
new file mode 100644
index 00000000000..d73109d5924
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreatePollInput.graphql
@@ -0,0 +1,21 @@
+input CreatePollInput {
+  """
+  Foreign key for the discussion this was created in
+  """
+  discussionId: ID!
+
+  """
+  The order of this threadable
+  """
+  threadSortOrder: Float!
+
+  """
+  Poll question
+  """
+  title: String!
+
+  """
+  All the poll voting options
+  """
+  options: [PollOptionInput!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/CreatePollPayload.graphql b/packages/server/graphql/public/typeDefs/CreatePollPayload.graphql
new file mode 100644
index 00000000000..365685cf68e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreatePollPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for CreatePollPayload
+"""
+union CreatePollPayload = ErrorPayload | CreatePollSuccess
diff --git a/packages/server/graphql/public/typeDefs/CreatePollSuccess.graphql b/packages/server/graphql/public/typeDefs/CreatePollSuccess.graphql
new file mode 100644
index 00000000000..3ce7e62b1e9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreatePollSuccess.graphql
@@ -0,0 +1,11 @@
+type CreatePollSuccess {
+  """
+  Poll id in a format of `poll:idGeneratedByDatabase`
+  """
+  pollId: ID!
+
+  """
+  the poll just created
+  """
+  poll: Poll!
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateReflectionInput.graphql b/packages/server/graphql/public/typeDefs/CreateReflectionInput.graphql
new file mode 100644
index 00000000000..127f1a09fd5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateReflectionInput.graphql
@@ -0,0 +1,13 @@
+input CreateReflectionInput {
+  """
+  A stringified draft-js document containing thoughts
+  """
+  content: String
+  meetingId: ID!
+
+  """
+  The prompt the reflection belongs to
+  """
+  promptId: ID!
+  sortOrder: Float!
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateReflectionPayload.graphql b/packages/server/graphql/public/typeDefs/CreateReflectionPayload.graphql
new file mode 100644
index 00000000000..aa2c5469088
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateReflectionPayload.graphql
@@ -0,0 +1,16 @@
+type CreateReflectionPayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+  reflectionId: ID
+  reflection: RetroReflection
+
+  """
+  The group automatically created for the reflection
+  """
+  reflectionGroup: RetroReflectionGroup
+
+  """
+  The stages that were unlocked by navigating
+  """
+  unlockedStages: [NewMeetingStage!]
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateStripeSubscriptionPayload.graphql b/packages/server/graphql/public/typeDefs/CreateStripeSubscriptionPayload.graphql
new file mode 100644
index 00000000000..3af21968de8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateStripeSubscriptionPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for createStripeSubscription, which could be an error
+"""
+union CreateStripeSubscriptionPayload = ErrorPayload | CreateStripeSubscriptionSuccess
diff --git a/packages/server/graphql/public/typeDefs/CreateStripeSubscriptionSuccess.graphql b/packages/server/graphql/public/typeDefs/CreateStripeSubscriptionSuccess.graphql
new file mode 100644
index 00000000000..527855ad237
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateStripeSubscriptionSuccess.graphql
@@ -0,0 +1,6 @@
+type CreateStripeSubscriptionSuccess {
+  """
+  The client secret from the Stripe subscription. Used for client-side retrieval using a publishable key.
+  """
+  stripeSubscriptionClientSecret: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateTaskInput.graphql b/packages/server/graphql/public/typeDefs/CreateTaskInput.graphql
new file mode 100644
index 00000000000..374821407a8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateTaskInput.graphql
@@ -0,0 +1,29 @@
+input CreateTaskInput {
+  content: String
+  plaintextContent: String
+
+  """
+  foreign key for the meeting this was created in
+  """
+  meetingId: ID
+
+  """
+  foreign key for the thread this was created in
+  """
+  discussionId: ID
+  threadSortOrder: Float
+  threadParentId: ID
+  sortOrder: Float
+  status: TaskStatusEnum!
+
+  """
+  teamId, the team the task is on
+  """
+  teamId: ID!
+
+  """
+  userId, the owner of the task. This can be null if the task is not assigned to anyone.
+  """
+  userId: ID
+  integration: CreateTaskIntegrationInput
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateTaskIntegrationInput.graphql b/packages/server/graphql/public/typeDefs/CreateTaskIntegrationInput.graphql
new file mode 100644
index 00000000000..6eab39b3dff
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateTaskIntegrationInput.graphql
@@ -0,0 +1,11 @@
+input CreateTaskIntegrationInput {
+  """
+  The service to push this new task to
+  """
+  service: TaskServiceEnum!
+
+  """
+  The key or composite key where the task should live in the service, e.g. nameWithOwner or cloudId:projectKey
+  """
+  serviceProjectHash: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateTaskIntegrationPayload.graphql b/packages/server/graphql/public/typeDefs/CreateTaskIntegrationPayload.graphql
new file mode 100644
index 00000000000..5052cf9017c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateTaskIntegrationPayload.graphql
@@ -0,0 +1,4 @@
+type CreateTaskIntegrationPayload {
+  error: StandardMutationError
+  task: Task
+}
diff --git a/packages/server/graphql/public/typeDefs/CreateTaskPayload.graphql b/packages/server/graphql/public/typeDefs/CreateTaskPayload.graphql
new file mode 100644
index 00000000000..4bc47198474
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreateTaskPayload.graphql
@@ -0,0 +1,5 @@
+type CreateTaskPayload {
+  error: StandardMutationError
+  task: Task
+  involvementNotification: NotifyTaskInvolves
+}
diff --git a/packages/server/graphql/public/typeDefs/CreditCard.graphql b/packages/server/graphql/public/typeDefs/CreditCard.graphql
new file mode 100644
index 00000000000..49ae8dffd14
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/CreditCard.graphql
@@ -0,0 +1,19 @@
+"""
+A credit card
+"""
+type CreditCard {
+  """
+  The brand of the credit card, as provided by stripe
+  """
+  brand: String!
+
+  """
+  The MM/YY string of the expiration date
+  """
+  expiry: String!
+
+  """
+  The last 4 digits of a credit card
+  """
+  last4: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/DateTime.graphql b/packages/server/graphql/public/typeDefs/DateTime.graphql
new file mode 100644
index 00000000000..68ab69c7bb7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DateTime.graphql
@@ -0,0 +1 @@
+scalar DateTime
diff --git a/packages/server/graphql/public/typeDefs/DeleteCommentPayload.graphql b/packages/server/graphql/public/typeDefs/DeleteCommentPayload.graphql
new file mode 100644
index 00000000000..4d8be7d19c7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DeleteCommentPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for DeleteCommentPayload
+"""
+union DeleteCommentPayload = ErrorPayload | DeleteCommentSuccess
diff --git a/packages/server/graphql/public/typeDefs/DeleteCommentSuccess.graphql b/packages/server/graphql/public/typeDefs/DeleteCommentSuccess.graphql
new file mode 100644
index 00000000000..e95b9c91157
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DeleteCommentSuccess.graphql
@@ -0,0 +1,8 @@
+type DeleteCommentSuccess {
+  commentId: ID!
+
+  """
+  the comment just deleted
+  """
+  comment: Comment!
+}
diff --git a/packages/server/graphql/public/typeDefs/DeleteTaskPayload.graphql b/packages/server/graphql/public/typeDefs/DeleteTaskPayload.graphql
new file mode 100644
index 00000000000..402a6575042
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DeleteTaskPayload.graphql
@@ -0,0 +1,8 @@
+type DeleteTaskPayload {
+  error: StandardMutationError
+
+  """
+  The task that was deleted
+  """
+  task: Task
+}
diff --git a/packages/server/graphql/public/typeDefs/DeleteUserPayload.graphql b/packages/server/graphql/public/typeDefs/DeleteUserPayload.graphql
new file mode 100644
index 00000000000..8c6af3086dc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DeleteUserPayload.graphql
@@ -0,0 +1,3 @@
+type DeleteUserPayload {
+  error: StandardMutationError
+}
diff --git a/packages/server/graphql/public/typeDefs/DenyPushInvitationPayload.graphql b/packages/server/graphql/public/typeDefs/DenyPushInvitationPayload.graphql
new file mode 100644
index 00000000000..32262b3e124
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DenyPushInvitationPayload.graphql
@@ -0,0 +1,5 @@
+type DenyPushInvitationPayload {
+  error: StandardMutationError
+  teamId: ID
+  userId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/DisconnectSocketPayload.graphql b/packages/server/graphql/public/typeDefs/DisconnectSocketPayload.graphql
new file mode 100644
index 00000000000..a4971482f0f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DisconnectSocketPayload.graphql
@@ -0,0 +1,6 @@
+type DisconnectSocketPayload {
+  """
+  The user that disconnected
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/DiscussPhase.graphql b/packages/server/graphql/public/typeDefs/DiscussPhase.graphql
new file mode 100644
index 00000000000..39c6a5a53f6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DiscussPhase.graphql
@@ -0,0 +1,17 @@
+"""
+The meeting phase where all team members discuss the topics with the most votes
+"""
+type DiscussPhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [RetroDiscussStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/Discussion.graphql b/packages/server/graphql/public/typeDefs/Discussion.graphql
new file mode 100644
index 00000000000..ecb0b3ebd22
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Discussion.graphql
@@ -0,0 +1,63 @@
+"""
+A discussion thread
+"""
+type Discussion {
+  id: ID!
+  teamId: ID!
+
+  """
+  Team
+  """
+  team: Team!
+  meetingId: ID!
+
+  """
+  time the thread was created
+  """
+  createdAt: DateTime!
+
+  """
+  The partial foreign key that references the object that is the topic of the discussion. E.g. AgendaItemId, TaskId, ReflectionGroupId
+  """
+  discussionTopicId: ID!
+
+  """
+  The partial foregin key that describes the type of object that is the topic of the discussion. E.g. AgendaItem, TaskId, ReflectionGroup, GitHubIssue
+  """
+  discussionTopicType: DiscussionTopicTypeEnum!
+
+  """
+  The stage where the discussion is
+  """
+  stage: NewMeetingStage
+
+  """
+  The number of comments contained in the thread
+  """
+  commentCount: Int!
+
+  """
+  The users writing a comment right now
+  """
+  commentors: [User!]!
+
+  """
+  The comments & tasks thread in the discussion
+  """
+  thread(
+    """
+    How many items to show. optional if only comments are desired
+    """
+    first: Int
+
+    """
+    the incrementing sort order in string format
+    """
+    after: String
+  ): ThreadableConnection!
+
+  """
+  The AI generated summary of the discussion. Undefined if the user doesnt have access to the feature or the stage isn't completed
+  """
+  summary: String
+}
diff --git a/packages/server/graphql/public/typeDefs/DiscussionThreadStage.graphql b/packages/server/graphql/public/typeDefs/DiscussionThreadStage.graphql
new file mode 100644
index 00000000000..bab6ba8221f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DiscussionThreadStage.graphql
@@ -0,0 +1,14 @@
+"""
+A meeting stage that includes a discussion thread
+"""
+interface DiscussionThreadStage {
+  """
+  The ID to find the discussion that goes in the stage
+  """
+  discussionId: ID!
+
+  """
+  The discussion about the stage
+  """
+  discussion: Discussion!
+}
diff --git a/packages/server/graphql/public/typeDefs/DiscussionTopicTypeEnum.graphql b/packages/server/graphql/public/typeDefs/DiscussionTopicTypeEnum.graphql
new file mode 100644
index 00000000000..eaea7ce3874
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DiscussionTopicTypeEnum.graphql
@@ -0,0 +1,11 @@
+"""
+The topic being discussed
+"""
+enum DiscussionTopicTypeEnum {
+  agendaItem
+  reflectionGroup
+  task
+  githubIssue
+  jiraIssue
+  teamPromptResponse
+}
diff --git a/packages/server/graphql/public/typeDefs/DismissNewFeaturePayload.graphql b/packages/server/graphql/public/typeDefs/DismissNewFeaturePayload.graphql
new file mode 100644
index 00000000000..fdb21082751
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DismissNewFeaturePayload.graphql
@@ -0,0 +1,3 @@
+type DismissNewFeaturePayload {
+  error: StandardMutationError
+}
diff --git a/packages/server/graphql/public/typeDefs/DismissSuggestedActionPayload.graphql b/packages/server/graphql/public/typeDefs/DismissSuggestedActionPayload.graphql
new file mode 100644
index 00000000000..325647c7466
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DismissSuggestedActionPayload.graphql
@@ -0,0 +1,13 @@
+type DismissSuggestedActionPayload {
+  error: StandardMutationError
+
+  """
+  The user that dismissed the action
+  """
+  user: User
+
+  """
+  The id of the removed suggested action
+  """
+  removedSuggestedActionId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/DowngradeToStarterPayload.graphql b/packages/server/graphql/public/typeDefs/DowngradeToStarterPayload.graphql
new file mode 100644
index 00000000000..cd15571e351
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DowngradeToStarterPayload.graphql
@@ -0,0 +1,13 @@
+type DowngradeToStarterPayload {
+  error: StandardMutationError
+
+  """
+  The new Starter Org
+  """
+  organization: Organization
+
+  """
+  The updated teams under the org
+  """
+  teams: [Team]
+}
diff --git a/packages/server/graphql/public/typeDefs/DragDiscussionTopicPayload.graphql b/packages/server/graphql/public/typeDefs/DragDiscussionTopicPayload.graphql
new file mode 100644
index 00000000000..96d48c6bbf7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DragDiscussionTopicPayload.graphql
@@ -0,0 +1,5 @@
+type DragDiscussionTopicPayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+  stage: RetroDiscussStage
+}
diff --git a/packages/server/graphql/public/typeDefs/DragEstimatingTaskPayload.graphql b/packages/server/graphql/public/typeDefs/DragEstimatingTaskPayload.graphql
new file mode 100644
index 00000000000..9b65df44304
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DragEstimatingTaskPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for DragEstimatingTaskPayload
+"""
+union DragEstimatingTaskPayload = ErrorPayload | DragEstimatingTaskSuccess
diff --git a/packages/server/graphql/public/typeDefs/DragEstimatingTaskSuccess.graphql b/packages/server/graphql/public/typeDefs/DragEstimatingTaskSuccess.graphql
new file mode 100644
index 00000000000..0bc246d36c6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DragEstimatingTaskSuccess.graphql
@@ -0,0 +1,6 @@
+type DragEstimatingTaskSuccess {
+  meetingId: ID!
+  meeting: PokerMeeting!
+  stageIds: [ID!]!
+  stages: [EstimateStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/DragReflectionDropTargetTypeEnum.graphql b/packages/server/graphql/public/typeDefs/DragReflectionDropTargetTypeEnum.graphql
new file mode 100644
index 00000000000..79ff6d42450
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/DragReflectionDropTargetTypeEnum.graphql
@@ -0,0 +1,7 @@
+"""
+The possible places a reflection can be dropped
+"""
+enum DragReflectionDropTargetTypeEnum {
+  REFLECTION_GROUP
+  REFLECTION_GRID
+}
diff --git a/packages/server/graphql/public/typeDefs/EditCommentingPayload.graphql b/packages/server/graphql/public/typeDefs/EditCommentingPayload.graphql
new file mode 100644
index 00000000000..26216992d81
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EditCommentingPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for EditCommentingPayload
+"""
+union EditCommentingPayload = ErrorPayload | EditCommentingSuccess
diff --git a/packages/server/graphql/public/typeDefs/EditCommentingSuccess.graphql b/packages/server/graphql/public/typeDefs/EditCommentingSuccess.graphql
new file mode 100644
index 00000000000..9bd8d9f8080
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EditCommentingSuccess.graphql
@@ -0,0 +1,11 @@
+type EditCommentingSuccess {
+  """
+  The discussion the comment was created in
+  """
+  discussionId: ID!
+
+  """
+  The discussion where the commenting state changed
+  """
+  discussion: Discussion!
+}
diff --git a/packages/server/graphql/public/typeDefs/EditReflectionPayload.graphql b/packages/server/graphql/public/typeDefs/EditReflectionPayload.graphql
new file mode 100644
index 00000000000..487fd043097
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EditReflectionPayload.graphql
@@ -0,0 +1,14 @@
+type EditReflectionPayload {
+  error: StandardMutationError
+  promptId: ID
+
+  """
+  The socketId of the client editing the card (uses socketId to maintain anonymity)
+  """
+  editorId: ID
+
+  """
+  true if the reflection is being edited, else false
+  """
+  isEditing: Boolean
+}
diff --git a/packages/server/graphql/public/typeDefs/EditTaskPayload.graphql b/packages/server/graphql/public/typeDefs/EditTaskPayload.graphql
new file mode 100644
index 00000000000..47e376e13ec
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EditTaskPayload.graphql
@@ -0,0 +1,10 @@
+type EditTaskPayload {
+  error: StandardMutationError
+  task: Task
+  editor: User
+
+  """
+  true if the editor is editing, false if they stopped editing
+  """
+  isEditing: Boolean
+}
diff --git a/packages/server/graphql/public/typeDefs/Email.graphql b/packages/server/graphql/public/typeDefs/Email.graphql
new file mode 100644
index 00000000000..041fcff429e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Email.graphql
@@ -0,0 +1 @@
+scalar Email
diff --git a/packages/server/graphql/public/typeDefs/EmailPasswordResetPayload.graphql b/packages/server/graphql/public/typeDefs/EmailPasswordResetPayload.graphql
new file mode 100644
index 00000000000..04e79563e47
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EmailPasswordResetPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for EmailPasswordResetPayload
+"""
+union EmailPasswordResetPayload = ErrorPayload | EmailPasswordResetSuccess
diff --git a/packages/server/graphql/public/typeDefs/EmailPasswordResetSuccess.graphql b/packages/server/graphql/public/typeDefs/EmailPasswordResetSuccess.graphql
new file mode 100644
index 00000000000..0fd9886822f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EmailPasswordResetSuccess.graphql
@@ -0,0 +1,6 @@
+type EmailPasswordResetSuccess {
+  """
+  True if the email password reset was successfully sent
+  """
+  success: Boolean
+}
diff --git a/packages/server/graphql/public/typeDefs/Emoji.graphql b/packages/server/graphql/public/typeDefs/Emoji.graphql
new file mode 100644
index 00000000000..763a834b879
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Emoji.graphql
@@ -0,0 +1,4 @@
+type Emoji {
+  id: ID!
+  count: Int!
+}
diff --git a/packages/server/graphql/public/typeDefs/EndCheckInPayload.graphql b/packages/server/graphql/public/typeDefs/EndCheckInPayload.graphql
new file mode 100644
index 00000000000..625fad6d9c7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndCheckInPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for EndCheckInPayload
+"""
+union EndCheckInPayload = ErrorPayload | EndCheckInSuccess
diff --git a/packages/server/graphql/public/typeDefs/EndCheckInSuccess.graphql b/packages/server/graphql/public/typeDefs/EndCheckInSuccess.graphql
new file mode 100644
index 00000000000..a2f2bd1c46d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndCheckInSuccess.graphql
@@ -0,0 +1,25 @@
+type EndCheckInSuccess {
+  """
+  true if the meeting was killed (ended before reaching last stage)
+  """
+  isKill: Boolean!
+  team: Team!
+  meeting: ActionMeeting!
+
+  """
+  The ID of the suggestion to try a check-in meeting, if tried
+  """
+  removedSuggestedActionId: ID
+  removedTaskIds: [ID!]
+
+  """
+  An event that is important to the viewer, e.g. an ended meeting
+  """
+  timelineEvent: TimelineEvent!
+  updatedTaskIds: [ID!]
+
+  """
+  Any tasks that were updated during the meeting
+  """
+  updatedTasks: [Task!]
+}
diff --git a/packages/server/graphql/public/typeDefs/EndDraggingReflectionPayload.graphql b/packages/server/graphql/public/typeDefs/EndDraggingReflectionPayload.graphql
new file mode 100644
index 00000000000..a96cd025216
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndDraggingReflectionPayload.graphql
@@ -0,0 +1,39 @@
+type EndDraggingReflectionPayload {
+  error: StandardMutationError
+  dragId: ID
+
+  """
+  The drag as sent from the team member
+  """
+  remoteDrag: RemoteReflectionDrag
+
+  """
+  the type of item the reflection was dropped on
+  """
+  dropTargetType: DragReflectionDropTargetTypeEnum
+
+  """
+  The ID that the dragged item was dropped on, if dropTargetType is not specific enough
+  """
+  dropTargetId: ID
+  meeting: RetrospectiveMeeting
+  meetingId: ID
+  reflection: RetroReflection
+  reflectionGroupId: ID
+  reflectionId: ID
+
+  """
+  foreign key to get user
+  """
+  userId: ID
+
+  """
+  The group encapsulating the new reflection. A new one was created if one was not provided.
+  """
+  reflectionGroup: RetroReflectionGroup
+
+  """
+  The old group the reflection was in
+  """
+  oldReflectionGroup: RetroReflectionGroup
+}
diff --git a/packages/server/graphql/public/typeDefs/EndRetrospectivePayload.graphql b/packages/server/graphql/public/typeDefs/EndRetrospectivePayload.graphql
new file mode 100644
index 00000000000..babe57ef1c0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndRetrospectivePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for EndRetrospectivePayload
+"""
+union EndRetrospectivePayload = ErrorPayload | EndRetrospectiveSuccess
diff --git a/packages/server/graphql/public/typeDefs/EndRetrospectiveSuccess.graphql b/packages/server/graphql/public/typeDefs/EndRetrospectiveSuccess.graphql
new file mode 100644
index 00000000000..41664c001d7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndRetrospectiveSuccess.graphql
@@ -0,0 +1,19 @@
+type EndRetrospectiveSuccess {
+  """
+  true if the meeting was killed (ended before reaching last stage)
+  """
+  isKill: Boolean!
+  team: Team!
+  meeting: RetrospectiveMeeting!
+
+  """
+  The ID of the suggestion to try a retro meeting, if tried
+  """
+  removedSuggestedActionId: ID
+  removedTaskIds: [ID!]!
+
+  """
+  An event that is important to the viewer, e.g. an ended meeting
+  """
+  timelineEvent: TimelineEvent!
+}
diff --git a/packages/server/graphql/public/typeDefs/EndSprintPokerPayload.graphql b/packages/server/graphql/public/typeDefs/EndSprintPokerPayload.graphql
new file mode 100644
index 00000000000..0aac95a275c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndSprintPokerPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for EndSprintPokerPayload
+"""
+union EndSprintPokerPayload = ErrorPayload | EndSprintPokerSuccess
diff --git a/packages/server/graphql/public/typeDefs/EndSprintPokerSuccess.graphql b/packages/server/graphql/public/typeDefs/EndSprintPokerSuccess.graphql
new file mode 100644
index 00000000000..f5435dd99be
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndSprintPokerSuccess.graphql
@@ -0,0 +1,11 @@
+type EndSprintPokerSuccess {
+  """
+  true if the meeting was killed (ended before reaching last stage)
+  """
+  isKill: Boolean!
+  meetingId: ID!
+  meeting: PokerMeeting!
+  removedTaskIds: [ID!]!
+  team: Team!
+  teamId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/EndTeamPromptPayload.graphql b/packages/server/graphql/public/typeDefs/EndTeamPromptPayload.graphql
new file mode 100644
index 00000000000..d9a2e8ae752
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EndTeamPromptPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for EndTeamPromptPayload
+"""
+union EndTeamPromptPayload = ErrorPayload | EndTeamPromptSuccess
diff --git a/packages/server/graphql/public/typeDefs/endTeamPrompt.graphql b/packages/server/graphql/public/typeDefs/EndTeamPromptSuccess.graphql
similarity index 100%
rename from packages/server/graphql/public/typeDefs/endTeamPrompt.graphql
rename to packages/server/graphql/public/typeDefs/EndTeamPromptSuccess.graphql
diff --git a/packages/server/graphql/public/typeDefs/ErrorPayload.graphql b/packages/server/graphql/public/typeDefs/ErrorPayload.graphql
new file mode 100644
index 00000000000..104f4574a10
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ErrorPayload.graphql
@@ -0,0 +1,3 @@
+type ErrorPayload {
+  error: StandardMutationError!
+}
diff --git a/packages/server/graphql/public/typeDefs/EstimatePhase.graphql b/packages/server/graphql/public/typeDefs/EstimatePhase.graphql
new file mode 100644
index 00000000000..11b532a4373
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EstimatePhase.graphql
@@ -0,0 +1,17 @@
+"""
+The meeting phase where all team members estimate a the point value of a task
+"""
+type EstimatePhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [EstimateStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/EstimateStage.graphql b/packages/server/graphql/public/typeDefs/EstimateStage.graphql
new file mode 100644
index 00000000000..93dbf33f157
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EstimateStage.graphql
@@ -0,0 +1,160 @@
+"""
+The stage where the team estimates & discusses a single task
+"""
+type EstimateStage implements NewMeetingStage & DiscussionThreadStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+
+  """
+  The ID to find the discussion that goes in the stage
+  """
+  discussionId: ID!
+
+  """
+  The discussion about the stage
+  """
+  discussion: Discussion!
+
+  """
+  The id of the user that added this stage.
+  """
+  creatorUserId: ID!
+
+  """
+  The ID that points to the issue that exists in parabol
+  """
+  taskId: ID!
+
+  """
+  The field name used by the service for this dimension
+  """
+  serviceField: ServiceField!
+
+  """
+  The immutable index of the dimensionRef tied to this stage
+  """
+  dimensionRefIdx: Int!
+
+  """
+  The immutable dimension linked to this stage
+  """
+  dimensionRef: TemplateDimensionRef!
+
+  """
+  the final score, as defined by the facilitator
+  """
+  finalScore: String
+
+  """
+  the userIds of the team members hovering the deck
+  """
+  hoveringUserIds: [ID!]!
+
+  """
+  the users of the team members hovering the deck
+  """
+  hoveringUsers: [User!]!
+
+  """
+  all the estimates, 1 per user
+  """
+  scores: [EstimateUserScore!]!
+
+  """
+  The task referenced in the stage, as it exists in Parabol. null if the task was deleted
+  """
+  task: Task
+
+  """
+  true when the participants are still voting and results are hidden. false when votes are revealed
+  """
+  isVoting: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/EstimateUserScore.graphql b/packages/server/graphql/public/typeDefs/EstimateUserScore.graphql
new file mode 100644
index 00000000000..025cf528468
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/EstimateUserScore.graphql
@@ -0,0 +1,29 @@
+"""
+The user and number of points they estimated for dimension (where 1 stage has 1 dimension)
+"""
+type EstimateUserScore {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  The stageId
+  """
+  stageId: ID!
+
+  """
+  The userId that for this score
+  """
+  userId: ID!
+
+  """
+  The user that for this score
+  """
+  user: User!
+
+  """
+  The label that was associated with the score at the time of the vote. Note: It may no longer exist on the dimension
+  """
+  label: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/File.graphql b/packages/server/graphql/public/typeDefs/File.graphql
new file mode 100644
index 00000000000..f43deeb39ab
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/File.graphql
@@ -0,0 +1,4 @@
+"""
+A file buffer
+"""
+scalar File
diff --git a/packages/server/graphql/public/typeDefs/FixedActivity.graphql b/packages/server/graphql/public/typeDefs/FixedActivity.graphql
new file mode 100644
index 00000000000..a5677d6fec4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/FixedActivity.graphql
@@ -0,0 +1,80 @@
+"""
+An activity that does not have a customizable template, e.g. standup, check-in
+"""
+type FixedActivity implements MeetingTemplate {
+  """
+  teamPrompt | action
+  """
+  id: ID!
+
+  """
+  Date the activity was created
+  """
+  createdAt: DateTime!
+
+  """
+  Always true
+  """
+  isActive: Boolean!
+
+  """
+  Always true
+  """
+  isFree: Boolean!
+
+  """
+  The time of the meeting the template was last used
+  """
+  lastUsedAt: DateTime
+
+  """
+  The name of the template
+  """
+  name: String!
+
+  """
+  Always aGhostOrg
+  """
+  orgId: ID!
+
+  """
+  Always public
+  """
+  scope: SharingScopeEnum!
+
+  """
+  Always aGhostTeam
+  """
+  teamId: ID!
+
+  """
+  aGhostTeam
+  """
+  team: Team!
+
+  """
+  teamPrompt | action
+  """
+  type: MeetingTypeEnum!
+  updatedAt: DateTime!
+
+  """
+  The category this template falls under, e.g. retro, feedback, strategy, etc.
+  """
+  category: String!
+
+  """
+  Whether this template should be in the recommended/quick start sections in the UI.
+  """
+  isRecommended: Boolean!
+
+  """
+  The url to the illustration used by the template
+  """
+  illustrationUrl: String!
+
+  """
+  The lowest scope of the permissions available to the viewer
+  """
+  viewerLowestScope: SharingScopeEnum!
+}
diff --git a/packages/server/graphql/public/typeDefs/FlagReadyToAdvancePayload.graphql b/packages/server/graphql/public/typeDefs/FlagReadyToAdvancePayload.graphql
new file mode 100644
index 00000000000..944038f9df5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/FlagReadyToAdvancePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for FlagReadyToAdvancePayload
+"""
+union FlagReadyToAdvancePayload = ErrorPayload | FlagReadyToAdvanceSuccess
diff --git a/packages/server/graphql/public/typeDefs/FlagReadyToAdvanceSuccess.graphql b/packages/server/graphql/public/typeDefs/FlagReadyToAdvanceSuccess.graphql
new file mode 100644
index 00000000000..0bae3e8d509
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/FlagReadyToAdvanceSuccess.graphql
@@ -0,0 +1,11 @@
+type FlagReadyToAdvanceSuccess {
+  """
+  the meeting with the updated readyCount
+  """
+  meeting: NewMeeting!
+
+  """
+  the stage with the updated readyCount
+  """
+  stage: NewMeetingStage!
+}
diff --git a/packages/server/graphql/public/typeDefs/GcalVideoTypeEnum.graphql b/packages/server/graphql/public/typeDefs/GcalVideoTypeEnum.graphql
new file mode 100644
index 00000000000..fe150ad5a6d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GcalVideoTypeEnum.graphql
@@ -0,0 +1,7 @@
+"""
+The type of video conferencing used in the gcal event
+"""
+enum GcalVideoTypeEnum {
+  meet
+  zoom
+}
diff --git a/packages/server/graphql/public/typeDefs/GenericMeetingPhase.graphql b/packages/server/graphql/public/typeDefs/GenericMeetingPhase.graphql
new file mode 100644
index 00000000000..7c2ee918d70
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GenericMeetingPhase.graphql
@@ -0,0 +1,17 @@
+"""
+An all-purpose meeting phase with no extra state
+"""
+type GenericMeetingPhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [GenericMeetingStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/GenericMeetingStage.graphql b/packages/server/graphql/public/typeDefs/GenericMeetingStage.graphql
new file mode 100644
index 00000000000..ed56b2d700d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GenericMeetingStage.graphql
@@ -0,0 +1,95 @@
+"""
+A stage of a meeting that has no extra state. Only used for single-stage phases
+"""
+type GenericMeetingStage implements NewMeetingStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+}
diff --git a/packages/server/graphql/public/typeDefs/GetDemoEntitiesPayload.graphql b/packages/server/graphql/public/typeDefs/GetDemoEntitiesPayload.graphql
new file mode 100644
index 00000000000..e9289594dc4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GetDemoEntitiesPayload.graphql
@@ -0,0 +1,4 @@
+type GetDemoEntitiesPayload {
+  error: StandardMutationError
+  entities: [GoogleAnalyzedEntity!]
+}
diff --git a/packages/server/graphql/public/typeDefs/GetTemplateSuggestionPayload.graphql b/packages/server/graphql/public/typeDefs/GetTemplateSuggestionPayload.graphql
new file mode 100644
index 00000000000..14ea93c2e95
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GetTemplateSuggestionPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for getTemplateSuggestion, which could be an error
+"""
+union GetTemplateSuggestionPayload = ErrorPayload | GetTemplateSuggestionSuccess
diff --git a/packages/server/graphql/public/typeDefs/GetTemplateSuggestionSuccess.graphql b/packages/server/graphql/public/typeDefs/GetTemplateSuggestionSuccess.graphql
new file mode 100644
index 00000000000..ecb9431570f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GetTemplateSuggestionSuccess.graphql
@@ -0,0 +1,11 @@
+type GetTemplateSuggestionSuccess {
+  """
+  The template the AI suggested
+  """
+  suggestedTemplate: MeetingTemplate!
+
+  """
+  The explanation from the AI
+  """
+  explanation: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/GitLabIntegration.graphql b/packages/server/graphql/public/typeDefs/GitLabIntegration.graphql
index 6308f2a967a..e5b592e42bb 100644
--- a/packages/server/graphql/public/typeDefs/GitLabIntegration.graphql
+++ b/packages/server/graphql/public/typeDefs/GitLabIntegration.graphql
@@ -51,34 +51,3 @@ type GitLabIntegration {
     state: String!
   ): GitLabIntegrationConnection!
 }
-
-"""
-A connection to a list of items.
-"""
-type GitLabIntegrationConnection {
-  """
-  Information to aid in pagination.
-  """
-  pageInfo: PageInfo!
-
-  """
-  A list of edges.
-  """
-  edges: [GitLabIntegrationEdge!]!
-
-  """
-  An error with the connection, if any
-  """
-  error: StandardMutationError
-}
-
-"""
-An edge in a connection.
-"""
-type GitLabIntegrationEdge {
-  """
-  The item at the end of the edge
-  """
-  node: TaskIntegration!
-  cursor: String
-}
diff --git a/packages/server/graphql/public/typeDefs/GitLabIntegrationConnection.graphql b/packages/server/graphql/public/typeDefs/GitLabIntegrationConnection.graphql
new file mode 100644
index 00000000000..c6bed6ef0c4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GitLabIntegrationConnection.graphql
@@ -0,0 +1,19 @@
+"""
+A connection to a list of items.
+"""
+type GitLabIntegrationConnection {
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  A list of edges.
+  """
+  edges: [GitLabIntegrationEdge!]!
+
+  """
+  An error with the connection, if any
+  """
+  error: StandardMutationError
+}
diff --git a/packages/server/graphql/public/typeDefs/GitLabIntegrationEdge.graphql b/packages/server/graphql/public/typeDefs/GitLabIntegrationEdge.graphql
new file mode 100644
index 00000000000..4e350189785
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GitLabIntegrationEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type GitLabIntegrationEdge {
+  """
+  The item at the end of the edge
+  """
+  node: TaskIntegration!
+  cursor: String
+}
diff --git a/packages/server/graphql/public/typeDefs/GoogleAnalyzedEntity.graphql b/packages/server/graphql/public/typeDefs/GoogleAnalyzedEntity.graphql
new file mode 100644
index 00000000000..eca94b86e1b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GoogleAnalyzedEntity.graphql
@@ -0,0 +1,16 @@
+type GoogleAnalyzedEntity {
+  """
+  The lemma (dictionary entry) of the entity name. Fancy way of saying the singular form of the name, if plural.
+  """
+  lemma: String!
+
+  """
+  The name of the entity. Usually 1 or 2 words. Always a noun, sometimes a proper noun.
+  """
+  name: String!
+
+  """
+  The salience of the entity in the provided text. The salience of all entities always sums to 1
+  """
+  salience: Float!
+}
diff --git a/packages/server/graphql/public/typeDefs/GroupPhaseCompletePayload.graphql b/packages/server/graphql/public/typeDefs/GroupPhaseCompletePayload.graphql
new file mode 100644
index 00000000000..312806a91aa
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/GroupPhaseCompletePayload.graphql
@@ -0,0 +1,16 @@
+type GroupPhaseCompletePayload {
+  """
+  a list of empty reflection groups to remove
+  """
+  emptyReflectionGroupIds: [ID!]!
+
+  """
+  the current meeting
+  """
+  meeting: RetrospectiveMeeting!
+
+  """
+  a list of updated reflection groups
+  """
+  reflectionGroups: [RetroReflectionGroup]
+}
diff --git a/packages/server/graphql/public/typeDefs/InactivateUserPayload.graphql b/packages/server/graphql/public/typeDefs/InactivateUserPayload.graphql
new file mode 100644
index 00000000000..2bf0d26efaf
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InactivateUserPayload.graphql
@@ -0,0 +1,8 @@
+type InactivateUserPayload {
+  error: StandardMutationError
+
+  """
+  The user that has been inactivated
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProvider.graphql b/packages/server/graphql/public/typeDefs/IntegrationProvider.graphql
new file mode 100644
index 00000000000..bf21d34eeed
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProvider.graphql
@@ -0,0 +1,44 @@
+"""
+An authentication provider configuration
+"""
+interface IntegrationProvider {
+  """
+  The provider's unique identifier
+  """
+  id: ID!
+
+  """
+  The team that created the provider. "aGhostTeam" if global
+  """
+  teamId: ID!
+
+  """
+  The timestamp the provider was created
+  """
+  createdAt: DateTime!
+
+  """
+  The timestamp the token was updated at
+  """
+  updatedAt: DateTime!
+
+  """
+  The name of the integration service (GitLab, Mattermost, etc)
+  """
+  service: IntegrationProviderServiceEnum!
+
+  """
+  The kind of token used by this provider (OAuth2, PAT, Webhook)
+  """
+  authStrategy: IntegrationProviderAuthStrategyEnum!
+
+  """
+  The scope this provider configuration was created at (globally, org-wide, or by the team)
+  """
+  scope: IntegrationProviderScopeEnum!
+
+  """
+  true if the provider configuration should be used
+  """
+  isActive: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderAuthStrategyEnum.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderAuthStrategyEnum.graphql
new file mode 100644
index 00000000000..aa45386bd63
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderAuthStrategyEnum.graphql
@@ -0,0 +1,9 @@
+"""
+The kind of token provided by the service
+"""
+enum IntegrationProviderAuthStrategyEnum {
+  oauth1
+  oauth2
+  pat
+  webhook
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderEditableScopeEnum.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderEditableScopeEnum.graphql
new file mode 100644
index 00000000000..cfd0e96994d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderEditableScopeEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The scope this provider was created on by a user (excluding global scope)
+"""
+enum IntegrationProviderEditableScopeEnum {
+  org
+  team
+  global
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth1.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth1.graphql
new file mode 100644
index 00000000000..84ee5e10ccd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth1.graphql
@@ -0,0 +1,19 @@
+"""
+OAuth1 provider metadata
+"""
+input IntegrationProviderMetadataInputOAuth1 {
+  """
+  The base URL used to access the provider
+  """
+  serverBaseUrl: URL!
+
+  """
+  The client key to give to the provider
+  """
+  consumerKey: ID!
+
+  """
+  Secret or Private key of the generate private/public key pair
+  """
+  consumerSecret: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth2.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth2.graphql
new file mode 100644
index 00000000000..883a150c01e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputOAuth2.graphql
@@ -0,0 +1,24 @@
+"""
+OAuth2 provider metadata
+"""
+input IntegrationProviderMetadataInputOAuth2 {
+  """
+  The base URL used to access the provider
+  """
+  serverBaseUrl: URL!
+
+  """
+  The client id to give to the provider
+  """
+  clientId: String!
+
+  """
+  The client id to give to the provider
+  """
+  clientSecret: String!
+
+  """
+  The tenant id to give to the provider
+  """
+  tenantId: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputWebhook.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputWebhook.graphql
new file mode 100644
index 00000000000..2a7bd81c3e0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderMetadataInputWebhook.graphql
@@ -0,0 +1,9 @@
+"""
+Webhook provider metadata
+"""
+input IntegrationProviderMetadataInputWebhook {
+  """
+  Webhook URL to be used by the provider
+  """
+  webhookUrl: URL!
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderOAuth1.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderOAuth1.graphql
new file mode 100644
index 00000000000..ca655217703
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderOAuth1.graphql
@@ -0,0 +1,49 @@
+"""
+An integration provider that connects via OAuth1.0
+"""
+type IntegrationProviderOAuth1 implements IntegrationProvider {
+  """
+  The provider's unique identifier
+  """
+  id: ID!
+
+  """
+  The team that created the provider. "aGhostTeam" if global
+  """
+  teamId: ID!
+
+  """
+  The timestamp the provider was created
+  """
+  createdAt: DateTime!
+
+  """
+  The timestamp the token was updated at
+  """
+  updatedAt: DateTime!
+
+  """
+  The name of the integration service (GitLab, Mattermost, etc)
+  """
+  service: IntegrationProviderServiceEnum!
+
+  """
+  The kind of token used by this provider (OAuth2, PAT, Webhook)
+  """
+  authStrategy: IntegrationProviderAuthStrategyEnum!
+
+  """
+  The scope this provider configuration was created at (globally, org-wide, or by the team)
+  """
+  scope: IntegrationProviderScopeEnum!
+
+  """
+  true if the provider configuration should be used
+  """
+  isActive: Boolean!
+
+  """
+  The base URL of the OAuth1 server
+  """
+  serverBaseUrl: URL!
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderOAuth2.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderOAuth2.graphql
new file mode 100644
index 00000000000..04dc844dfc8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderOAuth2.graphql
@@ -0,0 +1,59 @@
+"""
+An integration provider that connects via OAuth2
+"""
+type IntegrationProviderOAuth2 implements IntegrationProvider {
+  """
+  The provider's unique identifier
+  """
+  id: ID!
+
+  """
+  The team that created the provider. "aGhostTeam" if global
+  """
+  teamId: ID!
+
+  """
+  The timestamp the provider was created
+  """
+  createdAt: DateTime!
+
+  """
+  The timestamp the token was updated at
+  """
+  updatedAt: DateTime!
+
+  """
+  The name of the integration service (GitLab, Mattermost, etc)
+  """
+  service: IntegrationProviderServiceEnum!
+
+  """
+  The kind of token used by this provider (OAuth2, PAT, Webhook)
+  """
+  authStrategy: IntegrationProviderAuthStrategyEnum!
+
+  """
+  The scope this provider configuration was created at (globally, org-wide, or by the team)
+  """
+  scope: IntegrationProviderScopeEnum!
+
+  """
+  true if the provider configuration should be used
+  """
+  isActive: Boolean!
+
+  """
+  The base URL of the OAuth2 server
+  """
+  serverBaseUrl: URL!
+
+  """
+  The OAuth2 client id
+  """
+  clientId: ID!
+
+  """
+  The tenant ID for Azure Active Directory Auth
+  """
+  tenantId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderScopeEnum.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderScopeEnum.graphql
new file mode 100644
index 00000000000..53328a8b2ce
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderScopeEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The scope this provider was created on (globally, org-wide, or on the team)
+"""
+enum IntegrationProviderScopeEnum {
+  global
+  org
+  team
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderServiceEnum.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderServiceEnum.graphql
new file mode 100644
index 00000000000..2711a56fc5b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderServiceEnum.graphql
@@ -0,0 +1,13 @@
+"""
+The name of the service of the Integration Provider
+"""
+enum IntegrationProviderServiceEnum {
+  jira
+  github
+  gitlab
+  mattermost
+  jiraServer
+  gcal
+  azureDevOps
+  msTeams
+}
diff --git a/packages/server/graphql/public/typeDefs/IntegrationProviderWebhook.graphql b/packages/server/graphql/public/typeDefs/IntegrationProviderWebhook.graphql
new file mode 100644
index 00000000000..932c3987b0c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/IntegrationProviderWebhook.graphql
@@ -0,0 +1,49 @@
+"""
+An integration provider that connects via webhook
+"""
+type IntegrationProviderWebhook implements IntegrationProvider {
+  """
+  The provider's unique identifier
+  """
+  id: ID!
+
+  """
+  The team that created the provider. "aGhostTeam" if global
+  """
+  teamId: ID!
+
+  """
+  The timestamp the provider was created
+  """
+  createdAt: DateTime!
+
+  """
+  The timestamp the token was updated at
+  """
+  updatedAt: DateTime!
+
+  """
+  The name of the integration service (GitLab, Mattermost, etc)
+  """
+  service: IntegrationProviderServiceEnum!
+
+  """
+  The kind of token used by this provider (OAuth2, PAT, Webhook)
+  """
+  authStrategy: IntegrationProviderAuthStrategyEnum!
+
+  """
+  The scope this provider configuration was created at (globally, org-wide, or by the team)
+  """
+  scope: IntegrationProviderScopeEnum!
+
+  """
+  true if the provider configuration should be used
+  """
+  isActive: Boolean!
+
+  """
+  The webhook URL
+  """
+  webhookUrl: URL!
+}
diff --git a/packages/server/graphql/public/typeDefs/InvalidateSessionsPayload.graphql b/packages/server/graphql/public/typeDefs/InvalidateSessionsPayload.graphql
new file mode 100644
index 00000000000..8b8dc8d330d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InvalidateSessionsPayload.graphql
@@ -0,0 +1,8 @@
+type InvalidateSessionsPayload {
+  error: StandardMutationError
+
+  """
+  The new, only valid auth token
+  """
+  authToken: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/InviteToTeamPayload.graphql b/packages/server/graphql/public/typeDefs/InviteToTeamPayload.graphql
new file mode 100644
index 00000000000..b9dc3473e0f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InviteToTeamPayload.graphql
@@ -0,0 +1,28 @@
+type InviteToTeamPayload {
+  error: StandardMutationError
+
+  """
+  The team the inviter is inviting the invitee to
+  """
+  team: Team
+
+  """
+  A list of email addresses the invitations were sent to
+  """
+  invitees: [Email!]
+
+  """
+  the notification ID if this payload is sent to a subscriber, else null
+  """
+  teamInvitationNotificationId: ID
+
+  """
+  The notification sent to the invitee if they are a parabol user
+  """
+  teamInvitationNotification: NotificationTeamInvitation
+
+  """
+  the `invite your team` suggested action that was removed, if any
+  """
+  removedSuggestedActionId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/Invoice.graphql b/packages/server/graphql/public/typeDefs/Invoice.graphql
new file mode 100644
index 00000000000..9d046fffc4d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Invoice.graphql
@@ -0,0 +1,104 @@
+"""
+A monthly billing invoice for an organization
+"""
+type Invoice {
+  """
+  A shortid for the invoice
+  """
+  id: ID!
+
+  """
+  The tier this invoice pays for
+  """
+  tier: TierEnum!
+
+  """
+  The amount the card will be charged (total + startingBalance with a min value of 0)
+  """
+  amountDue: Float!
+
+  """
+  The datetime the invoice was first generated
+  """
+  createdAt: DateTime!
+
+  """
+  The discount coupon information from Stripe, if any discount applied
+  """
+  coupon: Coupon
+
+  """
+  The total amount for the invoice (in USD)
+  """
+  total: Float!
+
+  """
+  The emails the invoice was sent to
+  """
+  billingLeaderEmails: [Email!]!
+
+  """
+  the card used to pay the invoice
+  """
+  creditCard: CreditCard
+
+  """
+  The timestamp for the end of the billing cycle
+  """
+  endAt: DateTime!
+
+  """
+  The date the invoice was created
+  """
+  invoiceDate: DateTime!
+
+  """
+  An invoice line item for previous month adjustments
+  """
+  lines: [InvoiceLineItem!]!
+
+  """
+  The details that comprise the charges for next month
+  """
+  nextPeriodCharges: NextPeriodCharges!
+
+  """
+  *The organization id to charge
+  """
+  orgId: ID!
+
+  """
+  The persisted name of the org as it was when invoiced
+  """
+  orgName: String!
+
+  """
+  the datetime the invoice was successfully paid
+  """
+  paidAt: DateTime
+
+  """
+  The URL to pay via stripe if payment was not collected in app
+  """
+  payUrl: String
+
+  """
+  The picture of the organization
+  """
+  picture: URL
+
+  """
+  The timestamp for the beginning of the billing cycle
+  """
+  startAt: DateTime!
+
+  """
+  The balance on the customer account (in cents)
+  """
+  startingBalance: Float!
+
+  """
+  the status of the invoice. starts as pending, moves to paid or unpaid depending on if the payment succeeded
+  """
+  status: InvoiceStatusEnum!
+}
diff --git a/packages/server/graphql/public/typeDefs/InvoiceConnection.graphql b/packages/server/graphql/public/typeDefs/InvoiceConnection.graphql
new file mode 100644
index 00000000000..7d9da62cc54
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InvoiceConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type InvoiceConnection {
+  """
+  Page info with cursors coerced to ISO8601 dates
+  """
+  pageInfo: PageInfoDateCursor
+
+  """
+  A list of edges.
+  """
+  edges: [InvoiceEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/InvoiceEdge.graphql b/packages/server/graphql/public/typeDefs/InvoiceEdge.graphql
new file mode 100644
index 00000000000..b09b8ae5186
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InvoiceEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type InvoiceEdge {
+  """
+  The item at the end of the edge
+  """
+  node: Invoice!
+  cursor: DateTime
+}
diff --git a/packages/server/graphql/public/typeDefs/InvoiceLineItem.graphql b/packages/server/graphql/public/typeDefs/InvoiceLineItem.graphql
new file mode 100644
index 00000000000..c8b84bbed0c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InvoiceLineItem.graphql
@@ -0,0 +1,34 @@
+"""
+A single line item charge on the invoice
+"""
+type InvoiceLineItem {
+  """
+  The unique line item id
+  """
+  id: ID!
+
+  """
+  The amount for the line item (in USD)
+  """
+  amount: Float!
+
+  """
+  A description of the charge. Only present if we have no idea what the charge is
+  """
+  description: String
+
+  """
+  Array of user activity line items that roll up to total activity (add/leave/pause/unpause)
+  """
+  details: [InvoiceLineItemDetails!]!
+
+  """
+  The total number of days that all org users have been inactive during the billing cycle
+  """
+  quantity: Int
+
+  """
+  The line item type for a monthly billing invoice
+  """
+  type: InvoiceLineItemEnum!
+}
diff --git a/packages/server/graphql/public/typeDefs/InvoiceLineItemDetails.graphql b/packages/server/graphql/public/typeDefs/InvoiceLineItemDetails.graphql
new file mode 100644
index 00000000000..4dea9f99a7d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InvoiceLineItemDetails.graphql
@@ -0,0 +1,34 @@
+"""
+The per-user-action line item details,
+"""
+type InvoiceLineItemDetails {
+  """
+  The unique detailed line item id
+  """
+  id: ID!
+
+  """
+  The amount for the line item (in USD)
+  """
+  amount: Float!
+
+  """
+  The email affected by this line item change
+  """
+  email: Email!
+
+  """
+  End of the event. Only present if a pause action gets matched up with an unpause action
+  """
+  endAt: DateTime
+
+  """
+  The parent line item id
+  """
+  parentId: ID!
+
+  """
+  The timestamp for the beginning of the period of no charge
+  """
+  startAt: DateTime
+}
diff --git a/packages/server/graphql/public/typeDefs/InvoiceLineItemEnum.graphql b/packages/server/graphql/public/typeDefs/InvoiceLineItemEnum.graphql
new file mode 100644
index 00000000000..70402ffab9e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InvoiceLineItemEnum.graphql
@@ -0,0 +1,9 @@
+"""
+A big picture line item
+"""
+enum InvoiceLineItemEnum {
+  ADDED_USERS
+  INACTIVITY_ADJUSTMENTS
+  OTHER_ADJUSTMENTS
+  REMOVED_USERS
+}
diff --git a/packages/server/graphql/public/typeDefs/InvoiceStatusEnum.graphql b/packages/server/graphql/public/typeDefs/InvoiceStatusEnum.graphql
new file mode 100644
index 00000000000..362eebf472f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/InvoiceStatusEnum.graphql
@@ -0,0 +1,9 @@
+"""
+The payment status of the invoice
+"""
+enum InvoiceStatusEnum {
+  PENDING
+  PAID
+  FAILED
+  UPCOMING
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraDimensionField.graphql b/packages/server/graphql/public/typeDefs/JiraDimensionField.graphql
new file mode 100644
index 00000000000..0f17ff90b0a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraDimensionField.graphql
@@ -0,0 +1,41 @@
+"""
+Poker dimensions mapped to their corresponding fields in jira
+"""
+type JiraDimensionField {
+  id: ID!
+
+  """
+  The atlassian cloud that the field lives in
+  """
+  cloudId: ID!
+
+  """
+  The name of the associated dimension
+  """
+  dimensionName: String!
+
+  """
+  The project under the atlassian cloud the field lives in
+  """
+  projectKey: ID!
+
+  """
+  Type id of the issue
+  """
+  issueType: ID!
+
+  """
+  The ID referring to the field name
+  """
+  fieldId: ID!
+
+  """
+  The field name in jira that the estimate is pushed to
+  """
+  fieldName: String!
+
+  """
+  the type of field, e.g. number, string, any
+  """
+  fieldType: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraIssue.graphql b/packages/server/graphql/public/typeDefs/JiraIssue.graphql
index 5b364a1ba4c..c5a281c3def 100644
--- a/packages/server/graphql/public/typeDefs/JiraIssue.graphql
+++ b/packages/server/graphql/public/typeDefs/JiraIssue.graphql
@@ -1,23 +1,3 @@
-enum JiraIssueMissingEstimationFieldHintEnum {
-  teamManagedStoryPoints
-  companyManagedStoryPoints
-}
-
-"""
-Possible voting field
-"""
-type JiraIssueField {
-  """
-  ID of the field in Jira
-  """
-  fieldId: ID!
-
-  """
-  Name of the field
-  """
-  fieldName: String!
-}
-
 """
 The Jira Issue that comes direct from Jira
 """
@@ -107,34 +87,3 @@ type JiraIssue implements TaskIntegration {
   """
   lastUpdated: DateTime!
 }
-
-"""
-A connection to a list of items.
-"""
-type JiraIssueConnection {
-  """
-  Page info with cursors
-  """
-  pageInfo: PageInfo
-
-  """
-  A list of edges.
-  """
-  edges: [JiraIssueEdge!]!
-
-  """
-  An error with the connection, if any
-  """
-  error: StandardMutationError
-}
-
-"""
-An edge in a connection.
-"""
-type JiraIssueEdge {
-  """
-  The item at the end of the edge
-  """
-  node: JiraIssue!
-  cursor: String
-}
diff --git a/packages/server/graphql/public/typeDefs/JiraIssueConnection.graphql b/packages/server/graphql/public/typeDefs/JiraIssueConnection.graphql
new file mode 100644
index 00000000000..b7db3f14acf
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraIssueConnection.graphql
@@ -0,0 +1,19 @@
+"""
+A connection to a list of items.
+"""
+type JiraIssueConnection {
+  """
+  Page info with cursors
+  """
+  pageInfo: PageInfo
+
+  """
+  A list of edges.
+  """
+  edges: [JiraIssueEdge!]!
+
+  """
+  An error with the connection, if any
+  """
+  error: StandardMutationError
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraIssueEdge.graphql b/packages/server/graphql/public/typeDefs/JiraIssueEdge.graphql
new file mode 100644
index 00000000000..3fb602838ef
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraIssueEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type JiraIssueEdge {
+  """
+  The item at the end of the edge
+  """
+  node: JiraIssue!
+  cursor: String
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraIssueField.graphql b/packages/server/graphql/public/typeDefs/JiraIssueField.graphql
new file mode 100644
index 00000000000..012f7b14f58
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraIssueField.graphql
@@ -0,0 +1,14 @@
+"""
+Possible voting field
+"""
+type JiraIssueField {
+  """
+  ID of the field in Jira
+  """
+  fieldId: ID!
+
+  """
+  Name of the field
+  """
+  fieldName: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraIssueMissingEstimationFieldHintEnum.graphql b/packages/server/graphql/public/typeDefs/JiraIssueMissingEstimationFieldHintEnum.graphql
new file mode 100644
index 00000000000..4e6862fb5fc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraIssueMissingEstimationFieldHintEnum.graphql
@@ -0,0 +1,4 @@
+enum JiraIssueMissingEstimationFieldHintEnum {
+  teamManagedStoryPoints
+  companyManagedStoryPoints
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraRemoteAvatarUrls.graphql b/packages/server/graphql/public/typeDefs/JiraRemoteAvatarUrls.graphql
new file mode 100644
index 00000000000..a2e7eaace38
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraRemoteAvatarUrls.graphql
@@ -0,0 +1,9 @@
+"""
+The URLs for avatars. NOTE: If they are custom, an Authorization header is required!
+"""
+type JiraRemoteAvatarUrls {
+  x48: ID!
+  x24: ID!
+  x16: ID!
+  x32: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraRemoteProjectCategory.graphql b/packages/server/graphql/public/typeDefs/JiraRemoteProjectCategory.graphql
new file mode 100644
index 00000000000..7fda09b7eaf
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraRemoteProjectCategory.graphql
@@ -0,0 +1,9 @@
+"""
+A project category fetched from a JiraRemoteProject
+"""
+type JiraRemoteProjectCategory {
+  self: String!
+  id: String!
+  name: String!
+  description: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraSearchQueryInput.graphql b/packages/server/graphql/public/typeDefs/JiraSearchQueryInput.graphql
new file mode 100644
index 00000000000..dd0261cdf3a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraSearchQueryInput.graphql
@@ -0,0 +1,21 @@
+input JiraSearchQueryInput {
+  """
+  The query string, either simple or JQL depending on the isJQL flag
+  """
+  queryString: String!
+
+  """
+  true if the queryString is JQL, else false
+  """
+  isJQL: Boolean!
+
+  """
+  The list of project keys selected as a filter. null if not set
+  """
+  projectKeyFilters: [ID!]
+
+  """
+  true if this query should be deleted
+  """
+  isRemove: Boolean
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraServerIssue.graphql b/packages/server/graphql/public/typeDefs/JiraServerIssue.graphql
index 38ca5e9c7a1..32cdb31c420 100644
--- a/packages/server/graphql/public/typeDefs/JiraServerIssue.graphql
+++ b/packages/server/graphql/public/typeDefs/JiraServerIssue.graphql
@@ -1,59 +1,3 @@
-"""
-A connection to a list of items.
-"""
-type JiraServerIssueConnection {
-  """
-  Information to aid in pagination.
-  """
-  pageInfo: PageInfo!
-
-  """
-  A list of edges.
-  """
-  edges: [JiraServerIssueEdge!]!
-
-  """
-  An error with the connection, if any
-  """
-  error: StandardMutationError
-}
-
-"""
-Information about pagination in a connection.
-"""
-type PageInfo {
-  """
-  When paginating forwards, are there more items?
-  """
-  hasNextPage: Boolean!
-
-  """
-  When paginating backwards, are there more items?
-  """
-  hasPreviousPage: Boolean!
-
-  """
-  When paginating backwards, the cursor to continue.
-  """
-  startCursor: String
-
-  """
-  When paginating forwards, the cursor to continue.
-  """
-  endCursor: String
-}
-
-"""
-An edge in a connection.
-"""
-type JiraServerIssueEdge {
-  """
-  The item at the end of the edge
-  """
-  node: JiraServerIssue!
-  cursor: String
-}
-
 """
 The Jira Issue that comes direct from Jira Server
 """
diff --git a/packages/server/graphql/public/typeDefs/JiraServerIssueConnection.graphql b/packages/server/graphql/public/typeDefs/JiraServerIssueConnection.graphql
new file mode 100644
index 00000000000..61381a559f5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraServerIssueConnection.graphql
@@ -0,0 +1,19 @@
+"""
+A connection to a list of items.
+"""
+type JiraServerIssueConnection {
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  A list of edges.
+  """
+  edges: [JiraServerIssueEdge!]!
+
+  """
+  An error with the connection, if any
+  """
+  error: StandardMutationError
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraServerIssueEdge.graphql b/packages/server/graphql/public/typeDefs/JiraServerIssueEdge.graphql
new file mode 100644
index 00000000000..a3ece819bcc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraServerIssueEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type JiraServerIssueEdge {
+  """
+  The item at the end of the edge
+  """
+  node: JiraServerIssue!
+  cursor: String
+}
diff --git a/packages/server/graphql/public/typeDefs/JiraServerSearchQueryInput.graphql b/packages/server/graphql/public/typeDefs/JiraServerSearchQueryInput.graphql
new file mode 100644
index 00000000000..9a6467e7416
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JiraServerSearchQueryInput.graphql
@@ -0,0 +1,5 @@
+input JiraServerSearchQueryInput {
+  queryString: String!
+  isJQL: Boolean!
+  projectKeyFilters: [ID!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/JoinMeetingPayload.graphql b/packages/server/graphql/public/typeDefs/JoinMeetingPayload.graphql
new file mode 100644
index 00000000000..2d2c1e109e5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JoinMeetingPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for JoinMeetingPayload
+"""
+union JoinMeetingPayload = ErrorPayload | JoinMeetingSuccess
diff --git a/packages/server/graphql/public/typeDefs/JoinMeetingSuccess.graphql b/packages/server/graphql/public/typeDefs/JoinMeetingSuccess.graphql
new file mode 100644
index 00000000000..4204facb9d5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/JoinMeetingSuccess.graphql
@@ -0,0 +1,8 @@
+type JoinMeetingSuccess {
+  meetingId: ID!
+
+  """
+  The meeting with the updated stages, if any
+  """
+  meeting: NewMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/MassInvitation.graphql b/packages/server/graphql/public/typeDefs/MassInvitation.graphql
new file mode 100644
index 00000000000..1a0d810c304
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MassInvitation.graphql
@@ -0,0 +1,15 @@
+"""
+An invitation and expiration
+"""
+type MassInvitation {
+  """
+  the invitation token
+  """
+  id: ID!
+
+  """
+  the expiration for the token
+  """
+  expiration: DateTime!
+  meetingId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/MassInvitationPayload.graphql b/packages/server/graphql/public/typeDefs/MassInvitationPayload.graphql
new file mode 100644
index 00000000000..5e78953d3e0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MassInvitationPayload.graphql
@@ -0,0 +1,18 @@
+type MassInvitationPayload {
+  errorType: TeamInvitationErrorEnum
+
+  """
+  The name of the person that sent the invitation, present if errorType is expired
+  """
+  inviterName: String
+
+  """
+  The teamId from the token
+  """
+  teamId: ID
+
+  """
+  name of the inviting team, present if invitation exists
+  """
+  teamName: String
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingEngagement.graphql b/packages/server/graphql/public/typeDefs/MeetingEngagement.graphql
new file mode 100644
index 00000000000..2af4130fb5d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingEngagement.graphql
@@ -0,0 +1,6 @@
+type MeetingEngagement {
+  """
+  Engagement across retros, poker and standups
+  """
+  all: Float!
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingGreeting.graphql b/packages/server/graphql/public/typeDefs/MeetingGreeting.graphql
new file mode 100644
index 00000000000..251b6553336
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingGreeting.graphql
@@ -0,0 +1,11 @@
+type MeetingGreeting {
+  """
+  The foreign-language greeting
+  """
+  content: String!
+
+  """
+  The source language for the greeting
+  """
+  language: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingMember.graphql b/packages/server/graphql/public/typeDefs/MeetingMember.graphql
new file mode 100644
index 00000000000..c24aabe0921
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingMember.graphql
@@ -0,0 +1,28 @@
+"""
+All the user details for a specific meeting
+"""
+interface MeetingMember {
+  """
+  A composite of userId::meetingId
+  """
+  id: ID!
+
+  """
+  true if present, false if absent, else null
+  """
+  isCheckedIn: Boolean
+    @deprecated(
+      reason: "Members are checked in when they enter the meeting now & not created beforehand"
+    )
+  meetingId: ID!
+  meetingType: MeetingTypeEnum!
+  teamId: ID!
+  teamMember: TeamMember!
+  user: User!
+  userId: ID!
+
+  """
+  The last time a meeting was updated (stage completed, finished, etc)
+  """
+  updatedAt: DateTime!
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingStageTimeLimitPayload.graphql b/packages/server/graphql/public/typeDefs/MeetingStageTimeLimitPayload.graphql
new file mode 100644
index 00000000000..26b98725ef8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingStageTimeLimitPayload.graphql
@@ -0,0 +1,6 @@
+type MeetingStageTimeLimitPayload {
+  """
+  The new notification that was just created
+  """
+  notification: NotificationMeetingStageTimeLimitEnd!
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingStat.graphql b/packages/server/graphql/public/typeDefs/MeetingStat.graphql
new file mode 100644
index 00000000000..98e69e0c785
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingStat.graphql
@@ -0,0 +1,5 @@
+type MeetingStat {
+  id: ID!
+  meetingType: MeetingTypeEnum!
+  createdAt: DateTime!
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingSubscriptionPayload.graphql b/packages/server/graphql/public/typeDefs/MeetingSubscriptionPayload.graphql
new file mode 100644
index 00000000000..8444053315f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingSubscriptionPayload.graphql
@@ -0,0 +1,50 @@
+type MeetingSubscriptionPayload {
+  fieldName: String!
+  AddTranscriptionBotSuccess: AddTranscriptionBotSuccess
+  AutogroupSuccess: AutogroupSuccess
+  AddCommentSuccess: AddCommentSuccess
+  CreatePollSuccess: CreatePollSuccess
+  AddReactjiToReflectionSuccess: AddReactjiToReflectionSuccess
+  AddReactjiToReactableSuccess: AddReactjiToReactableSuccess
+  CreateReflectionPayload: CreateReflectionPayload
+  DeleteCommentSuccess: DeleteCommentSuccess
+  DragDiscussionTopicPayload: DragDiscussionTopicPayload
+  DragEstimatingTaskSuccess: DragEstimatingTaskSuccess
+  EditCommentingSuccess: EditCommentingSuccess
+  EditReflectionPayload: EditReflectionPayload
+  EndDraggingReflectionPayload: EndDraggingReflectionPayload
+  EndRetrospectiveSuccess: EndRetrospectiveSuccess
+  EndTeamPromptSuccess: EndTeamPromptSuccess
+  FlagReadyToAdvanceSuccess: FlagReadyToAdvanceSuccess
+  GenerateGroupsSuccess: GenerateGroupsSuccess
+  NewMeetingCheckInPayload: NewMeetingCheckInPayload
+  PromoteNewMeetingFacilitatorPayload: PromoteNewMeetingFacilitatorPayload
+  RemoveReflectionPayload: RemoveReflectionPayload
+  ResetReflectionGroupsSuccess: ResetReflectionGroupsSuccess
+  ResetRetroMeetingToGroupStagePayload: ResetRetroMeetingToGroupStagePayload
+  RevealTeamHealthVotesSuccess: RevealTeamHealthVotesSuccess
+  SetPhaseFocusPayload: SetPhaseFocusPayload
+  SetStageTimerPayload: SetStageTimerPayload
+  SetTaskHighlightSuccess: SetTaskHighlightSuccess
+  SetTeamHealthVoteSuccess: SetTeamHealthVoteSuccess
+  StartDraggingReflectionPayload: StartDraggingReflectionPayload
+  UpdateCommentContentSuccess: UpdateCommentContentSuccess
+  UpdateDragLocationPayload: UpdateDragLocationPayload
+  UpdateMeetingPromptSuccess: UpdateMeetingPromptSuccess
+  UpdateNewCheckInQuestionPayload: UpdateNewCheckInQuestionPayload
+  UpdatedNotification: UpdatedNotification
+  UpdateReflectionContentPayload: UpdateReflectionContentPayload
+  UpdateReflectionGroupTitlePayload: UpdateReflectionGroupTitlePayload
+  UpdateRetroMaxVotesSuccess: UpdateRetroMaxVotesSuccess
+  UpdatePokerScopeSuccess: UpdatePokerScopeSuccess
+  VoteForReflectionGroupPayload: VoteForReflectionGroupPayload
+  VoteForPokerStorySuccess: VoteForPokerStorySuccess
+  PokerRevealVotesSuccess: PokerRevealVotesSuccess
+  PokerResetDimensionSuccess: PokerResetDimensionSuccess
+  PokerAnnounceDeckHoverSuccess: PokerAnnounceDeckHoverSuccess
+  JoinMeetingSuccess: JoinMeetingSuccess
+  SetPokerSpectateSuccess: SetPokerSpectateSuccess
+  SetTaskEstimateSuccess: SetTaskEstimateSuccess
+  UpsertTeamPromptResponseSuccess: UpsertTeamPromptResponseSuccess
+  UpdateMeetingTemplateSuccess: UpdateMeetingTemplateSuccess
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingTemplate.graphql b/packages/server/graphql/public/typeDefs/MeetingTemplate.graphql
index 92eff01d9f8..dafd05fa78d 100644
--- a/packages/server/graphql/public/typeDefs/MeetingTemplate.graphql
+++ b/packages/server/graphql/public/typeDefs/MeetingTemplate.graphql
@@ -63,356 +63,12 @@ interface MeetingTemplate {
   Whether this template should be in the recommended/quick start sections in the UI.
   """
   isRecommended: Boolean!
-  """
-  The url to the illustration used by the template
-  """
-  illustrationUrl: String!
-  """
-  The lowest scope of the permissions available to the viewer
-  """
-  viewerLowestScope: SharingScopeEnum!
-}
-
-"""
-A connection to a list of items.
-"""
-type MeetingTemplateConnection {
-  """
-  Information to aid in pagination.
-  """
-  pageInfo: PageInfo!
-
-  """
-  A list of edges.
-  """
-  edges: [MeetingTemplateEdge!]!
-}
-
-"""
-An edge in a connection.
-"""
-type MeetingTemplateEdge {
-  """
-  The item at the end of the edge
-  """
-  node: MeetingTemplate!
-
-  """
-  A cursor for use in pagination
-  """
-  cursor: String!
-}
-
-"""
-The team-specific templates for the reflection prompts
-"""
-type ReflectTemplate implements MeetingTemplate {
-  """
-  shortid
-  """
-  id: ID!
-  createdAt: DateTime!
-
-  """
-  True if template can be used, else false
-  """
-  isActive: Boolean!
-
-  """
-  True if template is available to all teams including non-paying teams, else false
-  """
-  isFree: Boolean!
-
-  """
-  The time of the meeting the template was last used
-  """
-  lastUsedAt: DateTime
-
-  """
-  The name of the template
-  """
-  name: String!
-
-  """
-  *Foreign key. The organization that owns the team that created the template
-  """
-  orgId: ID!
-
-  """
-  Who can see this template
-  """
-  scope: SharingScopeEnum!
-
-  """
-  *Foreign key. The team this template belongs to
-  """
-  teamId: ID!
 
-  """
-  The team this template belongs to
-  """
-  team: Team!
-
-  """
-  The type of the template
-  """
-  type: MeetingTypeEnum!
-  updatedAt: DateTime!
-
-  """
-  The prompts that are part of this template
-  """
-  prompts: [ReflectPrompt!]!
-
-  """
-  The category this template falls under, e.g. retro, feedback, strategy, etc.
-  """
-  category: String!
-
-  """
-  Whether this template should be in the recommended/quick start sections in the UI.
-  """
-  isRecommended: Boolean!
   """
   The url to the illustration used by the template
   """
   illustrationUrl: String!
-  """
-  The lowest scope of the permissions available to the viewer
-  """
-  viewerLowestScope: SharingScopeEnum!
-
-  """
-  Experimental: sub-categories that this template is in (e.g. "popular", "recentlyUsed", "unused",
-  etc.)
-  """
-  subCategories: [String!]!
-}
-
-"""
-A connection to a list of items.
-"""
-type ReflectTemplateConnection {
-  """
-  Information to aid in pagination.
-  """
-  pageInfo: PageInfo!
-
-  """
-  A list of edges.
-  """
-  edges: [ReflectTemplateEdge!]!
-}
-
-"""
-An edge in a connection.
-"""
-type ReflectTemplateEdge {
-  """
-  The item at the end of the edge
-  """
-  node: ReflectTemplate!
-
-  """
-  A cursor for use in pagination
-  """
-  cursor: String!
-}
 
-"""
-The team-specific templates for sprint poker meeting
-"""
-type PokerTemplate implements MeetingTemplate {
-  """
-  shortid
-  """
-  id: ID!
-  createdAt: DateTime!
-
-  """
-  True if template can be used, else false
-  """
-  isActive: Boolean!
-
-  """
-  True if template is available to all teams including non-paying teams, else false
-  """
-  isFree: Boolean!
-
-  """
-  The time of the meeting the template was last used
-  """
-  lastUsedAt: DateTime
-
-  """
-  The name of the template
-  """
-  name: String!
-
-  """
-  *Foreign key. The organization that owns the team that created the template
-  """
-  orgId: ID!
-
-  """
-  Who can see this template
-  """
-  scope: SharingScopeEnum!
-
-  """
-  *Foreign key. The team this template belongs to
-  """
-  teamId: ID!
-
-  """
-  The team this template belongs to
-  """
-  team: Team!
-
-  """
-  The type of the template
-  """
-  type: MeetingTypeEnum!
-  updatedAt: DateTime!
-
-  """
-  The dimensions that are part of this template
-  """
-  dimensions: [TemplateDimension!]!
-
-  """
-  A query for the dimension
-  """
-  dimension(
-    """
-    The dimension ID for the desired dimension
-    """
-    dimensionId: ID!
-  ): TemplateDimension!
-
-  """
-  The category this template falls under, e.g. retro, feedback, strategy, etc.
-  """
-  category: String!
-
-  """
-  Whether this template should be in the recommended/quick start sections in the UI.
-  """
-  isRecommended: Boolean!
-  """
-  The url to the illustration used by the template
-  """
-  illustrationUrl: String!
-  """
-  The lowest scope of the permissions available to the viewer
-  """
-  viewerLowestScope: SharingScopeEnum!
-}
-
-"""
-A connection to a list of items.
-"""
-type PokerTemplateConnection {
-  """
-  Information to aid in pagination.
-  """
-  pageInfo: PageInfo!
-
-  """
-  A list of edges.
-  """
-  edges: [PokerTemplateEdge!]!
-}
-
-"""
-An edge in a connection.
-"""
-type PokerTemplateEdge {
-  """
-  The item at the end of the edge
-  """
-  node: PokerTemplate!
-
-  """
-  A cursor for use in pagination
-  """
-  cursor: String!
-}
-
-"""
-An activity that does not have a customizable template, e.g. standup, check-in
-"""
-type FixedActivity implements MeetingTemplate {
-  """
-  teamPrompt | action
-  """
-  id: ID!
-
-  """
-  Date the activity was created
-  """
-  createdAt: DateTime!
-
-  """
-  Always true
-  """
-  isActive: Boolean!
-
-  """
-  Always true
-  """
-  isFree: Boolean!
-
-  """
-  The time of the meeting the template was last used
-  """
-  lastUsedAt: DateTime
-
-  """
-  The name of the template
-  """
-  name: String!
-
-  """
-  Always aGhostOrg
-  """
-  orgId: ID!
-
-  """
-  Always public
-  """
-  scope: SharingScopeEnum!
-
-  """
-  Always aGhostTeam
-  """
-  teamId: ID!
-
-  """
-  aGhostTeam
-  """
-  team: Team!
-
-  """
-  teamPrompt | action
-  """
-  type: MeetingTypeEnum!
-  updatedAt: DateTime!
-
-  """
-  The category this template falls under, e.g. retro, feedback, strategy, etc.
-  """
-  category: String!
-
-  """
-  Whether this template should be in the recommended/quick start sections in the UI.
-  """
-  isRecommended: Boolean!
-
-  """
-  The url to the illustration used by the template
-  """
-  illustrationUrl: String!
   """
   The lowest scope of the permissions available to the viewer
   """
diff --git a/packages/server/graphql/public/typeDefs/MeetingTemplateConnection.graphql b/packages/server/graphql/public/typeDefs/MeetingTemplateConnection.graphql
new file mode 100644
index 00000000000..9bb256aa7e9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingTemplateConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type MeetingTemplateConnection {
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  A list of edges.
+  """
+  edges: [MeetingTemplateEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingTemplateEdge.graphql b/packages/server/graphql/public/typeDefs/MeetingTemplateEdge.graphql
new file mode 100644
index 00000000000..669e478cba3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingTemplateEdge.graphql
@@ -0,0 +1,14 @@
+"""
+An edge in a connection.
+"""
+type MeetingTemplateEdge {
+  """
+  The item at the end of the edge
+  """
+  node: MeetingTemplate!
+
+  """
+  A cursor for use in pagination
+  """
+  cursor: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/MeetingTypeEnum.graphql b/packages/server/graphql/public/typeDefs/MeetingTypeEnum.graphql
new file mode 100644
index 00000000000..c90bec2bf76
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MeetingTypeEnum.graphql
@@ -0,0 +1,9 @@
+"""
+The type of meeting
+"""
+enum MeetingTypeEnum {
+  action
+  retrospective
+  poker
+  teamPrompt
+}
diff --git a/packages/server/graphql/public/typeDefs/ModifyCheckInQuestionPayload.graphql b/packages/server/graphql/public/typeDefs/ModifyCheckInQuestionPayload.graphql
new file mode 100644
index 00000000000..4f67a728a2c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ModifyCheckInQuestionPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for modifyCheckInQuestion, which could be an error
+"""
+union ModifyCheckInQuestionPayload = ErrorPayload | ModifyCheckInQuestionSuccess
diff --git a/packages/server/graphql/public/typeDefs/ModifyCheckInQuestionSuccess.graphql b/packages/server/graphql/public/typeDefs/ModifyCheckInQuestionSuccess.graphql
new file mode 100644
index 00000000000..6107dc9c982
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ModifyCheckInQuestionSuccess.graphql
@@ -0,0 +1,3 @@
+type ModifyCheckInQuestionSuccess {
+  modifiedCheckInQuestion: String
+}
diff --git a/packages/server/graphql/public/typeDefs/ModifyType.graphql b/packages/server/graphql/public/typeDefs/ModifyType.graphql
new file mode 100644
index 00000000000..5f2fc3549c9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ModifyType.graphql
@@ -0,0 +1,5 @@
+enum ModifyType {
+  SERIOUS
+  FUNNY
+  EXCITING
+}
diff --git a/packages/server/graphql/public/typeDefs/MovePokerTemplateDimensionPayload.graphql b/packages/server/graphql/public/typeDefs/MovePokerTemplateDimensionPayload.graphql
new file mode 100644
index 00000000000..cb5683b9e64
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MovePokerTemplateDimensionPayload.graphql
@@ -0,0 +1,4 @@
+type MovePokerTemplateDimensionPayload {
+  error: StandardMutationError
+  dimension: TemplateDimension
+}
diff --git a/packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValuePayload.graphql b/packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValuePayload.graphql
new file mode 100644
index 00000000000..40bc530dd8e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValuePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for MovePokerTemplateScaleValuePayload
+"""
+union MovePokerTemplateScaleValuePayload = ErrorPayload | MovePokerTemplateScaleValueSuccess
diff --git a/packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValueSuccess.graphql b/packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValueSuccess.graphql
new file mode 100644
index 00000000000..9c4983ec453
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MovePokerTemplateScaleValueSuccess.graphql
@@ -0,0 +1,6 @@
+type MovePokerTemplateScaleValueSuccess {
+  """
+  The scale after values are moved
+  """
+  scale: TemplateScale!
+}
diff --git a/packages/server/graphql/public/typeDefs/MoveReflectTemplatePromptPayload.graphql b/packages/server/graphql/public/typeDefs/MoveReflectTemplatePromptPayload.graphql
new file mode 100644
index 00000000000..2350bd177e9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/MoveReflectTemplatePromptPayload.graphql
@@ -0,0 +1,4 @@
+type MoveReflectTemplatePromptPayload {
+  error: StandardMutationError
+  prompt: ReflectPrompt
+}
diff --git a/packages/server/graphql/public/typeDefs/Mutation.graphql b/packages/server/graphql/public/typeDefs/Mutation.graphql
new file mode 100644
index 00000000000..3c86c1c9f20
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Mutation.graphql
@@ -0,0 +1,2018 @@
+type Mutation {
+  """
+  Create a new agenda item
+  """
+  addAgendaItem(
+    """
+    The new task including an id, teamMemberId, and content
+    """
+    newAgendaItem: CreateAgendaItemInput!
+  ): AddAgendaItemPayload
+  addAtlassianAuth(code: ID!, teamId: ID!): AddAtlassianAuthPayload!
+
+  """
+  Add a comment to a discussion
+  """
+  addComment(
+    """
+    A partial new comment
+    """
+    comment: AddCommentInput!
+  ): AddCommentPayload!
+
+  """
+  Add a new dimension for the poker template
+  """
+  addPokerTemplateDimension(templateId: ID!): AddPokerTemplateDimensionPayload!
+
+  """
+  Add a new scale for the poker template
+  """
+  addPokerTemplateScale(parentScaleId: ID, teamId: ID!): AddPokerTemplateScalePayload!
+
+  """
+  Add a new scale value for a scale in a poker template
+  """
+  addPokerTemplateScaleValue(
+    scaleId: ID!
+    scaleValue: AddTemplateScaleInput!
+  ): AddPokerTemplateScaleValuePayload!
+
+  """
+  Add a new template full of prompts
+  """
+  addReflectTemplatePrompt(templateId: ID!): AddReflectTemplatePromptPayload
+  addSlackAuth(code: ID!, teamId: ID!): AddSlackAuthPayload!
+  addGitHubAuth(code: ID!, teamId: ID!): AddGitHubAuthPayload!
+
+  """
+  Create a new team and add the first team member
+  """
+  addOrg(
+    """
+    The new team object with exactly 1 team member
+    """
+    newTeam: NewTeamInput!
+
+    """
+    The name of the new team
+    """
+    orgName: String!
+    invitees: [Email!]
+  ): AddOrgPayload!
+
+  """
+  Create a new team and add the first team member
+  """
+  addTeam(
+    """
+    The new team object
+    """
+    newTeam: NewTeamInput!
+    invitees: [Email!]
+  ): AddTeamPayload!
+  archiveOrganization(
+    """
+    The orgId to archive
+    """
+    orgId: ID!
+  ): ArchiveOrganizationPayload!
+  archiveTeam(
+    """
+    The teamId to archive (or delete, if team is unused)
+    """
+    teamId: ID!
+  ): ArchiveTeamPayload!
+
+  """
+  Archive a timeline event
+  """
+  archiveTimelineEvent(
+    """
+    the id for the timeline event
+    """
+    timelineEventId: ID!
+  ): ArchiveTimelineEventPayload!
+
+  """
+  Change the team a task is associated with. Also copy the viewers integration if necessary.
+  """
+  changeTaskTeam(
+    """
+    The task to change
+    """
+    taskId: ID!
+
+    """
+    The new team to assign the task to
+    """
+    teamId: ID!
+  ): ChangeTaskTeamPayload
+
+  """
+  set the interaction status of a notifcation
+  """
+  setNotificationStatus(
+    """
+    The id of the notification
+    """
+    notificationId: ID!
+    status: NotificationStatusEnum!
+  ): SetNotificationStatusPayload
+  createTaskIntegration(
+    """
+    Which integration to push the task to
+    """
+    integrationProviderService: IntegrationProviderServiceEnum!
+
+    """
+    Jira projectId, GitHub nameWithOwner etc.
+    """
+    integrationRepoId: ID!
+
+    """
+    The id of the task to convert to an issue
+    """
+    taskId: ID!
+  ): CreateTaskIntegrationPayload
+
+  """
+  Create a new mass inivtation and optionally void old ones
+  """
+  createMassInvitation(
+    """
+    the specific meeting where the invite occurred, if any
+    """
+    meetingId: ID
+
+    """
+    The teamId to create the mass invitation for
+    """
+    teamId: ID!
+
+    """
+    If true, will void all existing mass invitations for the team member
+    """
+    voidOld: Boolean
+  ): CreateMassInvitationPayload!
+
+  """
+  Generate a new OAuth1 request token and encode it in the authorization URL to start an oauth1 flow
+  """
+  createOAuth1AuthorizeUrl(
+    """
+    Id of the integration provider with OAuth1 auth strategy
+    """
+    providerId: ID!
+
+    """
+    Id of the team where the integration should be added
+    """
+    teamId: ID!
+  ): CreateOAuth1AuthorizationURLPayload
+
+  """
+  Create a new reflection
+  """
+  createReflection(input: CreateReflectionInput!): CreateReflectionPayload
+
+  """
+  Create a new task, triggering a CreateCard for other viewers
+  """
+  createTask(
+    """
+    The new task including an id, status, and type, and teamMemberId
+    """
+    newTask: CreateTaskInput!
+
+    """
+    The part of the site where the creation occurred
+    """
+    area: AreaEnum
+  ): CreateTaskPayload!
+
+  """
+  Delete a comment from a discussion
+  """
+  deleteComment(commentId: ID!, meetingId: ID!): DeleteCommentPayload!
+
+  """
+  Delete (not archive!) a task
+  """
+  deleteTask(
+    """
+    The taskId to delete
+    """
+    taskId: ID!
+  ): DeleteTaskPayload
+
+  """
+  Delete a user, removing them from all teams and orgs
+  """
+  deleteUser(
+    """
+    a userId
+    """
+    userId: ID
+
+    """
+    the user email
+    """
+    email: ID
+
+    """
+    the reason why the user wants to delete their account
+    """
+    reason: String
+  ): DeleteUserPayload!
+
+  """
+  Deny a user from joining via push invitation
+  """
+  denyPushInvitation(teamId: ID!, userId: ID!): DenyPushInvitationPayload
+
+  """
+  Redeem an invitation token for a logged in user
+  """
+  dismissNewFeature: DismissNewFeaturePayload!
+
+  """
+  Dismiss a suggested action
+  """
+  dismissSuggestedAction(
+    """
+    The id of the suggested action to dismiss
+    """
+    suggestedActionId: ID!
+  ): DismissSuggestedActionPayload!
+
+  """
+  Downgrade a paid account to the starter plan service
+  """
+  downgradeToStarter(
+    """
+    the org requesting the upgrade
+    """
+    orgId: ID!
+
+    """
+    the reasons the user is leaving
+    """
+    reasonsForLeaving: [ReasonToDowngradeEnum]
+
+    """
+    the name of the tool they are moving to. only required if anotherTool is selected as a reason to downgrade
+    """
+    otherTool: String
+  ): DowngradeToStarterPayload
+
+  """
+  Changes the priority of the discussion topics
+  """
+  dragDiscussionTopic(meetingId: ID!, stageId: ID!, sortOrder: Float!): DragDiscussionTopicPayload
+
+  """
+  Changes the ordering of the estimating tasks
+  """
+  dragEstimatingTask(
+    meetingId: ID!
+    taskId: ID!
+
+    """
+    The index of the tasks will be moved to, in the list of estimating tasks sidebar section
+    """
+    newPositionIndex: Int!
+  ): DragEstimatingTaskPayload!
+
+  """
+  Send an email to reset a password
+  """
+  emailPasswordReset(
+    """
+    email to send the password reset code to
+    """
+    email: ID!
+  ): EmailPasswordResetPayload!
+
+  """
+  Track which users are commenting
+  """
+  editCommenting(
+    """
+    True if the user is commenting, false if the user has stopped commenting
+    """
+    isCommenting: Boolean!
+    discussionId: ID!
+  ): EditCommentingPayload
+
+  """
+  Finish a sprint poker meeting
+  """
+  endSprintPoker(
+    """
+    The meeting to end
+    """
+    meetingId: ID!
+  ): EndSprintPokerPayload!
+
+  """
+  Changes the editing state of a user for a phase item
+  """
+  editReflection(
+    """
+    Whether a reflectPrompt is being edited or not
+    """
+    isEditing: Boolean!
+    meetingId: ID!
+    promptId: ID!
+  ): EditReflectionPayload
+
+  """
+  Announce to everyone that you are editing a task
+  """
+  editTask(
+    """
+    The task id that is being edited
+    """
+    taskId: ID!
+
+    """
+    true if the editing is starting, false if it is stopping
+    """
+    isEditing: Boolean!
+  ): EditTaskPayload
+
+  """
+  Finish a check-in meeting
+  """
+  endCheckIn(
+    """
+    The meeting to end
+    """
+    meetingId: ID!
+  ): EndCheckInPayload!
+
+  """
+  Broadcast that the viewer stopped dragging a reflection
+  """
+  endDraggingReflection(
+    reflectionId: ID!
+
+    """
+    if it was a drop (isDragging = false), the type of item it was dropped on. null if there was no valid drop target
+    """
+    dropTargetType: DragReflectionDropTargetTypeEnum
+
+    """
+    if dropTargetType could refer to more than 1 component, this ID defines which one
+    """
+    dropTargetId: ID
+
+    """
+    the ID of the drag to connect to the start drag event
+    """
+    dragId: ID
+  ): EndDraggingReflectionPayload
+
+  """
+  Finish a retrospective meeting
+  """
+  endRetrospective(
+    """
+    The meeting to end
+    """
+    meetingId: ID!
+  ): EndRetrospectivePayload!
+
+  """
+  flag a viewer as ready to advance to the next stage of a meeting
+  """
+  flagReadyToAdvance(
+    meetingId: ID!
+
+    """
+    the stage that the viewer marked as ready
+    """
+    stageId: ID!
+
+    """
+    true if ready to advance, else false
+    """
+    isReady: Boolean!
+  ): FlagReadyToAdvancePayload!
+
+  """
+  Invalidate all sessions by blacklisting all JWTs issued before now
+  """
+  invalidateSessions: InvalidateSessionsPayload!
+
+  """
+  Send a team invitation to an email address
+  """
+  inviteToTeam(
+    """
+    the specific meeting where the invite occurred, if any
+    """
+    meetingId: ID
+
+    """
+    The id of the inviting team
+    """
+    teamId: ID!
+    invitees: [Email!]!
+  ): InviteToTeamPayload!
+
+  """
+  Move a template dimension
+  """
+  movePokerTemplateDimension(
+    dimensionId: ID!
+    sortOrder: Float!
+  ): MovePokerTemplateDimensionPayload!
+
+  """
+  Move a reflect template
+  """
+  moveReflectTemplatePrompt(promptId: ID!, sortOrder: Float!): MoveReflectTemplatePromptPayload
+
+  """
+  Move a team to a different org. Requires billing leader rights on both orgs!
+  """
+  moveTeamToOrg(
+    """
+    The teamId that you want to move
+    """
+    teamIds: [ID!]!
+
+    """
+    The ID of the organization you want to move the team to
+    """
+    orgId: ID!
+  ): String
+
+  """
+  update a meeting by marking an item complete and setting the facilitator location
+  """
+  navigateMeeting(
+    """
+    The stage that the facilitator would like to mark as complete
+    """
+    completedStageId: ID
+
+    """
+    The stage where the facilitator is
+    """
+    facilitatorStageId: ID
+
+    """
+    The meeting ID
+    """
+    meetingId: ID!
+  ): NavigateMeetingPayload!
+
+  """
+  Check a member in as present or absent
+  """
+  newMeetingCheckIn(
+    """
+    The id of the user being marked present or absent
+    """
+    userId: ID!
+
+    """
+    the meeting currently in progress
+    """
+    meetingId: ID!
+
+    """
+    true if the member is present, false if absent, null if undecided
+    """
+    isCheckedIn: Boolean
+  ): NewMeetingCheckInPayload
+    @deprecated(reason: "Members now join lazily and joining means they are present")
+
+  """
+  Increment the count of times the org has clicked pay later
+  """
+  payLater(
+    """
+    the org that has clicked pay later
+    """
+    meetingId: ID!
+  ): PayLaterPayload!
+
+  """
+  Add or remove a task and its estimate phase from the meeting
+  """
+  persistJiraSearchQuery(
+    """
+    the team with the settings we add the query to
+    """
+    teamId: ID!
+
+    """
+    the jira search query to persist (or remove, if isRemove is true)
+    """
+    input: JiraSearchQueryInput!
+  ): PersistJiraSearchQueryPayload!
+
+  """
+  Request to be invited to a team in real time
+  """
+  pushInvitation(
+    """
+    the meeting ID the pusher would like to join
+    """
+    meetingId: ID
+    teamId: ID!
+  ): PushInvitationPayload
+
+  """
+  Change a facilitator while the meeting is in progress
+  """
+  promoteNewMeetingFacilitator(
+    """
+    userId of the new facilitator for this meeting
+    """
+    facilitatorUserId: ID!
+    meetingId: ID!
+  ): PromoteNewMeetingFacilitatorPayload
+
+  """
+  Promote another team member to be the leader
+  """
+  promoteToTeamLead(
+    """
+    Team id of the team which is about to get a new team leader
+    """
+    teamId: ID!
+
+    """
+    userId who will be set as a new team leader
+    """
+    userId: ID!
+  ): PromoteToTeamLeadPayload
+
+  """
+  Update the description of a reflection prompt
+  """
+  reflectTemplatePromptUpdateDescription(
+    promptId: ID!
+    description: String!
+  ): ReflectTemplatePromptUpdateDescriptionPayload
+
+  """
+  Update the description of a poker template dimension
+  """
+  pokerTemplateDimensionUpdateDescription(
+    dimensionId: ID!
+    description: String!
+  ): PokerTemplateDimensionUpdateDescriptionPayload
+  reflectTemplatePromptUpdateGroupColor(
+    promptId: ID!
+    groupColor: String!
+  ): ReflectTemplatePromptUpdateGroupColorPayload
+
+  """
+  Remove an agenda item
+  """
+  removeAgendaItem(
+    """
+    The agenda item unique id
+    """
+    agendaItemId: ID!
+  ): RemoveAgendaItemPayload
+
+  """
+  Disconnect a team member from atlassian
+  """
+  removeAtlassianAuth(
+    """
+    the teamId to disconnect from the token
+    """
+    teamId: ID!
+  ): RemoveAtlassianAuthPayload!
+
+  """
+  Disconnect a team member from GitHub
+  """
+  removeGitHubAuth(
+    """
+    the teamId to disconnect from the token
+    """
+    teamId: ID!
+  ): RemoveGitHubAuthPayload!
+
+  """
+  Remove a user from an org
+  """
+  removeOrgUser(
+    """
+    the user to remove
+    """
+    userId: ID!
+
+    """
+    the org that does not want them anymore
+    """
+    orgId: ID!
+  ): RemoveOrgUserPayload
+
+  """
+  Remove a poker meeting template
+  """
+  removePokerTemplate(templateId: ID!): RemovePokerTemplatePayload!
+
+  """
+  Remove a template full of prompts
+  """
+  removeReflectTemplate(templateId: ID!): RemoveReflectTemplatePayload
+
+  """
+  Remove a prompt from a template
+  """
+  removeReflectTemplatePrompt(promptId: ID!): RemoveReflectTemplatePromptPayload
+
+  """
+  Remove a dimension from a template
+  """
+  removePokerTemplateDimension(dimensionId: ID!): RemovePokerTemplateDimensionPayload!
+
+  """
+  Rename a meeting
+  """
+  renameMeeting(
+    """
+    the new meeting name
+    """
+    name: String!
+
+    """
+    the meeting with the new name
+    """
+    meetingId: ID!
+  ): RenameMeetingPayload!
+
+  """
+  Rename a meeting template
+  """
+  renameMeetingTemplate(templateId: ID!, name: String!): RenameMeetingTemplatePayload
+
+  """
+  Rename a reflect template prompt
+  """
+  renameReflectTemplatePrompt(promptId: ID!, question: String!): RenameReflectTemplatePromptPayload
+
+  """
+  Rename a poker template dimension
+  """
+  renamePokerTemplateDimension(
+    dimensionId: ID!
+    name: String!
+  ): RenamePokerTemplateDimensionPayload!
+
+  """
+  Rename a poker template scale
+  """
+  renamePokerTemplateScale(scaleId: ID!, name: String!): RenamePokerTemplateScalePayload!
+
+  """
+  Remove a scale from a template
+  """
+  removePokerTemplateScale(scaleId: ID!): RemovePokerTemplateScalePayload!
+
+  """
+  Remove a scale value from the scale of a template
+  """
+  removePokerTemplateScaleValue(scaleId: ID!, label: String!): RemovePokerTemplateScaleValuePayload!
+
+  """
+  Remove a reflection
+  """
+  removeReflection(reflectionId: ID!): RemoveReflectionPayload
+
+  """
+  Disconnect a team member from Slack
+  """
+  removeSlackAuth(
+    """
+    the teamId to disconnect from the token
+    """
+    teamId: ID!
+  ): RemoveSlackAuthPayload!
+
+  """
+  Remove a team member from the team
+  """
+  removeTeamMember(
+    """
+    The teamMemberId of the person who is being removed
+    """
+    teamMemberId: ID!
+  ): RemoveTeamMemberPayload
+
+  """
+  Reset the password for an account
+  """
+  resetPassword(
+    """
+    the password reset token
+    """
+    token: ID!
+
+    """
+    The new password for the account
+    """
+    newPassword: String!
+  ): ResetPasswordPayload!
+
+  """
+  Reset a retro meeting to group stage
+  """
+  resetRetroMeetingToGroupStage(meetingId: ID!): ResetRetroMeetingToGroupStagePayload!
+
+  """
+  Set the selected template for the upcoming retro meeting
+  """
+  selectTemplate(selectedTemplateId: ID!, teamId: ID!): SelectTemplatePayload
+
+  """
+  Share where in the app the viewer is
+  """
+  setAppLocation(
+    """
+    The location the viewer is currently at
+    """
+    location: String
+  ): SetAppLocationPayload!
+
+  """
+  Update the default Slack channel where notifications are sent
+  """
+  setDefaultSlackChannel(slackChannelId: ID!, teamId: ID!): SetDefaultSlackChannelPayload!
+
+  """
+  Focus (or unfocus) a phase item
+  """
+  setPhaseFocus(
+    meetingId: ID!
+
+    """
+    The currently focused phase item
+    """
+    focusedPromptId: ID
+  ): SetPhaseFocusPayload
+
+  """
+  Set or clear a timer for a meeting stage
+  """
+  setStageTimer(
+    """
+    the id of the meeting
+    """
+    meetingId: ID!
+
+    """
+    The time the timer is scheduled to go off (based on client clock), null if unsetting the timer
+    """
+    scheduledEndTime: DateTime
+
+    """
+    scheduledEndTime - now. Used to reconcile bad client clocks. Present for time limit, else null
+    """
+    timeRemaining: Float
+  ): SetStageTimerPayload!
+  setSlackNotification(
+    slackChannelId: ID
+    slackNotificationEvents: [SlackNotificationEventEnum!]!
+    teamId: ID!
+  ): SetSlackNotificationPayload!
+
+  """
+  Broadcast that the viewer started dragging a reflection
+  """
+  startDraggingReflection(
+    reflectionId: ID!
+    dragId: ID!
+    isSpotlight: Boolean
+  ): StartDraggingReflectionPayload
+
+  """
+  Start a new sprint poker meeting
+  """
+  startSprintPoker(
+    """
+    The team starting the meeting
+    """
+    teamId: ID!
+
+    """
+    The name of the meeting
+    """
+    name: String
+
+    """
+    The gcal input if creating a gcal event
+    """
+    gcalInput: CreateGcalEventInput
+  ): StartSprintPokerPayload!
+
+  """
+  Broadcast that the viewer highlights a task
+  """
+  setTaskHighlight(taskId: ID!, meetingId: ID!, isHighlighted: Boolean!): SetTaskHighlightPayload!
+
+  """
+  Update an agenda item
+  """
+  updateAgendaItem(
+    """
+    The updated item including an id, content, status, sortOrder
+    """
+    updatedAgendaItem: UpdateAgendaItemInput!
+  ): UpdateAgendaItemPayload
+
+  """
+  Update the content of a comment
+  """
+  updateCommentContent(
+    commentId: ID!
+
+    """
+    A stringified draft-js document containing thoughts
+    """
+    content: String!
+    meetingId: ID!
+  ): UpdateCommentContentPayload
+
+  """
+  Update an existing credit card on file
+  """
+  oldUpdateCreditCard(
+    """
+    the org requesting the changed billing
+    """
+    orgId: ID!
+
+    """
+    The token that came back from stripe
+    """
+    stripeToken: ID!
+  ): OldUpdateCreditCardPayload
+
+  """
+  Update the scale used for a dimension in a template
+  """
+  updatePokerTemplateDimensionScale(
+    dimensionId: ID!
+    scaleId: ID!
+  ): UpdatePokerTemplateDimensionScalePayload!
+
+  """
+  Update the label, numerical value or color of a scale value in a scale
+  """
+  updatePokerTemplateScaleValue(
+    scaleId: ID!
+    oldScaleValue: TemplateScaleInput!
+    newScaleValue: TemplateScaleInput!
+  ): UpdatePokerTemplateScaleValuePayload!
+
+  """
+  Update a Team's Icebreaker in a new meeting
+  """
+  updateNewCheckInQuestion(
+    """
+    ID of the Team which will have its Icebreaker updated
+    """
+    meetingId: ID!
+
+    """
+    The Team's new Icebreaker
+    """
+    checkInQuestion: String!
+  ): UpdateNewCheckInQuestionPayload
+
+  """
+  all the info required to provide an accurate display-specific location of where an item is
+  """
+  updateDragLocation(input: UpdateDragLocationInput!): Boolean
+
+  """
+  Add or remove a task and its estimate phase from the meeting
+  """
+  updatePokerScope(
+    """
+    the meeting with the estimate phases to modify
+    """
+    meetingId: ID!
+
+    """
+    The list of items to add/remove to the estimate phase
+    """
+    updates: [UpdatePokerScopeItemInput!]!
+  ): UpdatePokerScopePayload!
+
+  """
+  Update the content of a reflection
+  """
+  updateReflectionContent(
+    reflectionId: ID!
+
+    """
+    A stringified draft-js document containing thoughts
+    """
+    content: String!
+  ): UpdateReflectionContentPayload
+
+  """
+  Update the title of a reflection group
+  """
+  updateReflectionGroupTitle(
+    reflectionGroupId: ID!
+
+    """
+    The new title for the group
+    """
+    title: String!
+  ): UpdateReflectionGroupTitlePayload
+
+  """
+  Change the max votes for participants
+  """
+  updateRetroMaxVotes(
+    """
+    The total number of votes for each participant
+    """
+    totalVotes: Int!
+
+    """
+    The total number of votes for each participant to vote on a single topic
+    """
+    maxVotesPerGroup: Int!
+
+    """
+    the meeting to update
+    """
+    meetingId: ID!
+  ): UpdateRetroMaxVotesPayload!
+
+  """
+  Update a task with a change in content, ownership, or status
+  """
+  updateTask(
+    """
+    The part of the site where the creation occurred
+    """
+    area: AreaEnum
+
+    """
+    the updated task including the id, and at least one other field
+    """
+    updatedTask: UpdateTaskInput!
+  ): UpdateTaskPayload
+
+  """
+  Set or unset the due date of a task
+  """
+  updateTaskDueDate(
+    """
+    The task id
+    """
+    taskId: ID!
+
+    """
+    the new due date. if not a valid date, it will unset the due date
+    """
+    dueDate: DateTime
+  ): UpdateTaskDueDatePayload
+  updateTeamName(
+    """
+    The input object containing the teamId and any modified fields
+    """
+    updatedTeam: UpdatedTeamInput!
+  ): UpdateTeamNamePayload
+
+  """
+  Change the scope of a template
+  """
+  updateTemplateScope(
+    """
+    The id of the template
+    """
+    templateId: ID!
+
+    """
+    the new scope
+    """
+    scope: SharingScopeEnum!
+  ): UpdateTemplateScopePayload!
+
+  """
+  Upgrade an account to the paid service
+  """
+  oldUpgradeToTeamTier(
+    """
+    the org requesting the upgrade
+    """
+    orgId: ID!
+
+    """
+    The token that came back from stripe
+    """
+    stripeToken: ID!
+  ): OldUpgradeToTeamTierPayload
+
+  """
+  Cast your vote for a reflection group
+  """
+  voteForReflectionGroup(
+    """
+    true if the user wants to remove one of their votes
+    """
+    isUnvote: Boolean
+    reflectionGroupId: ID!
+  ): VoteForReflectionGroupPayload
+
+  """
+  Cast a vote for the estimated points for a given dimension
+  """
+  voteForPokerStory(
+    meetingId: ID!
+
+    """
+    The stage that contains the dimension to vote for
+    """
+    stageId: ID!
+
+    """
+    The label of the scaleValue to vote for. If null, remove the vote
+    """
+    score: String
+  ): VoteForPokerStoryPayload!
+
+  """
+  Progresses the stage dimension to the reveal & discuss step
+  """
+  pokerRevealVotes(meetingId: ID!, stageId: ID!): PokerRevealVotesPayload!
+
+  """
+  Remove all votes, the final vote, and reset the stage
+  """
+  pokerResetDimension(meetingId: ID!, stageId: ID!): PokerResetDimensionPayload!
+
+  """
+  """
+  pokerAnnounceDeckHover(
+    meetingId: ID!
+    stageId: ID!
+
+    """
+    true if the viewer has started hovering the deck, else false
+    """
+    isHover: Boolean!
+  ): PokerAnnounceDeckHoverPayload!
+
+  """
+  Move a scale value to an index
+  """
+  movePokerTemplateScaleValue(
+    scaleId: ID!
+
+    """
+    The label of the moving scale value
+    """
+    label: String!
+
+    """
+    The index position where the scale value is moving to
+    """
+    index: Int!
+  ): MovePokerTemplateScaleValuePayload!
+
+  """
+  Create a meeting member for a user
+  """
+  joinMeeting(meetingId: ID!): JoinMeetingPayload!
+
+  """
+  Set whether the user is spectating poker meeting
+  """
+  setPokerSpectate(
+    meetingId: ID!
+
+    """
+    true if the viewer is spectating poker and does not want to vote. else false
+    """
+    isSpectating: Boolean!
+  ): SetPokerSpectatePayload!
+
+  """
+  """
+  persistGitHubSearchQuery(
+    """
+    the team witht the settings we add the query to
+    """
+    teamId: ID!
+
+    """
+    The query string as sent to GitHub
+    """
+    queryString: String!
+
+    """
+    true if this query should be deleted
+    """
+    isRemove: Boolean
+  ): PersistGitHubSearchQueryPayload!
+
+  """
+  Update a task estimate
+  """
+  setTaskEstimate(taskEstimate: TaskEstimateInput!): SetTaskEstimatePayload!
+
+  """
+  Show/hide the drawer in the team dashboard
+  """
+  toggleTeamDrawer(
+    """
+    the team to show/hide the drawer for
+    """
+    teamId: ID!
+
+    """
+    The type of team drawer that the viewer is toggling. Null if closing the drawer.
+    """
+    teamDrawerType: TeamDrawer
+  ): ToggleTeamDrawerPayload!
+
+  """
+  Update how a parabol dimension maps to a GitHub label
+  """
+  updateGitHubDimensionField(
+    dimensionName: String!
+
+    """
+    The template string to map to a label
+    """
+    labelTemplate: String!
+
+    """
+    The repo the issue lives on
+    """
+    nameWithOwner: ID!
+
+    """
+    The meeting the update happend in. Returns a meeting object with updated serviceField
+    """
+    meetingId: ID!
+  ): UpdateGitHubDimensionFieldPayload!
+  createPoll(
+    """
+    The new poll including title and poll options
+    """
+    newPoll: CreatePollInput!
+  ): CreatePollPayload!
+
+  """
+  Adds a new Integration Provider configuration
+  """
+  addIntegrationProvider(
+    """
+    The new Integration Provider
+    """
+    input: AddIntegrationProviderInput!
+  ): AddIntegrationProviderPayload!
+
+  """
+  Update the Integration Provider settings
+  """
+  updateIntegrationProvider(
+    """
+    The new Integration Provider
+    """
+    provider: UpdateIntegrationProviderInput!
+  ): UpdateIntegrationProviderPayload!
+
+  """
+  Remove an Integration Provider, and any associated tokens
+  """
+  removeIntegrationProvider(
+    """
+    Id of the Integration Provider to remove
+    """
+    providerId: ID!
+  ): RemoveIntegrationProviderPayload!
+
+  """
+  Finish the team prompt meeting
+  """
+  endTeamPrompt(
+    """
+    The meeting to end
+    """
+    meetingId: ID!
+  ): EndTeamPromptPayload!
+
+  """
+  Set the Azure DevOps field that the poker dimension should map to
+  """
+  updateAzureDevOpsDimensionField(
+    dimensionName: String!
+
+    """
+    The Azure DevOps field name that we should push estimates to
+    """
+    fieldName: String!
+
+    """
+    The Azure DevOps instanceId the field lives on
+    """
+    instanceId: ID!
+
+    """
+    The project the field lives on
+    """
+    projectKey: ID!
+
+    """
+    The meeting the update happend in. Returns a meeting object with updated serviceField
+    """
+    meetingId: ID!
+
+    """
+    The work item type in Azure DevOps
+    """
+    workItemType: ID!
+  ): UpdateAzureDevOpsDimensionFieldPayload!
+
+  """
+  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!
+
+  """
+  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!
+
+  """
+  pauses the subscription for a single user
+  """
+  inactivateUser(
+    """
+    the user to pause
+    """
+    userId: ID!
+  ): InactivateUserPayload
+
+  """
+  Adds the request user to multiple selected teams on the domain
+  """
+  acceptRequestToJoinDomain(
+    """
+    DomainJoinRequest id
+    """
+    requestId: ID!
+
+    """
+    Array of team ids
+    """
+    teamIds: [ID!]!
+  ): AcceptRequestToJoinDomainPayload!
+
+  """
+  Redeem an invitation token for a logged in user
+  """
+  acceptTeamInvitation(
+    """
+    The invitation token or mass invitation code
+    """
+    invitationToken: ID!
+
+    """
+    the notification clicked to accept, if any
+    """
+    notificationId: ID
+  ): AcceptTeamInvitationPayload!
+
+  """
+  Restrict accepting team invites to a list of approved domains
+  """
+  addApprovedOrganizationDomains(
+    """
+    The organization ID
+    """
+    orgId: ID!
+
+    """
+    A list of domains or email addressed allowed to join the organization
+    """
+    emailDomains: [String!]!
+  ): AddApprovedOrganizationDomainsPayload!
+
+  """
+  Add or remove a reactji from a reactable
+  """
+  addReactjiToReactable(
+    """
+    The id of the reactable
+    """
+    reactableId: ID!
+
+    """
+    the type of the
+    """
+    reactableType: ReactableEnum!
+
+    """
+    the id of the reactji to add
+    """
+    reactji: String!
+
+    """
+    If true, remove the reaction, else add it
+    """
+    isRemove: Boolean
+
+    """
+    The id of the meeting
+    """
+    meetingId: ID!
+  ): AddReactjiToReactablePayload!
+
+  """
+  Add an integration authorization for a specific team member
+  """
+  addTeamMemberIntegrationAuth(
+    providerId: ID!
+    teamId: ID!
+
+    """
+    The OAuth2 code or personal access token. Null for webhook auth
+    """
+    oauthCodeOrPat: ID
+
+    """
+    OAuth1 token verifier
+    """
+    oauthVerifier: ID
+
+    """
+    The URL the OAuth2 token will be sent to. Null for webhook auth
+    """
+    redirectUri: URL
+  ): AddTeamMemberIntegrationAuthPayload!
+
+  """
+  Add the transcription bot to the Zoom meeting
+  """
+  addTranscriptionBot(meetingId: ID!, videoMeetingURL: String!): AddTranscriptionBotPayload!
+
+  """
+  Creates suggested reflection groups using OpenAI
+  """
+  autogroup(meetingId: ID!): AutogroupPayload!
+
+  """
+  Batch archive tasks
+  """
+  batchArchiveTasks(
+    """
+    ids of the tasks to archive
+    """
+    taskIds: [ID!]!
+  ): BatchArchiveTasksPayload!
+
+  """
+  for troubleshooting by admins, create a JWT for a given userId
+  """
+  createImposterToken(
+    """
+    The target userId to impersonate
+    """
+    userId: ID
+
+    """
+    The email address of the user to impersonate
+    """
+    email: Email
+  ): CreateImposterTokenPayload!
+
+  """
+  Create the Stripe subscription for the given org
+  """
+  createStripeSubscription(orgId: ID!, paymentMethodId: ID!): CreateStripeSubscriptionPayload!
+
+  """
+  Ask the AI for a template suggestion
+  """
+  getTemplateSuggestion(
+    """
+    The question the user has for the AI
+    """
+    prompt: String!
+  ): GetTemplateSuggestionPayload!
+
+  """
+  Sign up or login using Google
+  """
+  loginWithGoogle(
+    """
+    The code provided from the OAuth2 flow
+    """
+    code: ID!
+
+    """
+    optional pseudo id created before they were a user
+    """
+    pseudoId: ID
+
+    """
+    if present, the user is also joining a team
+    """
+    invitationToken: ID
+
+    """
+    query params on the login page, used to maybe add feature flag
+    """
+    params: String!
+  ): UserLogInPayload!
+
+  """
+  Sign up or login using Microsoft
+  """
+  loginWithMicrosoft(
+    """
+    The code provided from the OAuth2 flow
+    """
+    code: ID!
+
+    """
+    optional pseudo id created before they were a user
+    """
+    pseudoId: ID
+
+    """
+    if present, the user is also joining a team
+    """
+    invitationToken: ID
+
+    """
+    query params on the login page, used to maybe add feature flag
+    """
+    params: String!
+  ): UserLogInPayload!
+
+  """
+  Login using an email address and password
+  """
+  loginWithPassword(email: ID!, password: String!): UserLogInPayload!
+
+  """
+  Describe the mutation here
+  """
+  modifyCheckInQuestion(
+    meetingId: ID!
+    checkInQuestion: String!
+    modifyType: ModifyType!
+  ): ModifyCheckInQuestionPayload!
+  persistIntegrationSearchQuery(
+    teamId: ID!
+    service: IntegrationProviderServiceEnum!
+    providerId: ID
+    jiraServerSearchQuery: JiraServerSearchQueryInput
+  ): PersistIntegrationSearchQueryPayload!
+
+  """
+  Remove the approved domains for a given organization
+  """
+  removeApprovedOrganizationDomains(
+    """
+    The ID for the organization to remove the restriction from
+    """
+    orgId: ID!
+
+    """
+    The list of emails and/or domains to unrestrict from the org
+    """
+    emailDomains: [String!]!
+  ): RemoveApprovedOrganizationDomainsPayload!
+
+  """
+  Describe the mutation here
+  """
+  removeIntegrationSearchQuery(
+    """
+    integration search query ID
+    """
+    id: ID!
+    teamId: ID!
+  ): RemoveIntegrationSearchQueryPayload!
+
+  """
+  Remove the integrated auth for a given team member
+  """
+  removeTeamMemberIntegrationAuth(
+    """
+    The Integration Provider service name related to the token
+    """
+    service: IntegrationProviderServiceEnum!
+
+    """
+    The team id related to the token
+    """
+    teamId: ID!
+  ): RemoveTeamMemberIntegrationAuthPayload!
+
+  """
+  Sends the request to the appropriate organizations on the viewer's domain
+  """
+  requestToJoinDomain: RequestToJoinDomainPayload!
+
+  """
+  Resets the reflection groups to the state they were in before autogrouping
+  """
+  resetReflectionGroups(meetingId: ID!): ResetReflectionGroupsPayload!
+  revealTeamHealthVotes(meetingId: ID!, stageId: ID!): RevealTeamHealthVotesPayload!
+
+  """
+  Enabled or disable the icebreaker round
+  """
+  setMeetingSettings(
+    settingsId: ID!
+
+    """
+    true to turn icebreaker phase on, false to turn it off
+    """
+    checkinEnabled: Boolean
+
+    """
+    true to turn team health phase on, false to turn it off
+    """
+    teamHealthEnabled: Boolean
+
+    """
+    disables anonymity of reflections
+    """
+    disableAnonymity: Boolean
+
+    """
+    the url of the video meeting, e.g. the Zoom link
+    """
+    videoMeetingURL: String
+  ): SetMeetingSettingsPayload!
+
+  """
+  Update the role of the org user
+  """
+  setOrgUserRole(
+    orgId: ID!
+    userId: ID!
+
+    """
+    The role to set the user to, e.g. billing leader. Null to remove the role
+    """
+    role: OrgUserRole
+  ): SetOrgUserRolePayload!
+  setTeamHealthVote(meetingId: ID!, stageId: ID!, label: String!): SetTeamHealthVotePayload!
+
+  """
+  Shares retro discussion to integration
+  """
+  shareTopic(
+    """
+    Discussion stage id
+    """
+    stageId: ID!
+
+    """
+    meetingId
+    """
+    meetingId: ID!
+
+    """
+    Integration channelId
+    """
+    channelId: ID!
+  ): ShareTopicPayload!
+
+  """
+  Sign up using an email address and password
+  """
+  signUpWithPassword(
+    email: ID!
+    password: String!
+
+    """
+    optional pseudo id created before they were a user
+    """
+    pseudoId: ID
+
+    """
+    used to determine what suggested actions to create
+    """
+    invitationToken: ID
+
+    """
+    query params on the login page, used to maybe add feature flag
+    """
+    params: String!
+  ): UserLogInPayload!
+
+  """
+  Start a new meeting
+  """
+  startCheckIn(
+    """
+    The team starting the meeting
+    """
+    teamId: ID!
+
+    """
+    The name of the meeting
+    """
+    name: String
+
+    """
+    The gcal input if creating a gcal event
+    """
+    gcalInput: CreateGcalEventInput
+  ): StartCheckInPayload!
+
+  """
+  Start a new meeting
+  """
+  startRetrospective(
+    """
+    The team starting the meeting
+    """
+    teamId: ID!
+
+    """
+    Name of the meeting or series
+    """
+    name: String
+
+    """
+    The recurrence rule for the meeting series in RRULE format
+    """
+    rrule: RRule
+
+    """
+    The gcal input if creating a gcal event
+    """
+    gcalInput: CreateGcalEventInput
+  ): StartRetrospectivePayload!
+
+  """
+  Starts a new team prompt meeting
+  """
+  startTeamPrompt(
+    """
+    Id of the team starting the meeting
+    """
+    teamId: ID!
+
+    """
+    Meeting or series name, by default "Standup"
+    """
+    name: String
+
+    """
+    The recurrence rule for the meeting series in RRULE format
+    """
+    rrule: RRule
+
+    """
+    The gcal input if creating a gcal event. If not provided, no gcal event will be created
+    """
+    gcalInput: CreateGcalEventInput
+  ): StartTeamPromptPayload!
+
+  """
+  Add or remove the template to the user's favorite templates
+  """
+  toggleFavoriteTemplate(
+    """
+    The ID of the template to be toggled as a favorite
+    """
+    templateId: ID!
+  ): ToggleFavoriteTemplatePayload!
+
+  """
+  Toggles the sendSummaryEmail value on the User object which determines whether summary emails are sent to the user
+  """
+  toggleSummaryEmail: ToggleSummaryEmailPayload!
+
+  """
+  Update the autoJoin value for a set of teams
+  """
+  updateAutoJoin(
+    """
+    The team ids to update
+    """
+    teamIds: [ID!]!
+
+    """
+    The new autoJoin value for the teams
+    """
+    autoJoin: Boolean!
+  ): UpdateAutoJoinPayload!
+
+  """
+  Update an org's credit card
+  """
+  updateCreditCard(
+    """
+    The id of the org that is updating their credit card
+    """
+    orgId: ID!
+
+    """
+    The id of the new payment method from Stripe
+    """
+    paymentMethodId: ID!
+  ): UpdateCreditCardPayload!
+
+  """
+  Give someone advanced features in a flag
+  """
+  updateFeatureFlag(
+    """
+    a list of the complete or partial email of the person to whom you are giving advanced features.
+          Matches via a regex to support entire domains
+    """
+    emails: [String!]
+
+    """
+    grant access to an entire domain. the part of the email after the @
+    """
+    domain: String
+
+    """
+    the flag that you want to give to the user
+    """
+    flag: UserFlagEnum!
+
+    """
+    whether to add or remove the flag
+    """
+    addFlag: Boolean!
+  ): UpdateFeatureFlagPayload!
+
+  """
+  Update how a parabol dimension maps to a GitLab label
+  """
+  updateGitLabDimensionField(
+    """
+    The Poker dimension that we're updating, e.g. story points
+    """
+    dimensionName: String!
+
+    """
+    The template string to map to a label, e.g. __comment
+    """
+    labelTemplate: String!
+
+    """
+    The meeting the update happend in. Returns a meeting object with updated serviceField.
+    """
+    meetingId: ID!
+
+    """
+    The id of the project the issue belongs to
+    """
+    projectId: Int!
+  ): UpdateGitLabDimensionFieldPayload!
+
+  """
+  Set the jira field that the poker dimension should map to
+  """
+  updateJiraDimensionField(
+    """
+    Id of the parabol task on which the dimension was updated
+    """
+    taskId: ID!
+
+    """
+    Dimension name from the template used
+    """
+    dimensionName: String!
+
+    """
+    The jira field id that we should push estimates to
+    """
+    fieldId: ID!
+
+    """
+    The meeting the update happend in. Returns a meeting object with updated serviceField
+    """
+    meetingId: ID!
+  ): UpdateDimensionFieldPayload!
+
+  """
+  Set the JiraServer field that the poker dimension should map to`,
+  """
+  updateJiraServerDimensionField(
+    dimensionName: String!
+
+    """
+    The Jira Server field name that we should push estimates to
+    """
+    fieldName: ID!
+
+    """
+    The Jira Server issue type for which to set the dimension
+    """
+    issueType: ID!
+
+    """
+    Project id for this setting
+    """
+    projectId: ID!
+
+    """
+    The meeting the update happend in. Returns a meeting object with updated serviceField
+    """
+    meetingId: ID!
+  ): UpdateDimensionFieldPayload!
+
+  """
+  Describe the mutation here
+  """
+  updateMeetingPrompt(
+    """
+    The meeting to update the prompt
+    """
+    meetingId: ID!
+
+    """
+    The updated prompt
+    """
+    newPrompt: String!
+  ): UpdateMeetingPromptPayload!
+
+  """
+  Update a meeting template
+  """
+  updateMeetingTemplate(
+    """
+    The id of the meeting
+    """
+    meetingId: ID!
+
+    """
+    The id of the meeting template
+    """
+    templateId: ID!
+  ): UpdateMeetingTemplatePayload!
+
+  """
+  Update an with a change in name, avatar
+  """
+  updateOrg(
+    """
+    the updated org including the id, and at least one other field
+    """
+    updatedOrg: UpdateOrgInput!
+  ): UpdateOrgPayload!
+
+  """
+  Updates the recurrence settings for a meeting
+  1. When the meeting is not recurring, this will start the meeting recurring with the given recurrenceRule
+  2. When the meeting is recurring and the provided recurrenceRule is defined, this will update the recurrence rule with the given recurrenceRule
+  3. When the meeting is recurring and the provided recurrenceRule is null, this will stop the meeting from recurring
+  """
+  updateRecurrenceSettings(
+    """
+    ID of the meeting to update recurrence settings for
+    """
+    meetingId: ID!
+
+    """
+    New meeting series name
+    """
+    name: String
+
+    """
+    The recurrence rule for the meeting series in RRULE format
+    """
+    rrule: RRule
+  ): UpdateRecurrenceSettingsPayload!
+
+  """
+  Updates the mainCategory for the given template
+  """
+  updateTemplateCategory(
+    """
+    The ID of the template
+    """
+    templateId: ID!
+
+    """
+    The new category for the template
+    """
+    mainCategory: String!
+  ): UpdateTemplateCategoryPayload!
+  updateUserProfile(
+    """
+    The input object containing the user profile fields that can be changed
+    """
+    updatedUser: UpdateUserProfileInput!
+  ): UpdateUserProfilePayload
+
+  """
+  Describe the mutation here
+  """
+  upgradeToTeamTier(invoiceId: ID!): UpgradeToTeamTierPayload!
+
+  """
+  Upload the IdP Metadata file for an org for those who cannot self-host the file
+  """
+  uploadIdPMetadata(
+    """
+    the XML Metadata file for the IdP
+    """
+    file: File!
+
+    """
+    The orgId to upload the IdP Metadata for
+    """
+    orgId: ID!
+  ): UploadIdPMetadataPayload!
+
+  """
+  Upload an image for an org avatar
+  """
+  uploadOrgImage(
+    """
+    the org avatar image file
+    """
+    file: File!
+
+    """
+    The org id to upload an avatar for
+    """
+    orgId: ID!
+  ): UpdateOrgPayload!
+
+  """
+  Upload an image for a user avatar
+  """
+  uploadUserImage(
+    """
+    the user avatar image file
+    """
+    file: File!
+  ): UpdateUserProfilePayload
+
+  """
+  upsert the content of a team prompt response
+  """
+  upsertTeamPromptResponse(
+    """
+    The id of the team prompt response to upsert
+    """
+    teamPromptResponseId: ID
+
+    """
+    The id of the team prompt meeting
+    """
+    meetingId: ID!
+
+    """
+    The stringified content of the team prompt response
+    """
+    content: String!
+  ): UpsertTeamPromptResponsePayload!
+
+  """
+  Verify an email address and sign in if not already a user
+  """
+  verifyEmail(
+    """
+    The 48-byte url-safe base64 encoded verification token
+    """
+    verificationToken: ID!
+  ): UserLogInPayload!
+}
diff --git a/packages/server/graphql/public/typeDefs/NavigateMeetingPayload.graphql b/packages/server/graphql/public/typeDefs/NavigateMeetingPayload.graphql
new file mode 100644
index 00000000000..578cf829415
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NavigateMeetingPayload.graphql
@@ -0,0 +1,24 @@
+type NavigateMeetingPayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+
+  """
+  The stage that the facilitator is now on
+  """
+  facilitatorStage: NewMeetingStage
+
+  """
+  The stage that the facilitator left
+  """
+  oldFacilitatorStage: NewMeetingStage
+
+  """
+  Additional details triggered by completing certain phases
+  """
+  phaseComplete: PhaseCompletePayload
+
+  """
+  The stages that were unlocked by navigating
+  """
+  unlockedStages: [NewMeetingStage!]
+}
diff --git a/packages/server/graphql/public/typeDefs/NewFeatureBroadcast.graphql b/packages/server/graphql/public/typeDefs/NewFeatureBroadcast.graphql
new file mode 100644
index 00000000000..55c2cb1517d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NewFeatureBroadcast.graphql
@@ -0,0 +1,21 @@
+"""
+The latest feature released by Parabol
+"""
+type NewFeatureBroadcast {
+  id: ID!
+
+  """
+  The text of the action button in the snackbar
+  """
+  actionButtonCopy: String!
+
+  """
+  The description of the new feature
+  """
+  snackbarMessage: String!
+
+  """
+  The permalink to the blog post describing the new feature
+  """
+  url: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/NewMeeting.graphql b/packages/server/graphql/public/typeDefs/NewMeeting.graphql
index 37094a312b2..8e64ac3bcb3 100644
--- a/packages/server/graphql/public/typeDefs/NewMeeting.graphql
+++ b/packages/server/graphql/public/typeDefs/NewMeeting.graphql
@@ -66,7 +66,6 @@ interface NewMeeting {
   The meeting series this meeting is associated with if the meeting is recurring
   """
   meetingSeries: MeetingSeries
-
   meetingType: MeetingTypeEnum!
 
   """
diff --git a/packages/server/graphql/public/typeDefs/NewMeetingCheckInPayload.graphql b/packages/server/graphql/public/typeDefs/NewMeetingCheckInPayload.graphql
new file mode 100644
index 00000000000..33c680d8509
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NewMeetingCheckInPayload.graphql
@@ -0,0 +1,5 @@
+type NewMeetingCheckInPayload {
+  error: StandardMutationError
+  meetingMember: MeetingMember
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/NewMeetingPhase.graphql b/packages/server/graphql/public/typeDefs/NewMeetingPhase.graphql
new file mode 100644
index 00000000000..521683da34a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NewMeetingPhase.graphql
@@ -0,0 +1,14 @@
+interface NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [NewMeetingStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/NewMeetingPhaseTypeEnum.graphql b/packages/server/graphql/public/typeDefs/NewMeetingPhaseTypeEnum.graphql
new file mode 100644
index 00000000000..0f852d178c4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NewMeetingPhaseTypeEnum.graphql
@@ -0,0 +1,20 @@
+"""
+The phase of the meeting
+"""
+enum NewMeetingPhaseTypeEnum {
+  lobby
+  checkin
+  updates
+  firstcall
+  agendaitems
+  lastcall
+  reflect
+  group
+  vote
+  discuss
+  SUMMARY
+  SCOPE
+  ESTIMATE
+  RESPONSES
+  TEAM_HEALTH
+}
diff --git a/packages/server/graphql/public/typeDefs/NewMeetingStage.graphql b/packages/server/graphql/public/typeDefs/NewMeetingStage.graphql
new file mode 100644
index 00000000000..752c0f1404c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NewMeetingStage.graphql
@@ -0,0 +1,95 @@
+"""
+An instance of a meeting phase item. On the client, this usually represents a single view
+"""
+interface NewMeetingStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+}
diff --git a/packages/server/graphql/public/typeDefs/NewMeetingTeamMemberStage.graphql b/packages/server/graphql/public/typeDefs/NewMeetingTeamMemberStage.graphql
new file mode 100644
index 00000000000..435f67758a6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NewMeetingTeamMemberStage.graphql
@@ -0,0 +1,19 @@
+"""
+An instance of a meeting phase item. On the client, this usually represents a single view
+"""
+interface NewMeetingTeamMemberStage {
+  """
+  The meeting member that is the focus for this phase item
+  """
+  meetingMember: MeetingMember!
+
+  """
+  foreign key. use teamMember
+  """
+  teamMemberId: ID!
+
+  """
+  The team member that is the focus for this phase item
+  """
+  teamMember: TeamMember!
+}
diff --git a/packages/server/graphql/public/typeDefs/NewTeamInput.graphql b/packages/server/graphql/public/typeDefs/NewTeamInput.graphql
new file mode 100644
index 00000000000..187c6dc3e25
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NewTeamInput.graphql
@@ -0,0 +1,11 @@
+input NewTeamInput {
+  """
+  The name of the team
+  """
+  name: String!
+
+  """
+  The unique orginization ID that pays for the team
+  """
+  orgId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/NextPeriodCharges.graphql b/packages/server/graphql/public/typeDefs/NextPeriodCharges.graphql
new file mode 100644
index 00000000000..2a288677fff
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NextPeriodCharges.graphql
@@ -0,0 +1,29 @@
+"""
+A single line item for the charges for next month
+"""
+type NextPeriodCharges {
+  """
+  The amount for the line item (in USD)
+  """
+  amount: Float!
+
+  """
+  The datetime the next period will end
+  """
+  nextPeriodEnd: DateTime!
+
+  """
+  The total number of days that all org users have been inactive during the billing cycle
+  """
+  quantity: Int!
+
+  """
+  The per-seat monthly price of the subscription (in dollars), null if invoice is not per-seat
+  """
+  unitPrice: Float
+
+  """
+  "year" if enterprise, else "month" for pro
+  """
+  interval: String
+}
diff --git a/packages/server/graphql/public/typeDefs/Notification.graphql b/packages/server/graphql/public/typeDefs/Notification.graphql
new file mode 100644
index 00000000000..b4a073ec5f0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Notification.graphql
@@ -0,0 +1,22 @@
+interface Notification {
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotificationConnection.graphql b/packages/server/graphql/public/typeDefs/NotificationConnection.graphql
new file mode 100644
index 00000000000..2b48cf2f9f1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotificationConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type NotificationConnection {
+  """
+  Page info with cursors coerced to ISO8601 dates
+  """
+  pageInfo: PageInfoDateCursor
+
+  """
+  A list of edges.
+  """
+  edges: [NotificationEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotificationEdge.graphql b/packages/server/graphql/public/typeDefs/NotificationEdge.graphql
new file mode 100644
index 00000000000..3f8e2b9ce78
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotificationEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type NotificationEdge {
+  """
+  The item at the end of the edge
+  """
+  node: Notification!
+  cursor: DateTime
+}
diff --git a/packages/server/graphql/public/typeDefs/NotificationEnum.graphql b/packages/server/graphql/public/typeDefs/NotificationEnum.graphql
new file mode 100644
index 00000000000..6f37a3ac60f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotificationEnum.graphql
@@ -0,0 +1,20 @@
+"""
+The kind of notification
+"""
+enum NotificationEnum {
+  DISCUSSION_MENTIONED
+  KICKED_OUT
+  PAYMENT_REJECTED
+  PROMOTE_TO_BILLING_LEADER
+  TEAM_INVITATION
+  TEAM_ARCHIVED
+  TASK_INVOLVES
+  MEETING_STAGE_TIME_LIMIT_END
+  RESPONSE_MENTIONED
+  MENTIONED
+  RESPONSE_REPLIED
+  TEAMS_LIMIT_EXCEEDED
+  TEAMS_LIMIT_REMINDER
+  PROMPT_TO_JOIN_ORG
+  REQUEST_TO_JOIN_ORG
+}
diff --git a/packages/server/graphql/public/typeDefs/NotificationMeetingStageTimeLimitEnd.graphql b/packages/server/graphql/public/typeDefs/NotificationMeetingStageTimeLimitEnd.graphql
new file mode 100644
index 00000000000..2a5f2f58793
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotificationMeetingStageTimeLimitEnd.graphql
@@ -0,0 +1,35 @@
+"""
+A notification sent to a facilitator that the stage time limit has ended
+"""
+type NotificationMeetingStageTimeLimitEnd implements Notification & TeamNotification {
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+
+  """
+  FK
+  """
+  meetingId: ID!
+
+  """
+  The meeting that had the time limit expire
+  """
+  meeting: NewMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotificationStatusEnum.graphql b/packages/server/graphql/public/typeDefs/NotificationStatusEnum.graphql
new file mode 100644
index 00000000000..9cfac416f10
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotificationStatusEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The status of the notification interaction
+"""
+enum NotificationStatusEnum {
+  UNREAD
+  READ
+  CLICKED
+}
diff --git a/packages/server/graphql/public/typeDefs/NotificationSubscriptionPayload.graphql b/packages/server/graphql/public/typeDefs/NotificationSubscriptionPayload.graphql
new file mode 100644
index 00000000000..0a719c7ac0a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotificationSubscriptionPayload.graphql
@@ -0,0 +1,30 @@
+type NotificationSubscriptionPayload {
+  fieldName: String!
+  AcceptTeamInvitationPayload: AcceptTeamInvitationPayload
+  AddNewFeaturePayload: AddNewFeaturePayload
+  AddOrgPayload: AddOrgPayload
+  AddTeamPayload: AddTeamPayload
+  ArchiveTimelineEventSuccess: ArchiveTimelineEventSuccess
+  SetNotificationStatusPayload: SetNotificationStatusPayload
+  CreateTaskPayload: CreateTaskPayload
+  DeleteTaskPayload: DeleteTaskPayload
+  DisconnectSocketPayload: DisconnectSocketPayload
+  EndCheckInSuccess: EndCheckInSuccess
+  EndRetrospectiveSuccess: EndRetrospectiveSuccess
+  InvalidateSessionsPayload: InvalidateSessionsPayload
+  InviteToTeamPayload: InviteToTeamPayload
+  MeetingStageTimeLimitPayload: MeetingStageTimeLimitPayload
+  RemoveOrgUserPayload: RemoveOrgUserPayload
+  StripeFailPaymentPayload: StripeFailPaymentPayload
+  PersistJiraSearchQuerySuccess: PersistJiraSearchQuerySuccess
+  User: User
+  AuthTokenPayload: AuthTokenPayload
+  PersistGitHubSearchQuerySuccess: PersistGitHubSearchQuerySuccess
+  JiraServerIssue: JiraServerIssue
+  AddedNotification: AddedNotification
+  UpdateFeatureFlagPayload: UpdateFeatureFlagPayload
+  JiraIssue: JiraIssue
+  UpdatedNotification: UpdatedNotification
+  RemoveIntegrationSearchQuerySuccess: RemoveIntegrationSearchQuerySuccess
+  PersistIntegrationSearchQuerySuccess: PersistIntegrationSearchQuerySuccess
+}
diff --git a/packages/server/graphql/public/typeDefs/NotificationTeamInvitation.graphql b/packages/server/graphql/public/typeDefs/NotificationTeamInvitation.graphql
new file mode 100644
index 00000000000..da4f804ada2
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotificationTeamInvitation.graphql
@@ -0,0 +1,41 @@
+"""
+A notification sent to a user that was invited to a new team
+"""
+type NotificationTeamInvitation implements Notification & TeamNotification {
+  """
+  FK
+  """
+  teamId: ID!
+
+  """
+  FK
+  """
+  invitationId: ID!
+
+  """
+  The invitation that triggered this notification
+  """
+  invitation: TeamInvitation!
+  team: Team!
+
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotifyKickedOut.graphql b/packages/server/graphql/public/typeDefs/NotifyKickedOut.graphql
new file mode 100644
index 00000000000..25000f756eb
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotifyKickedOut.graphql
@@ -0,0 +1,45 @@
+"""
+A notification sent to someone who was just kicked off a team
+"""
+type NotifyKickedOut implements Notification {
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+
+  """
+  the user that evicted recipient
+  """
+  evictor: User!
+
+  """
+  The name of the team the user is joining
+  """
+  teamName: String!
+
+  """
+  The teamId the user was kicked out of
+  """
+  teamId: ID!
+
+  """
+  The team the task is on
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotifyPaymentRejected.graphql b/packages/server/graphql/public/typeDefs/NotifyPaymentRejected.graphql
new file mode 100644
index 00000000000..8370eba194c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotifyPaymentRejected.graphql
@@ -0,0 +1,27 @@
+"""
+A notification sent to a user when their payment has been rejected
+"""
+type NotifyPaymentRejected implements Notification {
+  organization: Organization!
+
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotifyPromoteToOrgLeader.graphql b/packages/server/graphql/public/typeDefs/NotifyPromoteToOrgLeader.graphql
new file mode 100644
index 00000000000..fed68f7e084
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotifyPromoteToOrgLeader.graphql
@@ -0,0 +1,27 @@
+"""
+A notification alerting the user that they have been promoted (to team or org leader)
+"""
+type NotifyPromoteToOrgLeader implements Notification {
+  organization: Organization!
+
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotifyReqestToJoinOrg.graphql b/packages/server/graphql/public/typeDefs/NotifyRequestToJoinOrg.graphql
similarity index 100%
rename from packages/server/graphql/public/typeDefs/NotifyReqestToJoinOrg.graphql
rename to packages/server/graphql/public/typeDefs/NotifyRequestToJoinOrg.graphql
diff --git a/packages/server/graphql/public/typeDefs/NotifyTaskInvolves.graphql b/packages/server/graphql/public/typeDefs/NotifyTaskInvolves.graphql
new file mode 100644
index 00000000000..573123a9c77
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotifyTaskInvolves.graphql
@@ -0,0 +1,56 @@
+"""
+A notification sent to someone who was just added to a team
+"""
+type NotifyTaskInvolves implements Notification & TeamNotification {
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+
+  """
+  How the user is affiliated with the task
+  """
+  involvement: TaskInvolvementType!
+
+  """
+  The taskId that now involves the userId
+  """
+  taskId: ID!
+
+  """
+  The task that now involves the userId
+  """
+  task: Task
+
+  """
+  The teamMemberId of the person that made the change
+  """
+  changeAuthorId: ID
+
+  """
+  The TeamMember of the person that made the change
+  """
+  changeAuthor: TeamMember!
+  teamId: ID!
+
+  """
+  The team the task is on
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/NotifyTeamArchived.graphql b/packages/server/graphql/public/typeDefs/NotifyTeamArchived.graphql
new file mode 100644
index 00000000000..ffd29fc070c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/NotifyTeamArchived.graphql
@@ -0,0 +1,31 @@
+"""
+A notification alerting the user that a team they were on is now archived
+"""
+type NotifyTeamArchived implements Notification {
+  """
+  the user that archived the team
+  """
+  archivor: User!
+  team: Team!
+
+  """
+  A shortid for the notification
+  """
+  id: ID!
+
+  """
+  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
+  """
+  status: NotificationStatusEnum!
+
+  """
+  The datetime to activate the notification & send it to the client
+  """
+  createdAt: DateTime!
+  type: NotificationEnum!
+
+  """
+  *The userId that should see this notification
+  """
+  userId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/OldUpdateCreditCardPayload.graphql b/packages/server/graphql/public/typeDefs/OldUpdateCreditCardPayload.graphql
new file mode 100644
index 00000000000..d00d35f14b9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OldUpdateCreditCardPayload.graphql
@@ -0,0 +1,13 @@
+type OldUpdateCreditCardPayload {
+  error: StandardMutationError
+
+  """
+  The organization that received the updated credit card
+  """
+  organization: Organization
+
+  """
+  The teams that are now paid up
+  """
+  teamsUpdated: [Team]
+}
diff --git a/packages/server/graphql/public/typeDefs/OldUpgradeToTeamTierPayload.graphql b/packages/server/graphql/public/typeDefs/OldUpgradeToTeamTierPayload.graphql
new file mode 100644
index 00000000000..fce7bf6bdfd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OldUpgradeToTeamTierPayload.graphql
@@ -0,0 +1,23 @@
+type OldUpgradeToTeamTierPayload {
+  error: StandardMutationError
+
+  """
+  The new Team Org
+  """
+  organization: Organization
+
+  """
+  The updated teams under the org
+  """
+  teams: [Team!]
+
+  """
+  the ids of the meetings that were showing conversion modals
+  """
+  meetingIds: [ID!]
+
+  """
+  the meetings that were showing conversion modals
+  """
+  meetings: [NewMeeting!]
+}
diff --git a/packages/server/graphql/public/typeDefs/OrgUserCount.graphql b/packages/server/graphql/public/typeDefs/OrgUserCount.graphql
new file mode 100644
index 00000000000..7dd603839b4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OrgUserCount.graphql
@@ -0,0 +1,11 @@
+type OrgUserCount {
+  """
+  The number of orgUsers who have an inactive flag
+  """
+  inactiveUserCount: Int!
+
+  """
+  The number of orgUsers who do not have an inactive flag
+  """
+  activeUserCount: Int!
+}
diff --git a/packages/server/graphql/public/typeDefs/OrgUserRole.graphql b/packages/server/graphql/public/typeDefs/OrgUserRole.graphql
new file mode 100644
index 00000000000..a0f43431055
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OrgUserRole.graphql
@@ -0,0 +1,7 @@
+"""
+The role of the org user
+"""
+enum OrgUserRole {
+  BILLING_LEADER
+  ORG_ADMIN
+}
diff --git a/packages/server/graphql/public/typeDefs/Organization.graphql b/packages/server/graphql/public/typeDefs/Organization.graphql
index 49201cbd7ea..775fac7a035 100644
--- a/packages/server/graphql/public/typeDefs/Organization.graphql
+++ b/packages/server/graphql/public/typeDefs/Organization.graphql
@@ -186,32 +186,3 @@ type Organization {
   """
   approvedDomains: [String!]!
 }
-
-type MeetingStat {
-  id: ID!
-  meetingType: MeetingTypeEnum!
-  createdAt: DateTime!
-}
-
-type TeamStat {
-  id: ID!
-  createdAt: DateTime!
-}
-
-"""
-The types of flags that give an individual organization super powers
-"""
-type OrganizationFeatureFlags {
-  noAISummary: Boolean!
-  standupAISummary: Boolean!
-  noPromptToJoinOrg: Boolean!
-  suggestGroups: Boolean!
-  zoomTranscription: Boolean!
-  shareSummary: Boolean!
-  teamsLimit: Boolean!
-  noTeamInsights: Boolean!
-  singleColumnStandups: Boolean!
-  publicTeams: Boolean!
-  aiTemplate: Boolean!
-  relatedDiscussions: Boolean!
-}
diff --git a/packages/server/graphql/public/typeDefs/OrganizationFeatureFlags.graphql b/packages/server/graphql/public/typeDefs/OrganizationFeatureFlags.graphql
new file mode 100644
index 00000000000..d0c765b0d10
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OrganizationFeatureFlags.graphql
@@ -0,0 +1,17 @@
+"""
+The types of flags that give an individual organization super powers
+"""
+type OrganizationFeatureFlags {
+  noAISummary: Boolean!
+  standupAISummary: Boolean!
+  noPromptToJoinOrg: Boolean!
+  suggestGroups: Boolean!
+  zoomTranscription: Boolean!
+  shareSummary: Boolean!
+  teamsLimit: Boolean!
+  noTeamInsights: Boolean!
+  singleColumnStandups: Boolean!
+  publicTeams: Boolean!
+  aiTemplate: Boolean!
+  relatedDiscussions: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/OrganizationSubscriptionPayload.graphql b/packages/server/graphql/public/typeDefs/OrganizationSubscriptionPayload.graphql
new file mode 100644
index 00000000000..282c1d807aa
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OrganizationSubscriptionPayload.graphql
@@ -0,0 +1,15 @@
+type OrganizationSubscriptionPayload {
+  fieldName: String!
+  AddOrgPayload: AddOrgPayload
+  ArchiveOrganizationPayload: ArchiveOrganizationPayload
+  DowngradeToStarterPayload: DowngradeToStarterPayload
+  PayLaterPayload: PayLaterPayload
+  RemoveOrgUserPayload: RemoveOrgUserPayload
+  SetOrgUserRoleSuccess: SetOrgUserRoleSuccess
+  OldUpdateCreditCardPayload: OldUpdateCreditCardPayload
+  UpdateCreditCardPayload: UpdateCreditCardPayload
+  UpdateOrgPayload: UpdateOrgPayload
+  OldUpgradeToTeamTierPayload: OldUpgradeToTeamTierPayload
+  UpgradeToTeamTierSuccess: UpgradeToTeamTierSuccess
+  UpdateTemplateScopeSuccess: UpdateTemplateScopeSuccess
+}
diff --git a/packages/server/graphql/public/typeDefs/OrganizationUser.graphql b/packages/server/graphql/public/typeDefs/OrganizationUser.graphql
index 74f1a79b0be..7e76f729d3a 100644
--- a/packages/server/graphql/public/typeDefs/OrganizationUser.graphql
+++ b/packages/server/graphql/public/typeDefs/OrganizationUser.graphql
@@ -1,3 +1,52 @@
-extend type OrganizationUser {
+"""
+organization-specific details about a user
+"""
+type OrganizationUser {
+  """
+  orgId::userId
+  """
+  id: ID!
+
+  """
+  true if the user is paused and the orgs are not being billed, else false
+  """
+  inactive: Boolean!
+
+  """
+  the datetime the user first joined the org
+  """
+  joinedAt: DateTime!
+
+  """
+  FK
+  """
+  orgId: ID!
+
+  """
+  The user attached to the organization
+  """
+  organization: Organization!
+
+  """
+  if not a member, the datetime the user was removed from the org
+  """
+  removedAt: DateTime
+
+  """
+  role of the user in the org
+  """
+  role: OrgUserRole
+
+  """
+  FK
+  """
+  userId: ID!
+
+  """
+  The user attached to the organization
+  """
+  user: User!
   suggestedTier: TierEnum
+  tier: TierEnum
+  billingTier: TierEnum
 }
diff --git a/packages/server/graphql/public/typeDefs/OrganizationUserConnection.graphql b/packages/server/graphql/public/typeDefs/OrganizationUserConnection.graphql
new file mode 100644
index 00000000000..1c0651c79bd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OrganizationUserConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type OrganizationUserConnection {
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  A list of edges.
+  """
+  edges: [OrganizationUserEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/OrganizationUserEdge.graphql b/packages/server/graphql/public/typeDefs/OrganizationUserEdge.graphql
new file mode 100644
index 00000000000..ea3b56843a0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/OrganizationUserEdge.graphql
@@ -0,0 +1,14 @@
+"""
+An edge in a connection.
+"""
+type OrganizationUserEdge {
+  """
+  The item at the end of the edge
+  """
+  node: OrganizationUser!
+
+  """
+  A cursor for use in pagination
+  """
+  cursor: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/ParseSAMLMetadataPayload.graphql b/packages/server/graphql/public/typeDefs/ParseSAMLMetadataPayload.graphql
new file mode 100644
index 00000000000..3ffab12f2b1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ParseSAMLMetadataPayload.graphql
@@ -0,0 +1 @@
+union ParseSAMLMetadataPayload = ErrorPayload | ParseSAMLMetadataSuccess
diff --git a/packages/server/graphql/public/typeDefs/ParseSAMLMetadataSuccess.graphql b/packages/server/graphql/public/typeDefs/ParseSAMLMetadataSuccess.graphql
new file mode 100644
index 00000000000..c569ab2e3d7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ParseSAMLMetadataSuccess.graphql
@@ -0,0 +1,3 @@
+type ParseSAMLMetadataSuccess {
+  url: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/PayLaterPayload.graphql b/packages/server/graphql/public/typeDefs/PayLaterPayload.graphql
new file mode 100644
index 00000000000..d50e2f1f431
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PayLaterPayload.graphql
@@ -0,0 +1,13 @@
+type PayLaterPayload {
+  error: StandardMutationError
+
+  """
+  the ids of the meetings that were showing conversion modals
+  """
+  meetingId: ID
+
+  """
+  the meetings that were showing conversion modals
+  """
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/PersistGitHubSearchQueryPayload.graphql b/packages/server/graphql/public/typeDefs/PersistGitHubSearchQueryPayload.graphql
new file mode 100644
index 00000000000..8b61d3337a4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PersistGitHubSearchQueryPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for PersistGitHubSearchQueryPayload
+"""
+union PersistGitHubSearchQueryPayload = ErrorPayload | PersistGitHubSearchQuerySuccess
diff --git a/packages/server/graphql/public/typeDefs/PersistGitHubSearchQuerySuccess.graphql b/packages/server/graphql/public/typeDefs/PersistGitHubSearchQuerySuccess.graphql
new file mode 100644
index 00000000000..80df1269088
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PersistGitHubSearchQuerySuccess.graphql
@@ -0,0 +1,16 @@
+type PersistGitHubSearchQuerySuccess {
+  """
+  The affected teamId
+  """
+  teamId: ID!
+
+  """
+  The affected userId
+  """
+  userId: ID!
+
+  """
+  The auth with the updated search queries
+  """
+  githubIntegration: GitHubIntegration!
+}
diff --git a/packages/server/graphql/public/typeDefs/PersistIntegrationSearchQueryPayload.graphql b/packages/server/graphql/public/typeDefs/PersistIntegrationSearchQueryPayload.graphql
new file mode 100644
index 00000000000..09b05ab188d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PersistIntegrationSearchQueryPayload.graphql
@@ -0,0 +1 @@
+union PersistIntegrationSearchQueryPayload = PersistIntegrationSearchQuerySuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/PersistIntegrationSearchQuerySuccess.graphql b/packages/server/graphql/public/typeDefs/PersistIntegrationSearchQuerySuccess.graphql
new file mode 100644
index 00000000000..3de27aabe7d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PersistIntegrationSearchQuerySuccess.graphql
@@ -0,0 +1,5 @@
+type PersistIntegrationSearchQuerySuccess {
+  userId: ID
+  teamId: ID
+  jiraServerIntegration: JiraServerIntegration
+}
diff --git a/packages/server/graphql/public/typeDefs/PersistJiraSearchQueryPayload.graphql b/packages/server/graphql/public/typeDefs/PersistJiraSearchQueryPayload.graphql
new file mode 100644
index 00000000000..1ac24e74f3b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PersistJiraSearchQueryPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for PersistJiraSearchQueryPayload
+"""
+union PersistJiraSearchQueryPayload = ErrorPayload | PersistJiraSearchQuerySuccess
diff --git a/packages/server/graphql/public/typeDefs/PersistJiraSearchQuerySuccess.graphql b/packages/server/graphql/public/typeDefs/PersistJiraSearchQuerySuccess.graphql
new file mode 100644
index 00000000000..dd43afa3c01
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PersistJiraSearchQuerySuccess.graphql
@@ -0,0 +1,6 @@
+type PersistJiraSearchQuerySuccess {
+  """
+  The newly created auth
+  """
+  atlassianIntegration: AtlassianIntegration
+}
diff --git a/packages/server/graphql/public/typeDefs/PhaseCompletePayload.graphql b/packages/server/graphql/public/typeDefs/PhaseCompletePayload.graphql
new file mode 100644
index 00000000000..904a419dce1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PhaseCompletePayload.graphql
@@ -0,0 +1,16 @@
+type PhaseCompletePayload {
+  """
+  payload provided if the retro reflect phase was completed
+  """
+  reflect: ReflectPhaseCompletePayload
+
+  """
+  payload provided if the retro grouping phase was completed
+  """
+  group: GroupPhaseCompletePayload
+
+  """
+  payload provided if the retro voting phase was completed
+  """
+  vote: VotePhaseCompletePayload
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverPayload.graphql b/packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverPayload.graphql
new file mode 100644
index 00000000000..2927506cf49
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for PokerAnnounceDeckHoverPayload
+"""
+union PokerAnnounceDeckHoverPayload = ErrorPayload | PokerAnnounceDeckHoverSuccess
diff --git a/packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverSuccess.graphql b/packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverSuccess.graphql
new file mode 100644
index 00000000000..630472312cc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerAnnounceDeckHoverSuccess.graphql
@@ -0,0 +1,12 @@
+type PokerAnnounceDeckHoverSuccess {
+  meetingId: ID!
+  stageId: ID!
+  userId: ID!
+  user: User!
+  isHover: Boolean!
+
+  """
+  The stage that holds the updated scores
+  """
+  stage: EstimateStage!
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerMeeting.graphql b/packages/server/graphql/public/typeDefs/PokerMeeting.graphql
index 678549a82ec..188d78da9de 100644
--- a/packages/server/graphql/public/typeDefs/PokerMeeting.graphql
+++ b/packages/server/graphql/public/typeDefs/PokerMeeting.graphql
@@ -2,6 +2,42 @@
 A Poker meeting
 """
 type PokerMeeting implements NewMeeting {
+  """
+  The number of comments generated in the meeting
+  """
+  commentCount: Int!
+
+  """
+  The team members that were active during the time of the meeting
+  """
+  meetingMembers: [PokerMeetingMember!]!
+
+  """
+  The number of stories scored during a meeting
+  """
+  storyCount: Int!
+
+  """
+  A single story created in a Sprint Poker meeting
+  """
+  story(storyId: ID!): Task
+  teamId: ID!
+
+  """
+  The ID of the template used for the meeting. Note the underlying template could have changed!
+  """
+  templateId: ID! @deprecated(reason: "The underlying template could be mutated. Use templateRefId")
+
+  """
+  The ID of the immutable templateRef used for the meeting
+  """
+  templateRefId: ID!
+
+  """
+  The Poker meeting member of the viewer
+  """
+  viewerMeetingMember: PokerMeetingMember
+
   """
   The unique meeting id. shortid.
   """
@@ -47,11 +83,6 @@ type PokerMeeting implements NewMeeting {
   """
   locked: Boolean!
 
-  """
-  The team members that were active during the time of the meeting
-  """
-  meetingMembers: [PokerMeetingMember!]!
-
   """
   The auto-incrementing meeting number for the team
   """
@@ -66,7 +97,6 @@ type PokerMeeting implements NewMeeting {
   The meeting series this meeting is associated with if the meeting is recurring
   """
   meetingSeries: MeetingSeries
-
   meetingType: MeetingTypeEnum!
 
   """
@@ -103,7 +133,6 @@ type PokerMeeting implements NewMeeting {
   The time the meeting summary was emailed to the team
   """
   summarySentAt: DateTime
-  teamId: ID!
 
   """
   The team that ran the meeting
@@ -114,34 +143,4 @@ type PokerMeeting implements NewMeeting {
   The last time a meeting was updated (stage completed, finished, etc)
   """
   updatedAt: DateTime
-
-  """
-  The Poker meeting member of the viewer
-  """
-  viewerMeetingMember: PokerMeetingMember
-
-  """
-  The number of comments generated in the meeting
-  """
-  commentCount: Int!
-
-  """
-  The number of stories scored during a meeting
-  """
-  storyCount: Int!
-
-  """
-  A single story created in a Sprint Poker meeting
-  """
-  story(storyId: ID!): Task
-
-  """
-  The ID of the template used for the meeting. Note the underlying template could have changed!
-  """
-  templateId: ID! @deprecated(reason: "The underlying template could be mutated. Use templateRefId")
-
-  """
-  The ID of the immutable templateRef used for the meeting
-  """
-  templateRefId: ID!
 }
diff --git a/packages/server/graphql/public/typeDefs/PokerMeetingMember.graphql b/packages/server/graphql/public/typeDefs/PokerMeetingMember.graphql
new file mode 100644
index 00000000000..3e50258e918
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerMeetingMember.graphql
@@ -0,0 +1,33 @@
+"""
+All the meeting specifics for a user in a poker meeting
+"""
+type PokerMeetingMember implements MeetingMember {
+  """
+  A composite of userId::meetingId
+  """
+  id: ID!
+
+  """
+  true if present, false if absent, else null
+  """
+  isCheckedIn: Boolean
+    @deprecated(
+      reason: "Members are checked in when they enter the meeting now & not created beforehand"
+    )
+  meetingId: ID!
+  meetingType: MeetingTypeEnum!
+  teamId: ID!
+  teamMember: TeamMember!
+  user: User!
+  userId: ID!
+
+  """
+  The last time a meeting was updated (stage completed, finished, etc)
+  """
+  updatedAt: DateTime!
+
+  """
+  true if the user is not voting and does not want their vote to count towards aggregates
+  """
+  isSpectating: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerMeetingSettings.graphql b/packages/server/graphql/public/typeDefs/PokerMeetingSettings.graphql
new file mode 100644
index 00000000000..abfd95c3fbc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerMeetingSettings.graphql
@@ -0,0 +1,65 @@
+"""
+The retro-specific meeting settings
+"""
+type PokerMeetingSettings implements TeamMeetingSettings {
+  id: ID!
+
+  """
+  The type of meeting these settings apply to
+  """
+  meetingType: MeetingTypeEnum!
+
+  """
+  The broad phase types that will be addressed during the meeting
+  """
+  phaseTypes: [NewMeetingPhaseTypeEnum!]!
+
+  """
+  FK
+  """
+  teamId: ID!
+
+  """
+  The team these settings belong to
+  """
+  team: Team!
+
+  """
+  FK. The template that will be used to start the poker meeting
+  """
+  selectedTemplateId: ID!
+
+  """
+  The template that will be used to start the Poker meeting
+  """
+  selectedTemplate: PokerTemplate!
+
+  """
+  The list of templates used to start a Poker meeting
+  """
+  teamTemplates: [PokerTemplate!]!
+
+  """
+  The list of templates shared across the organization to start a Poker meeting
+  """
+  organizationTemplates(
+    first: Int!
+
+    """
+    The cursor, which is the templateId
+    """
+    after: ID
+  ): PokerTemplateConnection!
+
+  """
+  The list of templates shared across the organization to start a Poker meeting
+  """
+  publicTemplates(
+    first: Int!
+
+    """
+    The cursor, which is the templateId
+    """
+    after: ID
+  ): PokerTemplateConnection!
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerResetDimensionPayload.graphql b/packages/server/graphql/public/typeDefs/PokerResetDimensionPayload.graphql
new file mode 100644
index 00000000000..288d4c3718b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerResetDimensionPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for PokerResetDimensionPayload
+"""
+union PokerResetDimensionPayload = ErrorPayload | PokerResetDimensionSuccess
diff --git a/packages/server/graphql/public/typeDefs/PokerResetDimensionSuccess.graphql b/packages/server/graphql/public/typeDefs/PokerResetDimensionSuccess.graphql
new file mode 100644
index 00000000000..ae28d15b94f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerResetDimensionSuccess.graphql
@@ -0,0 +1,6 @@
+type PokerResetDimensionSuccess {
+  """
+  The stage that holds the updated isVoting step
+  """
+  stage: EstimateStage!
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerRevealVotesPayload.graphql b/packages/server/graphql/public/typeDefs/PokerRevealVotesPayload.graphql
new file mode 100644
index 00000000000..f87a079b6e9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerRevealVotesPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for PokerRevealVotesPayload
+"""
+union PokerRevealVotesPayload = ErrorPayload | PokerRevealVotesSuccess
diff --git a/packages/server/graphql/public/typeDefs/PokerRevealVotesSuccess.graphql b/packages/server/graphql/public/typeDefs/PokerRevealVotesSuccess.graphql
new file mode 100644
index 00000000000..135c28409d6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerRevealVotesSuccess.graphql
@@ -0,0 +1,6 @@
+type PokerRevealVotesSuccess {
+  """
+  The stage that holds the updated isVoting step
+  """
+  stage: EstimateStage!
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerTemplate.graphql b/packages/server/graphql/public/typeDefs/PokerTemplate.graphql
new file mode 100644
index 00000000000..ce4a2f44fe9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerTemplate.graphql
@@ -0,0 +1,91 @@
+"""
+The team-specific templates for sprint poker meeting
+"""
+type PokerTemplate implements MeetingTemplate {
+  """
+  shortid
+  """
+  id: ID!
+  createdAt: DateTime!
+
+  """
+  True if template can be used, else false
+  """
+  isActive: Boolean!
+
+  """
+  True if template is available to all teams including non-paying teams, else false
+  """
+  isFree: Boolean!
+
+  """
+  The time of the meeting the template was last used
+  """
+  lastUsedAt: DateTime
+
+  """
+  The name of the template
+  """
+  name: String!
+
+  """
+  *Foreign key. The organization that owns the team that created the template
+  """
+  orgId: ID!
+
+  """
+  Who can see this template
+  """
+  scope: SharingScopeEnum!
+
+  """
+  *Foreign key. The team this template belongs to
+  """
+  teamId: ID!
+
+  """
+  The team this template belongs to
+  """
+  team: Team!
+
+  """
+  The type of the template
+  """
+  type: MeetingTypeEnum!
+  updatedAt: DateTime!
+
+  """
+  The dimensions that are part of this template
+  """
+  dimensions: [TemplateDimension!]!
+
+  """
+  A query for the dimension
+  """
+  dimension(
+    """
+    The dimension ID for the desired dimension
+    """
+    dimensionId: ID!
+  ): TemplateDimension!
+
+  """
+  The category this template falls under, e.g. retro, feedback, strategy, etc.
+  """
+  category: String!
+
+  """
+  Whether this template should be in the recommended/quick start sections in the UI.
+  """
+  isRecommended: Boolean!
+
+  """
+  The url to the illustration used by the template
+  """
+  illustrationUrl: String!
+
+  """
+  The lowest scope of the permissions available to the viewer
+  """
+  viewerLowestScope: SharingScopeEnum!
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerTemplateConnection.graphql b/packages/server/graphql/public/typeDefs/PokerTemplateConnection.graphql
new file mode 100644
index 00000000000..795b0b753d3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerTemplateConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type PokerTemplateConnection {
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  A list of edges.
+  """
+  edges: [PokerTemplateEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerTemplateDimensionUpdateDescriptionPayload.graphql b/packages/server/graphql/public/typeDefs/PokerTemplateDimensionUpdateDescriptionPayload.graphql
new file mode 100644
index 00000000000..34d40a429ac
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerTemplateDimensionUpdateDescriptionPayload.graphql
@@ -0,0 +1,4 @@
+type PokerTemplateDimensionUpdateDescriptionPayload {
+  error: StandardMutationError
+  dimension: TemplateDimension
+}
diff --git a/packages/server/graphql/public/typeDefs/PokerTemplateEdge.graphql b/packages/server/graphql/public/typeDefs/PokerTemplateEdge.graphql
new file mode 100644
index 00000000000..c8cdffa28ce
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PokerTemplateEdge.graphql
@@ -0,0 +1,14 @@
+"""
+An edge in a connection.
+"""
+type PokerTemplateEdge {
+  """
+  The item at the end of the edge
+  """
+  node: PokerTemplate!
+
+  """
+  A cursor for use in pagination
+  """
+  cursor: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/Poll.graphql b/packages/server/graphql/public/typeDefs/Poll.graphql
new file mode 100644
index 00000000000..e2dc4a97fd3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Poll.graphql
@@ -0,0 +1,79 @@
+"""
+A poll created during the meeting
+"""
+type Poll implements Threadable {
+  """
+  Poll id in a format of `poll:idGeneratedByDatabase`
+  """
+  id: ID!
+
+  """
+  The rich text body of the item
+  """
+  content: String!
+
+  """
+  The timestamp the item was created
+  """
+  createdAt: DateTime!
+
+  """
+  The userId that created the item
+  """
+  createdBy: ID
+
+  """
+  The user that created the item
+  """
+  createdByUser: User!
+
+  """
+  the replies to this threadable item
+  """
+  replies: [Threadable!]!
+
+  """
+  The FK of the discussion this task was created in. Null if task was not created in a discussion
+  """
+  discussionId: ID
+
+  """
+  the parent, if this threadable is a reply, else null
+  """
+  threadParentId: ID
+
+  """
+  the order of this threadable, relative to threadParentId
+  """
+  threadSortOrder: Float
+
+  """
+  The timestamp the item was updated
+  """
+  updatedAt: DateTime!
+
+  """
+  The foreign key for the meeting the poll was created in
+  """
+  meetingId: ID
+
+  """
+  The id of the team (indexed)
+  """
+  teamId: ID!
+
+  """
+  The team this poll belongs to
+  """
+  team: Team!
+
+  """
+  Poll title
+  """
+  title: String!
+
+  """
+  A list of all the poll options related to this poll
+  """
+  options: [PollOption!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/PollOption.graphql b/packages/server/graphql/public/typeDefs/PollOption.graphql
new file mode 100644
index 00000000000..55e73a8cd66
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PollOption.graphql
@@ -0,0 +1,39 @@
+"""
+Poll options for a given poll
+"""
+type PollOption {
+  """
+  Poll option id in a format of `pollOption:idGeneratedByDatabase`
+  """
+  id: ID!
+
+  """
+  The timestamp the item was created
+  """
+  createdAt: DateTime!
+
+  """
+  The timestamp the item was updated
+  """
+  updatedAt: DateTime!
+
+  """
+  The foreign key of the poll this option belongs to in a format of `poll:idGeneratedByDatabase`
+  """
+  pollId: ID!
+
+  """
+  The poll this option belongs to
+  """
+  poll: Poll!
+
+  """
+  The ids of the users who voted for this option
+  """
+  voteUserIds: [ID!]!
+
+  """
+  Poll option title
+  """
+  title: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/PollOptionInput.graphql b/packages/server/graphql/public/typeDefs/PollOptionInput.graphql
new file mode 100644
index 00000000000..2025540db20
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PollOptionInput.graphql
@@ -0,0 +1,6 @@
+input PollOptionInput {
+  """
+  Poll option title
+  """
+  title: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/PromoteNewMeetingFacilitatorPayload.graphql b/packages/server/graphql/public/typeDefs/PromoteNewMeetingFacilitatorPayload.graphql
new file mode 100644
index 00000000000..0e2750c9d34
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PromoteNewMeetingFacilitatorPayload.graphql
@@ -0,0 +1,14 @@
+type PromoteNewMeetingFacilitatorPayload {
+  error: StandardMutationError
+
+  """
+  The meeting in progress
+  """
+  meeting: NewMeeting
+  facilitatorStage: NewMeetingStage
+
+  """
+  The old meeting facilitator
+  """
+  oldFacilitator: User
+}
diff --git a/packages/server/graphql/public/typeDefs/PromoteToTeamLeadPayload.graphql b/packages/server/graphql/public/typeDefs/PromoteToTeamLeadPayload.graphql
new file mode 100644
index 00000000000..f918cf4ba93
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PromoteToTeamLeadPayload.graphql
@@ -0,0 +1,6 @@
+type PromoteToTeamLeadPayload {
+  error: StandardMutationError
+  team: Team
+  oldLeader: TeamMember
+  newLeader: TeamMember
+}
diff --git a/packages/server/graphql/public/typeDefs/PushInvitationPayload.graphql b/packages/server/graphql/public/typeDefs/PushInvitationPayload.graphql
new file mode 100644
index 00000000000..31d7eed4d9f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/PushInvitationPayload.graphql
@@ -0,0 +1,6 @@
+type PushInvitationPayload {
+  error: StandardMutationError
+  user: User
+  meetingId: ID
+  team: Team
+}
diff --git a/packages/server/graphql/public/typeDefs/Query.graphql b/packages/server/graphql/public/typeDefs/Query.graphql
index ccc8b3e0384..53eff2278e8 100644
--- a/packages/server/graphql/public/typeDefs/Query.graphql
+++ b/packages/server/graphql/public/typeDefs/Query.graphql
@@ -1,11 +1,5 @@
 type Query {
   viewer: User!
-  getDemoEntities(
-    """
-    the reflection bodies to entitize
-    """
-    text: String!
-  ): GetDemoEntitiesPayload!
   massInvitation(
     """
     The mass invitation token
@@ -18,6 +12,12 @@ type Query {
     """
     token: ID!
   ): VerifiedInvitationPayload!
+  getDemoEntities(
+    """
+    the reflection bodies to entitize
+    """
+    text: String!
+  ): GetDemoEntitiesPayload!
   SAMLIdP(
     """
     the email associated with a SAML login. null if instance is SSO-only
diff --git a/packages/server/graphql/public/typeDefs/RRule.graphql b/packages/server/graphql/public/typeDefs/RRule.graphql
index b4dd0b7b3c9..40e0798b008 100644
--- a/packages/server/graphql/public/typeDefs/RRule.graphql
+++ b/packages/server/graphql/public/typeDefs/RRule.graphql
@@ -1 +1,4 @@
+"""
+A custom scalar type for representing RRule strings
+"""
 scalar RRule
diff --git a/packages/server/graphql/public/typeDefs/Reactable.graphql b/packages/server/graphql/public/typeDefs/Reactable.graphql
new file mode 100644
index 00000000000..fe7fb545808
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Reactable.graphql
@@ -0,0 +1,14 @@
+"""
+An item that can have reactjis
+"""
+interface Reactable {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  All the reactjis for the given reflection
+  """
+  reactjis: [Reactji!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/ReactableEnum.graphql b/packages/server/graphql/public/typeDefs/ReactableEnum.graphql
new file mode 100644
index 00000000000..8443d999130
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReactableEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The type of reactable
+"""
+enum ReactableEnum {
+  COMMENT
+  REFLECTION
+  RESPONSE
+}
diff --git a/packages/server/graphql/public/typeDefs/ReasonToDowngradeEnum.graphql b/packages/server/graphql/public/typeDefs/ReasonToDowngradeEnum.graphql
new file mode 100644
index 00000000000..e734690492f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReasonToDowngradeEnum.graphql
@@ -0,0 +1,10 @@
+"""
+Where the upgrade CTA button was clicked
+"""
+enum ReasonToDowngradeEnum {
+  tooExpensive
+  budgetChanges
+  missingKeyFeatures
+  notUsingPaidFeatures
+  anotherTool
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectPhase.graphql b/packages/server/graphql/public/typeDefs/ReflectPhase.graphql
new file mode 100644
index 00000000000..2c6230af721
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectPhase.graphql
@@ -0,0 +1,32 @@
+"""
+The meeting phase where all team members check in one-by-one
+"""
+type ReflectPhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [GenericMeetingStage!]!
+
+  """
+  foreign key. use focusedPrompt
+  """
+  focusedPromptId: ID
+
+  """
+  the Prompt that the facilitator wants the group to focus on
+  """
+  focusedPrompt: ReflectPrompt
+
+  """
+  The prompts used during the reflect phase
+  """
+  reflectPrompts: [ReflectPrompt!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectPhaseCompletePayload.graphql b/packages/server/graphql/public/typeDefs/ReflectPhaseCompletePayload.graphql
new file mode 100644
index 00000000000..e2a81686ab1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectPhaseCompletePayload.graphql
@@ -0,0 +1,11 @@
+type ReflectPhaseCompletePayload {
+  """
+  a list of empty reflection groups to remove
+  """
+  emptyReflectionGroupIds: [ID!]!
+
+  """
+  The grouped reflections
+  """
+  reflectionGroups: [RetroReflectionGroup!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectPrompt.graphql b/packages/server/graphql/public/typeDefs/ReflectPrompt.graphql
new file mode 100644
index 00000000000..a6f9c9fd268
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectPrompt.graphql
@@ -0,0 +1,56 @@
+"""
+A team-specific reflection prompt. Usually 3 or 4 exist per team, eg Good/Bad/Change, 4Ls, etc.
+"""
+type ReflectPrompt {
+  """
+  shortid
+  """
+  id: ID!
+  createdAt: DateTime!
+
+  """
+  foreign key. use the team field
+  """
+  teamId: ID!
+
+  """
+  The team that owns this reflectPrompt
+  """
+  team: Team
+  updatedAt: DateTime!
+
+  """
+  the order of the items in the template
+  """
+  sortOrder: Float!
+
+  """
+  FK for template
+  """
+  templateId: ID!
+
+  """
+  The template that this prompt belongs to
+  """
+  template: ReflectTemplate!
+
+  """
+  The question to answer during the phase of the retrospective (eg What went well?)
+  """
+  question: String!
+
+  """
+  The description to the question for further context. A long version of the question.
+  """
+  description: String!
+
+  """
+  The color used to visually group a phase item.
+  """
+  groupColor: String!
+
+  """
+  The datetime that the prompt was removed. Null if it has not been removed.
+  """
+  removedAt: DateTime
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectTemplate.graphql b/packages/server/graphql/public/typeDefs/ReflectTemplate.graphql
new file mode 100644
index 00000000000..cb717837186
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectTemplate.graphql
@@ -0,0 +1,87 @@
+"""
+The team-specific templates for the reflection prompts
+"""
+type ReflectTemplate implements MeetingTemplate {
+  """
+  shortid
+  """
+  id: ID!
+  createdAt: DateTime!
+
+  """
+  True if template can be used, else false
+  """
+  isActive: Boolean!
+
+  """
+  True if template is available to all teams including non-paying teams, else false
+  """
+  isFree: Boolean!
+
+  """
+  The time of the meeting the template was last used
+  """
+  lastUsedAt: DateTime
+
+  """
+  The name of the template
+  """
+  name: String!
+
+  """
+  *Foreign key. The organization that owns the team that created the template
+  """
+  orgId: ID!
+
+  """
+  Who can see this template
+  """
+  scope: SharingScopeEnum!
+
+  """
+  *Foreign key. The team this template belongs to
+  """
+  teamId: ID!
+
+  """
+  The team this template belongs to
+  """
+  team: Team!
+
+  """
+  The type of the template
+  """
+  type: MeetingTypeEnum!
+  updatedAt: DateTime!
+
+  """
+  The prompts that are part of this template
+  """
+  prompts: [ReflectPrompt!]!
+
+  """
+  The category this template falls under, e.g. retro, feedback, strategy, etc.
+  """
+  category: String!
+
+  """
+  Whether this template should be in the recommended/quick start sections in the UI.
+  """
+  isRecommended: Boolean!
+
+  """
+  The url to the illustration used by the template
+  """
+  illustrationUrl: String!
+
+  """
+  The lowest scope of the permissions available to the viewer
+  """
+  viewerLowestScope: SharingScopeEnum!
+
+  """
+  Experimental: sub-categories that this template is in (e.g. "popular", "recentlyUsed", "unused",
+  etc.)
+  """
+  subCategories: [String!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectTemplateConnection.graphql b/packages/server/graphql/public/typeDefs/ReflectTemplateConnection.graphql
new file mode 100644
index 00000000000..3bbca5792c7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectTemplateConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type ReflectTemplateConnection {
+  """
+  Information to aid in pagination.
+  """
+  pageInfo: PageInfo!
+
+  """
+  A list of edges.
+  """
+  edges: [ReflectTemplateEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectTemplateEdge.graphql b/packages/server/graphql/public/typeDefs/ReflectTemplateEdge.graphql
new file mode 100644
index 00000000000..ae29d8653f9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectTemplateEdge.graphql
@@ -0,0 +1,14 @@
+"""
+An edge in a connection.
+"""
+type ReflectTemplateEdge {
+  """
+  The item at the end of the edge
+  """
+  node: ReflectTemplate!
+
+  """
+  A cursor for use in pagination
+  """
+  cursor: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateDescriptionPayload.graphql b/packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateDescriptionPayload.graphql
new file mode 100644
index 00000000000..0bb2112d5f3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateDescriptionPayload.graphql
@@ -0,0 +1,4 @@
+type ReflectTemplatePromptUpdateDescriptionPayload {
+  error: StandardMutationError
+  prompt: ReflectPrompt
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateGroupColorPayload.graphql b/packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateGroupColorPayload.graphql
new file mode 100644
index 00000000000..6233b7ed0a2
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectTemplatePromptUpdateGroupColorPayload.graphql
@@ -0,0 +1,4 @@
+type ReflectTemplatePromptUpdateGroupColorPayload {
+  error: StandardMutationError
+  prompt: ReflectPrompt
+}
diff --git a/packages/server/graphql/public/typeDefs/ReflectionGroupSortEnum.graphql b/packages/server/graphql/public/typeDefs/ReflectionGroupSortEnum.graphql
new file mode 100644
index 00000000000..3afbc769a35
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ReflectionGroupSortEnum.graphql
@@ -0,0 +1,7 @@
+"""
+sorts for the reflection group. default is sortOrder. sorting by voteCount filters out items without votes.
+"""
+enum ReflectionGroupSortEnum {
+  voteCount
+  stageOrder
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoteReflectionDrag.graphql b/packages/server/graphql/public/typeDefs/RemoteReflectionDrag.graphql
new file mode 100644
index 00000000000..e73e9cc4bda
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoteReflectionDrag.graphql
@@ -0,0 +1,49 @@
+"""
+Info associated with a current drag
+"""
+type RemoteReflectionDrag {
+  id: ID!
+
+  """
+  The userId of the person currently dragging the reflection
+  """
+  dragUserId: ID
+
+  """
+  The name of the dragUser
+  """
+  dragUserName: String
+  isSpotlight: Boolean
+  clientHeight: Float
+  clientWidth: Float
+
+  """
+  The primary key of the item being drug
+  """
+  sourceId: ID!
+
+  """
+  The estimated destination of the item being drug
+  """
+  targetId: ID
+
+  """
+  horizontal distance from the top left of the target
+  """
+  targetOffsetX: Float
+
+  """
+  vertical distance from the top left of the target
+  """
+  targetOffsetY: Float
+
+  """
+  the left of the source, relative to the client window
+  """
+  clientX: Float
+
+  """
+  the top of the source, relative to the client window
+  """
+  clientY: Float
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveAgendaItemPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveAgendaItemPayload.graphql
new file mode 100644
index 00000000000..b32444482a8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveAgendaItemPayload.graphql
@@ -0,0 +1,10 @@
+type RemoveAgendaItemPayload {
+  error: StandardMutationError
+  agendaItem: AgendaItem
+  meetingId: ID
+
+  """
+  The meeting with the updated agenda item, if any
+  """
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsPayload.graphql
new file mode 100644
index 00000000000..f9d76dedfa8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsPayload.graphql
@@ -0,0 +1,6 @@
+"""
+Return value for removeApprovedOrganizationDomains, which could be an error
+"""
+union RemoveApprovedOrganizationDomainsPayload =
+  | ErrorPayload
+  | RemoveApprovedOrganizationDomainsSuccess
diff --git a/packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsSuccess.graphql b/packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsSuccess.graphql
new file mode 100644
index 00000000000..b633447b8d6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveApprovedOrganizationDomainsSuccess.graphql
@@ -0,0 +1,6 @@
+type RemoveApprovedOrganizationDomainsSuccess {
+  """
+  The organization with updated restrictions
+  """
+  organization: Organization!
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveAtlassianAuthPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveAtlassianAuthPayload.graphql
new file mode 100644
index 00000000000..ad752a53423
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveAtlassianAuthPayload.graphql
@@ -0,0 +1,14 @@
+type RemoveAtlassianAuthPayload {
+  error: StandardMutationError
+  teamId: ID
+
+  """
+  The team member with the updated auth
+  """
+  teamMember: TeamMember
+
+  """
+  The user with updated atlassianAuth
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveGitHubAuthPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveGitHubAuthPayload.graphql
new file mode 100644
index 00000000000..79979d9d861
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveGitHubAuthPayload.graphql
@@ -0,0 +1,14 @@
+type RemoveGitHubAuthPayload {
+  error: StandardMutationError
+  teamId: ID
+
+  """
+  The team member with the updated auth
+  """
+  teamMember: TeamMember
+
+  """
+  The user with updated githubAuth
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveIntegrationProviderPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveIntegrationProviderPayload.graphql
new file mode 100644
index 00000000000..814ee62aca0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveIntegrationProviderPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for RemoveIntegrationProviderPayload
+"""
+union RemoveIntegrationProviderPayload = ErrorPayload | RemoveIntegrationProviderSuccess
diff --git a/packages/server/graphql/public/typeDefs/RemoveIntegrationProviderSuccess.graphql b/packages/server/graphql/public/typeDefs/RemoveIntegrationProviderSuccess.graphql
new file mode 100644
index 00000000000..21a48092f74
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveIntegrationProviderSuccess.graphql
@@ -0,0 +1,11 @@
+type RemoveIntegrationProviderSuccess {
+  """
+  The team member with the updated auth
+  """
+  teamMember: TeamMember!
+
+  """
+  The user who updated TeamMemberIntegrationAuth object
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQueryPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQueryPayload.graphql
new file mode 100644
index 00000000000..bd42b3bb9b6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQueryPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for removeIntegrationSearchQuery, which could be an error
+"""
+union RemoveIntegrationSearchQueryPayload = ErrorPayload | RemoveIntegrationSearchQuerySuccess
diff --git a/packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQuerySuccess.graphql b/packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQuerySuccess.graphql
new file mode 100644
index 00000000000..68340681824
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveIntegrationSearchQuerySuccess.graphql
@@ -0,0 +1,5 @@
+type RemoveIntegrationSearchQuerySuccess {
+  userId: ID
+  teamId: ID
+  jiraServerIntegration: JiraServerIntegration
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveOrgUserPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveOrgUserPayload.graphql
new file mode 100644
index 00000000000..a2e659914be
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveOrgUserPayload.graphql
@@ -0,0 +1,39 @@
+type RemoveOrgUserPayload {
+  error: StandardMutationError
+
+  """
+  The organization the user was removed from
+  """
+  organization: Organization
+
+  """
+  The teams the user was removed from
+  """
+  teams: [Team!]
+
+  """
+  The teamMembers removed
+  """
+  teamMembers: [TeamMember!]
+
+  """
+  The tasks that were archived or reassigned
+  """
+  updatedTasks: [Task!]
+
+  """
+  The user removed from the organization
+  """
+  user: User
+
+  """
+  The notifications for each team the user was kicked out of
+  """
+  kickOutNotifications: [NotifyKickedOut!]
+
+  """
+  The organization member that got removed
+  """
+  removedOrgMember: OrganizationUser
+  organizationUserId: String
+}
diff --git a/packages/server/graphql/public/typeDefs/RemovePokerTemplateDimensionPayload.graphql b/packages/server/graphql/public/typeDefs/RemovePokerTemplateDimensionPayload.graphql
new file mode 100644
index 00000000000..ea1e915af62
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemovePokerTemplateDimensionPayload.graphql
@@ -0,0 +1,5 @@
+type RemovePokerTemplateDimensionPayload {
+  error: StandardMutationError
+  pokerTemplate: PokerTemplate
+  dimension: TemplateDimension
+}
diff --git a/packages/server/graphql/public/typeDefs/RemovePokerTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/RemovePokerTemplatePayload.graphql
new file mode 100644
index 00000000000..1f75c5ebd17
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemovePokerTemplatePayload.graphql
@@ -0,0 +1,5 @@
+type RemovePokerTemplatePayload {
+  error: StandardMutationError
+  pokerTemplate: PokerTemplate
+  pokerMeetingSettings: PokerMeetingSettings
+}
diff --git a/packages/server/graphql/public/typeDefs/RemovePokerTemplateScalePayload.graphql b/packages/server/graphql/public/typeDefs/RemovePokerTemplateScalePayload.graphql
new file mode 100644
index 00000000000..4fe9470912d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemovePokerTemplateScalePayload.graphql
@@ -0,0 +1,9 @@
+type RemovePokerTemplateScalePayload {
+  error: StandardMutationError
+  scale: TemplateScale
+
+  """
+  A list of dimensions that were using the archived scale
+  """
+  dimensions: [TemplateDimension!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/RemovePokerTemplateScaleValuePayload.graphql b/packages/server/graphql/public/typeDefs/RemovePokerTemplateScaleValuePayload.graphql
new file mode 100644
index 00000000000..b78aad7676f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemovePokerTemplateScaleValuePayload.graphql
@@ -0,0 +1,4 @@
+type RemovePokerTemplateScaleValuePayload {
+  error: StandardMutationError
+  scale: TemplateScale
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveReflectTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/RemoveReflectTemplatePayload.graphql
new file mode 100644
index 00000000000..5701a8dbd27
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveReflectTemplatePayload.graphql
@@ -0,0 +1,5 @@
+type RemoveReflectTemplatePayload {
+  error: StandardMutationError
+  reflectTemplate: ReflectTemplate
+  retroMeetingSettings: RetrospectiveMeetingSettings
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveReflectTemplatePromptPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveReflectTemplatePromptPayload.graphql
new file mode 100644
index 00000000000..c5d9a9148da
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveReflectTemplatePromptPayload.graphql
@@ -0,0 +1,5 @@
+type RemoveReflectTemplatePromptPayload {
+  error: StandardMutationError
+  reflectTemplate: ReflectTemplate
+  prompt: ReflectPrompt
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveReflectionPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveReflectionPayload.graphql
new file mode 100644
index 00000000000..2b0dcae5dfd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveReflectionPayload.graphql
@@ -0,0 +1,10 @@
+type RemoveReflectionPayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+  reflection: RetroReflection
+
+  """
+  The stages that were unlocked by navigating
+  """
+  unlockedStages: [NewMeetingStage!]
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveSlackAuthPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveSlackAuthPayload.graphql
new file mode 100644
index 00000000000..c7dcce18e7b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveSlackAuthPayload.graphql
@@ -0,0 +1,14 @@
+type RemoveSlackAuthPayload {
+  error: StandardMutationError
+
+  """
+  The ID of the authorization removed
+  """
+  authId: ID
+  teamId: ID
+
+  """
+  The user with updated slackAuth
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthPayload.graphql
new file mode 100644
index 00000000000..4334aaae1a5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for RemoveTeamMemberIntegrationAuthPayload
+"""
+union RemoveTeamMemberIntegrationAuthPayload = ErrorPayload | RemoveTeamMemberIntegrationAuthSuccess
diff --git a/packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthSuccess.graphql b/packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthSuccess.graphql
new file mode 100644
index 00000000000..5ef551db64a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveTeamMemberIntegrationAuthSuccess.graphql
@@ -0,0 +1,11 @@
+type RemoveTeamMemberIntegrationAuthSuccess {
+  """
+  The team member with the updated auth
+  """
+  teamMember: TeamMember!
+
+  """
+  The user who updated TeamMemberIntegrationAuth object
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/RemoveTeamMemberPayload.graphql b/packages/server/graphql/public/typeDefs/RemoveTeamMemberPayload.graphql
new file mode 100644
index 00000000000..1b5bef10895
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RemoveTeamMemberPayload.graphql
@@ -0,0 +1,28 @@
+type RemoveTeamMemberPayload {
+  error: StandardMutationError
+
+  """
+  The team member removed
+  """
+  teamMember: TeamMember
+
+  """
+  The team the team member was removed from
+  """
+  team: Team
+
+  """
+  The tasks that got reassigned
+  """
+  updatedTasks: [Task!]
+
+  """
+  The user removed from the team
+  """
+  user: User
+
+  """
+  A notification if you were kicked out by the team leader
+  """
+  kickOutNotification: NotifyKickedOut
+}
diff --git a/packages/server/graphql/public/typeDefs/RenameMeetingPayload.graphql b/packages/server/graphql/public/typeDefs/RenameMeetingPayload.graphql
new file mode 100644
index 00000000000..22b1341ffcb
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RenameMeetingPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for RenameMeetingPayload
+"""
+union RenameMeetingPayload = ErrorPayload | RenameMeetingSuccess
diff --git a/packages/server/graphql/public/typeDefs/RenameMeetingSuccess.graphql b/packages/server/graphql/public/typeDefs/RenameMeetingSuccess.graphql
new file mode 100644
index 00000000000..e3fff53dac8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RenameMeetingSuccess.graphql
@@ -0,0 +1,6 @@
+type RenameMeetingSuccess {
+  """
+  the renamed meeting
+  """
+  meeting: NewMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/RenameMeetingTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/RenameMeetingTemplatePayload.graphql
new file mode 100644
index 00000000000..cd60e40f5ed
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RenameMeetingTemplatePayload.graphql
@@ -0,0 +1,4 @@
+type RenameMeetingTemplatePayload {
+  error: StandardMutationError
+  meetingTemplate: MeetingTemplate
+}
diff --git a/packages/server/graphql/public/typeDefs/RenamePokerTemplateDimensionPayload.graphql b/packages/server/graphql/public/typeDefs/RenamePokerTemplateDimensionPayload.graphql
new file mode 100644
index 00000000000..ec572cc7be2
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RenamePokerTemplateDimensionPayload.graphql
@@ -0,0 +1,4 @@
+type RenamePokerTemplateDimensionPayload {
+  error: StandardMutationError
+  dimension: TemplateDimension
+}
diff --git a/packages/server/graphql/public/typeDefs/RenamePokerTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/RenamePokerTemplatePayload.graphql
new file mode 100644
index 00000000000..17754c2b465
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RenamePokerTemplatePayload.graphql
@@ -0,0 +1,4 @@
+type RenamePokerTemplatePayload {
+  error: StandardMutationError
+  pokerTemplate: PokerTemplate
+}
diff --git a/packages/server/graphql/public/typeDefs/RenamePokerTemplateScalePayload.graphql b/packages/server/graphql/public/typeDefs/RenamePokerTemplateScalePayload.graphql
new file mode 100644
index 00000000000..e15f9673704
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RenamePokerTemplateScalePayload.graphql
@@ -0,0 +1,4 @@
+type RenamePokerTemplateScalePayload {
+  error: StandardMutationError
+  scale: TemplateScale
+}
diff --git a/packages/server/graphql/public/typeDefs/RenameReflectTemplatePromptPayload.graphql b/packages/server/graphql/public/typeDefs/RenameReflectTemplatePromptPayload.graphql
new file mode 100644
index 00000000000..124624e61da
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RenameReflectTemplatePromptPayload.graphql
@@ -0,0 +1,4 @@
+type RenameReflectTemplatePromptPayload {
+  error: StandardMutationError
+  prompt: ReflectPrompt
+}
diff --git a/packages/server/graphql/public/typeDefs/RequestToJoinDomainPayload.graphql b/packages/server/graphql/public/typeDefs/RequestToJoinDomainPayload.graphql
new file mode 100644
index 00000000000..55f1fd59b3d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RequestToJoinDomainPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for requestToJoinDomain, which could be an error
+"""
+union RequestToJoinDomainPayload = ErrorPayload | RequestToJoinDomainSuccess
diff --git a/packages/server/graphql/public/typeDefs/RequestToJoinDomainSuccess.graphql b/packages/server/graphql/public/typeDefs/RequestToJoinDomainSuccess.graphql
new file mode 100644
index 00000000000..d1ad1bbb3a3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RequestToJoinDomainSuccess.graphql
@@ -0,0 +1,6 @@
+type RequestToJoinDomainSuccess {
+  """
+  Was the request created successfully
+  """
+  success: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/ResetPasswordPayload.graphql b/packages/server/graphql/public/typeDefs/ResetPasswordPayload.graphql
new file mode 100644
index 00000000000..52aee86f7bc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ResetPasswordPayload.graphql
@@ -0,0 +1,14 @@
+type ResetPasswordPayload {
+  error: StandardMutationError
+
+  """
+  The new auth token
+  """
+  authToken: ID
+  userId: ID
+
+  """
+  the user that changed their password
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/ResetReflectionGroupsPayload.graphql b/packages/server/graphql/public/typeDefs/ResetReflectionGroupsPayload.graphql
new file mode 100644
index 00000000000..1640e68ddc0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ResetReflectionGroupsPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for resetReflectionGroups, which could be an error
+"""
+union ResetReflectionGroupsPayload = ErrorPayload | ResetReflectionGroupsSuccess
diff --git a/packages/server/graphql/public/typeDefs/ResetReflectionGroupsSuccess.graphql b/packages/server/graphql/public/typeDefs/ResetReflectionGroupsSuccess.graphql
new file mode 100644
index 00000000000..5bfadb5b16b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ResetReflectionGroupsSuccess.graphql
@@ -0,0 +1,3 @@
+type ResetReflectionGroupsSuccess {
+  meeting: RetrospectiveMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/ResetRetroMeetingToGroupStagePayload.graphql b/packages/server/graphql/public/typeDefs/ResetRetroMeetingToGroupStagePayload.graphql
new file mode 100644
index 00000000000..71fc7a3174c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ResetRetroMeetingToGroupStagePayload.graphql
@@ -0,0 +1,4 @@
+type ResetRetroMeetingToGroupStagePayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/RetroDiscussStage.graphql b/packages/server/graphql/public/typeDefs/RetroDiscussStage.graphql
new file mode 100644
index 00000000000..22a67c2877f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RetroDiscussStage.graphql
@@ -0,0 +1,120 @@
+"""
+The stage where the team discusses a single theme
+"""
+type RetroDiscussStage implements NewMeetingStage & DiscussionThreadStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+
+  """
+  The ID to find the discussion that goes in the stage
+  """
+  discussionId: ID!
+
+  """
+  The discussion about the stage or a dummy data when there is no disscussion
+  """
+  discussion: Discussion!
+
+  """
+  foreign key. use reflectionGroup
+  """
+  reflectionGroupId: ID!
+
+  """
+  the group that is the focal point of the discussion
+  """
+  reflectionGroup: RetroReflectionGroup!
+
+  """
+  The sort order for reprioritizing discussion topics
+  """
+  sortOrder: Float!
+}
diff --git a/packages/server/graphql/public/typeDefs/RetroReflectionGroup.graphql b/packages/server/graphql/public/typeDefs/RetroReflectionGroup.graphql
new file mode 100644
index 00000000000..8d7ff3cf2b7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RetroReflectionGroup.graphql
@@ -0,0 +1,87 @@
+"""
+A reflection group created during the group phase of a retrospective
+"""
+type RetroReflectionGroup {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  A list of users currently commenting
+  """
+  commentors: [CommentorDetails!]
+    @deprecated(reason: "Moved to ThreadConnection. Can remove Jun-01-2021")
+
+  """
+  The timestamp the meeting was created
+  """
+  createdAt: DateTime!
+
+  """
+  True if the group has not been removed, else false
+  """
+  isActive: Boolean!
+
+  """
+  The foreign key to link a reflection group to its meeting
+  """
+  meetingId: ID!
+
+  """
+  The retrospective meeting this reflection was created in
+  """
+  meeting: RetrospectiveMeeting!
+  prompt: ReflectPrompt!
+
+  """
+  The foreign key to link a reflection group to its prompt. Immutable.
+  """
+  promptId: ID!
+  reflections: [RetroReflection!]!
+
+  """
+  Our auto-suggested title, to be compared to the actual title for analytics
+  """
+  smartTitle: String
+
+  """
+  The sort order of the reflection group
+  """
+  sortOrder: Float!
+
+  """
+  The team that is running the retro
+  """
+  team: Team
+
+  """
+  The title of the grouping of the retrospective reflections
+  """
+  title: String
+
+  """
+  true if a user wrote the title, else false
+  """
+  titleIsUserDefined: Boolean!
+
+  """
+  The timestamp the meeting was updated at
+  """
+  updatedAt: DateTime
+
+  """
+  A list of voterIds (userIds). Not available to team to preserve anonymity
+  """
+  voterIds: [ID!]!
+
+  """
+  The number of votes this group has received
+  """
+  voteCount: Int!
+
+  """
+  The number of votes the viewer has given this group
+  """
+  viewerVoteCount: Int
+}
diff --git a/packages/server/graphql/public/typeDefs/RetrospectiveMeeting.graphql b/packages/server/graphql/public/typeDefs/RetrospectiveMeeting.graphql
index f9ff31de25e..3f76c149e84 100644
--- a/packages/server/graphql/public/typeDefs/RetrospectiveMeeting.graphql
+++ b/packages/server/graphql/public/typeDefs/RetrospectiveMeeting.graphql
@@ -1,33 +1,3 @@
-"""
-A suggested reflection group created by OpenAI'
-"""
-type AutogroupReflectionGroup {
-  """
-  The smart title for the reflection group created by OpenAI
-  """
-  groupTitle: String!
-
-  """
-  The ids of the reflections in the group
-  """
-  reflectionIds: [ID!]!
-}
-
-"""
-A block of the meeting transcription with a speaker and text
-"""
-type TranscriptBlock {
-  """
-  The speaker who said the words
-  """
-  speaker: String!
-
-  """
-  The words that the speaker said
-  """
-  words: String!
-}
-
 """
 A retrospective meeting
 """
@@ -116,7 +86,6 @@ type RetrospectiveMeeting implements NewMeeting {
   The meeting series this meeting is associated with if the meeting is recurring
   """
   meetingSeries: MeetingSeries
-
   meetingType: MeetingTypeEnum!
 
   """
@@ -153,7 +122,6 @@ type RetrospectiveMeeting implements NewMeeting {
   The time the meeting summary was emailed to the team
   """
   summarySentAt: DateTime
-
   teamId: ID!
 
   """
diff --git a/packages/server/graphql/public/typeDefs/RetrospectiveMeetingMember.graphql b/packages/server/graphql/public/typeDefs/RetrospectiveMeetingMember.graphql
new file mode 100644
index 00000000000..c0cb2ccc6f8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RetrospectiveMeetingMember.graphql
@@ -0,0 +1,34 @@
+"""
+All the meeting specifics for a user in a retro meeting
+"""
+type RetrospectiveMeetingMember implements MeetingMember {
+  """
+  A composite of userId::meetingId
+  """
+  id: ID!
+
+  """
+  true if present, false if absent, else null
+  """
+  isCheckedIn: Boolean
+    @deprecated(
+      reason: "Members are checked in when they enter the meeting now & not created beforehand"
+    )
+  meetingId: ID!
+  meetingType: MeetingTypeEnum!
+  teamId: ID!
+  teamMember: TeamMember!
+  user: User!
+  userId: ID!
+
+  """
+  The last time a meeting was updated (stage completed, finished, etc)
+  """
+  updatedAt: DateTime!
+
+  """
+  The tasks assigned to members during the meeting
+  """
+  tasks: [Task!]!
+  votesRemaining: Int!
+}
diff --git a/packages/server/graphql/public/typeDefs/RetrospectiveMeetingSettings.graphql b/packages/server/graphql/public/typeDefs/RetrospectiveMeetingSettings.graphql
new file mode 100644
index 00000000000..aa85e82872c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RetrospectiveMeetingSettings.graphql
@@ -0,0 +1,90 @@
+"""
+The retro-specific meeting settings
+"""
+type RetrospectiveMeetingSettings implements TeamMeetingSettings {
+  id: ID!
+
+  """
+  The type of meeting these settings apply to
+  """
+  meetingType: MeetingTypeEnum!
+
+  """
+  The broad phase types that will be addressed during the meeting
+  """
+  phaseTypes: [NewMeetingPhaseTypeEnum!]!
+
+  """
+  FK
+  """
+  teamId: ID!
+
+  """
+  The team these settings belong to
+  """
+  team: Team!
+
+  """
+  The total number of votes each team member receives for the voting phase
+  """
+  totalVotes: Int!
+
+  """
+  The maximum number of votes a team member can vote for a single reflection group
+  """
+  maxVotesPerGroup: Int!
+
+  """
+  Disables anonymity of reflections
+  """
+  disableAnonymity: Boolean!
+
+  """
+  FK. The template that will be used to start the retrospective
+  """
+  selectedTemplateId: ID!
+
+  """
+  The template that will be used to start the retrospective
+  """
+  selectedTemplate: ReflectTemplate!
+
+  """
+  The list of templates used to start a retrospective
+  """
+  reflectTemplates: [ReflectTemplate!]!
+
+  """
+  The list of templates used to start a retrospective
+  """
+  teamTemplates: [ReflectTemplate!]!
+
+  """
+  The list of templates shared across the organization to start a retrospective
+  """
+  organizationTemplates(
+    first: Int!
+
+    """
+    The cursor, which is the templateId
+    """
+    after: ID
+  ): ReflectTemplateConnection!
+
+  """
+  The list of templates shared across the organization to start a retrospective
+  """
+  publicTemplates(
+    first: Int!
+
+    """
+    The cursor, which is the templateId
+    """
+    after: ID
+  ): ReflectTemplateConnection!
+
+  """
+  The meeting URL that we will transcribe; stored in settings until the meeting starts
+  """
+  videoMeetingURL: String
+}
diff --git a/packages/server/graphql/public/typeDefs/RevealTeamHealthVotesPayload.graphql b/packages/server/graphql/public/typeDefs/RevealTeamHealthVotesPayload.graphql
new file mode 100644
index 00000000000..36e2251fdd7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RevealTeamHealthVotesPayload.graphql
@@ -0,0 +1 @@
+union RevealTeamHealthVotesPayload = ErrorPayload | RevealTeamHealthVotesSuccess
diff --git a/packages/server/graphql/public/typeDefs/RevealTeamHealthVotesSuccess.graphql b/packages/server/graphql/public/typeDefs/RevealTeamHealthVotesSuccess.graphql
new file mode 100644
index 00000000000..4f8c1bd329a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/RevealTeamHealthVotesSuccess.graphql
@@ -0,0 +1,5 @@
+type RevealTeamHealthVotesSuccess {
+  meetingId: ID!
+  stageId: ID!
+  stage: TeamHealthStage!
+}
diff --git a/packages/server/graphql/public/typeDefs/SAML.graphql b/packages/server/graphql/public/typeDefs/SAML.graphql
index 350fd9689cf..883813c9f03 100644
--- a/packages/server/graphql/public/typeDefs/SAML.graphql
+++ b/packages/server/graphql/public/typeDefs/SAML.graphql
@@ -26,7 +26,6 @@ type SAML {
   An immutable URL used to retrieve the metadata. If metadata is present but URL is unknown it will be `Unknown`
   """
   metadataURL: String
-
   createdAt: DateTime!
   updatedAt: DateTime!
 
@@ -50,8 +49,3 @@ type SAML {
   """
   organization: Organization
 }
-type ParseSAMLMetadataSuccess {
-  url: String!
-}
-
-union ParseSAMLMetadataPayload = ErrorPayload | ParseSAMLMetadataSuccess
diff --git a/packages/server/graphql/public/typeDefs/SelectTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/SelectTemplatePayload.graphql
new file mode 100644
index 00000000000..fd2d05de3a7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SelectTemplatePayload.graphql
@@ -0,0 +1,4 @@
+type SelectTemplatePayload {
+  error: StandardMutationError
+  meetingSettings: TeamMeetingSettings
+}
diff --git a/packages/server/graphql/public/typeDefs/ServiceEnum.graphql b/packages/server/graphql/public/typeDefs/ServiceEnum.graphql
new file mode 100644
index 00000000000..ac2d7cd26c9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ServiceEnum.graphql
@@ -0,0 +1,10 @@
+enum ServiceEnum {
+  PARABOL
+  github
+  jira
+  gitlab
+  mattermost
+  jiraServer
+  gcal
+  azureDevOps
+}
diff --git a/packages/server/graphql/public/typeDefs/ServiceField.graphql b/packages/server/graphql/public/typeDefs/ServiceField.graphql
new file mode 100644
index 00000000000..c92184c91fd
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ServiceField.graphql
@@ -0,0 +1,14 @@
+"""
+A field that exists on a 3rd party service
+"""
+type ServiceField {
+  """
+  The name of the field as provided by the service
+  """
+  name: String!
+
+  """
+  The field type, to be used for validation and analytics
+  """
+  type: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/SetAppLocationPayload.graphql b/packages/server/graphql/public/typeDefs/SetAppLocationPayload.graphql
new file mode 100644
index 00000000000..08d1e9acd98
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetAppLocationPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for SetAppLocationPayload
+"""
+union SetAppLocationPayload = ErrorPayload | SetAppLocationSuccess
diff --git a/packages/server/graphql/public/typeDefs/SetAppLocationSuccess.graphql b/packages/server/graphql/public/typeDefs/SetAppLocationSuccess.graphql
new file mode 100644
index 00000000000..ffcf1fc5f47
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetAppLocationSuccess.graphql
@@ -0,0 +1,6 @@
+type SetAppLocationSuccess {
+  """
+  the user with the updated location
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/SetDefaultSlackChannelPayload.graphql b/packages/server/graphql/public/typeDefs/SetDefaultSlackChannelPayload.graphql
new file mode 100644
index 00000000000..121e09a5f4a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetDefaultSlackChannelPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for SetDefaultSlackChannelPayload
+"""
+union SetDefaultSlackChannelPayload = ErrorPayload | SetDefaultSlackChannelSuccess
diff --git a/packages/server/graphql/public/typeDefs/SetDefaultSlackChannelSuccess.graphql b/packages/server/graphql/public/typeDefs/SetDefaultSlackChannelSuccess.graphql
new file mode 100644
index 00000000000..65e566ab5b3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetDefaultSlackChannelSuccess.graphql
@@ -0,0 +1,11 @@
+type SetDefaultSlackChannelSuccess {
+  """
+  The id of the slack channel that is now the default slack channel
+  """
+  slackChannelId: ID!
+
+  """
+  The team member with the updated slack channel
+  """
+  teamMember: TeamMember!
+}
diff --git a/packages/server/graphql/public/typeDefs/SetMeetingSettingsPayload.graphql b/packages/server/graphql/public/typeDefs/SetMeetingSettingsPayload.graphql
new file mode 100644
index 00000000000..81e52579dce
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetMeetingSettingsPayload.graphql
@@ -0,0 +1,4 @@
+type SetMeetingSettingsPayload {
+  error: StandardMutationError
+  settings: TeamMeetingSettings
+}
diff --git a/packages/server/graphql/public/typeDefs/SetNotificationStatusPayload.graphql b/packages/server/graphql/public/typeDefs/SetNotificationStatusPayload.graphql
new file mode 100644
index 00000000000..ea387234af6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetNotificationStatusPayload.graphql
@@ -0,0 +1,8 @@
+type SetNotificationStatusPayload {
+  error: StandardMutationError
+
+  """
+  The updated notification
+  """
+  notification: Notification
+}
diff --git a/packages/server/graphql/public/typeDefs/SetOrgUserRolePayload.graphql b/packages/server/graphql/public/typeDefs/SetOrgUserRolePayload.graphql
new file mode 100644
index 00000000000..14eef286386
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetOrgUserRolePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for setOrgUserRole, which could be an error
+"""
+union SetOrgUserRolePayload = ErrorPayload | SetOrgUserRoleSuccess
diff --git a/packages/server/graphql/public/typeDefs/SetOrgUserRoleSuccess.graphql b/packages/server/graphql/public/typeDefs/SetOrgUserRoleSuccess.graphql
new file mode 100644
index 00000000000..c96a24131ce
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetOrgUserRoleSuccess.graphql
@@ -0,0 +1,5 @@
+type SetOrgUserRoleSuccess {
+  organization: Organization!
+  updatedOrgMember: OrganizationUser!
+  notificationsAdded: [Notification!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/SetPhaseFocusPayload.graphql b/packages/server/graphql/public/typeDefs/SetPhaseFocusPayload.graphql
new file mode 100644
index 00000000000..3af85f671ba
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetPhaseFocusPayload.graphql
@@ -0,0 +1,5 @@
+type SetPhaseFocusPayload {
+  error: StandardMutationError
+  meeting: RetrospectiveMeeting!
+  reflectPhase: ReflectPhase!
+}
diff --git a/packages/server/graphql/public/typeDefs/SetPokerSpectatePayload.graphql b/packages/server/graphql/public/typeDefs/SetPokerSpectatePayload.graphql
new file mode 100644
index 00000000000..bbc8653a86a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetPokerSpectatePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for SetPokerSpectatePayload
+"""
+union SetPokerSpectatePayload = ErrorPayload | SetPokerSpectateSuccess
diff --git a/packages/server/graphql/public/typeDefs/SetPokerSpectateSuccess.graphql b/packages/server/graphql/public/typeDefs/SetPokerSpectateSuccess.graphql
new file mode 100644
index 00000000000..24ade683658
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetPokerSpectateSuccess.graphql
@@ -0,0 +1,14 @@
+type SetPokerSpectateSuccess {
+  meetingId: ID!
+  userId: ID!
+
+  """
+  The meeting member with the updated isSpectating value
+  """
+  meetingMember: PokerMeetingMember!
+
+  """
+  The stages that were updated if the viewer voted and then changed to spectating
+  """
+  updatedStages: [EstimateStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/SetSlackNotificationPayload.graphql b/packages/server/graphql/public/typeDefs/SetSlackNotificationPayload.graphql
new file mode 100644
index 00000000000..8862d6fe0cb
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetSlackNotificationPayload.graphql
@@ -0,0 +1,9 @@
+type SetSlackNotificationPayload {
+  error: StandardMutationError
+  slackNotifications: [SlackNotification!]
+
+  """
+  The user with updated slack notifications
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/SetStageTimerPayload.graphql b/packages/server/graphql/public/typeDefs/SetStageTimerPayload.graphql
new file mode 100644
index 00000000000..7cfca6ddb5b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetStageTimerPayload.graphql
@@ -0,0 +1,8 @@
+type SetStageTimerPayload {
+  error: StandardMutationError
+
+  """
+  The updated stage
+  """
+  stage: NewMeetingStage
+}
diff --git a/packages/server/graphql/public/typeDefs/SetTaskEstimatePayload.graphql b/packages/server/graphql/public/typeDefs/SetTaskEstimatePayload.graphql
new file mode 100644
index 00000000000..77deaf5c3e1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetTaskEstimatePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for SetTaskEstimatePayload
+"""
+union SetTaskEstimatePayload = ErrorPayload | SetTaskEstimateSuccess
diff --git a/packages/server/graphql/public/typeDefs/SetTaskEstimateSuccess.graphql b/packages/server/graphql/public/typeDefs/SetTaskEstimateSuccess.graphql
new file mode 100644
index 00000000000..03a6ebf75ad
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetTaskEstimateSuccess.graphql
@@ -0,0 +1,8 @@
+type SetTaskEstimateSuccess {
+  task: Task!
+
+  """
+  The stage that holds the updated finalScore, if meetingId was provided
+  """
+  stage: EstimateStage
+}
diff --git a/packages/server/graphql/public/typeDefs/SetTaskHighlightPayload.graphql b/packages/server/graphql/public/typeDefs/SetTaskHighlightPayload.graphql
new file mode 100644
index 00000000000..98a547b098c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetTaskHighlightPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for SetTaskHighlightPayload
+"""
+union SetTaskHighlightPayload = ErrorPayload | SetTaskHighlightSuccess
diff --git a/packages/server/graphql/public/typeDefs/SetTaskHighlightSuccess.graphql b/packages/server/graphql/public/typeDefs/SetTaskHighlightSuccess.graphql
new file mode 100644
index 00000000000..4c1bfc05818
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetTaskHighlightSuccess.graphql
@@ -0,0 +1,16 @@
+type SetTaskHighlightSuccess {
+  """
+  Meeting where the task is highlighted
+  """
+  meetingId: ID!
+
+  """
+  Task which highlight changed
+  """
+  taskId: ID!
+
+  """
+  Task which highlight changed
+  """
+  task: Task!
+}
diff --git a/packages/server/graphql/public/typeDefs/SetTeamHealthVotePayload.graphql b/packages/server/graphql/public/typeDefs/SetTeamHealthVotePayload.graphql
new file mode 100644
index 00000000000..a2fd8347b98
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetTeamHealthVotePayload.graphql
@@ -0,0 +1 @@
+union SetTeamHealthVotePayload = ErrorPayload | SetTeamHealthVoteSuccess
diff --git a/packages/server/graphql/public/typeDefs/SetTeamHealthVoteSuccess.graphql b/packages/server/graphql/public/typeDefs/SetTeamHealthVoteSuccess.graphql
new file mode 100644
index 00000000000..2fd361716be
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SetTeamHealthVoteSuccess.graphql
@@ -0,0 +1,5 @@
+type SetTeamHealthVoteSuccess {
+  meetingId: ID!
+  stageId: ID!
+  stage: TeamHealthStage!
+}
diff --git a/packages/server/graphql/public/typeDefs/ShareTopicPayload.graphql b/packages/server/graphql/public/typeDefs/ShareTopicPayload.graphql
new file mode 100644
index 00000000000..9597100c6d9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ShareTopicPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for shareTopic, which could be an error
+"""
+union ShareTopicPayload = ErrorPayload | ShareTopicSuccess
diff --git a/packages/server/graphql/public/typeDefs/ShareTopicSuccess.graphql b/packages/server/graphql/public/typeDefs/ShareTopicSuccess.graphql
new file mode 100644
index 00000000000..2024c5ac3e8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ShareTopicSuccess.graphql
@@ -0,0 +1,6 @@
+type ShareTopicSuccess {
+  """
+  Meeting
+  """
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/SharingScopeEnum.graphql b/packages/server/graphql/public/typeDefs/SharingScopeEnum.graphql
new file mode 100644
index 00000000000..da5a1cd75bc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SharingScopeEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The scope of a shareable item
+"""
+enum SharingScopeEnum {
+  TEAM
+  ORGANIZATION
+  PUBLIC
+}
diff --git a/packages/server/graphql/public/typeDefs/SlackNotification.graphql b/packages/server/graphql/public/typeDefs/SlackNotification.graphql
new file mode 100644
index 00000000000..cb22cd44f4b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SlackNotification.graphql
@@ -0,0 +1,15 @@
+"""
+an event trigger and slack channel to receive it
+"""
+type SlackNotification {
+  id: ID!
+  event: SlackNotificationEventEnum!
+  eventType: SlackNotificationEventTypeEnum!
+
+  """
+  null if no notification is to be sent
+  """
+  channelId: ID
+  teamId: ID!
+  userId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/SlackNotificationEventEnum.graphql b/packages/server/graphql/public/typeDefs/SlackNotificationEventEnum.graphql
new file mode 100644
index 00000000000..24bdf2e39a1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SlackNotificationEventEnum.graphql
@@ -0,0 +1,11 @@
+"""
+The event that triggers a slack notification
+"""
+enum SlackNotificationEventEnum {
+  meetingStart
+  meetingEnd
+  MEETING_STAGE_TIME_LIMIT_END
+  MEETING_STAGE_TIME_LIMIT_START
+  TOPIC_SHARED
+  STANDUP_RESPONSE_SUBMITTED
+}
diff --git a/packages/server/graphql/public/typeDefs/SlackNotificationEventTypeEnum.graphql b/packages/server/graphql/public/typeDefs/SlackNotificationEventTypeEnum.graphql
new file mode 100644
index 00000000000..e8cd0eee9c6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SlackNotificationEventTypeEnum.graphql
@@ -0,0 +1,14 @@
+"""
+The type of event for a slack notification
+"""
+enum SlackNotificationEventTypeEnum {
+  """
+  notification that concerns the whole team
+  """
+  team
+
+  """
+  notification that concerns a single member on the team
+  """
+  member
+}
diff --git a/packages/server/graphql/public/typeDefs/StandardMutationError.graphql b/packages/server/graphql/public/typeDefs/StandardMutationError.graphql
new file mode 100644
index 00000000000..3ed1bcef44f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StandardMutationError.graphql
@@ -0,0 +1,11 @@
+type StandardMutationError {
+  """
+  The title of the error
+  """
+  title: String
+
+  """
+  The full error
+  """
+  message: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/StartCheckInPayload.graphql b/packages/server/graphql/public/typeDefs/StartCheckInPayload.graphql
new file mode 100644
index 00000000000..863f3749b23
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartCheckInPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for StartCheckInPayload
+"""
+union StartCheckInPayload = StartCheckInSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/StartCheckInSuccess.graphql b/packages/server/graphql/public/typeDefs/StartCheckInSuccess.graphql
new file mode 100644
index 00000000000..5f2d2395da7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartCheckInSuccess.graphql
@@ -0,0 +1,6 @@
+type StartCheckInSuccess {
+  meeting: ActionMeeting!
+  meetingId: ID!
+  team: Team!
+  hasGcalError: Boolean
+}
diff --git a/packages/server/graphql/public/typeDefs/StartDraggingReflectionPayload.graphql b/packages/server/graphql/public/typeDefs/StartDraggingReflectionPayload.graphql
new file mode 100644
index 00000000000..864c24c719f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartDraggingReflectionPayload.graphql
@@ -0,0 +1,13 @@
+type StartDraggingReflectionPayload {
+  error: StandardMutationError
+
+  """
+  The proposed start/end of a drag. Subject to race conditions, it is up to the client to decide to accept or ignore
+  """
+  remoteDrag: RemoteReflectionDrag
+  meeting: NewMeeting
+  meetingId: ID
+  reflection: RetroReflection
+  reflectionId: ID
+  teamId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/StartRetrospectivePayload.graphql b/packages/server/graphql/public/typeDefs/StartRetrospectivePayload.graphql
new file mode 100644
index 00000000000..736aac0d4d3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartRetrospectivePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for StartRetrospectivePayload
+"""
+union StartRetrospectivePayload = ErrorPayload | StartRetrospectiveSuccess
diff --git a/packages/server/graphql/public/typeDefs/StartRetrospectiveSuccess.graphql b/packages/server/graphql/public/typeDefs/StartRetrospectiveSuccess.graphql
new file mode 100644
index 00000000000..ac0669fd220
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartRetrospectiveSuccess.graphql
@@ -0,0 +1,6 @@
+type StartRetrospectiveSuccess {
+  meeting: RetrospectiveMeeting!
+  meetingId: ID!
+  team: Team!
+  hasGcalError: Boolean
+}
diff --git a/packages/server/graphql/public/typeDefs/StartSprintPokerPayload.graphql b/packages/server/graphql/public/typeDefs/StartSprintPokerPayload.graphql
new file mode 100644
index 00000000000..c89352ba8b6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartSprintPokerPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for StartSprintPokerPayload
+"""
+union StartSprintPokerPayload = ErrorPayload | StartSprintPokerSuccess
diff --git a/packages/server/graphql/public/typeDefs/StartSprintPokerSuccess.graphql b/packages/server/graphql/public/typeDefs/StartSprintPokerSuccess.graphql
new file mode 100644
index 00000000000..8b02b29c108
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartSprintPokerSuccess.graphql
@@ -0,0 +1,11 @@
+type StartSprintPokerSuccess {
+  meetingId: ID!
+  meeting: PokerMeeting!
+  team: Team!
+  teamId: ID!
+
+  """
+  True if there was an error creating the Google Calendar event. False if there was no error or no gcalInput was provided.
+  """
+  hasGcalError: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/StartTeamPromptPayload.graphql b/packages/server/graphql/public/typeDefs/StartTeamPromptPayload.graphql
new file mode 100644
index 00000000000..0df9fdda811
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartTeamPromptPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for updateRecurrenceSettings, which could be an error
+"""
+union StartTeamPromptPayload = StartTeamPromptSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/StartTeamPromptSuccess.graphql b/packages/server/graphql/public/typeDefs/StartTeamPromptSuccess.graphql
new file mode 100644
index 00000000000..dfbfaab320a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StartTeamPromptSuccess.graphql
@@ -0,0 +1,16 @@
+type StartTeamPromptSuccess {
+  """
+  The started meeting
+  """
+  meeting: TeamPromptMeeting!
+
+  """
+  The team that started the meeting
+  """
+  team: Team!
+
+  """
+  True if there was an error creating the Google Calendar event. False if there was no error or no gcalInput was provided.
+  """
+  hasGcalError: Boolean
+}
diff --git a/packages/server/graphql/public/typeDefs/StripeFailPaymentPayload.graphql b/packages/server/graphql/public/typeDefs/StripeFailPaymentPayload.graphql
new file mode 100644
index 00000000000..7345c9eefc2
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/StripeFailPaymentPayload.graphql
@@ -0,0 +1,9 @@
+type StripeFailPaymentPayload {
+  error: StandardMutationError
+  organization: Organization
+
+  """
+  The notification to a billing leader stating the payment was rejected
+  """
+  notification: NotifyPaymentRejected!
+}
diff --git a/packages/server/graphql/public/typeDefs/Subscription.graphql b/packages/server/graphql/public/typeDefs/Subscription.graphql
new file mode 100644
index 00000000000..7329c653d66
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Subscription.graphql
@@ -0,0 +1,7 @@
+type Subscription {
+  meetingSubscription(meetingId: ID!): MeetingSubscriptionPayload!
+  notificationSubscription: NotificationSubscriptionPayload!
+  organizationSubscription: OrganizationSubscriptionPayload!
+  taskSubscription: TaskSubscriptionPayload!
+  teamSubscription: TeamSubscriptionPayload!
+}
diff --git a/packages/server/graphql/public/typeDefs/Subscriptions.graphql b/packages/server/graphql/public/typeDefs/Subscriptions.graphql
deleted file mode 100644
index 3f2e1a48de5..00000000000
--- a/packages/server/graphql/public/typeDefs/Subscriptions.graphql
+++ /dev/null
@@ -1,195 +0,0 @@
-type Subscription {
-  meetingSubscription(meetingId: ID!): MeetingSubscriptionPayload!
-  notificationSubscription: NotificationSubscriptionPayload!
-  organizationSubscription: OrganizationSubscriptionPayload!
-  taskSubscription: TaskSubscriptionPayload!
-  teamSubscription: TeamSubscriptionPayload!
-}
-
-type MeetingSubscriptionPayload {
-  fieldName: String!
-  AddTranscriptionBotSuccess: AddTranscriptionBotSuccess
-  AutogroupSuccess: AutogroupSuccess
-  AddCommentSuccess: AddCommentSuccess
-  CreatePollSuccess: CreatePollSuccess
-  AddReactjiToReflectionSuccess: AddReactjiToReflectionSuccess
-  AddReactjiToReactableSuccess: AddReactjiToReactableSuccess
-  CreateReflectionPayload: CreateReflectionPayload
-  DeleteCommentSuccess: DeleteCommentSuccess
-  DragDiscussionTopicPayload: DragDiscussionTopicPayload
-  DragEstimatingTaskSuccess: DragEstimatingTaskSuccess
-  EditCommentingSuccess: EditCommentingSuccess
-  EditReflectionPayload: EditReflectionPayload
-  EndDraggingReflectionPayload: EndDraggingReflectionPayload
-  EndRetrospectiveSuccess: EndRetrospectiveSuccess
-  EndTeamPromptSuccess: EndTeamPromptSuccess
-  FlagReadyToAdvanceSuccess: FlagReadyToAdvanceSuccess
-  GenerateGroupsSuccess: GenerateGroupsSuccess
-  NewMeetingCheckInPayload: NewMeetingCheckInPayload
-  PromoteNewMeetingFacilitatorPayload: PromoteNewMeetingFacilitatorPayload
-  RemoveReflectionPayload: RemoveReflectionPayload
-  ResetReflectionGroupsSuccess: ResetReflectionGroupsSuccess
-  ResetRetroMeetingToGroupStagePayload: ResetRetroMeetingToGroupStagePayload
-  RevealTeamHealthVotesSuccess: RevealTeamHealthVotesSuccess
-  SetPhaseFocusPayload: SetPhaseFocusPayload
-  SetStageTimerPayload: SetStageTimerPayload
-  SetTaskHighlightSuccess: SetTaskHighlightSuccess
-  SetTeamHealthVoteSuccess: SetTeamHealthVoteSuccess
-  StartDraggingReflectionPayload: StartDraggingReflectionPayload
-  UpdateCommentContentSuccess: UpdateCommentContentSuccess
-  UpdateDragLocationPayload: UpdateDragLocationPayload
-  UpdateMeetingPromptSuccess: UpdateMeetingPromptSuccess
-  UpdateNewCheckInQuestionPayload: UpdateNewCheckInQuestionPayload
-  UpdatedNotification: UpdatedNotification
-  UpdateReflectionContentPayload: UpdateReflectionContentPayload
-  UpdateReflectionGroupTitlePayload: UpdateReflectionGroupTitlePayload
-  UpdateRetroMaxVotesSuccess: UpdateRetroMaxVotesSuccess
-  UpdatePokerScopeSuccess: UpdatePokerScopeSuccess
-  VoteForReflectionGroupPayload: VoteForReflectionGroupPayload
-  VoteForPokerStorySuccess: VoteForPokerStorySuccess
-  PokerRevealVotesSuccess: PokerRevealVotesSuccess
-  PokerResetDimensionSuccess: PokerResetDimensionSuccess
-  PokerAnnounceDeckHoverSuccess: PokerAnnounceDeckHoverSuccess
-  JoinMeetingSuccess: JoinMeetingSuccess
-  SetPokerSpectateSuccess: SetPokerSpectateSuccess
-  SetTaskEstimateSuccess: SetTaskEstimateSuccess
-  UpsertTeamPromptResponseSuccess: UpsertTeamPromptResponseSuccess
-  UpdateMeetingTemplateSuccess: UpdateMeetingTemplateSuccess
-}
-
-type NotificationSubscriptionPayload {
-  fieldName: String!
-  AcceptTeamInvitationPayload: AcceptTeamInvitationPayload
-  AddNewFeaturePayload: AddNewFeaturePayload
-  AddOrgPayload: AddOrgPayload
-  AddTeamPayload: AddTeamPayload
-  ArchiveTimelineEventSuccess: ArchiveTimelineEventSuccess
-  SetNotificationStatusPayload: SetNotificationStatusPayload
-  CreateTaskPayload: CreateTaskPayload
-  DeleteTaskPayload: DeleteTaskPayload
-  DisconnectSocketPayload: DisconnectSocketPayload
-  EndCheckInSuccess: EndCheckInSuccess
-  EndRetrospectiveSuccess: EndRetrospectiveSuccess
-  InvalidateSessionsPayload: InvalidateSessionsPayload
-  InviteToTeamPayload: InviteToTeamPayload
-  MeetingStageTimeLimitPayload: MeetingStageTimeLimitPayload
-  RemoveOrgUserPayload: RemoveOrgUserPayload
-  StripeFailPaymentPayload: StripeFailPaymentPayload
-  PersistJiraSearchQuerySuccess: PersistJiraSearchQuerySuccess
-  User: User
-  AuthTokenPayload: AuthTokenPayload
-  PersistGitHubSearchQuerySuccess: PersistGitHubSearchQuerySuccess
-  JiraServerIssue: JiraServerIssue
-  AddedNotification: AddedNotification
-  UpdateFeatureFlagPayload: UpdateFeatureFlagPayload
-  JiraIssue: JiraIssue
-  UpdatedNotification: UpdatedNotification
-  RemoveIntegrationSearchQuerySuccess: RemoveIntegrationSearchQuerySuccess
-  PersistIntegrationSearchQuerySuccess: PersistIntegrationSearchQuerySuccess
-}
-
-type OrganizationSubscriptionPayload {
-  fieldName: String!
-  AddOrgPayload: AddOrgPayload
-  ArchiveOrganizationPayload: ArchiveOrganizationPayload
-  DowngradeToStarterPayload: DowngradeToStarterPayload
-  PayLaterPayload: PayLaterPayload
-  RemoveOrgUserPayload: RemoveOrgUserPayload
-  SetOrgUserRoleSuccess: SetOrgUserRoleSuccess
-  OldUpdateCreditCardPayload: OldUpdateCreditCardPayload
-  UpdateCreditCardPayload: UpdateCreditCardPayload
-  UpdateOrgPayload: UpdateOrgPayload
-  OldUpgradeToTeamTierPayload: OldUpgradeToTeamTierPayload
-  UpgradeToTeamTierSuccess: UpgradeToTeamTierSuccess
-  UpdateTemplateScopeSuccess: UpdateTemplateScopeSuccess
-}
-
-type TaskSubscriptionPayload {
-  fieldName: String!
-  ChangeTaskTeamPayload: ChangeTaskTeamPayload
-  CreateTaskIntegrationPayload: CreateTaskIntegrationPayload
-  CreateTaskPayload: CreateTaskPayload
-  DeleteTaskPayload: DeleteTaskPayload
-  EditTaskPayload: EditTaskPayload
-  RemoveOrgUserPayload: RemoveOrgUserPayload
-  RemoveTeamMemberPayload: RemoveTeamMemberPayload
-  UpdateTaskPayload: UpdateTaskPayload
-  UpdateTaskDueDatePayload: UpdateTaskDueDatePayload
-}
-
-type TeamSubscriptionPayload {
-  fieldName: String!
-  AcceptTeamInvitationPayload: AcceptTeamInvitationPayload
-  AddAgendaItemPayload: AddAgendaItemPayload
-  AddAtlassianAuthPayload: AddAtlassianAuthPayload
-  AddGitHubAuthPayload: AddGitHubAuthPayload
-  AddIntegrationProviderSuccess: AddIntegrationProviderSuccess
-  AddSlackAuthPayload: AddSlackAuthPayload
-  AddTeamPayload: AddTeamPayload
-  ArchiveTeamPayload: ArchiveTeamPayload
-  BatchArchiveTasksSuccess: BatchArchiveTasksSuccess
-  DenyPushInvitationPayload: DenyPushInvitationPayload
-  DowngradeToStarterPayload: DowngradeToStarterPayload
-  EndCheckInSuccess: EndCheckInSuccess
-  EndRetrospectiveSuccess: EndRetrospectiveSuccess
-  EndSprintPokerSuccess: EndSprintPokerSuccess
-  EndTeamPromptSuccess: EndTeamPromptSuccess
-  NavigateMeetingPayload: NavigateMeetingPayload
-  PushInvitationPayload: PushInvitationPayload
-  PromoteToTeamLeadPayload: PromoteToTeamLeadPayload
-  RemoveAgendaItemPayload: RemoveAgendaItemPayload
-  RemoveOrgUserPayload: RemoveOrgUserPayload
-  RemoveTeamMemberPayload: RemoveTeamMemberPayload
-  RenameMeetingSuccess: RenameMeetingSuccess
-  SelectTemplatePayload: SelectTemplatePayload
-  StartCheckInSuccess: StartCheckInSuccess
-  StartRetrospectiveSuccess: StartRetrospectiveSuccess
-  StartSprintPokerSuccess: StartSprintPokerSuccess
-  StartTeamPromptSuccess: StartTeamPromptSuccess
-  UpdateAgendaItemPayload: UpdateAgendaItemPayload
-  OldUpdateCreditCardPayload: OldUpdateCreditCardPayload
-  UpdateCreditCardPayload: UpdateCreditCardPayload
-  UpdateTeamNamePayload: UpdateTeamNamePayload
-  OldUpgradeToTeamTierPayload: OldUpgradeToTeamTierPayload
-  UpgradeToTeamTierSuccess: UpgradeToTeamTierSuccess
-  AddReflectTemplateSuccess: AddReflectTemplateSuccess
-  AddPokerTemplateSuccess: AddPokerTemplateSuccess
-  AddReflectTemplatePromptPayload: AddReflectTemplatePromptPayload
-  AddPokerTemplateDimensionPayload: AddPokerTemplateDimensionPayload
-  AddPokerTemplateScalePayload: AddPokerTemplateScalePayload
-  AddPokerTemplateScaleValuePayload: AddPokerTemplateScaleValuePayload
-  MoveReflectTemplatePromptPayload: MoveReflectTemplatePromptPayload
-  MovePokerTemplateDimensionPayload: MovePokerTemplateDimensionPayload
-  ReflectTemplatePromptUpdateDescriptionPayload: ReflectTemplatePromptUpdateDescriptionPayload
-  PokerTemplateDimensionUpdateDescriptionPayload: PokerTemplateDimensionUpdateDescriptionPayload
-  ReflectTemplatePromptUpdateGroupColorPayload: ReflectTemplatePromptUpdateGroupColorPayload
-  RemoveAtlassianAuthPayload: RemoveAtlassianAuthPayload
-  RemoveGitHubAuthPayload: RemoveGitHubAuthPayload
-  RemoveSlackAuthPayload: RemoveSlackAuthPayload
-  RemoveReflectTemplatePayload: RemoveReflectTemplatePayload
-  RemovePokerTemplatePayload: RemovePokerTemplatePayload
-  RemoveReflectTemplatePromptPayload: RemoveReflectTemplatePromptPayload
-  RemovePokerTemplateDimensionPayload: RemovePokerTemplateDimensionPayload
-  RemovePokerTemplateScalePayload: RemovePokerTemplateScalePayload
-  RenameMeetingTemplatePayload: RenameMeetingTemplatePayload
-  RenamePokerTemplatePayload: RenamePokerTemplatePayload
-  RenameReflectTemplatePromptPayload: RenameReflectTemplatePromptPayload
-  RenamePokerTemplateDimensionPayload: RenamePokerTemplateDimensionPayload
-  RenamePokerTemplateScalePayload: RenamePokerTemplateScalePayload
-  RemovePokerTemplateScaleValuePayload: RemovePokerTemplateScaleValuePayload
-  SetMeetingSettingsPayload: SetMeetingSettingsPayload
-  SetSlackNotificationPayload: SetSlackNotificationPayload
-  UpdatePokerTemplateDimensionScalePayload: UpdatePokerTemplateDimensionScalePayload
-  UpdatePokerTemplateScaleValuePayload: UpdatePokerTemplateScaleValuePayload
-  UpdateUserProfilePayload: UpdateUserProfilePayload
-  PersistJiraSearchQuerySuccess: PersistJiraSearchQuerySuccess
-  MovePokerTemplateScaleValueSuccess: MovePokerTemplateScaleValueSuccess
-  UpdateAzureDevOpsDimensionFieldSuccess: UpdateAzureDevOpsDimensionFieldSuccess
-  SetDefaultSlackChannelSuccess: SetDefaultSlackChannelSuccess
-  SetAppLocationSuccess: SetAppLocationSuccess
-  UpdateGitHubDimensionFieldSuccess: UpdateGitHubDimensionFieldSuccess
-  UpdateIntegrationProviderSuccess: UpdateIntegrationProviderSuccess
-  UpdateRecurrenceSettingsSuccess: UpdateRecurrenceSettingsSuccess
-  UpdateDimensionFieldSuccess: UpdateDimensionFieldSuccess
-  UpdateTemplateCategorySuccess: UpdateTemplateCategorySuccess
-}
diff --git a/packages/server/graphql/public/typeDefs/SuggestedAction.graphql b/packages/server/graphql/public/typeDefs/SuggestedAction.graphql
new file mode 100644
index 00000000000..72f462bafc7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SuggestedAction.graphql
@@ -0,0 +1,39 @@
+"""
+A past event that is important to the viewer
+"""
+interface SuggestedAction {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the action was created at
+  """
+  createdAt: DateTime!
+
+  """
+  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
+  """
+  priority: Float
+
+  """
+  * The timestamp the action was removed at
+  """
+  removedAt: DateTime!
+
+  """
+  The specific type of suggested action
+  """
+  type: SuggestedActionTypeEnum!
+
+  """
+  * The userId this action is for
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/SuggestedActionCreateNewTeam.graphql b/packages/server/graphql/public/typeDefs/SuggestedActionCreateNewTeam.graphql
new file mode 100644
index 00000000000..3d188acbbc1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SuggestedActionCreateNewTeam.graphql
@@ -0,0 +1,39 @@
+"""
+a suggestion to try a retro with your team
+"""
+type SuggestedActionCreateNewTeam implements SuggestedAction {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the action was created at
+  """
+  createdAt: DateTime!
+
+  """
+  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
+  """
+  priority: Float
+
+  """
+  * The timestamp the action was removed at
+  """
+  removedAt: DateTime!
+
+  """
+  The specific type of suggested action
+  """
+  type: SuggestedActionTypeEnum!
+
+  """
+  * The userId this action is for
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/SuggestedActionInviteYourTeam.graphql b/packages/server/graphql/public/typeDefs/SuggestedActionInviteYourTeam.graphql
new file mode 100644
index 00000000000..d39f8126a2e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SuggestedActionInviteYourTeam.graphql
@@ -0,0 +1,49 @@
+"""
+a suggestion to invite others to your team
+"""
+type SuggestedActionInviteYourTeam implements SuggestedAction {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the action was created at
+  """
+  createdAt: DateTime!
+
+  """
+  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
+  """
+  priority: Float
+
+  """
+  * The timestamp the action was removed at
+  """
+  removedAt: DateTime!
+
+  """
+  The specific type of suggested action
+  """
+  type: SuggestedActionTypeEnum!
+
+  """
+  * The userId this action is for
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+
+  """
+  The teamId that we suggest you should invite people to
+  """
+  teamId: ID!
+
+  """
+  The team you should invite people to
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/SuggestedActionTryActionMeeting.graphql b/packages/server/graphql/public/typeDefs/SuggestedActionTryActionMeeting.graphql
new file mode 100644
index 00000000000..54e984ffd5d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SuggestedActionTryActionMeeting.graphql
@@ -0,0 +1,49 @@
+"""
+a suggestion to try a retro with your team
+"""
+type SuggestedActionTryActionMeeting implements SuggestedAction {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the action was created at
+  """
+  createdAt: DateTime!
+
+  """
+  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
+  """
+  priority: Float
+
+  """
+  * The timestamp the action was removed at
+  """
+  removedAt: DateTime!
+
+  """
+  The specific type of suggested action
+  """
+  type: SuggestedActionTypeEnum!
+
+  """
+  * The userId this action is for
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+
+  """
+  fk
+  """
+  teamId: ID!
+
+  """
+  The team you should run an action meeting with
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/SuggestedActionTryRetroMeeting.graphql b/packages/server/graphql/public/typeDefs/SuggestedActionTryRetroMeeting.graphql
new file mode 100644
index 00000000000..c95dab4238c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SuggestedActionTryRetroMeeting.graphql
@@ -0,0 +1,49 @@
+"""
+a suggestion to try a retro with your team
+"""
+type SuggestedActionTryRetroMeeting implements SuggestedAction {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the action was created at
+  """
+  createdAt: DateTime!
+
+  """
+  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
+  """
+  priority: Float
+
+  """
+  * The timestamp the action was removed at
+  """
+  removedAt: DateTime!
+
+  """
+  The specific type of suggested action
+  """
+  type: SuggestedActionTypeEnum!
+
+  """
+  * The userId this action is for
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+
+  """
+  fk
+  """
+  teamId: ID!
+
+  """
+  The team you should run a retro with
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/SuggestedActionTryTheDemo.graphql b/packages/server/graphql/public/typeDefs/SuggestedActionTryTheDemo.graphql
new file mode 100644
index 00000000000..cf2c70feb1e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SuggestedActionTryTheDemo.graphql
@@ -0,0 +1,39 @@
+"""
+a suggestion to invite others to your team
+"""
+type SuggestedActionTryTheDemo implements SuggestedAction {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the action was created at
+  """
+  createdAt: DateTime!
+
+  """
+  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
+  """
+  priority: Float
+
+  """
+  * The timestamp the action was removed at
+  """
+  removedAt: DateTime!
+
+  """
+  The specific type of suggested action
+  """
+  type: SuggestedActionTypeEnum!
+
+  """
+  * The userId this action is for
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/SuggestedActionTypeEnum.graphql b/packages/server/graphql/public/typeDefs/SuggestedActionTypeEnum.graphql
new file mode 100644
index 00000000000..dc30db66d12
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/SuggestedActionTypeEnum.graphql
@@ -0,0 +1,10 @@
+"""
+The specific type of the suggested action
+"""
+enum SuggestedActionTypeEnum {
+  inviteYourTeam
+  tryTheDemo
+  tryRetroMeeting
+  createNewTeam
+  tryActionMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/Task.graphql b/packages/server/graphql/public/typeDefs/Task.graphql
new file mode 100644
index 00000000000..4ea269155c0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Task.graphql
@@ -0,0 +1,154 @@
+"""
+A long-term task shared across the team, assigned to a single user
+"""
+type Task implements Threadable {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  The rich text body of the item
+  """
+  content: String!
+
+  """
+  The timestamp the item was created
+  """
+  createdAt: DateTime!
+
+  """
+  The userId that created the item
+  """
+  createdBy: ID!
+
+  """
+  The user that created the item
+  """
+  createdByUser: User!
+
+  """
+  the replies to this threadable item
+  """
+  replies: [Threadable!]!
+
+  """
+  The FK of the discussion this task was created in. Null if task was not created in a discussion
+  """
+  discussionId: ID
+
+  """
+  the parent, if this threadable is a reply, else null
+  """
+  threadParentId: ID
+
+  """
+  the order of this threadable, relative to threadParentId
+  """
+  threadSortOrder: Float
+
+  """
+  The timestamp the item was updated
+  """
+  updatedAt: DateTime!
+
+  """
+  The agenda item that the task was created in, if any
+  """
+  agendaItem: AgendaItem
+
+  """
+  Type of the integration if there is one
+  """
+  taskService: TaskServiceEnum
+
+  """
+  a user-defined due date
+  """
+  dueDate: DateTime
+
+  """
+  A list of the most recent estimates for the task
+  """
+  estimates: [TaskEstimate!]!
+
+  """
+  a list of users currently editing the task (fed by a subscription, so queries return null)
+  """
+  editors: [TaskEditorDetails!]!
+
+  """
+  The reference to the single source of truth for this task
+  """
+  integration: TaskIntegration
+
+  """
+  A hash of the integrated task
+  """
+  integrationHash: ID
+
+  """
+  the foreign key for the meeting the task was created in
+  """
+  meetingId: ID
+
+  """
+  the foreign key for the meeting the task was marked as complete
+  """
+  doneMeetingId: ID
+
+  """
+  the plain text content of the task
+  """
+  plaintextContent: String!
+
+  """
+  the shared sort order for tasks on the team dash & user dash
+  """
+  sortOrder: Float!
+
+  """
+  The status of the task
+  """
+  status: TaskStatusEnum!
+
+  """
+  The tags associated with the task
+  """
+  tags: [String!]!
+
+  """
+  The id of the team (indexed). Needed for subscribing to archived tasks
+  """
+  teamId: ID!
+
+  """
+  The team this task belongs to
+  """
+  team: Team!
+
+  """
+  The first block of the content
+  """
+  title: String!
+
+  """
+  * The userId, index useful for server-side methods getting all tasks under a user. This can be null if the task is not assigned to anyone.
+  """
+  userId: ID
+
+  """
+  The user the task is assigned to. Null if it is not assigned to anyone.
+  """
+  user: User
+
+  """
+  The owner hovers over the task in their solo update of a checkin
+  """
+  isHighlighted(
+    """
+    Meeting for which the highlight is checked
+    """
+    meetingId: ID
+  ): Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskConnection.graphql b/packages/server/graphql/public/typeDefs/TaskConnection.graphql
new file mode 100644
index 00000000000..203fd36f48a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type TaskConnection {
+  """
+  Page info with cursors coerced to ISO8601 dates
+  """
+  pageInfo: PageInfoDateCursor
+
+  """
+  A list of edges.
+  """
+  edges: [TaskEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskEdge.graphql b/packages/server/graphql/public/typeDefs/TaskEdge.graphql
new file mode 100644
index 00000000000..fa050cf3532
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type TaskEdge {
+  """
+  The item at the end of the edge
+  """
+  node: Task!
+  cursor: DateTime
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskEditorDetails.graphql b/packages/server/graphql/public/typeDefs/TaskEditorDetails.graphql
new file mode 100644
index 00000000000..2a06e98ec0d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskEditorDetails.graphql
@@ -0,0 +1,11 @@
+type TaskEditorDetails {
+  """
+  The userId of the person editing the task
+  """
+  userId: ID!
+
+  """
+  The name of the userId editing the task
+  """
+  preferredName: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskEstimate.graphql b/packages/server/graphql/public/typeDefs/TaskEstimate.graphql
new file mode 100644
index 00000000000..7f6aacf88ea
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskEstimate.graphql
@@ -0,0 +1,59 @@
+"""
+An estimate for a Task that was voted on and scored in a poker meeting
+"""
+type TaskEstimate {
+  """
+  The ID of the estimate
+  """
+  id: ID!
+
+  """
+  The timestamp the estimate was created
+  """
+  createdAt: DateTime!
+
+  """
+  The source that a change came in through
+  """
+  changeSource: ChangeSourceEnum!
+
+  """
+  The name of the estimate dimension
+  """
+  name: String!
+
+  """
+  The human-readable label for the estimate
+  """
+  label: String!
+
+  """
+  *The taskId that the estimate refers to
+  """
+  taskId: ID!
+
+  """
+  The userId that added the estimate
+  """
+  userId: ID!
+
+  """
+  *The meetingId that the estimate occured in, if any
+  """
+  meetingId: ID
+
+  """
+  The meeting stageId the estimate occurred in, if any
+  """
+  stageId: ID
+
+  """
+  The discussionId where the estimated was discussed
+  """
+  discussionId: ID
+
+  """
+  If the task comes from jira, this is the jira field that the estimate refers to
+  """
+  jiraFieldId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskEstimateInput.graphql b/packages/server/graphql/public/typeDefs/TaskEstimateInput.graphql
new file mode 100644
index 00000000000..e1ab49dab64
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskEstimateInput.graphql
@@ -0,0 +1,14 @@
+input TaskEstimateInput {
+  taskId: ID!
+
+  """
+  The new estimate value
+  """
+  value: String!
+
+  """
+  The name of the estimate, e.g. Story Points
+  """
+  dimensionName: String!
+  meetingId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskIntegration.graphql b/packages/server/graphql/public/typeDefs/TaskIntegration.graphql
new file mode 100644
index 00000000000..4546c4a617e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskIntegration.graphql
@@ -0,0 +1,3 @@
+interface TaskIntegration {
+  id: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskInvolvementType.graphql b/packages/server/graphql/public/typeDefs/TaskInvolvementType.graphql
new file mode 100644
index 00000000000..086a40957c1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskInvolvementType.graphql
@@ -0,0 +1,7 @@
+"""
+How a user is involved with a task (listed in hierarchical order)
+"""
+enum TaskInvolvementType {
+  ASSIGNEE
+  MENTIONEE
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskServiceEnum.graphql b/packages/server/graphql/public/typeDefs/TaskServiceEnum.graphql
new file mode 100644
index 00000000000..08dcb1ad2a6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskServiceEnum.graphql
@@ -0,0 +1,11 @@
+"""
+The list of services for task integrations
+"""
+enum TaskServiceEnum {
+  github
+  jira
+  PARABOL
+  jiraServer
+  gitlab
+  azureDevOps
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskStatusEnum.graphql b/packages/server/graphql/public/typeDefs/TaskStatusEnum.graphql
new file mode 100644
index 00000000000..2a3932ae6ea
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskStatusEnum.graphql
@@ -0,0 +1,9 @@
+"""
+The status of the task
+"""
+enum TaskStatusEnum {
+  active
+  stuck
+  done
+  future
+}
diff --git a/packages/server/graphql/public/typeDefs/TaskSubscriptionPayload.graphql b/packages/server/graphql/public/typeDefs/TaskSubscriptionPayload.graphql
new file mode 100644
index 00000000000..53762e92487
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TaskSubscriptionPayload.graphql
@@ -0,0 +1,12 @@
+type TaskSubscriptionPayload {
+  fieldName: String!
+  ChangeTaskTeamPayload: ChangeTaskTeamPayload
+  CreateTaskIntegrationPayload: CreateTaskIntegrationPayload
+  CreateTaskPayload: CreateTaskPayload
+  DeleteTaskPayload: DeleteTaskPayload
+  EditTaskPayload: EditTaskPayload
+  RemoveOrgUserPayload: RemoveOrgUserPayload
+  RemoveTeamMemberPayload: RemoveTeamMemberPayload
+  UpdateTaskPayload: UpdateTaskPayload
+  UpdateTaskDueDatePayload: UpdateTaskDueDatePayload
+}
diff --git a/packages/server/graphql/public/typeDefs/Team.graphql b/packages/server/graphql/public/typeDefs/Team.graphql
index 718c296f4d1..6d197a733d5 100644
--- a/packages/server/graphql/public/typeDefs/Team.graphql
+++ b/packages/server/graphql/public/typeDefs/Team.graphql
@@ -7,16 +7,6 @@ type Team {
   """
   id: ID!
 
-  """
-  Whether or not new users with the same domain and a verified email should auto-join the team
-  """
-  autoJoin: Boolean!
-
-  """
-  Whether the viewer belongs to the team
-  """
-  isViewerOnTeam: Boolean!
-
   """
   The datetime the team was created
   """
@@ -88,11 +78,6 @@ type Team {
   """
   isViewerLead: Boolean!
 
-  """
-  true if the viewer is an admin for the team's org, else false
-  """
-  isOrgAdmin: Boolean!
-
   """
   The team-specific settings for running all available types of meetings
   """
@@ -123,6 +108,11 @@ type Team {
   """
   activeMeetings: [NewMeeting!]!
 
+  """
+  The number of qualifying meetings that have an AI generated summary. Qualifying meetings are meetings with three or more meeting members and five or more reflections
+  """
+  qualAIMeetingsCount: Int!
+
   """
   The new meeting in progress, if any
   """
@@ -132,11 +122,6 @@ type Team {
     """
     meetingId: ID!
   ): NewMeeting
-
-  tier: TierEnum!
-
-  billingTier: TierEnum!
-
   organization: Organization!
 
   """
@@ -171,10 +156,28 @@ type Team {
   """
   isArchived: Boolean
 
+  """
+  Whether or not new users with the same domain and a verified email should auto-join the team
+  """
+  autoJoin: Boolean!
+
+  """
+  Whether the viewer belongs to the team
+  """
+  isViewerOnTeam: Boolean!
+
+  """
+  true if the viewer is an admin for the team's org, else false
+  """
+  isOrgAdmin: Boolean!
+  tier: TierEnum!
+  billingTier: TierEnum!
+
   """
   Insights for the team, null if not enough data or feature flag isn't set
   """
   insights: TeamInsights
+
   """
   The team member that is the viewer
   """
diff --git a/packages/server/graphql/public/typeDefs/TeamDrawer.graphql b/packages/server/graphql/public/typeDefs/TeamDrawer.graphql
new file mode 100644
index 00000000000..0937f6f3b15
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamDrawer.graphql
@@ -0,0 +1,7 @@
+"""
+The right drawer types available on the team dashboard
+"""
+enum TeamDrawer {
+  agenda
+  manageTeam
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamHealthPhase.graphql b/packages/server/graphql/public/typeDefs/TeamHealthPhase.graphql
index 76930bd6987..8700cdb1475 100644
--- a/packages/server/graphql/public/typeDefs/TeamHealthPhase.graphql
+++ b/packages/server/graphql/public/typeDefs/TeamHealthPhase.graphql
@@ -3,15 +3,12 @@ type TeamHealthPhase implements NewMeetingPhase {
   shortid
   """
   id: ID!
-
   meetingId: ID!
-
   teamId: ID!
 
   """
   The type of phase
   """
   phaseType: NewMeetingPhaseTypeEnum!
-
   stages: [TeamHealthStage!]!
 }
diff --git a/packages/server/graphql/public/typeDefs/TeamHealthStage.graphql b/packages/server/graphql/public/typeDefs/TeamHealthStage.graphql
index 982d5fb8dbc..8521237c192 100644
--- a/packages/server/graphql/public/typeDefs/TeamHealthStage.graphql
+++ b/packages/server/graphql/public/typeDefs/TeamHealthStage.graphql
@@ -83,7 +83,6 @@ type TeamHealthStage implements NewMeetingStage {
   The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
   """
   suggestedTimeLimit: Float
-
   teamId: ID!
 
   """
diff --git a/packages/server/graphql/public/typeDefs/TeamInsights.graphql b/packages/server/graphql/public/typeDefs/TeamInsights.graphql
index cbd5ae1741e..63052091671 100644
--- a/packages/server/graphql/public/typeDefs/TeamInsights.graphql
+++ b/packages/server/graphql/public/typeDefs/TeamInsights.graphql
@@ -1,22 +1,3 @@
-type Emoji {
-  id: ID!
-  count: Int!
-}
-
-type MeetingEngagement {
-  """
-  Engagement across retros, poker and standups
-  """
-  all: Float!
-}
-
-type TopRetroTemplate {
-  id: ID!
-  reflectTemplateId: ID!
-  reflectTemplate: ReflectTemplate!
-  count: Int!
-}
-
 type TeamInsights {
   id: ID!
 
diff --git a/packages/server/graphql/public/typeDefs/TeamInvitation.graphql b/packages/server/graphql/public/typeDefs/TeamInvitation.graphql
new file mode 100644
index 00000000000..b9e32d695b0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamInvitation.graphql
@@ -0,0 +1,59 @@
+"""
+An invitation to become a team member
+"""
+type TeamInvitation {
+  """
+  The unique invitation Id
+  """
+  id: ID!
+
+  """
+  null if not accepted, else the datetime the invitation was accepted
+  """
+  acceptedAt: DateTime
+
+  """
+  null if not accepted, else the userId that accepted the invitation
+  """
+  acceptedBy: ID
+
+  """
+  The datetime the invitation was created
+  """
+  createdAt: DateTime!
+
+  """
+  The email of the invitee
+  """
+  email: Email!
+
+  """
+  The datetime the invitation expires. Changes when team is archived.
+  """
+  expiresAt: DateTime!
+
+  """
+  The userId of the person that sent the invitation
+  """
+  invitedBy: ID!
+
+  """
+  The userId of the person that sent the invitation
+  """
+  inviter: User!
+
+  """
+  the meetingId that the invite was generated for
+  """
+  meetingId: ID
+
+  """
+  The team invited to
+  """
+  teamId: ID!
+
+  """
+  48-byte hex encoded random string
+  """
+  token: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamInvitationErrorEnum.graphql b/packages/server/graphql/public/typeDefs/TeamInvitationErrorEnum.graphql
new file mode 100644
index 00000000000..6e0d5fb0b4a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamInvitationErrorEnum.graphql
@@ -0,0 +1,10 @@
+"""
+The reason the invitation failed
+"""
+enum TeamInvitationErrorEnum {
+  accepted
+  expired
+  notFound
+  restrictedDomain
+  unverifiedEmail
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamInvitationPayload.graphql b/packages/server/graphql/public/typeDefs/TeamInvitationPayload.graphql
new file mode 100644
index 00000000000..89c9073b66b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamInvitationPayload.graphql
@@ -0,0 +1,19 @@
+"""
+The response to a teamInvitation query
+"""
+type TeamInvitationPayload {
+  """
+  The team invitation, if any
+  """
+  teamInvitation: TeamInvitation
+
+  """
+  the teamId of the team trying to join
+  """
+  teamId: ID
+
+  """
+  one of the active meetings trying to join
+  """
+  meetingId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamMeetingSettings.graphql b/packages/server/graphql/public/typeDefs/TeamMeetingSettings.graphql
new file mode 100644
index 00000000000..18bdd33e125
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamMeetingSettings.graphql
@@ -0,0 +1,26 @@
+"""
+The team settings for a specific type of meeting
+"""
+interface TeamMeetingSettings {
+  id: ID!
+
+  """
+  The type of meeting these settings apply to
+  """
+  meetingType: MeetingTypeEnum!
+
+  """
+  The broad phase types that will be addressed during the meeting
+  """
+  phaseTypes: [NewMeetingPhaseTypeEnum!]!
+
+  """
+  FK
+  """
+  teamId: ID!
+
+  """
+  The team these settings belong to
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamNotification.graphql b/packages/server/graphql/public/typeDefs/TeamNotification.graphql
new file mode 100644
index 00000000000..d8646e7fd13
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamNotification.graphql
@@ -0,0 +1,4 @@
+interface TeamNotification {
+  id: ID
+  type: NotificationEnum
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql b/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql
index 928d4fcd633..31fb8b30ec9 100644
--- a/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql
+++ b/packages/server/graphql/public/typeDefs/TeamPromptMeeting.graphql
@@ -2,6 +2,41 @@
 A team prompt meeting
 """
 type TeamPromptMeeting implements NewMeeting {
+  """
+  The name of the meeting
+  """
+  meetingPrompt: String!
+
+  """
+  The settings that govern the team prompt meeting
+  """
+  settings: TeamPromptMeetingSettings!
+
+  """
+  The tasks created within the meeting
+  """
+  responses: [TeamPromptResponse!]!
+
+  """
+  The team prompt meeting member of the viewer
+  """
+  viewerMeetingMember: TeamPromptMeetingMember
+
+  """
+  The number of responses generated in the meeting
+  """
+  responseCount: Int!
+
+  """
+  The number of tasks generated in the meeting
+  """
+  taskCount: Int!
+
+  """
+  The number of comments generated in the meeting
+  """
+  commentCount: Int!
+
   """
   The unique meeting id. shortid.
   """
@@ -123,21 +158,6 @@ type TeamPromptMeeting implements NewMeeting {
   """
   updatedAt: DateTime
 
-  """
-  The team prompt meeting member of the viewer
-  """
-  viewerMeetingMember: TeamPromptMeetingMember
-
-  """
-  The settings that govern the team prompt meeting
-  """
-  settings: TeamPromptMeetingSettings!
-
-  """
-  The tasks created within the meeting
-  """
-  responses: [TeamPromptResponse!]!
-
   """
   The previous meeting in the series if this meeting is recurring
   """
diff --git a/packages/server/graphql/public/typeDefs/TeamPromptMeetingMember.graphql b/packages/server/graphql/public/typeDefs/TeamPromptMeetingMember.graphql
new file mode 100644
index 00000000000..3405d43db69
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamPromptMeetingMember.graphql
@@ -0,0 +1,28 @@
+"""
+All the meeting specifics for a user in a team prompt meeting
+"""
+type TeamPromptMeetingMember implements MeetingMember {
+  """
+  A composite of userId::meetingId
+  """
+  id: ID!
+
+  """
+  true if present, false if absent, else null
+  """
+  isCheckedIn: Boolean
+    @deprecated(
+      reason: "Members are checked in when they enter the meeting now & not created beforehand"
+    )
+  meetingId: ID!
+  meetingType: MeetingTypeEnum!
+  teamId: ID!
+  teamMember: TeamMember!
+  user: User!
+  userId: ID!
+
+  """
+  The last time a meeting was updated (stage completed, finished, etc)
+  """
+  updatedAt: DateTime!
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamPromptMeetingSettings.graphql b/packages/server/graphql/public/typeDefs/TeamPromptMeetingSettings.graphql
new file mode 100644
index 00000000000..35f4413b394
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamPromptMeetingSettings.graphql
@@ -0,0 +1,26 @@
+"""
+The team prompt specific meeting settings
+"""
+type TeamPromptMeetingSettings implements TeamMeetingSettings {
+  id: ID!
+
+  """
+  The type of meeting these settings apply to
+  """
+  meetingType: MeetingTypeEnum!
+
+  """
+  The broad phase types that will be addressed during the meeting
+  """
+  phaseTypes: [NewMeetingPhaseTypeEnum!]!
+
+  """
+  FK
+  """
+  teamId: ID!
+
+  """
+  The team these settings belong to
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamPromptResponse.graphql b/packages/server/graphql/public/typeDefs/TeamPromptResponse.graphql
new file mode 100644
index 00000000000..e0bfcca25c7
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamPromptResponse.graphql
@@ -0,0 +1,54 @@
+"""
+A response of a single team member in a team prompt
+"""
+type TeamPromptResponse implements Reactable {
+  """
+  Team prompt response id in a format of `teamPromptResponse:idGeneratedByDatabase`
+  """
+  id: ID!
+
+  """
+  All the reactjis for the given reflection
+  """
+  reactjis: [Reactji!]!
+
+  """
+  Id of the user who created the team prompt response
+  """
+  userId: ID!
+
+  """
+  The user who created the response
+  """
+  user: User!
+
+  """
+  the content of the response
+  """
+  content: String!
+
+  """
+  the plain text content of the response
+  """
+  plaintextContent: String!
+
+  """
+  The timestamp the response was created
+  """
+  createdAt: DateTime!
+
+  """
+  The timestamp the response was updated at
+  """
+  updatedAt: DateTime!
+
+  """
+  the shared sort order for reponses
+  """
+  sortOrder: Float!
+
+  """
+  The team this response belongs to
+  """
+  team: Team!
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamPromptResponseStage.graphql b/packages/server/graphql/public/typeDefs/TeamPromptResponseStage.graphql
new file mode 100644
index 00000000000..5de073fb748
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamPromptResponseStage.graphql
@@ -0,0 +1,115 @@
+"""
+The stage where the single team member responds to a prompt
+"""
+type TeamPromptResponseStage implements NewMeetingStage & DiscussionThreadStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+
+  """
+  The ID to find the discussion that goes in the stage
+  """
+  discussionId: ID!
+
+  """
+  The discussion about the stage
+  """
+  discussion: Discussion!
+
+  """
+  The team member this stage belongs to
+  """
+  teamMember: TeamMember!
+
+  """
+  The response to the prompt
+  """
+  response: TeamPromptResponse
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamPromptResponsesPhase.graphql b/packages/server/graphql/public/typeDefs/TeamPromptResponsesPhase.graphql
new file mode 100644
index 00000000000..c151a6cdab0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamPromptResponsesPhase.graphql
@@ -0,0 +1,17 @@
+"""
+The meeting phase where each of the team members can respond to prompts
+"""
+type TeamPromptResponsesPhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [TeamPromptResponseStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamStat.graphql b/packages/server/graphql/public/typeDefs/TeamStat.graphql
new file mode 100644
index 00000000000..cfb5376cd26
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamStat.graphql
@@ -0,0 +1,4 @@
+type TeamStat {
+  id: ID!
+  createdAt: DateTime!
+}
diff --git a/packages/server/graphql/public/typeDefs/TeamSubscriptionPayload.graphql b/packages/server/graphql/public/typeDefs/TeamSubscriptionPayload.graphql
new file mode 100644
index 00000000000..7337114462a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TeamSubscriptionPayload.graphql
@@ -0,0 +1,76 @@
+type TeamSubscriptionPayload {
+  fieldName: String!
+  AcceptTeamInvitationPayload: AcceptTeamInvitationPayload
+  AddAgendaItemPayload: AddAgendaItemPayload
+  AddAtlassianAuthPayload: AddAtlassianAuthPayload
+  AddGitHubAuthPayload: AddGitHubAuthPayload
+  AddIntegrationProviderSuccess: AddIntegrationProviderSuccess
+  AddSlackAuthPayload: AddSlackAuthPayload
+  AddTeamPayload: AddTeamPayload
+  ArchiveTeamPayload: ArchiveTeamPayload
+  BatchArchiveTasksSuccess: BatchArchiveTasksSuccess
+  DenyPushInvitationPayload: DenyPushInvitationPayload
+  DowngradeToStarterPayload: DowngradeToStarterPayload
+  EndCheckInSuccess: EndCheckInSuccess
+  EndRetrospectiveSuccess: EndRetrospectiveSuccess
+  EndSprintPokerSuccess: EndSprintPokerSuccess
+  EndTeamPromptSuccess: EndTeamPromptSuccess
+  NavigateMeetingPayload: NavigateMeetingPayload
+  PushInvitationPayload: PushInvitationPayload
+  PromoteToTeamLeadPayload: PromoteToTeamLeadPayload
+  RemoveAgendaItemPayload: RemoveAgendaItemPayload
+  RemoveOrgUserPayload: RemoveOrgUserPayload
+  RemoveTeamMemberPayload: RemoveTeamMemberPayload
+  RenameMeetingSuccess: RenameMeetingSuccess
+  SelectTemplatePayload: SelectTemplatePayload
+  StartCheckInSuccess: StartCheckInSuccess
+  StartRetrospectiveSuccess: StartRetrospectiveSuccess
+  StartSprintPokerSuccess: StartSprintPokerSuccess
+  StartTeamPromptSuccess: StartTeamPromptSuccess
+  UpdateAgendaItemPayload: UpdateAgendaItemPayload
+  OldUpdateCreditCardPayload: OldUpdateCreditCardPayload
+  UpdateCreditCardPayload: UpdateCreditCardPayload
+  UpdateTeamNamePayload: UpdateTeamNamePayload
+  OldUpgradeToTeamTierPayload: OldUpgradeToTeamTierPayload
+  UpgradeToTeamTierSuccess: UpgradeToTeamTierSuccess
+  AddReflectTemplateSuccess: AddReflectTemplateSuccess
+  AddPokerTemplateSuccess: AddPokerTemplateSuccess
+  AddReflectTemplatePromptPayload: AddReflectTemplatePromptPayload
+  AddPokerTemplateDimensionPayload: AddPokerTemplateDimensionPayload
+  AddPokerTemplateScalePayload: AddPokerTemplateScalePayload
+  AddPokerTemplateScaleValuePayload: AddPokerTemplateScaleValuePayload
+  MoveReflectTemplatePromptPayload: MoveReflectTemplatePromptPayload
+  MovePokerTemplateDimensionPayload: MovePokerTemplateDimensionPayload
+  ReflectTemplatePromptUpdateDescriptionPayload: ReflectTemplatePromptUpdateDescriptionPayload
+  PokerTemplateDimensionUpdateDescriptionPayload: PokerTemplateDimensionUpdateDescriptionPayload
+  ReflectTemplatePromptUpdateGroupColorPayload: ReflectTemplatePromptUpdateGroupColorPayload
+  RemoveAtlassianAuthPayload: RemoveAtlassianAuthPayload
+  RemoveGitHubAuthPayload: RemoveGitHubAuthPayload
+  RemoveSlackAuthPayload: RemoveSlackAuthPayload
+  RemoveReflectTemplatePayload: RemoveReflectTemplatePayload
+  RemovePokerTemplatePayload: RemovePokerTemplatePayload
+  RemoveReflectTemplatePromptPayload: RemoveReflectTemplatePromptPayload
+  RemovePokerTemplateDimensionPayload: RemovePokerTemplateDimensionPayload
+  RemovePokerTemplateScalePayload: RemovePokerTemplateScalePayload
+  RenameMeetingTemplatePayload: RenameMeetingTemplatePayload
+  RenamePokerTemplatePayload: RenamePokerTemplatePayload
+  RenameReflectTemplatePromptPayload: RenameReflectTemplatePromptPayload
+  RenamePokerTemplateDimensionPayload: RenamePokerTemplateDimensionPayload
+  RenamePokerTemplateScalePayload: RenamePokerTemplateScalePayload
+  RemovePokerTemplateScaleValuePayload: RemovePokerTemplateScaleValuePayload
+  SetMeetingSettingsPayload: SetMeetingSettingsPayload
+  SetSlackNotificationPayload: SetSlackNotificationPayload
+  UpdatePokerTemplateDimensionScalePayload: UpdatePokerTemplateDimensionScalePayload
+  UpdatePokerTemplateScaleValuePayload: UpdatePokerTemplateScaleValuePayload
+  UpdateUserProfilePayload: UpdateUserProfilePayload
+  PersistJiraSearchQuerySuccess: PersistJiraSearchQuerySuccess
+  MovePokerTemplateScaleValueSuccess: MovePokerTemplateScaleValueSuccess
+  UpdateAzureDevOpsDimensionFieldSuccess: UpdateAzureDevOpsDimensionFieldSuccess
+  SetDefaultSlackChannelSuccess: SetDefaultSlackChannelSuccess
+  SetAppLocationSuccess: SetAppLocationSuccess
+  UpdateGitHubDimensionFieldSuccess: UpdateGitHubDimensionFieldSuccess
+  UpdateIntegrationProviderSuccess: UpdateIntegrationProviderSuccess
+  UpdateRecurrenceSettingsSuccess: UpdateRecurrenceSettingsSuccess
+  UpdateDimensionFieldSuccess: UpdateDimensionFieldSuccess
+  UpdateTemplateCategorySuccess: UpdateTemplateCategorySuccess
+}
diff --git a/packages/server/graphql/public/typeDefs/TemplateDimension.graphql b/packages/server/graphql/public/typeDefs/TemplateDimension.graphql
new file mode 100644
index 00000000000..fd9686e2661
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TemplateDimension.graphql
@@ -0,0 +1,66 @@
+"""
+A team-specific template dimension: e.g., effort, importance etc.
+"""
+type TemplateDimension {
+  """
+  shortid
+  """
+  id: ID!
+  createdAt: DateTime!
+
+  """
+  true if the dimension is currently used by the team, else false
+  """
+  isActive: Boolean!
+
+  """
+  The datetime that the dimension was removed. Null if it has not been removed.
+  """
+  removedAt: DateTime
+
+  """
+  foreign key. use the team field
+  """
+  teamId: ID!
+
+  """
+  The team that owns this dimension
+  """
+  team: Team!
+  updatedAt: DateTime!
+
+  """
+  the order of the dimensions in the template
+  """
+  sortOrder: Float!
+
+  """
+  FK for template
+  """
+  templateId: ID!
+
+  """
+  The template that this dimension belongs to
+  """
+  template: PokerTemplate!
+
+  """
+  The name of the dimension
+  """
+  name: String!
+
+  """
+  The description to the dimension name for further context. A long version of the dimension name.
+  """
+  description: String!
+
+  """
+  The scaleId to resolve the selected scale
+  """
+  scaleId: ID!
+
+  """
+  scale used in this dimension
+  """
+  selectedScale: TemplateScale!
+}
diff --git a/packages/server/graphql/public/typeDefs/TemplateDimensionRef.graphql b/packages/server/graphql/public/typeDefs/TemplateDimensionRef.graphql
new file mode 100644
index 00000000000..53b4cc00c29
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TemplateDimensionRef.graphql
@@ -0,0 +1,26 @@
+"""
+An immutable TemplateDimension
+"""
+type TemplateDimensionRef {
+  id: ID!
+
+  """
+  the order of the dimensions in the template
+  """
+  sortOrder: Float!
+
+  """
+  The name of the dimension
+  """
+  name: String!
+
+  """
+  The md5 hash to resolve the immutable selected scale ref
+  """
+  scaleRefId: ID!
+
+  """
+  scale used in this dimension
+  """
+  scale: TemplateScaleRef!
+}
diff --git a/packages/server/graphql/public/typeDefs/TemplateScale.graphql b/packages/server/graphql/public/typeDefs/TemplateScale.graphql
new file mode 100644
index 00000000000..4bc231b1559
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TemplateScale.graphql
@@ -0,0 +1,51 @@
+"""
+A team-specific template scale.
+"""
+type TemplateScale {
+  """
+  shortid
+  """
+  id: ID!
+  createdAt: DateTime!
+
+  """
+  true if the scale is currently used by the team, else false
+  """
+  isActive: Boolean!
+
+  """
+  True if this is a starter/default scale; false otherwise
+  """
+  isStarter: Boolean!
+
+  """
+  The datetime that the scale was removed. Null if it has not been removed.
+  """
+  removedAt: DateTime
+
+  """
+  foreign key. use the team field
+  """
+  teamId: ID!
+
+  """
+  The team that owns this template scale
+  """
+  team: Team!
+  updatedAt: DateTime!
+
+  """
+  The title of the scale used in the template
+  """
+  name: String!
+
+  """
+  The dimensions currently using this scale
+  """
+  dimensions: [TemplateDimension!]!
+
+  """
+  The values used in this scale
+  """
+  values: [TemplateScaleValue!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/TemplateScaleInput.graphql b/packages/server/graphql/public/typeDefs/TemplateScaleInput.graphql
new file mode 100644
index 00000000000..8a65bd3d8fe
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TemplateScaleInput.graphql
@@ -0,0 +1,14 @@
+"""
+A value for a scale
+"""
+input TemplateScaleInput {
+  """
+  The color used to visually group a scale value
+  """
+  color: String!
+
+  """
+  The label for this value, e.g., XS, M, L
+  """
+  label: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/TemplateScaleRef.graphql b/packages/server/graphql/public/typeDefs/TemplateScaleRef.graphql
new file mode 100644
index 00000000000..f524716dad9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TemplateScaleRef.graphql
@@ -0,0 +1,20 @@
+"""
+An immutable version of TemplateScale to be shared across all users
+"""
+type TemplateScaleRef {
+  """
+  md5 hash
+  """
+  id: ID!
+  createdAt: DateTime!
+
+  """
+  The title of the scale used in the template
+  """
+  name: String!
+
+  """
+  The values used in this scale
+  """
+  values: [TemplateScaleValue!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/TemplateScaleValue.graphql b/packages/server/graphql/public/typeDefs/TemplateScaleValue.graphql
new file mode 100644
index 00000000000..eb7b913c6a5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TemplateScaleValue.graphql
@@ -0,0 +1,26 @@
+"""
+A value for a scale.
+"""
+type TemplateScaleValue {
+  id: ID!
+
+  """
+  The id of the scale this value belongs to
+  """
+  scaleId: ID!
+
+  """
+  The color used to visually group a scale value
+  """
+  color: String!
+
+  """
+  The label for this value, e.g., XS, M, L
+  """
+  label: String!
+
+  """
+  the order of the scale value in this scale
+  """
+  sortOrder: Int!
+}
diff --git a/packages/server/graphql/public/typeDefs/Threadable.graphql b/packages/server/graphql/public/typeDefs/Threadable.graphql
new file mode 100644
index 00000000000..211aa6b1d32
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/Threadable.graphql
@@ -0,0 +1,54 @@
+"""
+An item that can be put in a thread
+"""
+interface Threadable {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  The rich text body of the item
+  """
+  content: String!
+
+  """
+  The timestamp the item was created
+  """
+  createdAt: DateTime!
+
+  """
+  The userId that created the item
+  """
+  createdBy: ID
+
+  """
+  The user that created the item
+  """
+  createdByUser: User
+
+  """
+  the replies to this threadable item
+  """
+  replies: [Threadable!]!
+
+  """
+  The FK of the discussion this task was created in. Null if task was not created in a discussion
+  """
+  discussionId: ID
+
+  """
+  the parent, if this threadable is a reply, else null
+  """
+  threadParentId: ID
+
+  """
+  the order of this threadable, relative to threadParentId
+  """
+  threadSortOrder: Float
+
+  """
+  The timestamp the item was updated
+  """
+  updatedAt: DateTime!
+}
diff --git a/packages/server/graphql/public/typeDefs/ThreadableConnection.graphql b/packages/server/graphql/public/typeDefs/ThreadableConnection.graphql
new file mode 100644
index 00000000000..d687883c205
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ThreadableConnection.graphql
@@ -0,0 +1,19 @@
+"""
+A connection to a list of items.
+"""
+type ThreadableConnection {
+  """
+  Page info with strings (sortOrder) as cursors
+  """
+  pageInfo: PageInfo
+
+  """
+  A list of edges.
+  """
+  edges: [ThreadableEdge!]!
+
+  """
+  Any errors that prevented the query from returning the full results
+  """
+  error: String
+}
diff --git a/packages/server/graphql/public/typeDefs/ThreadableEdge.graphql b/packages/server/graphql/public/typeDefs/ThreadableEdge.graphql
new file mode 100644
index 00000000000..737da63cb36
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ThreadableEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type ThreadableEdge {
+  """
+  The item at the end of the edge
+  """
+  node: Threadable!
+  cursor: String
+}
diff --git a/packages/server/graphql/public/typeDefs/TierEnum.graphql b/packages/server/graphql/public/typeDefs/TierEnum.graphql
new file mode 100644
index 00000000000..83709642f12
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TierEnum.graphql
@@ -0,0 +1,8 @@
+"""
+The pay tier of the team
+"""
+enum TierEnum {
+  starter
+  team
+  enterprise
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEvent.graphql b/packages/server/graphql/public/typeDefs/TimelineEvent.graphql
new file mode 100644
index 00000000000..822f23ccdd8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEvent.graphql
@@ -0,0 +1,64 @@
+"""
+A past event that is important to the viewer
+"""
+interface TimelineEvent {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the event was created at
+  """
+  createdAt: DateTime!
+
+  """
+  the number of times the user has interacted with (ie clicked) this event
+  """
+  interactionCount: Int!
+
+  """
+  true if the timeline event is active, false if archived
+  """
+  isActive: Boolean!
+
+  """
+  The orgId this event is associated with. Null if not traceable to one org
+  """
+  orgId: ID
+
+  """
+  The organization this event is associated with
+  """
+  organization: Organization
+
+  """
+  the number of times the user has seen this event
+  """
+  seenCount: Int!
+
+  """
+  The teamId this event is associated with. Null if not traceable to one team
+  """
+  teamId: ID
+
+  """
+  The team that can see this event
+  """
+  team: Team
+
+  """
+  The specific type of event
+  """
+  type: TimelineEventEnum!
+
+  """
+  * The userId that can see this event
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventCompletedActionMeeting.graphql b/packages/server/graphql/public/typeDefs/TimelineEventCompletedActionMeeting.graphql
new file mode 100644
index 00000000000..90e042f54be
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventCompletedActionMeeting.graphql
@@ -0,0 +1,74 @@
+"""
+An event for a completed action meeting
+"""
+type TimelineEventCompletedActionMeeting implements TimelineEvent {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the event was created at
+  """
+  createdAt: DateTime!
+
+  """
+  the number of times the user has interacted with (ie clicked) this event
+  """
+  interactionCount: Int!
+
+  """
+  true if the timeline event is active, false if archived
+  """
+  isActive: Boolean!
+
+  """
+  The orgId this event is associated with
+  """
+  orgId: ID!
+
+  """
+  The organization this event is associated with
+  """
+  organization: Organization
+
+  """
+  the number of times the user has seen this event
+  """
+  seenCount: Int!
+
+  """
+  The teamId this event is associated with
+  """
+  teamId: ID!
+
+  """
+  The team that can see this event
+  """
+  team: Team!
+
+  """
+  The specific type of event
+  """
+  type: TimelineEventEnum!
+
+  """
+  * The userId that can see this event
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+
+  """
+  The meeting that was completed
+  """
+  meeting: ActionMeeting!
+
+  """
+  The meetingId that was completed, null if legacyMeetingId is present
+  """
+  meetingId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventCompletedRetroMeeting.graphql b/packages/server/graphql/public/typeDefs/TimelineEventCompletedRetroMeeting.graphql
new file mode 100644
index 00000000000..746c257dc90
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventCompletedRetroMeeting.graphql
@@ -0,0 +1,74 @@
+"""
+An event for a completed retro meeting
+"""
+type TimelineEventCompletedRetroMeeting implements TimelineEvent {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the event was created at
+  """
+  createdAt: DateTime!
+
+  """
+  the number of times the user has interacted with (ie clicked) this event
+  """
+  interactionCount: Int!
+
+  """
+  true if the timeline event is active, false if archived
+  """
+  isActive: Boolean!
+
+  """
+  The orgId this event is associated with
+  """
+  orgId: ID!
+
+  """
+  The organization this event is associated with
+  """
+  organization: Organization
+
+  """
+  the number of times the user has seen this event
+  """
+  seenCount: Int!
+
+  """
+  The teamId this event is associated with
+  """
+  teamId: ID!
+
+  """
+  The team that can see this event
+  """
+  team: Team!
+
+  """
+  The specific type of event
+  """
+  type: TimelineEventEnum!
+
+  """
+  * The userId that can see this event
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+
+  """
+  The meeting that was completed
+  """
+  meeting: RetrospectiveMeeting!
+
+  """
+  The meetingId that was completed
+  """
+  meetingId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventConnection.graphql b/packages/server/graphql/public/typeDefs/TimelineEventConnection.graphql
new file mode 100644
index 00000000000..f4cd8a589c1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventConnection.graphql
@@ -0,0 +1,14 @@
+"""
+A connection to a list of items.
+"""
+type TimelineEventConnection {
+  """
+  Page info with cursors coerced to ISO8601 dates
+  """
+  pageInfo: PageInfoDateCursor
+
+  """
+  A list of edges.
+  """
+  edges: [TimelineEventEdge!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventEdge.graphql b/packages/server/graphql/public/typeDefs/TimelineEventEdge.graphql
new file mode 100644
index 00000000000..4c42e7fdf99
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventEdge.graphql
@@ -0,0 +1,10 @@
+"""
+An edge in a connection.
+"""
+type TimelineEventEdge {
+  """
+  The item at the end of the edge
+  """
+  node: TimelineEvent!
+  cursor: DateTime
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventEnum.graphql b/packages/server/graphql/public/typeDefs/TimelineEventEnum.graphql
new file mode 100644
index 00000000000..a2a74c10861
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventEnum.graphql
@@ -0,0 +1,11 @@
+"""
+The specific type of event
+"""
+enum TimelineEventEnum {
+  retroComplete
+  actionComplete
+  joinedParabol
+  createdTeam
+  POKER_COMPLETE
+  TEAM_PROMPT_COMPLETE
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventJoinedParabol.graphql b/packages/server/graphql/public/typeDefs/TimelineEventJoinedParabol.graphql
new file mode 100644
index 00000000000..415c49a49f5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventJoinedParabol.graphql
@@ -0,0 +1,64 @@
+"""
+An event for joining the app
+"""
+type TimelineEventJoinedParabol implements TimelineEvent {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the event was created at
+  """
+  createdAt: DateTime!
+
+  """
+  the number of times the user has interacted with (ie clicked) this event
+  """
+  interactionCount: Int!
+
+  """
+  true if the timeline event is active, false if archived
+  """
+  isActive: Boolean!
+
+  """
+  The orgId this event is associated with. Null if not traceable to one org
+  """
+  orgId: ID
+
+  """
+  The organization this event is associated with
+  """
+  organization: Organization
+
+  """
+  the number of times the user has seen this event
+  """
+  seenCount: Int!
+
+  """
+  The teamId this event is associated with. Null if not traceable to one team
+  """
+  teamId: ID
+
+  """
+  The team that can see this event
+  """
+  team: Team
+
+  """
+  The specific type of event
+  """
+  type: TimelineEventEnum!
+
+  """
+  * The userId that can see this event
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventPokerComplete.graphql b/packages/server/graphql/public/typeDefs/TimelineEventPokerComplete.graphql
new file mode 100644
index 00000000000..cef4d0ec42d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventPokerComplete.graphql
@@ -0,0 +1,74 @@
+"""
+An event for a completed poker meeting
+"""
+type TimelineEventPokerComplete implements TimelineEvent {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the event was created at
+  """
+  createdAt: DateTime!
+
+  """
+  the number of times the user has interacted with (ie clicked) this event
+  """
+  interactionCount: Int!
+
+  """
+  true if the timeline event is active, false if archived
+  """
+  isActive: Boolean!
+
+  """
+  The orgId this event is associated with
+  """
+  orgId: ID!
+
+  """
+  The organization this event is associated with
+  """
+  organization: Organization
+
+  """
+  the number of times the user has seen this event
+  """
+  seenCount: Int!
+
+  """
+  The teamId this event is associated with
+  """
+  teamId: ID!
+
+  """
+  The team that can see this event
+  """
+  team: Team!
+
+  """
+  The specific type of event
+  """
+  type: TimelineEventEnum!
+
+  """
+  * The userId that can see this event
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+
+  """
+  The meeting that was completed
+  """
+  meeting: PokerMeeting!
+
+  """
+  The meetingId that was completed
+  """
+  meetingId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/TimelineEventTeamCreated.graphql b/packages/server/graphql/public/typeDefs/TimelineEventTeamCreated.graphql
new file mode 100644
index 00000000000..2b06cb1239c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TimelineEventTeamCreated.graphql
@@ -0,0 +1,64 @@
+"""
+An event triggered whenever a team is created
+"""
+type TimelineEventTeamCreated implements TimelineEvent {
+  """
+  shortid
+  """
+  id: ID!
+
+  """
+  * The timestamp the event was created at
+  """
+  createdAt: DateTime!
+
+  """
+  the number of times the user has interacted with (ie clicked) this event
+  """
+  interactionCount: Int!
+
+  """
+  true if the timeline event is active, false if archived
+  """
+  isActive: Boolean!
+
+  """
+  The orgId this event is associated with
+  """
+  orgId: ID!
+
+  """
+  The organization this event is associated with
+  """
+  organization: Organization
+
+  """
+  the number of times the user has seen this event
+  """
+  seenCount: Int!
+
+  """
+  The teamId this event is associated with. Null if not traceable to one team
+  """
+  teamId: ID!
+
+  """
+  The team that can see this event
+  """
+  team: Team!
+
+  """
+  The specific type of event
+  """
+  type: TimelineEventEnum!
+
+  """
+  * The userId that can see this event
+  """
+  userId: ID!
+
+  """
+  The user than can see this event
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/ToggleFavoriteTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/ToggleFavoriteTemplatePayload.graphql
new file mode 100644
index 00000000000..c49a354cc04
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ToggleFavoriteTemplatePayload.graphql
@@ -0,0 +1 @@
+union ToggleFavoriteTemplatePayload = ErrorPayload | ToggleFavoriteTemplateSuccess
diff --git a/packages/server/graphql/public/typeDefs/ToggleFavoriteTemplateSuccess.graphql b/packages/server/graphql/public/typeDefs/ToggleFavoriteTemplateSuccess.graphql
new file mode 100644
index 00000000000..d7db253a943
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ToggleFavoriteTemplateSuccess.graphql
@@ -0,0 +1,6 @@
+type ToggleFavoriteTemplateSuccess {
+  """
+  The user who's favorite templates were updated
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/ToggleSummaryEmailPayload.graphql b/packages/server/graphql/public/typeDefs/ToggleSummaryEmailPayload.graphql
new file mode 100644
index 00000000000..e0291e41c71
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ToggleSummaryEmailPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for toggleSummaryEmail, which could be an error
+"""
+union ToggleSummaryEmailPayload = ErrorPayload | ToggleSummaryEmailSuccess
diff --git a/packages/server/graphql/public/typeDefs/ToggleSummaryEmailSuccess.graphql b/packages/server/graphql/public/typeDefs/ToggleSummaryEmailSuccess.graphql
new file mode 100644
index 00000000000..8c65a7dc389
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ToggleSummaryEmailSuccess.graphql
@@ -0,0 +1,6 @@
+type ToggleSummaryEmailSuccess {
+  """
+  The user whose summary email settings have changed
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/ToggleTeamDrawerPayload.graphql b/packages/server/graphql/public/typeDefs/ToggleTeamDrawerPayload.graphql
new file mode 100644
index 00000000000..0bebd2e9e32
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ToggleTeamDrawerPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for ToggleTeamDrawerPayload
+"""
+union ToggleTeamDrawerPayload = ErrorPayload | ToggleTeamDrawerSuccess
diff --git a/packages/server/graphql/public/typeDefs/ToggleTeamDrawerSuccess.graphql b/packages/server/graphql/public/typeDefs/ToggleTeamDrawerSuccess.graphql
new file mode 100644
index 00000000000..ec77cda3e11
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/ToggleTeamDrawerSuccess.graphql
@@ -0,0 +1,3 @@
+type ToggleTeamDrawerSuccess {
+  teamMember: TeamMember!
+}
diff --git a/packages/server/graphql/public/typeDefs/TopRetroTemplate.graphql b/packages/server/graphql/public/typeDefs/TopRetroTemplate.graphql
new file mode 100644
index 00000000000..6838afd87d9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TopRetroTemplate.graphql
@@ -0,0 +1,6 @@
+type TopRetroTemplate {
+  id: ID!
+  reflectTemplateId: ID!
+  reflectTemplate: ReflectTemplate!
+  count: Int!
+}
diff --git a/packages/server/graphql/public/typeDefs/TranscriptBlock.graphql b/packages/server/graphql/public/typeDefs/TranscriptBlock.graphql
new file mode 100644
index 00000000000..68655ea2c24
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/TranscriptBlock.graphql
@@ -0,0 +1,14 @@
+"""
+A block of the meeting transcription with a speaker and text
+"""
+type TranscriptBlock {
+  """
+  The speaker who said the words
+  """
+  speaker: String!
+
+  """
+  The words that the speaker said
+  """
+  words: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/URL.graphql b/packages/server/graphql/public/typeDefs/URL.graphql
new file mode 100644
index 00000000000..a1202a40663
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/URL.graphql
@@ -0,0 +1 @@
+scalar URL
diff --git a/packages/server/graphql/public/typeDefs/UpdateAgendaItemInput.graphql b/packages/server/graphql/public/typeDefs/UpdateAgendaItemInput.graphql
new file mode 100644
index 00000000000..d0110ae03ca
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateAgendaItemInput.graphql
@@ -0,0 +1,26 @@
+input UpdateAgendaItemInput {
+  """
+  The unique agenda item ID, composed of a teamId::shortid
+  """
+  id: ID!
+
+  """
+  The content of the agenda item
+  """
+  content: String
+
+  """
+  True if agenda item has been pinned
+  """
+  pinned: Boolean
+
+  """
+  True if not processed or deleted
+  """
+  isActive: Boolean
+
+  """
+  The sort order of the agenda item in the list
+  """
+  sortOrder: Float
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateAgendaItemPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateAgendaItemPayload.graphql
new file mode 100644
index 00000000000..5bfadb7a7a4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateAgendaItemPayload.graphql
@@ -0,0 +1,10 @@
+type UpdateAgendaItemPayload {
+  agendaItem: AgendaItem
+  meetingId: ID
+
+  """
+  The meeting with the updated agenda item, if any
+  """
+  meeting: NewMeeting
+  error: StandardMutationError
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateAutoJoinPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateAutoJoinPayload.graphql
new file mode 100644
index 00000000000..5db4e83f71e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateAutoJoinPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for updateAutoJoin, which could be an error
+"""
+union UpdateAutoJoinPayload = ErrorPayload | UpdateAutoJoinSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateAutoJoinSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateAutoJoinSuccess.graphql
new file mode 100644
index 00000000000..a28cea1f5aa
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateAutoJoinSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateAutoJoinSuccess {
+  """
+  The teams that were updated
+  """
+  updatedTeams: [Team!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateAzureDevOpsDimensionFieldPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateAzureDevOpsDimensionFieldPayload.graphql
new file mode 100644
index 00000000000..009c44d6f3c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateAzureDevOpsDimensionFieldPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdateAzureDevOpsDimensionFieldPayload
+"""
+union UpdateAzureDevOpsDimensionFieldPayload = ErrorPayload | UpdateAzureDevOpsDimensionFieldSuccess
diff --git a/packages/server/graphql/public/typeDefs/updateAzureDevOpsDimensionField.graphql b/packages/server/graphql/public/typeDefs/UpdateAzureDevOpsDimensionFieldSuccess.graphql
similarity index 100%
rename from packages/server/graphql/public/typeDefs/updateAzureDevOpsDimensionField.graphql
rename to packages/server/graphql/public/typeDefs/UpdateAzureDevOpsDimensionFieldSuccess.graphql
diff --git a/packages/server/graphql/public/typeDefs/UpdateCommentContentPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateCommentContentPayload.graphql
new file mode 100644
index 00000000000..d82180f2311
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateCommentContentPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdateCommentContentPayload
+"""
+union UpdateCommentContentPayload = ErrorPayload | UpdateCommentContentSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateCommentContentSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateCommentContentSuccess.graphql
new file mode 100644
index 00000000000..709d950ad77
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateCommentContentSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateCommentContentSuccess {
+  """
+  the comment with updated content
+  """
+  comment: Comment!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateCreditCardPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateCreditCardPayload.graphql
new file mode 100644
index 00000000000..497759788d2
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateCreditCardPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for updateCreditCard, which could be an error
+"""
+union UpdateCreditCardPayload = ErrorPayload | UpdateCreditCardSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateCreditCardSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateCreditCardSuccess.graphql
new file mode 100644
index 00000000000..1913acc176b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateCreditCardSuccess.graphql
@@ -0,0 +1,16 @@
+type UpdateCreditCardSuccess {
+  """
+  The teams that were updated with the new payment method
+  """
+  teamsUpdated: [Team!]!
+
+  """
+  The org that was updated with the new payment method
+  """
+  organization: Organization!
+
+  """
+  The client secret from the Stripe subscription. Used for client-side retrieval using a publishable key.
+  """
+  stripeSubscriptionClientSecret: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateDimensionFieldPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateDimensionFieldPayload.graphql
index 7aca181a191..f0979f061d7 100644
--- a/packages/server/graphql/public/typeDefs/UpdateDimensionFieldPayload.graphql
+++ b/packages/server/graphql/public/typeDefs/UpdateDimensionFieldPayload.graphql
@@ -1,14 +1 @@
-type UpdateDimensionFieldSuccess {
-  teamId: ID!
-
-  meetingId: ID
-
-  team: Team!
-
-  """
-  The poker meeting the field was updated from
-  """
-  meeting: PokerMeeting
-}
-
 union UpdateDimensionFieldPayload = UpdateDimensionFieldSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/UpdateDimensionFieldSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateDimensionFieldSuccess.graphql
new file mode 100644
index 00000000000..f4690298feb
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateDimensionFieldSuccess.graphql
@@ -0,0 +1,10 @@
+type UpdateDimensionFieldSuccess {
+  teamId: ID!
+  meetingId: ID
+  team: Team!
+
+  """
+  The poker meeting the field was updated from
+  """
+  meeting: PokerMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateDragLocationInput.graphql b/packages/server/graphql/public/typeDefs/UpdateDragLocationInput.graphql
new file mode 100644
index 00000000000..c3c515c1e77
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateDragLocationInput.graphql
@@ -0,0 +1,41 @@
+input UpdateDragLocationInput {
+  id: ID!
+  clientHeight: Float!
+  clientWidth: Float!
+  meetingId: ID!
+
+  """
+  The primary key of the item being drug
+  """
+  sourceId: ID!
+
+  """
+  The estimated destination of the item being drug
+  """
+  targetId: ID
+
+  """
+  The teamId to broadcast the message to
+  """
+  teamId: ID!
+
+  """
+  horizontal distance from the top left of the target
+  """
+  targetOffsetX: Float
+
+  """
+  vertical distance from the top left of the target
+  """
+  targetOffsetY: Float
+
+  """
+  the left of the source, relative to the client window
+  """
+  clientX: Float
+
+  """
+  the top of the source, relative to the client window
+  """
+  clientY: Float
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateDragLocationPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateDragLocationPayload.graphql
new file mode 100644
index 00000000000..b833e7aff3d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateDragLocationPayload.graphql
@@ -0,0 +1,7 @@
+type UpdateDragLocationPayload {
+  """
+  The drag as sent from the team member
+  """
+  remoteDrag: RemoteReflectionDrag
+  userId: ID!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateFeatureFlagPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateFeatureFlagPayload.graphql
new file mode 100644
index 00000000000..d1b49e06e88
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateFeatureFlagPayload.graphql
@@ -0,0 +1,13 @@
+type UpdateFeatureFlagPayload {
+  error: StandardMutationError
+
+  """
+  the user that was given the super power. Use users instead in GraphiQL since it may affect multiple users
+  """
+  user: User
+
+  """
+  the users given the super power
+  """
+  users: [User]
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldPayload.graphql
new file mode 100644
index 00000000000..50aee81c5ac
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdateGitHubDimensionFieldPayload
+"""
+union UpdateGitHubDimensionFieldPayload = ErrorPayload | UpdateGitHubDimensionFieldSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldSuccess.graphql
new file mode 100644
index 00000000000..ee35926d283
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateGitHubDimensionFieldSuccess.graphql
@@ -0,0 +1,10 @@
+type UpdateGitHubDimensionFieldSuccess {
+  teamId: ID!
+  meetingId: ID!
+  team: Team!
+
+  """
+  The poker meeting the field was updated from
+  """
+  meeting: PokerMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldPayload.graphql
new file mode 100644
index 00000000000..ec4e5c78115
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldPayload.graphql
@@ -0,0 +1 @@
+union UpdateGitLabDimensionFieldPayload = ErrorPayload | UpdateGitLabDimensionFieldSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldSuccess.graphql
new file mode 100644
index 00000000000..79470487aa1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateGitLabDimensionFieldSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateGitLabDimensionFieldSuccess {
+  teamId: ID
+  meetingId: ID
+  team: Team
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderInput.graphql b/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderInput.graphql
new file mode 100644
index 00000000000..d3f40708bba
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderInput.graphql
@@ -0,0 +1,24 @@
+"""
+An Integration Provider configuration
+"""
+input UpdateIntegrationProviderInput {
+  """
+  The the id of the Integration Provider to update
+  """
+  id: ID!
+
+  """
+  The new scope for this provider (org, team)
+  """
+  scope: IntegrationProviderEditableScopeEnum
+
+  """
+  Webhook provider metadata, has to be non-null if token type is webhook, refactor once we get https://github.com/graphql/graphql-spec/pull/825
+  """
+  webhookProviderMetadataInput: IntegrationProviderMetadataInputWebhook
+
+  """
+  OAuth2 provider metadata, has to be non-null if token type is OAuth2, refactor once we get https://github.com/graphql/graphql-spec/pull/825
+  """
+  oAuth2ProviderMetadataInput: IntegrationProviderMetadataInputOAuth2
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderPayload.graphql
new file mode 100644
index 00000000000..c585010be77
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdateIntegrationProviderPayload
+"""
+union UpdateIntegrationProviderPayload = ErrorPayload | UpdateIntegrationProviderSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderSuccess.graphql
new file mode 100644
index 00000000000..c2777493292
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateIntegrationProviderSuccess.graphql
@@ -0,0 +1,16 @@
+type UpdateIntegrationProviderSuccess {
+  """
+  The provider that was updated
+  """
+  provider: IntegrationProvider!
+
+  """
+  The team member with the updated auth
+  """
+  teamMember: TeamMember!
+
+  """
+  The user who updated TeamMemberIntegrationAuth object
+  """
+  user: User!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateMeetingPromptPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateMeetingPromptPayload.graphql
new file mode 100644
index 00000000000..9e87be86a22
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateMeetingPromptPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for updateMeetingPrompt, which could be an error
+"""
+union UpdateMeetingPromptPayload = UpdateMeetingPromptSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/UpdateMeetingPromptSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateMeetingPromptSuccess.graphql
new file mode 100644
index 00000000000..714dc4487ee
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateMeetingPromptSuccess.graphql
@@ -0,0 +1,8 @@
+type UpdateMeetingPromptSuccess {
+  meetingId: ID!
+
+  """
+  the updated meeting
+  """
+  meeting: TeamPromptMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateMeetingTemplatePayload.graphql b/packages/server/graphql/public/typeDefs/UpdateMeetingTemplatePayload.graphql
new file mode 100644
index 00000000000..38f60786df2
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateMeetingTemplatePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for updateMeetingTemplate, which could be an error
+"""
+union UpdateMeetingTemplatePayload = ErrorPayload | UpdateMeetingTemplateSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateMeetingTemplateSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateMeetingTemplateSuccess.graphql
new file mode 100644
index 00000000000..176f583d15e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateMeetingTemplateSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateMeetingTemplateSuccess {
+  """
+  The updated meeting
+  """
+  meeting: NewMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateNewCheckInQuestionPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateNewCheckInQuestionPayload.graphql
new file mode 100644
index 00000000000..26ead4f7267
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateNewCheckInQuestionPayload.graphql
@@ -0,0 +1,4 @@
+type UpdateNewCheckInQuestionPayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateOrgInput.graphql b/packages/server/graphql/public/typeDefs/UpdateOrgInput.graphql
new file mode 100644
index 00000000000..ab575b6e42e
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateOrgInput.graphql
@@ -0,0 +1,11 @@
+input UpdateOrgInput {
+  """
+  The unique action ID
+  """
+  id: ID!
+
+  """
+  The name of the org
+  """
+  name: String
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateOrgPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateOrgPayload.graphql
new file mode 100644
index 00000000000..e7e3e4fe7f9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateOrgPayload.graphql
@@ -0,0 +1,8 @@
+type UpdateOrgPayload {
+  error: StandardMutationError
+
+  """
+  The updated org
+  """
+  organization: Organization
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdatePokerScopeItemInput.graphql b/packages/server/graphql/public/typeDefs/UpdatePokerScopeItemInput.graphql
new file mode 100644
index 00000000000..62e9f1285d0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatePokerScopeItemInput.graphql
@@ -0,0 +1,16 @@
+input UpdatePokerScopeItemInput {
+  """
+  The location of the single source of truth (e.g. a jira-integrated parabol task would be "jira")
+  """
+  service: TaskServiceEnum!
+
+  """
+  If vanilla parabol task, taskId. If integrated parabol task, integrationHash
+  """
+  serviceTaskId: ID!
+
+  """
+  The action to perform
+  """
+  action: AddOrDeleteEnum!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdatePokerScopePayload.graphql b/packages/server/graphql/public/typeDefs/UpdatePokerScopePayload.graphql
new file mode 100644
index 00000000000..eb491b6a61c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatePokerScopePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdatePokerScopePayload
+"""
+union UpdatePokerScopePayload = ErrorPayload | UpdatePokerScopeSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdatePokerScopeSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdatePokerScopeSuccess.graphql
new file mode 100644
index 00000000000..eecc553a6da
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatePokerScopeSuccess.graphql
@@ -0,0 +1,11 @@
+type UpdatePokerScopeSuccess {
+  """
+  The meeting with the updated estimate phases
+  """
+  meeting: PokerMeeting!
+
+  """
+  The estimate stages added to the meeting
+  """
+  newStages: [EstimateStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdatePokerTemplateDimensionScalePayload.graphql b/packages/server/graphql/public/typeDefs/UpdatePokerTemplateDimensionScalePayload.graphql
new file mode 100644
index 00000000000..f10cd859a2a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatePokerTemplateDimensionScalePayload.graphql
@@ -0,0 +1,4 @@
+type UpdatePokerTemplateDimensionScalePayload {
+  error: StandardMutationError
+  dimension: TemplateDimension
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdatePokerTemplateScaleValuePayload.graphql b/packages/server/graphql/public/typeDefs/UpdatePokerTemplateScaleValuePayload.graphql
new file mode 100644
index 00000000000..b8a48f0d9f9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatePokerTemplateScaleValuePayload.graphql
@@ -0,0 +1,4 @@
+type UpdatePokerTemplateScaleValuePayload {
+  error: StandardMutationError
+  scale: TemplateScale
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsPayload.graphql
new file mode 100644
index 00000000000..21a2de0a8f9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for updateRecurrenceSettings, which could be an error
+"""
+union UpdateRecurrenceSettingsPayload = UpdateRecurrenceSettingsSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsSuccess.graphql
new file mode 100644
index 00000000000..254f512001d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateRecurrenceSettingsSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateRecurrenceSettingsSuccess {
+  """
+  The updated meeting
+  """
+  meeting: TeamPromptMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateReflectionContentPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateReflectionContentPayload.graphql
new file mode 100644
index 00000000000..dc8f444f7e9
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateReflectionContentPayload.graphql
@@ -0,0 +1,5 @@
+type UpdateReflectionContentPayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+  reflection: RetroReflection
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateReflectionGroupTitlePayload.graphql b/packages/server/graphql/public/typeDefs/UpdateReflectionGroupTitlePayload.graphql
new file mode 100644
index 00000000000..714ab4b687f
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateReflectionGroupTitlePayload.graphql
@@ -0,0 +1,5 @@
+type UpdateReflectionGroupTitlePayload {
+  error: StandardMutationError
+  meeting: NewMeeting
+  reflectionGroup: RetroReflectionGroup
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesPayload.graphql
new file mode 100644
index 00000000000..d6e9228a62c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdateRetroMaxVotesPayload
+"""
+union UpdateRetroMaxVotesPayload = ErrorPayload | UpdateRetroMaxVotesSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesSuccess.graphql
new file mode 100644
index 00000000000..9950b9e51d3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateRetroMaxVotesSuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateRetroMaxVotesSuccess {
+  """
+  the meeting with the updated max votes
+  """
+  meeting: RetrospectiveMeeting!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateTaskDueDatePayload.graphql b/packages/server/graphql/public/typeDefs/UpdateTaskDueDatePayload.graphql
new file mode 100644
index 00000000000..374169a79c1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTaskDueDatePayload.graphql
@@ -0,0 +1,4 @@
+type UpdateTaskDueDatePayload {
+  error: StandardMutationError
+  task: Task
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateTaskInput.graphql b/packages/server/graphql/public/typeDefs/UpdateTaskInput.graphql
new file mode 100644
index 00000000000..54e17c652ce
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTaskInput.graphql
@@ -0,0 +1,14 @@
+input UpdateTaskInput {
+  """
+  The task id
+  """
+  id: ID!
+  content: String
+  sortOrder: Float
+  status: TaskStatusEnum
+
+  """
+  userId, the owner of the task. This can be null if the task is not assigned to anyone.
+  """
+  userId: ID
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateTaskPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateTaskPayload.graphql
new file mode 100644
index 00000000000..1f5511f8393
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTaskPayload.graphql
@@ -0,0 +1,10 @@
+type UpdateTaskPayload {
+  error: StandardMutationError
+  task: Task
+
+  """
+  If a task was just turned private, this its ID, else null
+  """
+  privatizedTaskId: ID
+  addedNotification: NotifyTaskInvolves
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateTeamNamePayload.graphql b/packages/server/graphql/public/typeDefs/UpdateTeamNamePayload.graphql
new file mode 100644
index 00000000000..120ec8e7ac5
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTeamNamePayload.graphql
@@ -0,0 +1,4 @@
+type UpdateTeamNamePayload {
+  error: StandardMutationError
+  team: Team
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateTemplateCategoryPayload.graphql b/packages/server/graphql/public/typeDefs/UpdateTemplateCategoryPayload.graphql
new file mode 100644
index 00000000000..19781b9d60b
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTemplateCategoryPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for updateTemplateCategory, which could be an error
+"""
+union UpdateTemplateCategoryPayload = ErrorPayload | UpdateTemplateCategorySuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateTemplateCategorySuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateTemplateCategorySuccess.graphql
new file mode 100644
index 00000000000..781c9745bf8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTemplateCategorySuccess.graphql
@@ -0,0 +1,6 @@
+type UpdateTemplateCategorySuccess {
+  """
+  The template with the updated mainCategory
+  """
+  template: MeetingTemplate!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateTemplateScopePayload.graphql b/packages/server/graphql/public/typeDefs/UpdateTemplateScopePayload.graphql
new file mode 100644
index 00000000000..f6b6f42c7e3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTemplateScopePayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for UpdateTemplateScopePayload
+"""
+union UpdateTemplateScopePayload = ErrorPayload | UpdateTemplateScopeSuccess
diff --git a/packages/server/graphql/public/typeDefs/UpdateTemplateScopeSuccess.graphql b/packages/server/graphql/public/typeDefs/UpdateTemplateScopeSuccess.graphql
new file mode 100644
index 00000000000..07b856e67b8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateTemplateScopeSuccess.graphql
@@ -0,0 +1,16 @@
+type UpdateTemplateScopeSuccess {
+  """
+  the template that was just updated, if downscoped, does not provide whole story
+  """
+  template: MeetingTemplate!
+
+  """
+  if downscoping a previously used template, this will be the replacement
+  """
+  clonedTemplate: MeetingTemplate
+
+  """
+  The settings that contain the teamTemplates array that was modified
+  """
+  settings: TeamMeetingSettings!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateUserProfileInput.graphql b/packages/server/graphql/public/typeDefs/UpdateUserProfileInput.graphql
new file mode 100644
index 00000000000..f2b8d24f1c0
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateUserProfileInput.graphql
@@ -0,0 +1,6 @@
+input UpdateUserProfileInput {
+  """
+  The name, as confirmed by the user
+  """
+  preferredName: String
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdateUserProfilePayload.graphql b/packages/server/graphql/public/typeDefs/UpdateUserProfilePayload.graphql
new file mode 100644
index 00000000000..9b2925850b3
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdateUserProfilePayload.graphql
@@ -0,0 +1,9 @@
+type UpdateUserProfilePayload {
+  error: StandardMutationError
+  user: User
+
+  """
+  The updated team member
+  """
+  teamMembers: [TeamMember!]
+}
diff --git a/packages/server/graphql/public/typeDefs/UpatedNotification.graphql b/packages/server/graphql/public/typeDefs/UpdatedNotification.graphql
similarity index 100%
rename from packages/server/graphql/public/typeDefs/UpatedNotification.graphql
rename to packages/server/graphql/public/typeDefs/UpdatedNotification.graphql
diff --git a/packages/server/graphql/public/typeDefs/UpdatedTeamInput.graphql b/packages/server/graphql/public/typeDefs/UpdatedTeamInput.graphql
new file mode 100644
index 00000000000..a3e1568a21c
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatedTeamInput.graphql
@@ -0,0 +1,13 @@
+input UpdatedTeamInput {
+  id: ID!
+
+  """
+  The name of the team
+  """
+  name: String!
+
+  """
+  A link to the team’s profile image.
+  """
+  picture: URL
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdatesPhase.graphql b/packages/server/graphql/public/typeDefs/UpdatesPhase.graphql
new file mode 100644
index 00000000000..f0d2d573c26
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatesPhase.graphql
@@ -0,0 +1,17 @@
+"""
+The meeting phase where all team members give updates one-by-one
+"""
+type UpdatesPhase implements NewMeetingPhase {
+  """
+  shortid
+  """
+  id: ID!
+  meetingId: ID!
+  teamId: ID!
+
+  """
+  The type of phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum!
+  stages: [UpdatesStage!]!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpdatesStage.graphql b/packages/server/graphql/public/typeDefs/UpdatesStage.graphql
new file mode 100644
index 00000000000..a5c32cf19b1
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpdatesStage.graphql
@@ -0,0 +1,110 @@
+"""
+A stage that focuses on a single team member
+"""
+type UpdatesStage implements NewMeetingStage & NewMeetingTeamMemberStage {
+  """
+  stageId, shortid
+  """
+  id: ID!
+
+  """
+  The datetime the stage was completed
+  """
+  endAt: DateTime
+
+  """
+  foreign key. try using meeting
+  """
+  meetingId: ID!
+
+  """
+  The meeting this stage belongs to
+  """
+  meeting: NewMeeting
+
+  """
+  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
+  """
+  isComplete: Boolean!
+
+  """
+  true if any meeting participant can navigate to this stage
+  """
+  isNavigable: Boolean!
+
+  """
+  true if the facilitator can navigate to this stage
+  """
+  isNavigableByFacilitator: Boolean!
+
+  """
+  The phase this stage belongs to
+  """
+  phase: NewMeetingPhase
+
+  """
+  The type of the phase
+  """
+  phaseType: NewMeetingPhaseTypeEnum
+
+  """
+  The datetime the stage was started
+  """
+  startAt: DateTime
+
+  """
+  Number of times the facilitator has visited this stage
+  """
+  viewCount: Int
+
+  """
+  true if a time limit is set, false if end time is set, null if neither is set
+  """
+  isAsync: Boolean
+
+  """
+  true if the viewer is ready to advance, else false
+  """
+  isViewerReady: Boolean!
+
+  """
+  the number of meeting members ready to advance, excluding the facilitator
+  """
+  readyCount: Int!
+
+  """
+  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
+  """
+  scheduledEndTime: DateTime
+
+  """
+  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
+  """
+  suggestedEndTime: DateTime
+
+  """
+  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
+  """
+  suggestedTimeLimit: Float
+  teamId: ID!
+
+  """
+  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
+  """
+  timeRemaining: Float
+
+  """
+  The meeting member that is the focus for this phase item
+  """
+  meetingMember: MeetingMember!
+
+  """
+  foreign key. use teamMember
+  """
+  teamMemberId: ID!
+
+  """
+  The team member that is the focus for this phase item
+  """
+  teamMember: TeamMember!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpgradeToTeamTierPayload.graphql b/packages/server/graphql/public/typeDefs/UpgradeToTeamTierPayload.graphql
new file mode 100644
index 00000000000..06955b72ba8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpgradeToTeamTierPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return value for upgradeToTeamTier, which could be an error
+"""
+union UpgradeToTeamTierPayload = ErrorPayload | UpgradeToTeamTierSuccess
diff --git a/packages/server/graphql/public/typeDefs/upgradeToTeamTier.graphql b/packages/server/graphql/public/typeDefs/UpgradeToTeamTierSuccess.graphql
similarity index 57%
rename from packages/server/graphql/public/typeDefs/upgradeToTeamTier.graphql
rename to packages/server/graphql/public/typeDefs/UpgradeToTeamTierSuccess.graphql
index e09f21cfbc0..f4a30807ba4 100644
--- a/packages/server/graphql/public/typeDefs/upgradeToTeamTier.graphql
+++ b/packages/server/graphql/public/typeDefs/UpgradeToTeamTierSuccess.graphql
@@ -1,28 +1,19 @@
-extend type Mutation {
-  """
-  Describe the mutation here
-  """
-  upgradeToTeamTier(invoiceId: ID!): UpgradeToTeamTierPayload!
-}
-
-"""
-Return value for upgradeToTeamTier, which could be an error
-"""
-union UpgradeToTeamTierPayload = ErrorPayload | UpgradeToTeamTierSuccess
-
 type UpgradeToTeamTierSuccess {
   """
   The new org on the team tier
   """
   organization: Organization!
+
   """
   The updated teams under the org
   """
   teams: [Team!]!
+
   """
   the ids of the meetings that were showing conversion modals
   """
   meetingIds: [ID!]!
+
   """
   the meetings that were showing conversion modals
   """
diff --git a/packages/server/graphql/public/typeDefs/UploadIdPMetadataPayload.graphql b/packages/server/graphql/public/typeDefs/UploadIdPMetadataPayload.graphql
new file mode 100644
index 00000000000..8de5293c0de
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UploadIdPMetadataPayload.graphql
@@ -0,0 +1 @@
+union UploadIdPMetadataPayload = ErrorPayload | UploadIdPMetadataSuccess
diff --git a/packages/server/graphql/public/typeDefs/UploadIdPMetadataSuccess.graphql b/packages/server/graphql/public/typeDefs/UploadIdPMetadataSuccess.graphql
new file mode 100644
index 00000000000..161053338c8
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UploadIdPMetadataSuccess.graphql
@@ -0,0 +1,3 @@
+type UploadIdPMetadataSuccess {
+  url: String!
+}
diff --git a/packages/server/graphql/public/typeDefs/UpsertTeamPromptResponsePayload.graphql b/packages/server/graphql/public/typeDefs/UpsertTeamPromptResponsePayload.graphql
new file mode 100644
index 00000000000..a5bf6a15cbc
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpsertTeamPromptResponsePayload.graphql
@@ -0,0 +1 @@
+union UpsertTeamPromptResponsePayload = UpsertTeamPromptResponseSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/UpsertTeamPromptResponseSuccess.graphql b/packages/server/graphql/public/typeDefs/UpsertTeamPromptResponseSuccess.graphql
new file mode 100644
index 00000000000..906ce061f05
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UpsertTeamPromptResponseSuccess.graphql
@@ -0,0 +1,14 @@
+type UpsertTeamPromptResponseSuccess {
+  teamPromptResponseId: ID!
+  meetingId: ID!
+
+  """
+  the created/updated team prompt response
+  """
+  teamPromptResponse: TeamPromptResponse
+
+  """
+  the updated meeting
+  """
+  meeting: NewMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/User.graphql b/packages/server/graphql/public/typeDefs/User.graphql
index 8a6f9a76dcf..c154a6aae5e 100644
--- a/packages/server/graphql/public/typeDefs/User.graphql
+++ b/packages/server/graphql/public/typeDefs/User.graphql
@@ -1,9 +1,3 @@
-enum CanAccessEntity {
-  Team
-  Meeting
-  Organization
-}
-
 """
 The user account profile
 """
@@ -12,6 +6,11 @@ type User {
   The userId provided by us
   """
   id: ID!
+
+  """
+  The optional pseudoId for the user
+  """
+  pseudoId: String
   archivedTasks(
     first: Int!
 
@@ -32,41 +31,16 @@ type User {
     teamId: ID!
   ): Int
 
-  """
-  The assumed company this organizaiton belongs to
-  """
-  company: Company
-
   """
   The timestamp the user was created
   """
   createdAt: DateTime!
 
-  """
-  The domains the user is a lead of
-  """
-  domains: [Company!]!
-
-  """
-  Domain join request
-  """
-  domainJoinRequest(requestId: ID!): DomainJoinRequest
-
   """
   The user email
   """
   email: Email!
 
-  """
-  The user's favorite meeting templates
-  """
-  favoriteTemplates: [MeetingTemplate!]!
-
-  """
-  Any super power given to the user via a super user
-  """
-  featureFlags: UserFeatureFlags!
-
   """
   An array of objects with information about the user's identities.
         More than one will exists in case accounts are linked
@@ -77,12 +51,6 @@ type User {
   true if the user is not currently being billed for service. removed on every websocket handshake
   """
   inactive: Boolean
-  invoiceDetails(
-    """
-    The id of the invoice
-    """
-    invoiceId: ID!
-  ): Invoice
   invoices(
     first: Int!
 
@@ -110,7 +78,12 @@ type User {
   """
   true if the user is the first to sign up from their domain, else false
   """
-  isPatientZero: Boolean!
+  isPatient0: Boolean!
+
+  """
+  true if the user is the first to sign up from their domain, else false
+  """
+  isPatientZero: Boolean! @deprecated(reason: "Use isPatient0 instead")
 
   """
   the reason the user account was removed
@@ -170,6 +143,12 @@ type User {
     the number of timeline events to return
     """
     first: Int!
+
+    """
+    a list of team Ids that you want timeline events for. if null, will return timeline events for all possible active teams
+    """
+    teamIds: [ID!]
+    eventTypes: [TimelineEventEnum!]
   ): TimelineEventConnection!
 
   """
@@ -192,21 +171,11 @@ type User {
   """
   newFeature: NewFeatureBroadcast
 
-  """
-  url of user’s profile picture
-  """
-  picture: URL!
-
   """
   The application-specific name, defaults to email before the tld
   """
   preferredName: String!
 
-  """
-  url of user’s raster profile picture (if user profile pic is an SVG, raster will be a PNG)
-  """
-  rasterPicture: URL!
-
   """
   The last day the user connected via websocket or navigated to a common area
   """
@@ -287,6 +256,11 @@ type User {
   """
   overLimitCopy: String
 
+  """
+  Whether the user should receive a meeting summary email
+  """
+  sendSummaryEmail: Boolean!
+
   """
   The reflection groups that are similar to the selected reflection in the Spotlight
   """
@@ -343,21 +317,6 @@ type User {
     includeUnassigned: Boolean = false
   ): TaskConnection!
 
-  """
-  Check whether the viewer can access a given entity. This can be used to distinguish errors from unauthorized access which requires an invite.
-  """
-  canAccess(
-    """
-    the entity to check
-    """
-    entity: CanAccessEntity!
-
-    """
-    the id of the entity
-    """
-    id: ID!
-  ): Boolean!
-
   """
   A query for a team
   """
@@ -408,10 +367,6 @@ type User {
     userId: ID
   ): TeamMember
 
-  tier: TierEnum!
-
-  billingTier: TierEnum!
-
   """
   all the teams the user is a part of that the viewer can see
   """
@@ -428,6 +383,64 @@ type User {
     userId: ID!
   ): User
 
+  """
+  The assumed company this organizaiton belongs to
+  """
+  company: Company
+
+  """
+  The domains the user is a lead of
+  """
+  domains: [Company!]!
+
+  """
+  Domain join request
+  """
+  domainJoinRequest(requestId: ID!): DomainJoinRequest
+
+  """
+  The user's favorite meeting templates
+  """
+  favoriteTemplates: [MeetingTemplate!]!
+
+  """
+  Any super power given to the user via a super user
+  """
+  featureFlags: UserFeatureFlags!
+  invoiceDetails(
+    """
+    The id of the invoice
+    """
+    invoiceId: ID!
+  ): Invoice
+
+  """
+  url of user’s profile picture
+  """
+  picture: URL!
+
+  """
+  url of user’s raster profile picture (if user profile pic is an SVG, raster will be a PNG)
+  """
+  rasterPicture: URL!
+
+  """
+  Check whether the viewer can access a given entity. This can be used to distinguish errors from unauthorized access which requires an invite.
+  """
+  canAccess(
+    """
+    the entity to check
+    """
+    entity: CanAccessEntity!
+
+    """
+    the id of the entity
+    """
+    id: ID!
+  ): Boolean!
+  tier: TierEnum!
+  billingTier: TierEnum!
+
   """
   A connection of activities available to the user
   """
@@ -438,6 +451,7 @@ type User {
     The cursor, which is the templateId
     """
     after: ID
+
     """
     An optional argument to filter by template type
     """
@@ -472,15 +486,18 @@ type User {
     URL of a blob of XML from the IdP describing how to handle authentication
     """
     metadataURL: String!
+
     """
     The name of the company, used as a slug in signon URLs
     """
     domain: String!
   ): ParseSAMLMetadataPayload!
+
   """
   The number of free custom retro templates remaining
   """
   freeCustomRetroTemplatesRemaining: Int!
+
   """
   The number of free custom poker templates remaining
   """
diff --git a/packages/server/graphql/public/typeDefs/UserFeatureFlags.graphql b/packages/server/graphql/public/typeDefs/UserFeatureFlags.graphql
new file mode 100644
index 00000000000..a5b79f2b454
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UserFeatureFlags.graphql
@@ -0,0 +1,11 @@
+"""
+The types of flags that give an individual user super powers
+"""
+type UserFeatureFlags {
+  standups: Boolean!
+  insights: Boolean!
+  recurrence: Boolean!
+  noAISummary: Boolean!
+  noMeetingHistoryLimit: Boolean!
+  signUpDestinationTeam: Boolean!
+}
diff --git a/packages/server/graphql/public/typeDefs/UserFlagEnum.graphql b/packages/server/graphql/public/typeDefs/UserFlagEnum.graphql
new file mode 100644
index 00000000000..af80f22f44d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UserFlagEnum.graphql
@@ -0,0 +1,11 @@
+"""
+A flag to give an individual user super powers
+"""
+enum UserFlagEnum {
+  standups
+  insights
+  recurrence
+  noAISummary
+  noMeetingHistoryLimit
+  signUpDestinationTeam
+}
diff --git a/packages/server/graphql/public/typeDefs/UserLogInPayload.graphql b/packages/server/graphql/public/typeDefs/UserLogInPayload.graphql
index 83839032413..df84f16eae4 100644
--- a/packages/server/graphql/public/typeDefs/UserLogInPayload.graphql
+++ b/packages/server/graphql/public/typeDefs/UserLogInPayload.graphql
@@ -9,6 +9,7 @@ type UserLogInPayload {
   """
   authToken: ID
   userId: ID
+
   """
   if a new user is created
   """
diff --git a/packages/server/graphql/public/typeDefs/UserTiersCount.graphql b/packages/server/graphql/public/typeDefs/UserTiersCount.graphql
new file mode 100644
index 00000000000..4bb34805433
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/UserTiersCount.graphql
@@ -0,0 +1,20 @@
+"""
+A count of the number of account tiers a user belongs to.
+"""
+type UserTiersCount {
+  """
+  The number of starter orgs the user is active upon
+  """
+  tierStarterCount: Int
+
+  """
+  The number of orgs on the team tier the user is active upon
+  """
+  tierTeamCount: Int
+
+  """
+  The number of orgs on the team tier the user holds the role of Billing Leader
+  """
+  tierTeamBillingLeaderCount: Int
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/VerifiedInvitationPayload.graphql b/packages/server/graphql/public/typeDefs/VerifiedInvitationPayload.graphql
new file mode 100644
index 00000000000..8f08a8da2d6
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/VerifiedInvitationPayload.graphql
@@ -0,0 +1,46 @@
+type VerifiedInvitationPayload {
+  errorType: TeamInvitationErrorEnum
+
+  """
+  The name of the person that sent the invitation, present if errorType is expired
+  """
+  inviterName: String
+
+  """
+  The email of the person that send the invitation, present if errorType is expired
+  """
+  inviterEmail: String
+
+  """
+  true if the mx record is hosted by google, else falsy
+  """
+  isGoogle: Boolean
+
+  """
+  a string to redirect to the sso IdP, else null
+  """
+  ssoURL: String
+
+  """
+  The valid invitation, if any
+  """
+  teamInvitation: TeamInvitation
+
+  """
+  name of the inviting team, present if invitation exists
+  """
+  teamName: String
+  meetingId: ID
+  meetingName: String
+  meetingType: MeetingTypeEnum
+
+  """
+  The userId of the invitee, if already a parabol user
+  """
+  userId: ID
+
+  """
+  The invitee, if already a parabol user, present if errorType is null
+  """
+  user: User
+}
diff --git a/packages/server/graphql/public/typeDefs/VoteForPokerStoryPayload.graphql b/packages/server/graphql/public/typeDefs/VoteForPokerStoryPayload.graphql
new file mode 100644
index 00000000000..7965295783d
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/VoteForPokerStoryPayload.graphql
@@ -0,0 +1,4 @@
+"""
+Return object for VoteForPokerStoryPayload
+"""
+union VoteForPokerStoryPayload = ErrorPayload | VoteForPokerStorySuccess
diff --git a/packages/server/graphql/public/typeDefs/VoteForPokerStorySuccess.graphql b/packages/server/graphql/public/typeDefs/VoteForPokerStorySuccess.graphql
new file mode 100644
index 00000000000..d86a1308d73
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/VoteForPokerStorySuccess.graphql
@@ -0,0 +1,6 @@
+type VoteForPokerStorySuccess {
+  """
+  The stage that holds the updated scores
+  """
+  stage: EstimateStage!
+}
diff --git a/packages/server/graphql/public/typeDefs/VoteForReflectionGroupPayload.graphql b/packages/server/graphql/public/typeDefs/VoteForReflectionGroupPayload.graphql
new file mode 100644
index 00000000000..497773348a4
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/VoteForReflectionGroupPayload.graphql
@@ -0,0 +1,11 @@
+type VoteForReflectionGroupPayload {
+  error: StandardMutationError
+  meeting: RetrospectiveMeeting
+  meetingMember: RetrospectiveMeetingMember
+  reflectionGroup: RetroReflectionGroup
+
+  """
+  The stages that were locked or unlocked by having at least 1 vote
+  """
+  unlockedStages: [NewMeetingStage!]
+}
diff --git a/packages/server/graphql/public/typeDefs/VotePhaseCompletePayload.graphql b/packages/server/graphql/public/typeDefs/VotePhaseCompletePayload.graphql
new file mode 100644
index 00000000000..7a82cac412a
--- /dev/null
+++ b/packages/server/graphql/public/typeDefs/VotePhaseCompletePayload.graphql
@@ -0,0 +1,6 @@
+type VotePhaseCompletePayload {
+  """
+  the current meeting
+  """
+  meeting: RetrospectiveMeeting
+}
diff --git a/packages/server/graphql/public/typeDefs/_legacy.graphql b/packages/server/graphql/public/typeDefs/_legacy.graphql
deleted file mode 100644
index 6550de57f6d..00000000000
--- a/packages/server/graphql/public/typeDefs/_legacy.graphql
+++ /dev/null
@@ -1,8121 +0,0 @@
-"""
-An integration provider that connects via OAuth1.0
-"""
-type IntegrationProviderOAuth1 implements IntegrationProvider {
-  """
-  The provider's unique identifier
-  """
-  id: ID!
-
-  """
-  The team that created the provider. "aGhostTeam" if global
-  """
-  teamId: ID!
-
-  """
-  The timestamp the provider was created
-  """
-  createdAt: DateTime!
-
-  """
-  The timestamp the token was updated at
-  """
-  updatedAt: DateTime!
-
-  """
-  The name of the integration service (GitLab, Mattermost, etc)
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  The kind of token used by this provider (OAuth2, PAT, Webhook)
-  """
-  authStrategy: IntegrationProviderAuthStrategyEnum!
-
-  """
-  The scope this provider configuration was created at (globally, org-wide, or by the team)
-  """
-  scope: IntegrationProviderScopeEnum!
-
-  """
-  true if the provider configuration should be used
-  """
-  isActive: Boolean!
-
-  """
-  The base URL of the OAuth1 server
-  """
-  serverBaseUrl: URL!
-}
-
-"""
-An authentication provider configuration
-"""
-interface IntegrationProvider {
-  """
-  The provider's unique identifier
-  """
-  id: ID!
-
-  """
-  The team that created the provider. "aGhostTeam" if global
-  """
-  teamId: ID!
-
-  """
-  The timestamp the provider was created
-  """
-  createdAt: DateTime!
-
-  """
-  The timestamp the token was updated at
-  """
-  updatedAt: DateTime!
-
-  """
-  The name of the integration service (GitLab, Mattermost, etc)
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  The kind of token used by this provider (OAuth2, PAT, Webhook)
-  """
-  authStrategy: IntegrationProviderAuthStrategyEnum!
-
-  """
-  The scope this provider configuration was created at (globally, org-wide, or by the team)
-  """
-  scope: IntegrationProviderScopeEnum!
-
-  """
-  true if the provider configuration should be used
-  """
-  isActive: Boolean!
-}
-
-scalar DateTime
-
-"""
-The name of the service of the Integration Provider
-"""
-enum IntegrationProviderServiceEnum {
-  jira
-  github
-  gitlab
-  mattermost
-  jiraServer
-  gcal
-}
-
-"""
-The kind of token provided by the service
-"""
-enum IntegrationProviderAuthStrategyEnum {
-  oauth1
-  oauth2
-  pat
-  webhook
-}
-
-"""
-The scope this provider was created on (globally, org-wide, or on the team)
-"""
-enum IntegrationProviderScopeEnum {
-  global
-  org
-  team
-}
-
-scalar URL
-
-"""
-An integration provider that connects via OAuth2
-"""
-type IntegrationProviderOAuth2 implements IntegrationProvider {
-  """
-  The provider's unique identifier
-  """
-  id: ID!
-
-  """
-  The team that created the provider. "aGhostTeam" if global
-  """
-  teamId: ID!
-
-  """
-  The timestamp the provider was created
-  """
-  createdAt: DateTime!
-
-  """
-  The timestamp the token was updated at
-  """
-  updatedAt: DateTime!
-
-  """
-  The name of the integration service (GitLab, Mattermost, etc)
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  The kind of token used by this provider (OAuth2, PAT, Webhook)
-  """
-  authStrategy: IntegrationProviderAuthStrategyEnum!
-
-  """
-  The scope this provider configuration was created at (globally, org-wide, or by the team)
-  """
-  scope: IntegrationProviderScopeEnum!
-
-  """
-  true if the provider configuration should be used
-  """
-  isActive: Boolean!
-
-  """
-  The base URL of the OAuth2 server
-  """
-  serverBaseUrl: URL!
-
-  """
-  The OAuth2 client id
-  """
-  clientId: ID!
-}
-
-"""
-An integration provider that connects via webhook
-"""
-type IntegrationProviderWebhook implements IntegrationProvider {
-  """
-  The provider's unique identifier
-  """
-  id: ID!
-
-  """
-  The team that created the provider. "aGhostTeam" if global
-  """
-  teamId: ID!
-
-  """
-  The timestamp the provider was created
-  """
-  createdAt: DateTime!
-
-  """
-  The timestamp the token was updated at
-  """
-  updatedAt: DateTime!
-
-  """
-  The name of the integration service (GitLab, Mattermost, etc)
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  The kind of token used by this provider (OAuth2, PAT, Webhook)
-  """
-  authStrategy: IntegrationProviderAuthStrategyEnum!
-
-  """
-  The scope this provider configuration was created at (globally, org-wide, or by the team)
-  """
-  scope: IntegrationProviderScopeEnum!
-
-  """
-  true if the provider configuration should be used
-  """
-  isActive: Boolean!
-
-  """
-  The webhook URL
-  """
-  webhookUrl: URL!
-}
-
-"""
-An authentication strategy using Google
-"""
-type AuthIdentityGoogle implements AuthIdentity {
-  """
-  true if the email address using this strategy is verified, else false
-  """
-  isEmailVerified: Boolean!
-  type: AuthIdentityTypeEnum!
-
-  """
-  The googleID for this strategy
-  """
-  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
-"""
-interface AuthIdentity {
-  """
-  true if the email address using this strategy is verified, else false
-  """
-  isEmailVerified: Boolean!
-  type: AuthIdentityTypeEnum!
-}
-
-"""
-The types of authentication strategies
-"""
-enum AuthIdentityTypeEnum {
-  LOCAL
-  GOOGLE
-  MICROSOFT
-}
-
-"""
-An authentication strategy using an email & password
-"""
-type AuthIdentityLocal implements AuthIdentity {
-  """
-  true if the email address using this strategy is verified, else false
-  """
-  isEmailVerified: Boolean!
-  type: AuthIdentityTypeEnum!
-}
-
-"""
-The meeting phase where all team members check in one-by-one
-"""
-type CheckInPhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [CheckInStage!]!
-
-  """
-  The checkIn greeting (fun language)
-  """
-  checkInGreeting: MeetingGreeting!
-
-  """
-  The checkIn question of the week (draft-js format)
-  """
-  checkInQuestion: String!
-}
-
-interface NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [NewMeetingStage!]!
-}
-
-"""
-The phase of the meeting
-"""
-enum NewMeetingPhaseTypeEnum {
-  lobby
-  checkin
-  updates
-  firstcall
-  agendaitems
-  lastcall
-  reflect
-  group
-  vote
-  discuss
-  SUMMARY
-  SCOPE
-  ESTIMATE
-  RESPONSES
-}
-
-"""
-An instance of a meeting phase item. On the client, this usually represents a single view
-"""
-interface NewMeetingStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-}
-
-"""
-A connection to a list of items.
-"""
-type TaskConnection {
-  """
-  Page info with cursors coerced to ISO8601 dates
-  """
-  pageInfo: PageInfoDateCursor
-
-  """
-  A list of edges.
-  """
-  edges: [TaskEdge!]!
-}
-
-"""
-Information about pagination in a connection.
-"""
-type PageInfoDateCursor {
-  """
-  When paginating forwards, are there more items?
-  """
-  hasNextPage: Boolean!
-
-  """
-  When paginating backwards, are there more items?
-  """
-  hasPreviousPage: Boolean!
-
-  """
-  When paginating backwards, the cursor to continue.
-  """
-  startCursor: DateTime
-
-  """
-  When paginating forwards, the cursor to continue.
-  """
-  endCursor: DateTime
-}
-
-"""
-An edge in a connection.
-"""
-type TaskEdge {
-  """
-  The item at the end of the edge
-  """
-  node: Task!
-  cursor: DateTime
-}
-
-"""
-A long-term task shared across the team, assigned to a single user
-"""
-type Task implements Threadable {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  The rich text body of the item
-  """
-  content: String!
-
-  """
-  The timestamp the item was created
-  """
-  createdAt: DateTime!
-
-  """
-  The userId that created the item
-  """
-  createdBy: ID!
-
-  """
-  The user that created the item
-  """
-  createdByUser: User!
-
-  """
-  the replies to this threadable item
-  """
-  replies: [Threadable!]!
-
-  """
-  The FK of the discussion this task was created in. Null if task was not created in a discussion
-  """
-  discussionId: ID
-
-  """
-  the parent, if this threadable is a reply, else null
-  """
-  threadParentId: ID
-
-  """
-  the order of this threadable, relative to threadParentId
-  """
-  threadSortOrder: Float
-
-  """
-  The timestamp the item was updated
-  """
-  updatedAt: DateTime!
-
-  """
-  The agenda item that the task was created in, if any
-  """
-  agendaItem: AgendaItem
-
-  """
-  a user-defined due date
-  """
-  dueDate: DateTime
-
-  """
-  A list of the most recent estimates for the task
-  """
-  estimates: [TaskEstimate!]!
-
-  """
-  a list of users currently editing the task (fed by a subscription, so queries return null)
-  """
-  editors: [TaskEditorDetails!]!
-
-  """
-  The reference to the single source of truth for this task
-  """
-  integration: TaskIntegration
-
-  """
-  A hash of the integrated task
-  """
-  integrationHash: ID
-
-  """
-  the foreign key for the meeting the task was created in
-  """
-  meetingId: ID
-
-  """
-  the foreign key for the meeting the task was marked as complete
-  """
-  doneMeetingId: ID
-
-  """
-  the plain text content of the task
-  """
-  plaintextContent: String!
-
-  """
-  the shared sort order for tasks on the team dash & user dash
-  """
-  sortOrder: Float!
-
-  """
-  The status of the task
-  """
-  status: TaskStatusEnum!
-
-  """
-  The tags associated with the task
-  """
-  tags: [String!]!
-
-  """
-  The id of the team (indexed). Needed for subscribing to archived tasks
-  """
-  teamId: ID!
-
-  """
-  The team this task belongs to
-  """
-  team: Team!
-
-  """
-  The first block of the content
-  """
-  title: String!
-
-  """
-  * The userId, index useful for server-side methods getting all tasks under a user. This can be null if the task is not assigned to anyone.
-  """
-  userId: ID
-
-  """
-  The user the task is assigned to. Null if it is not assigned to anyone.
-  """
-  user: User
-
-  """
-  The owner hovers over the task in their solo update of a checkin
-  """
-  isHighlighted(
-    """
-    Meeting for which the highlight is checked
-    """
-    meetingId: ID
-  ): Boolean!
-}
-
-"""
-An item that can be put in a thread
-"""
-interface Threadable {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  The rich text body of the item
-  """
-  content: String!
-
-  """
-  The timestamp the item was created
-  """
-  createdAt: DateTime!
-
-  """
-  The userId that created the item
-  """
-  createdBy: ID
-
-  """
-  The user that created the item
-  """
-  createdByUser: User
-
-  """
-  the replies to this threadable item
-  """
-  replies: [Threadable!]!
-
-  """
-  The FK of the discussion this task was created in. Null if task was not created in a discussion
-  """
-  discussionId: ID
-
-  """
-  the parent, if this threadable is a reply, else null
-  """
-  threadParentId: ID
-
-  """
-  the order of this threadable, relative to threadParentId
-  """
-  threadSortOrder: Float
-
-  """
-  The timestamp the item was updated
-  """
-  updatedAt: DateTime!
-}
-
-"""
-The user that is commenting
-"""
-type CommentorDetails {
-  """
-  The userId of the person commenting
-  """
-  id: ID!
-
-  """
-  The preferred name of the user commenting
-  """
-  preferredName: String!
-}
-
-"""
-A member of a team
-"""
-type TeamMember {
-  """
-  An ID for the teamMember. userId::teamId
-  """
-  id: ID!
-
-  """
-  All the integrations that the user could possibly use
-  """
-  allAvailableRepoIntegrations: [RepoIntegration!]!
-
-  """
-  The datetime the team member was created
-  """
-  createdAt: DateTime!
-
-  """
-  true if the user is a part of the team, false if they no longer are
-  """
-  isNotRemoved: Boolean
-
-  """
-  Is user a team lead?
-  """
-  isLead: Boolean!
-
-  """
-  Is user an admin of the team's org?
-  """
-  isOrgAdmin: Boolean!
-
-  """
-  true if the user prefers to not vote during a poker meeting
-  """
-  isSpectatingPoker: Boolean!
-
-  """
-  the type of drawer that is open in the team dash. Null if the drawer is closed
-  """
-  openDrawer: TeamDrawer
-
-  """
-  The user email
-  """
-  email: Email!
-
-  """
-  url of user’s profile picture
-  """
-  picture: URL!
-
-  """
-  true if this team member belongs to the user that queried it
-  """
-  isSelf: Boolean!
-
-  """
-  The integrations that the team member has authorized. accessible by all
-  """
-  integrations: TeamMemberIntegrations!
-
-  """
-  The meeting specifics for the meeting the team member is currently in
-  """
-  meetingMember(meetingId: ID!): MeetingMember
-
-  """
-  The name of the assignee
-  """
-  preferredName: String!
-
-  """
-  The integrations that the user would probably like to use
-  """
-  repoIntegrations: RepoIntegrationQueryPayload!
-
-  """
-  Tasks owned by the team member
-  """
-  tasks(
-    first: Int
-
-    """
-    the datetime cursor
-    """
-    after: DateTime
-  ): TaskConnection
-
-  """
-  The team this team member belongs to
-  """
-  team: Team
-
-  """
-  foreign key to Team table
-  """
-  teamId: ID!
-
-  """
-  The user for the team member
-  """
-  user: User!
-
-  """
-  foreign key to User table
-  """
-  userId: ID!
-}
-
-"""
-The right drawer types available on the team dashboard
-"""
-enum TeamDrawer {
-  agenda
-  manageTeam
-}
-
-scalar Email
-
-interface TaskIntegration {
-  id: ID!
-}
-
-"""
-The URLs for avatars. NOTE: If they are custom, an Authorization header is required!
-"""
-type JiraRemoteAvatarUrls {
-  x48: ID!
-  x24: ID!
-  x16: ID!
-  x32: ID!
-}
-
-"""
-A project category fetched from a JiraRemoteProject
-"""
-type JiraRemoteProjectCategory {
-  self: String!
-  id: String!
-  name: String!
-  description: String!
-}
-
-type StandardMutationError {
-  """
-  The title of the error
-  """
-  title: String
-
-  """
-  The full error
-  """
-  message: String!
-}
-
-"""
-A jira search query including all filters selected when the query was executed
-"""
-type JiraSearchQuery {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  The query string, either simple or JQL depending on the isJQL flag
-  """
-  queryString: String!
-
-  """
-  true if the queryString is JQL, else false
-  """
-  isJQL: Boolean!
-
-  """
-  The list of project keys selected as a filter. null if not set
-  """
-  projectKeyFilters: [ID!]!
-
-  """
-  the time the search query was last used. Used for sorting
-  """
-  lastUsedAt: DateTime!
-}
-
-"""
-an event trigger and slack channel to receive it
-"""
-type SlackNotification {
-  id: ID!
-  event: SlackNotificationEventEnum!
-  eventType: SlackNotificationEventTypeEnum!
-
-  """
-  null if no notification is to be sent
-  """
-  channelId: ID
-  teamId: ID!
-  userId: ID!
-}
-
-"""
-The event that triggers a slack notification
-"""
-enum SlackNotificationEventEnum {
-  meetingStart
-  meetingEnd
-  MEETING_STAGE_TIME_LIMIT_END
-  MEETING_STAGE_TIME_LIMIT_START
-}
-
-"""
-The type of event for a slack notification
-"""
-enum SlackNotificationEventTypeEnum {
-  """
-  notification that concerns the whole team
-  """
-  team
-
-  """
-  notification that concerns a single member on the team
-  """
-  member
-}
-
-"""
-All the user details for a specific meeting
-"""
-interface MeetingMember {
-  """
-  A composite of userId::meetingId
-  """
-  id: ID!
-
-  """
-  true if present, false if absent, else null
-  """
-  isCheckedIn: Boolean
-    @deprecated(
-      reason: "Members are checked in when they enter the meeting now & not created beforehand"
-    )
-  meetingId: ID!
-  meetingType: MeetingTypeEnum!
-  teamId: ID!
-  teamMember: TeamMember!
-  user: User!
-  userId: ID!
-
-  """
-  The last time a meeting was updated (stage completed, finished, etc)
-  """
-  updatedAt: DateTime!
-}
-
-"""
-The type of meeting
-"""
-enum MeetingTypeEnum {
-  action
-  retrospective
-  poker
-  teamPrompt
-}
-
-"""
-An invitation and expiration
-"""
-type MassInvitation {
-  """
-  the invitation token
-  """
-  id: ID!
-
-  """
-  the expiration for the token
-  """
-  expiration: DateTime!
-  meetingId: ID
-}
-
-"""
-Poker dimensions mapped to their corresponding fields in jira
-"""
-type JiraDimensionField {
-  id: ID!
-
-  """
-  The atlassian cloud that the field lives in
-  """
-  cloudId: ID!
-
-  """
-  The name of the associated dimension
-  """
-  dimensionName: String!
-
-  """
-  The project under the atlassian cloud the field lives in
-  """
-  projectKey: ID!
-
-  """
-  The ID referring to the field name
-  """
-  fieldId: ID!
-
-  """
-  The field name in jira that the estimate is pushed to
-  """
-  fieldName: String!
-
-  """
-  the type of field, e.g. number, string, any
-  """
-  fieldType: String!
-}
-
-"""
-A team-specific reflection prompt. Usually 3 or 4 exist per team, eg Good/Bad/Change, 4Ls, etc.
-"""
-type ReflectPrompt {
-  """
-  shortid
-  """
-  id: ID!
-  createdAt: DateTime!
-
-  """
-  foreign key. use the team field
-  """
-  teamId: ID!
-
-  """
-  The team that owns this reflectPrompt
-  """
-  team: Team
-  updatedAt: DateTime!
-
-  """
-  the order of the items in the template
-  """
-  sortOrder: Float!
-
-  """
-  FK for template
-  """
-  templateId: ID!
-
-  """
-  The template that this prompt belongs to
-  """
-  template: ReflectTemplate!
-
-  """
-  The question to answer during the phase of the retrospective (eg What went well?)
-  """
-  question: String!
-
-  """
-  The description to the question for further context. A long version of the question.
-  """
-  description: String!
-
-  """
-  The color used to visually group a phase item.
-  """
-  groupColor: String!
-
-  """
-  The datetime that the prompt was removed. Null if it has not been removed.
-  """
-  removedAt: DateTime
-}
-
-"""
-The scope of a shareable item
-"""
-enum SharingScopeEnum {
-  TEAM
-  ORGANIZATION
-  PUBLIC
-}
-
-"""
-An invitation to become a team member
-"""
-type TeamInvitation {
-  """
-  The unique invitation Id
-  """
-  id: ID!
-
-  """
-  null if not accepted, else the datetime the invitation was accepted
-  """
-  acceptedAt: DateTime
-
-  """
-  null if not accepted, else the userId that accepted the invitation
-  """
-  acceptedBy: ID
-
-  """
-  The datetime the invitation was created
-  """
-  createdAt: DateTime!
-
-  """
-  The email of the invitee
-  """
-  email: Email!
-
-  """
-  The datetime the invitation expires. Changes when team is archived.
-  """
-  expiresAt: DateTime!
-
-  """
-  The userId of the person that sent the invitation
-  """
-  invitedBy: ID!
-
-  """
-  The userId of the person that sent the invitation
-  """
-  inviter: User!
-
-  """
-  the meetingId that the invite was generated for
-  """
-  meetingId: ID
-
-  """
-  The team invited to
-  """
-  teamId: ID!
-
-  """
-  48-byte hex encoded random string
-  """
-  token: ID!
-}
-
-"""
-The team settings for a specific type of meeting
-"""
-interface TeamMeetingSettings {
-  id: ID!
-
-  """
-  The type of meeting these settings apply to
-  """
-  meetingType: MeetingTypeEnum!
-
-  """
-  The broad phase types that will be addressed during the meeting
-  """
-  phaseTypes: [NewMeetingPhaseTypeEnum!]!
-
-  """
-  FK
-  """
-  teamId: ID!
-
-  """
-  The team these settings belong to
-  """
-  team: Team!
-}
-
-"""
-A team-specific template scale.
-"""
-type TemplateScale {
-  """
-  shortid
-  """
-  id: ID!
-  createdAt: DateTime!
-
-  """
-  true if the scale is currently used by the team, else false
-  """
-  isActive: Boolean!
-
-  """
-  True if this is a starter/default scale; false otherwise
-  """
-  isStarter: Boolean!
-
-  """
-  The datetime that the scale was removed. Null if it has not been removed.
-  """
-  removedAt: DateTime
-
-  """
-  foreign key. use the team field
-  """
-  teamId: ID!
-
-  """
-  The team that owns this template scale
-  """
-  team: Team!
-  updatedAt: DateTime!
-
-  """
-  The title of the scale used in the template
-  """
-  name: String!
-
-  """
-  The dimensions currently using this scale
-  """
-  dimensions: [TemplateDimension!]!
-
-  """
-  The values used in this scale
-  """
-  values: [TemplateScaleValue!]!
-}
-
-"""
-A team-specific template dimension: e.g., effort, importance etc.
-"""
-type TemplateDimension {
-  """
-  shortid
-  """
-  id: ID!
-  createdAt: DateTime!
-
-  """
-  true if the dimension is currently used by the team, else false
-  """
-  isActive: Boolean!
-
-  """
-  The datetime that the dimension was removed. Null if it has not been removed.
-  """
-  removedAt: DateTime
-
-  """
-  foreign key. use the team field
-  """
-  teamId: ID!
-
-  """
-  The team that owns this dimension
-  """
-  team: Team!
-  updatedAt: DateTime!
-
-  """
-  the order of the dimensions in the template
-  """
-  sortOrder: Float!
-
-  """
-  FK for template
-  """
-  templateId: ID!
-
-  """
-  The template that this dimension belongs to
-  """
-  template: PokerTemplate!
-
-  """
-  The name of the dimension
-  """
-  name: String!
-
-  """
-  The description to the dimension name for further context. A long version of the dimension name.
-  """
-  description: String!
-
-  """
-  The scaleId to resolve the selected scale
-  """
-  scaleId: ID!
-
-  """
-  scale used in this dimension
-  """
-  selectedScale: TemplateScale!
-}
-
-"""
-A value for a scale.
-"""
-type TemplateScaleValue {
-  id: ID!
-
-  """
-  The id of the scale this value belongs to
-  """
-  scaleId: ID!
-
-  """
-  The color used to visually group a scale value
-  """
-  color: String!
-
-  """
-  The label for this value, e.g., XS, M, L
-  """
-  label: String!
-
-  """
-  the order of the scale value in this scale
-  """
-  sortOrder: Int!
-}
-
-"""
-The pay tier of the team
-"""
-enum TierEnum {
-  starter
-  team
-  enterprise
-}
-
-"""
-A credit card
-"""
-type CreditCard {
-  """
-  The brand of the credit card, as provided by stripe
-  """
-  brand: String!
-
-  """
-  The MM/YY string of the expiration date
-  """
-  expiry: String!
-
-  """
-  The last 4 digits of a credit card
-  """
-  last4: String!
-}
-
-"""
-A connection to a list of items.
-"""
-type OrganizationUserConnection {
-  """
-  Information to aid in pagination.
-  """
-  pageInfo: PageInfo!
-
-  """
-  A list of edges.
-  """
-  edges: [OrganizationUserEdge!]!
-}
-
-"""
-Information about pagination in a connection.
-"""
-type PageInfo {
-  """
-  When paginating forwards, are there more items?
-  """
-  hasNextPage: Boolean!
-
-  """
-  When paginating backwards, are there more items?
-  """
-  hasPreviousPage: Boolean!
-
-  """
-  When paginating backwards, the cursor to continue.
-  """
-  startCursor: String
-
-  """
-  When paginating forwards, the cursor to continue.
-  """
-  endCursor: String
-}
-
-"""
-An edge in a connection.
-"""
-type OrganizationUserEdge {
-  """
-  The item at the end of the edge
-  """
-  node: OrganizationUser!
-
-  """
-  A cursor for use in pagination
-  """
-  cursor: String!
-}
-
-"""
-organization-specific details about a user
-"""
-type OrganizationUser {
-  """
-  orgId::userId
-  """
-  id: ID!
-
-  """
-  true if the user is paused and the orgs are not being billed, else false
-  """
-  inactive: Boolean!
-
-  """
-  the datetime the user first joined the org
-  """
-  joinedAt: DateTime!
-
-  """
-  FK
-  """
-  orgId: ID!
-
-  """
-  The user attached to the organization
-  """
-  organization: Organization!
-
-  """
-  if not a member, the datetime the user was removed from the org
-  """
-  removedAt: DateTime
-
-  """
-  role of the user in the org
-  """
-  role: OrgUserRole
-
-  """
-  FK
-  """
-  userId: ID!
-
-  """
-  The user attached to the organization
-  """
-  user: User!
-
-  tier: TierEnum
-
-  billingTier: TierEnum
-}
-
-"""
-The role of the org user
-"""
-enum OrgUserRole {
-  BILLING_LEADER
-}
-
-type OrgUserCount {
-  """
-  The number of orgUsers who have an inactive flag
-  """
-  inactiveUserCount: Int!
-
-  """
-  The number of orgUsers who do not have an inactive flag
-  """
-  activeUserCount: Int!
-}
-
-"""
-An estimate for a Task that was voted on and scored in a poker meeting
-"""
-type TaskEstimate {
-  """
-  The ID of the estimate
-  """
-  id: ID!
-
-  """
-  The timestamp the estimate was created
-  """
-  createdAt: DateTime!
-
-  """
-  The source that a change came in through
-  """
-  changeSource: ChangeSourceEnum!
-
-  """
-  The name of the estimate dimension
-  """
-  name: String!
-
-  """
-  The human-readable label for the estimate
-  """
-  label: String!
-
-  """
-  *The taskId that the estimate refers to
-  """
-  taskId: ID!
-
-  """
-  The userId that added the estimate
-  """
-  userId: ID!
-
-  """
-  *The meetingId that the estimate occured in, if any
-  """
-  meetingId: ID
-
-  """
-  The meeting stageId the estimate occurred in, if any
-  """
-  stageId: ID
-
-  """
-  The discussionId where the estimated was discussed
-  """
-  discussionId: ID
-
-  """
-  If the task comes from jira, this is the jira field that the estimate refers to
-  """
-  jiraFieldId: ID
-}
-
-"""
-The source that a change to a record came in through
-"""
-enum ChangeSourceEnum {
-  meeting
-  task
-  external
-}
-
-type TaskEditorDetails {
-  """
-  The userId of the person editing the task
-  """
-  userId: ID!
-
-  """
-  The name of the userId editing the task
-  """
-  preferredName: String!
-}
-
-"""
-The status of the task
-"""
-enum TaskStatusEnum {
-  active
-  stuck
-  done
-  future
-}
-
-"""
-A monthly billing invoice for an organization
-"""
-type Invoice {
-  """
-  A shortid for the invoice
-  """
-  id: ID!
-
-  """
-  The tier this invoice pays for
-  """
-  tier: TierEnum!
-
-  """
-  The amount the card will be charged (total + startingBalance with a min value of 0)
-  """
-  amountDue: Float!
-
-  """
-  The datetime the invoice was first generated
-  """
-  createdAt: DateTime!
-
-  """
-  The discount coupon information from Stripe, if any discount applied
-  """
-  coupon: Coupon
-
-  """
-  The total amount for the invoice (in USD)
-  """
-  total: Float!
-
-  """
-  The emails the invoice was sent to
-  """
-  billingLeaderEmails: [Email!]!
-
-  """
-  the card used to pay the invoice
-  """
-  creditCard: CreditCard
-
-  """
-  The timestamp for the end of the billing cycle
-  """
-  endAt: DateTime!
-
-  """
-  The date the invoice was created
-  """
-  invoiceDate: DateTime!
-
-  """
-  An invoice line item for previous month adjustments
-  """
-  lines: [InvoiceLineItem!]!
-
-  """
-  The details that comprise the charges for next month
-  """
-  nextPeriodCharges: NextPeriodCharges!
-
-  """
-  *The organization id to charge
-  """
-  orgId: ID!
-
-  """
-  The persisted name of the org as it was when invoiced
-  """
-  orgName: String!
-
-  """
-  the datetime the invoice was successfully paid
-  """
-  paidAt: DateTime
-
-  """
-  The URL to pay via stripe if payment was not collected in app
-  """
-  payUrl: String
-
-  """
-  The picture of the organization
-  """
-  picture: URL
-
-  """
-  The timestamp for the beginning of the billing cycle
-  """
-  startAt: DateTime!
-
-  """
-  The balance on the customer account (in cents)
-  """
-  startingBalance: Float!
-
-  """
-  the status of the invoice. starts as pending, moves to paid or unpaid depending on if the payment succeeded
-  """
-  status: InvoiceStatusEnum!
-}
-
-"""
-The discount coupon from Stripe, if any
-"""
-type Coupon {
-  """
-  The ID of the discount coupon from Stripe
-  """
-  id: String!
-
-  """
-  The amount off the invoice, if any
-  """
-  amountOff: Int
-
-  """
-  The name of the discount coupon from Stripe
-  """
-  name: String!
-
-  """
-  The percent off the invoice, if any
-  """
-  percentOff: Int
-}
-
-"""
-A single line item charge on the invoice
-"""
-type InvoiceLineItem {
-  """
-  The unique line item id
-  """
-  id: ID!
-
-  """
-  The amount for the line item (in USD)
-  """
-  amount: Float!
-
-  """
-  A description of the charge. Only present if we have no idea what the charge is
-  """
-  description: String
-
-  """
-  Array of user activity line items that roll up to total activity (add/leave/pause/unpause)
-  """
-  details: [InvoiceLineItemDetails!]!
-
-  """
-  The total number of days that all org users have been inactive during the billing cycle
-  """
-  quantity: Int
-
-  """
-  The line item type for a monthly billing invoice
-  """
-  type: InvoiceLineItemEnum!
-}
-
-"""
-The per-user-action line item details,
-"""
-type InvoiceLineItemDetails {
-  """
-  The unique detailed line item id
-  """
-  id: ID!
-
-  """
-  The amount for the line item (in USD)
-  """
-  amount: Float!
-
-  """
-  The email affected by this line item change
-  """
-  email: Email!
-
-  """
-  End of the event. Only present if a pause action gets matched up with an unpause action
-  """
-  endAt: DateTime
-
-  """
-  The parent line item id
-  """
-  parentId: ID!
-
-  """
-  The timestamp for the beginning of the period of no charge
-  """
-  startAt: DateTime
-}
-
-"""
-A big picture line item
-"""
-enum InvoiceLineItemEnum {
-  ADDED_USERS
-  INACTIVITY_ADJUSTMENTS
-  OTHER_ADJUSTMENTS
-  REMOVED_USERS
-}
-
-"""
-A single line item for the charges for next month
-"""
-type NextPeriodCharges {
-  """
-  The amount for the line item (in USD)
-  """
-  amount: Float!
-
-  """
-  The datetime the next period will end
-  """
-  nextPeriodEnd: DateTime!
-
-  """
-  The total number of days that all org users have been inactive during the billing cycle
-  """
-  quantity: Int!
-
-  """
-  The per-seat monthly price of the subscription (in dollars), null if invoice is not per-seat
-  """
-  unitPrice: Float
-
-  """
-  "year" if enterprise, else "month" for pro
-  """
-  interval: String
-}
-
-"""
-The payment status of the invoice
-"""
-enum InvoiceStatusEnum {
-  PENDING
-  PAID
-  FAILED
-  UPCOMING
-}
-
-"""
-A connection to a list of items.
-"""
-type InvoiceConnection {
-  """
-  Page info with cursors coerced to ISO8601 dates
-  """
-  pageInfo: PageInfoDateCursor
-
-  """
-  A list of edges.
-  """
-  edges: [InvoiceEdge!]!
-}
-
-"""
-An edge in a connection.
-"""
-type InvoiceEdge {
-  """
-  The item at the end of the edge
-  """
-  node: Invoice!
-  cursor: DateTime
-}
-
-"""
-A past event that is important to the viewer
-"""
-interface SuggestedAction {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the action was created at
-  """
-  createdAt: DateTime!
-
-  """
-  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
-  """
-  priority: Float
-
-  """
-  * The timestamp the action was removed at
-  """
-  removedAt: DateTime!
-
-  """
-  The specific type of suggested action
-  """
-  type: SuggestedActionTypeEnum!
-
-  """
-  * The userId this action is for
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-The specific type of the suggested action
-"""
-enum SuggestedActionTypeEnum {
-  inviteYourTeam
-  tryTheDemo
-  tryRetroMeeting
-  createNewTeam
-  tryActionMeeting
-}
-
-"""
-A connection to a list of items.
-"""
-type TimelineEventConnection {
-  """
-  Page info with cursors coerced to ISO8601 dates
-  """
-  pageInfo: PageInfoDateCursor
-
-  """
-  A list of edges.
-  """
-  edges: [TimelineEventEdge!]!
-}
-
-"""
-An edge in a connection.
-"""
-type TimelineEventEdge {
-  """
-  The item at the end of the edge
-  """
-  node: TimelineEvent!
-  cursor: DateTime
-}
-
-"""
-A past event that is important to the viewer
-"""
-interface TimelineEvent {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the event was created at
-  """
-  createdAt: DateTime!
-
-  """
-  the number of times the user has interacted with (ie clicked) this event
-  """
-  interactionCount: Int!
-
-  """
-  true if the timeline event is active, false if archived
-  """
-  isActive: Boolean!
-
-  """
-  The orgId this event is associated with. Null if not traceable to one org
-  """
-  orgId: ID
-
-  """
-  The organization this event is associated with
-  """
-  organization: Organization
-
-  """
-  the number of times the user has seen this event
-  """
-  seenCount: Int!
-
-  """
-  The teamId this event is associated with. Null if not traceable to one team
-  """
-  teamId: ID
-
-  """
-  The team that can see this event
-  """
-  team: Team
-
-  """
-  The specific type of event
-  """
-  type: TimelineEventEnum!
-
-  """
-  * The userId that can see this event
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-The specific type of event
-"""
-enum TimelineEventEnum {
-  retroComplete
-  actionComplete
-  joinedParabol
-  createdTeam
-  POKER_COMPLETE
-  TEAM_PROMPT_COMPLETE
-}
-
-"""
-A discussion thread
-"""
-type Discussion {
-  id: ID!
-  teamId: ID!
-  meetingId: ID!
-
-  """
-  Team
-  """
-  team: Team!
-
-  """
-  time the thread was created
-  """
-  createdAt: DateTime!
-
-  """
-  The partial foreign key that references the object that is the topic of the discussion. E.g. AgendaItemId, TaskId, ReflectionGroupId
-  """
-  discussionTopicId: ID!
-
-  """
-  The partial foregin key that describes the type of object that is the topic of the discussion. E.g. AgendaItem, TaskId, ReflectionGroup, GitHubIssue
-  """
-  discussionTopicType: DiscussionTopicTypeEnum!
-
-  """
-  The number of comments contained in the thread
-  """
-  commentCount: Int!
-
-  """
-  The users writing a comment right now
-  """
-  commentors: [User!]!
-
-  """
-  The comments & tasks thread in the discussion
-  """
-  thread(
-    """
-    How many items to show. optional if only comments are desired
-    """
-    first: Int
-
-    """
-    the incrementing sort order in string format
-    """
-    after: String
-  ): ThreadableConnection!
-
-  """
-  The stage where the discussion is
-  """
-  stage: NewMeetingStage
-}
-
-"""
-The topic being discussed
-"""
-enum DiscussionTopicTypeEnum {
-  agendaItem
-  reflectionGroup
-  task
-  githubIssue
-  jiraIssue
-}
-
-"""
-A connection to a list of items.
-"""
-type ThreadableConnection {
-  """
-  Page info with strings (sortOrder) as cursors
-  """
-  pageInfo: PageInfo
-
-  """
-  A list of edges.
-  """
-  edges: [ThreadableEdge!]!
-
-  """
-  Any errors that prevented the query from returning the full results
-  """
-  error: String
-}
-
-"""
-An edge in a connection.
-"""
-type ThreadableEdge {
-  """
-  The item at the end of the edge
-  """
-  node: Threadable!
-  cursor: String
-}
-
-"""
-The latest feature released by Parabol
-"""
-type NewFeatureBroadcast {
-  id: ID!
-
-  """
-  The text of the action button in the snackbar
-  """
-  actionButtonCopy: String!
-
-  """
-  The description of the new feature
-  """
-  snackbarMessage: String!
-
-  """
-  The permalink to the blog post describing the new feature
-  """
-  url: String!
-}
-
-"""
-A connection to a list of items.
-"""
-type NotificationConnection {
-  """
-  Page info with cursors coerced to ISO8601 dates
-  """
-  pageInfo: PageInfoDateCursor
-
-  """
-  A list of edges.
-  """
-  edges: [NotificationEdge!]!
-}
-
-"""
-An edge in a connection.
-"""
-type NotificationEdge {
-  """
-  The item at the end of the edge
-  """
-  node: Notification!
-  cursor: DateTime
-}
-
-interface Notification {
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-}
-
-"""
-The status of the notification interaction
-"""
-enum NotificationStatusEnum {
-  UNREAD
-  READ
-  CLICKED
-}
-
-"""
-The kind of notification
-"""
-enum NotificationEnum {
-  DISCUSSION_MENTIONED
-  KICKED_OUT
-  PAYMENT_REJECTED
-  PROMOTE_TO_BILLING_LEADER
-  TEAM_INVITATION
-  TEAM_ARCHIVED
-  TASK_INVOLVES
-  MEETING_STAGE_TIME_LIMIT_END
-  RESPONSE_MENTIONED
-  MENTIONED
-  RESPONSE_REPLIED
-  TEAMS_LIMIT_EXCEEDED
-  TEAMS_LIMIT_REMINDER
-}
-
-"""
-A reflection group created during the group phase of a retrospective
-"""
-type RetroReflectionGroup {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  A list of users currently commenting
-  """
-  commentors: [CommentorDetails!]
-    @deprecated(reason: "Moved to ThreadConnection. Can remove Jun-01-2021")
-
-  """
-  The timestamp the meeting was created
-  """
-  createdAt: DateTime!
-
-  """
-  True if the group has not been removed, else false
-  """
-  isActive: Boolean!
-
-  """
-  The foreign key to link a reflection group to its meeting
-  """
-  meetingId: ID!
-
-  """
-  The retrospective meeting this reflection was created in
-  """
-  meeting: RetrospectiveMeeting!
-  prompt: ReflectPrompt!
-
-  """
-  The foreign key to link a reflection group to its prompt. Immutable.
-  """
-  promptId: ID!
-  reflections: [RetroReflection!]!
-
-  """
-  Our auto-suggested title, to be compared to the actual title for analytics
-  """
-  smartTitle: String
-
-  """
-  The sort order of the reflection group
-  """
-  sortOrder: Float!
-
-  """
-  The team that is running the retro
-  """
-  team: Team
-
-  """
-  The title of the grouping of the retrospective reflections
-  """
-  title: String
-
-  """
-  true if a user wrote the title, else false
-  """
-  titleIsUserDefined: Boolean!
-
-  """
-  The timestamp the meeting was updated at
-  """
-  updatedAt: DateTime
-
-  """
-  A list of voterIds (userIds). Not available to team to preserve anonymity
-  """
-  voterIds: [ID!]!
-
-  """
-  The number of votes this group has received
-  """
-  voteCount: Int!
-
-  """
-  The number of votes the viewer has given this group
-  """
-  viewerVoteCount: Int
-}
-
-"""
-An item that can have reactjis
-"""
-interface Reactable {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  All the reactjis for the given reflection
-  """
-  reactjis: [Reactji!]!
-}
-
-type GoogleAnalyzedEntity {
-  """
-  The lemma (dictionary entry) of the entity name. Fancy way of saying the singular form of the name, if plural.
-  """
-  lemma: String!
-
-  """
-  The name of the entity. Usually 1 or 2 words. Always a noun, sometimes a proper noun.
-  """
-  name: String!
-
-  """
-  The salience of the entity in the provided text. The salience of all entities always sums to 1
-  """
-  salience: Float!
-}
-
-"""
-The response to a teamInvitation query
-"""
-type TeamInvitationPayload {
-  """
-  The team invitation, if any
-  """
-  teamInvitation: TeamInvitation
-
-  """
-  the teamId of the team trying to join
-  """
-  teamId: ID
-
-  """
-  one of the active meetings trying to join
-  """
-  meetingId: ID
-}
-
-"""
-A stage that focuses on a single team member
-"""
-type CheckInStage implements NewMeetingStage & NewMeetingTeamMemberStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-
-  """
-  The meeting member that is the focus for this phase item
-  """
-  meetingMember: MeetingMember!
-
-  """
-  foreign key. use teamMember
-  """
-  teamMemberId: ID!
-
-  """
-  The team member that is the focus for this phase item
-  """
-  teamMember: TeamMember!
-}
-
-"""
-An instance of a meeting phase item. On the client, this usually represents a single view
-"""
-interface NewMeetingTeamMemberStage {
-  """
-  The meeting member that is the focus for this phase item
-  """
-  meetingMember: MeetingMember!
-
-  """
-  foreign key. use teamMember
-  """
-  teamMemberId: ID!
-
-  """
-  The team member that is the focus for this phase item
-  """
-  teamMember: TeamMember!
-}
-
-type MeetingGreeting {
-  """
-  The foreign-language greeting
-  """
-  content: String!
-
-  """
-  The source language for the greeting
-  """
-  language: String!
-}
-
-"""
-The meeting phase where all team members check in one-by-one
-"""
-type ReflectPhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [GenericMeetingStage!]!
-
-  """
-  foreign key. use focusedPrompt
-  """
-  focusedPromptId: ID
-
-  """
-  the Prompt that the facilitator wants the group to focus on
-  """
-  focusedPrompt: ReflectPrompt
-
-  """
-  The prompts used during the reflect phase
-  """
-  reflectPrompts: [ReflectPrompt!]!
-}
-
-"""
-A stage of a meeting that has no extra state. Only used for single-stage phases
-"""
-type GenericMeetingStage implements NewMeetingStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-}
-
-"""
-The meeting phase where all team members discuss the topics with the most votes
-"""
-type DiscussPhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [RetroDiscussStage!]!
-}
-
-"""
-The stage where the team discusses a single theme
-"""
-type RetroDiscussStage implements NewMeetingStage & DiscussionThreadStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-
-  """
-  The ID to find the discussion that goes in the stage
-  """
-  discussionId: ID!
-
-  """
-  The discussion about the stage or a dummy data when there is no disscussion
-  """
-  discussion: Discussion!
-
-  """
-  foreign key. use reflectionGroup
-  """
-  reflectionGroupId: ID!
-
-  """
-  the group that is the focal point of the discussion
-  """
-  reflectionGroup: RetroReflectionGroup!
-
-  """
-  The sort order for reprioritizing discussion topics
-  """
-  sortOrder: Float!
-}
-
-"""
-A meeting stage that includes a discussion thread
-"""
-interface DiscussionThreadStage {
-  """
-  The ID to find the discussion that goes in the stage
-  """
-  discussionId: ID!
-
-  """
-  The discussion about the stage
-  """
-  discussion: Discussion!
-}
-
-"""
-The meeting phase where all team members give updates one-by-one
-"""
-type UpdatesPhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [UpdatesStage!]!
-}
-
-"""
-A stage that focuses on a single team member
-"""
-type UpdatesStage implements NewMeetingStage & NewMeetingTeamMemberStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-
-  """
-  The meeting member that is the focus for this phase item
-  """
-  meetingMember: MeetingMember!
-
-  """
-  foreign key. use teamMember
-  """
-  teamMemberId: ID!
-
-  """
-  The team member that is the focus for this phase item
-  """
-  teamMember: TeamMember!
-}
-
-"""
-The stage where the team estimates & discusses a single task
-"""
-type EstimateStage implements NewMeetingStage & DiscussionThreadStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-
-  """
-  The ID to find the discussion that goes in the stage
-  """
-  discussionId: ID!
-
-  """
-  The discussion about the stage
-  """
-  discussion: Discussion!
-
-  """
-  The id of the user that added this stage.
-  """
-  creatorUserId: ID!
-
-  """
-  The ID that points to the issue that exists in parabol
-  """
-  taskId: ID!
-
-  """
-  The field name used by the service for this dimension
-  """
-  serviceField: ServiceField!
-
-  """
-  The immutable index of the dimensionRef tied to this stage
-  """
-  dimensionRefIdx: Int!
-
-  """
-  The immutable dimension linked to this stage
-  """
-  dimensionRef: TemplateDimensionRef!
-
-  """
-  the final score, as defined by the facilitator
-  """
-  finalScore: String
-
-  """
-  the userIds of the team members hovering the deck
-  """
-  hoveringUserIds: [ID!]!
-
-  """
-  the users of the team members hovering the deck
-  """
-  hoveringUsers: [User!]!
-
-  """
-  all the estimates, 1 per user
-  """
-  scores: [EstimateUserScore!]!
-
-  """
-  The task referenced in the stage, as it exists in Parabol. null if the task was deleted
-  """
-  task: Task
-
-  """
-  true when the participants are still voting and results are hidden. false when votes are revealed
-  """
-  isVoting: Boolean!
-}
-
-"""
-A field that exists on a 3rd party service
-"""
-type ServiceField {
-  """
-  The name of the field as provided by the service
-  """
-  name: String!
-
-  """
-  The field type, to be used for validation and analytics
-  """
-  type: String!
-}
-
-"""
-An immutable TemplateDimension
-"""
-type TemplateDimensionRef {
-  id: ID!
-
-  """
-  the order of the dimensions in the template
-  """
-  sortOrder: Float!
-
-  """
-  The name of the dimension
-  """
-  name: String!
-
-  """
-  The md5 hash to resolve the immutable selected scale ref
-  """
-  scaleRefId: ID!
-
-  """
-  scale used in this dimension
-  """
-  scale: TemplateScaleRef!
-}
-
-"""
-An immutable version of TemplateScale to be shared across all users
-"""
-type TemplateScaleRef {
-  """
-  md5 hash
-  """
-  id: ID!
-  createdAt: DateTime!
-
-  """
-  The title of the scale used in the template
-  """
-  name: String!
-
-  """
-  The values used in this scale
-  """
-  values: [TemplateScaleValue!]!
-}
-
-"""
-The user and number of points they estimated for dimension (where 1 stage has 1 dimension)
-"""
-type EstimateUserScore {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  The stageId
-  """
-  stageId: ID!
-
-  """
-  The userId that for this score
-  """
-  userId: ID!
-
-  """
-  The user that for this score
-  """
-  user: User!
-
-  """
-  The label that was associated with the score at the time of the vote. Note: It may no longer exist on the dimension
-  """
-  label: String!
-}
-
-"""
-The meeting phase where all team members discuss the topics with the most votes
-"""
-type AgendaItemsPhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [AgendaItemsStage!]!
-}
-
-"""
-The stage where the team discusses a single agenda item
-"""
-type AgendaItemsStage implements NewMeetingStage & DiscussionThreadStage {
-  """
-  stageId, shortid
-  """
-  id: ID!
-
-  """
-  The datetime the stage was completed
-  """
-  endAt: DateTime
-
-  """
-  foreign key. try using meeting
-  """
-  meetingId: ID!
-
-  """
-  The meeting this stage belongs to
-  """
-  meeting: NewMeeting
-
-  """
-  true if the facilitator has completed this stage, else false. Should be boolean(endAt)
-  """
-  isComplete: Boolean!
-
-  """
-  true if any meeting participant can navigate to this stage
-  """
-  isNavigable: Boolean!
-
-  """
-  true if the facilitator can navigate to this stage
-  """
-  isNavigableByFacilitator: Boolean!
-
-  """
-  The phase this stage belongs to
-  """
-  phase: NewMeetingPhase
-
-  """
-  The type of the phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum
-
-  """
-  The datetime the stage was started
-  """
-  startAt: DateTime
-
-  """
-  Number of times the facilitator has visited this stage
-  """
-  viewCount: Int
-
-  """
-  true if a time limit is set, false if end time is set, null if neither is set
-  """
-  isAsync: Boolean
-
-  """
-  true if the viewer is ready to advance, else false
-  """
-  isViewerReady: Boolean!
-
-  """
-  the number of meeting members ready to advance, excluding the facilitator
-  """
-  readyCount: Int!
-
-  """
-  The datetime the phase is scheduled to be finished, null if no time limit or end time is set
-  """
-  scheduledEndTime: DateTime
-
-  """
-  The suggested ending datetime for a phase to be completed async, null if not enough data to make a suggestion
-  """
-  suggestedEndTime: DateTime
-
-  """
-  The suggested time limit for a phase to be completed together, null if not enough data to make a suggestion
-  """
-  suggestedTimeLimit: Float
-  teamId: ID!
-
-  """
-  The number of milliseconds left before the scheduled end time. Useful for unsynced client clocks. null if scheduledEndTime is null
-  """
-  timeRemaining: Float
-
-  """
-  The ID to find the discussion that goes in the stage
-  """
-  discussionId: ID!
-
-  """
-  The discussion about the stage
-  """
-  discussion: Discussion!
-
-  """
-  The id of the agenda item this relates to
-  """
-  agendaItemId: ID!
-  agendaItem: AgendaItem!
-}
-
-"""
-An all-purpose meeting phase with no extra state
-"""
-type GenericMeetingPhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [GenericMeetingStage!]!
-}
-
-"""
-The meeting phase where all team members estimate a the point value of a task
-"""
-type EstimatePhase implements NewMeetingPhase {
-  """
-  shortid
-  """
-  id: ID!
-  meetingId: ID!
-  teamId: ID!
-
-  """
-  The type of phase
-  """
-  phaseType: NewMeetingPhaseTypeEnum!
-  stages: [EstimateStage!]!
-}
-
-"""
-A notification sent to a user that was invited to a new team
-"""
-type NotificationTeamInvitation implements Notification & TeamNotification {
-  """
-  FK
-  """
-  teamId: ID!
-
-  """
-  FK
-  """
-  invitationId: ID!
-
-  """
-  The invitation that triggered this notification
-  """
-  invitation: TeamInvitation!
-  team: Team!
-
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-}
-
-interface TeamNotification {
-  id: ID
-  type: NotificationEnum
-}
-
-"""
-A notification alerting the user that they have been promoted (to team or org leader)
-"""
-type NotifyPromoteToOrgLeader implements Notification {
-  organization: Organization!
-
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-}
-
-"""
-All the meeting specifics for a user in a action meeting
-"""
-type ActionMeetingMember implements MeetingMember {
-  """
-  A composite of userId::meetingId
-  """
-  id: ID!
-
-  """
-  true if present, false if absent, else null
-  """
-  isCheckedIn: Boolean
-    @deprecated(
-      reason: "Members are checked in when they enter the meeting now & not created beforehand"
-    )
-  meetingId: ID!
-  meetingType: MeetingTypeEnum!
-  teamId: ID!
-  teamMember: TeamMember!
-  user: User!
-  userId: ID!
-
-  """
-  The last time a meeting was updated (stage completed, finished, etc)
-  """
-  updatedAt: DateTime!
-
-  """
-  The tasks marked as done in the meeting
-  """
-  doneTasks: [Task!]!
-
-  """
-  The tasks assigned to members during the meeting
-  """
-  tasks: [Task!]!
-}
-
-"""
-The retro-specific meeting settings
-"""
-type PokerMeetingSettings implements TeamMeetingSettings {
-  id: ID!
-
-  """
-  The type of meeting these settings apply to
-  """
-  meetingType: MeetingTypeEnum!
-
-  """
-  The broad phase types that will be addressed during the meeting
-  """
-  phaseTypes: [NewMeetingPhaseTypeEnum!]!
-
-  """
-  FK
-  """
-  teamId: ID!
-
-  """
-  The team these settings belong to
-  """
-  team: Team!
-
-  """
-  FK. The template that will be used to start the poker meeting
-  """
-  selectedTemplateId: ID!
-
-  """
-  The template that will be used to start the Poker meeting
-  """
-  selectedTemplate: PokerTemplate!
-
-  """
-  The list of templates used to start a Poker meeting
-  """
-  teamTemplates: [PokerTemplate!]!
-
-  """
-  The list of templates shared across the organization to start a Poker meeting
-  """
-  organizationTemplates(
-    first: Int!
-
-    """
-    The cursor, which is the templateId
-    """
-    after: ID
-  ): PokerTemplateConnection!
-
-  """
-  The list of templates shared across the organization to start a Poker meeting
-  """
-  publicTemplates(
-    first: Int!
-
-    """
-    The cursor, which is the templateId
-    """
-    after: ID
-  ): PokerTemplateConnection!
-}
-
-"""
-sorts for the reflection group. default is sortOrder. sorting by voteCount filters out items without votes.
-"""
-enum ReflectionGroupSortEnum {
-  voteCount
-  stageOrder
-}
-
-"""
-All the meeting specifics for a user in a retro meeting
-"""
-type RetrospectiveMeetingMember implements MeetingMember {
-  """
-  A composite of userId::meetingId
-  """
-  id: ID!
-
-  """
-  true if present, false if absent, else null
-  """
-  isCheckedIn: Boolean
-    @deprecated(
-      reason: "Members are checked in when they enter the meeting now & not created beforehand"
-    )
-  meetingId: ID!
-  meetingType: MeetingTypeEnum!
-  teamId: ID!
-  teamMember: TeamMember!
-  user: User!
-  userId: ID!
-
-  """
-  The last time a meeting was updated (stage completed, finished, etc)
-  """
-  updatedAt: DateTime!
-
-  """
-  The tasks assigned to members during the meeting
-  """
-  tasks: [Task!]!
-  votesRemaining: Int!
-}
-
-"""
-The retro-specific meeting settings
-"""
-type RetrospectiveMeetingSettings implements TeamMeetingSettings {
-  id: ID!
-
-  """
-  The type of meeting these settings apply to
-  """
-  meetingType: MeetingTypeEnum!
-
-  """
-  The broad phase types that will be addressed during the meeting
-  """
-  phaseTypes: [NewMeetingPhaseTypeEnum!]!
-
-  """
-  FK
-  """
-  teamId: ID!
-
-  """
-  The team these settings belong to
-  """
-  team: Team!
-
-  """
-  The total number of votes each team member receives for the voting phase
-  """
-  totalVotes: Int!
-
-  """
-  The maximum number of votes a team member can vote for a single reflection group
-  """
-  maxVotesPerGroup: Int!
-
-  """
-  FK. The template that will be used to start the retrospective
-  """
-  selectedTemplateId: ID!
-
-  """
-  The template that will be used to start the retrospective
-  """
-  selectedTemplate: ReflectTemplate!
-
-  """
-  The list of templates used to start a retrospective
-  """
-  reflectTemplates: [ReflectTemplate!]!
-
-  """
-  The list of templates used to start a retrospective
-  """
-  teamTemplates: [ReflectTemplate!]!
-
-  """
-  The list of templates shared across the organization to start a retrospective
-  """
-  organizationTemplates(
-    first: Int!
-
-    """
-    The cursor, which is the templateId
-    """
-    after: ID
-  ): ReflectTemplateConnection!
-
-  """
-  The list of templates shared across the organization to start a retrospective
-  """
-  publicTemplates(
-    first: Int!
-
-    """
-    The cursor, which is the templateId
-    """
-    after: ID
-  ): ReflectTemplateConnection!
-}
-
-"""
-a suggestion to invite others to your team
-"""
-type SuggestedActionInviteYourTeam implements SuggestedAction {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the action was created at
-  """
-  createdAt: DateTime!
-
-  """
-  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
-  """
-  priority: Float
-
-  """
-  * The timestamp the action was removed at
-  """
-  removedAt: DateTime!
-
-  """
-  The specific type of suggested action
-  """
-  type: SuggestedActionTypeEnum!
-
-  """
-  * The userId this action is for
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-
-  """
-  The teamId that we suggest you should invite people to
-  """
-  teamId: ID!
-
-  """
-  The team you should invite people to
-  """
-  team: Team!
-}
-
-"""
-a suggestion to try a retro with your team
-"""
-type SuggestedActionTryRetroMeeting implements SuggestedAction {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the action was created at
-  """
-  createdAt: DateTime!
-
-  """
-  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
-  """
-  priority: Float
-
-  """
-  * The timestamp the action was removed at
-  """
-  removedAt: DateTime!
-
-  """
-  The specific type of suggested action
-  """
-  type: SuggestedActionTypeEnum!
-
-  """
-  * The userId this action is for
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-
-  """
-  fk
-  """
-  teamId: ID!
-
-  """
-  The team you should run a retro with
-  """
-  team: Team!
-}
-
-"""
-a suggestion to try a retro with your team
-"""
-type SuggestedActionTryActionMeeting implements SuggestedAction {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the action was created at
-  """
-  createdAt: DateTime!
-
-  """
-  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
-  """
-  priority: Float
-
-  """
-  * The timestamp the action was removed at
-  """
-  removedAt: DateTime!
-
-  """
-  The specific type of suggested action
-  """
-  type: SuggestedActionTypeEnum!
-
-  """
-  * The userId this action is for
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-
-  """
-  fk
-  """
-  teamId: ID!
-
-  """
-  The team you should run an action meeting with
-  """
-  team: Team!
-}
-
-"""
-a suggestion to try a retro with your team
-"""
-type SuggestedActionCreateNewTeam implements SuggestedAction {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the action was created at
-  """
-  createdAt: DateTime!
-
-  """
-  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
-  """
-  priority: Float
-
-  """
-  * The timestamp the action was removed at
-  """
-  removedAt: DateTime!
-
-  """
-  The specific type of suggested action
-  """
-  type: SuggestedActionTypeEnum!
-
-  """
-  * The userId this action is for
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-a suggestion to invite others to your team
-"""
-type SuggestedActionTryTheDemo implements SuggestedAction {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the action was created at
-  """
-  createdAt: DateTime!
-
-  """
-  The priority of the suggested action compared to other suggested actions (smaller number is higher priority)
-  """
-  priority: Float
-
-  """
-  * The timestamp the action was removed at
-  """
-  removedAt: DateTime!
-
-  """
-  The specific type of suggested action
-  """
-  type: SuggestedActionTypeEnum!
-
-  """
-  * The userId this action is for
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-An event triggered whenever a team is created
-"""
-type TimelineEventTeamCreated implements TimelineEvent {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the event was created at
-  """
-  createdAt: DateTime!
-
-  """
-  the number of times the user has interacted with (ie clicked) this event
-  """
-  interactionCount: Int!
-
-  """
-  true if the timeline event is active, false if archived
-  """
-  isActive: Boolean!
-
-  """
-  The orgId this event is associated with
-  """
-  orgId: ID!
-
-  """
-  The organization this event is associated with
-  """
-  organization: Organization
-
-  """
-  the number of times the user has seen this event
-  """
-  seenCount: Int!
-
-  """
-  The teamId this event is associated with. Null if not traceable to one team
-  """
-  teamId: ID!
-
-  """
-  The team that can see this event
-  """
-  team: Team!
-
-  """
-  The specific type of event
-  """
-  type: TimelineEventEnum!
-
-  """
-  * The userId that can see this event
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-An event for joining the app
-"""
-type TimelineEventJoinedParabol implements TimelineEvent {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the event was created at
-  """
-  createdAt: DateTime!
-
-  """
-  the number of times the user has interacted with (ie clicked) this event
-  """
-  interactionCount: Int!
-
-  """
-  true if the timeline event is active, false if archived
-  """
-  isActive: Boolean!
-
-  """
-  The orgId this event is associated with. Null if not traceable to one org
-  """
-  orgId: ID
-
-  """
-  The organization this event is associated with
-  """
-  organization: Organization
-
-  """
-  the number of times the user has seen this event
-  """
-  seenCount: Int!
-
-  """
-  The teamId this event is associated with. Null if not traceable to one team
-  """
-  teamId: ID
-
-  """
-  The team that can see this event
-  """
-  team: Team
-
-  """
-  The specific type of event
-  """
-  type: TimelineEventEnum!
-
-  """
-  * The userId that can see this event
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-}
-
-"""
-An event for a completed retro meeting
-"""
-type TimelineEventCompletedRetroMeeting implements TimelineEvent {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the event was created at
-  """
-  createdAt: DateTime!
-
-  """
-  the number of times the user has interacted with (ie clicked) this event
-  """
-  interactionCount: Int!
-
-  """
-  true if the timeline event is active, false if archived
-  """
-  isActive: Boolean!
-
-  """
-  The orgId this event is associated with
-  """
-  orgId: ID!
-
-  """
-  The organization this event is associated with
-  """
-  organization: Organization
-
-  """
-  the number of times the user has seen this event
-  """
-  seenCount: Int!
-
-  """
-  The teamId this event is associated with
-  """
-  teamId: ID!
-
-  """
-  The team that can see this event
-  """
-  team: Team!
-
-  """
-  The specific type of event
-  """
-  type: TimelineEventEnum!
-
-  """
-  * The userId that can see this event
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-
-  """
-  The meeting that was completed
-  """
-  meeting: RetrospectiveMeeting!
-
-  """
-  The meetingId that was completed
-  """
-  meetingId: ID!
-}
-
-"""
-An event for a completed action meeting
-"""
-type TimelineEventCompletedActionMeeting implements TimelineEvent {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the event was created at
-  """
-  createdAt: DateTime!
-
-  """
-  the number of times the user has interacted with (ie clicked) this event
-  """
-  interactionCount: Int!
-
-  """
-  true if the timeline event is active, false if archived
-  """
-  isActive: Boolean!
-
-  """
-  The orgId this event is associated with
-  """
-  orgId: ID!
-
-  """
-  The organization this event is associated with
-  """
-  organization: Organization
-
-  """
-  the number of times the user has seen this event
-  """
-  seenCount: Int!
-
-  """
-  The teamId this event is associated with
-  """
-  teamId: ID!
-
-  """
-  The team that can see this event
-  """
-  team: Team!
-
-  """
-  The specific type of event
-  """
-  type: TimelineEventEnum!
-
-  """
-  * The userId that can see this event
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-
-  """
-  The meeting that was completed
-  """
-  meeting: ActionMeeting!
-
-  """
-  The meetingId that was completed, null if legacyMeetingId is present
-  """
-  meetingId: ID!
-}
-
-"""
-An event for a completed poker meeting
-"""
-type TimelineEventPokerComplete implements TimelineEvent {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  * The timestamp the event was created at
-  """
-  createdAt: DateTime!
-
-  """
-  the number of times the user has interacted with (ie clicked) this event
-  """
-  interactionCount: Int!
-
-  """
-  true if the timeline event is active, false if archived
-  """
-  isActive: Boolean!
-
-  """
-  The orgId this event is associated with
-  """
-  orgId: ID!
-
-  """
-  The organization this event is associated with
-  """
-  organization: Organization
-
-  """
-  the number of times the user has seen this event
-  """
-  seenCount: Int!
-
-  """
-  The teamId this event is associated with
-  """
-  teamId: ID!
-
-  """
-  The team that can see this event
-  """
-  team: Team!
-
-  """
-  The specific type of event
-  """
-  type: TimelineEventEnum!
-
-  """
-  * The userId that can see this event
-  """
-  userId: ID!
-
-  """
-  The user than can see this event
-  """
-  user: User!
-
-  """
-  The meeting that was completed
-  """
-  meeting: PokerMeeting!
-
-  """
-  The meetingId that was completed
-  """
-  meetingId: ID!
-}
-
-"""
-All the meeting specifics for a user in a poker meeting
-"""
-type PokerMeetingMember implements MeetingMember {
-  """
-  A composite of userId::meetingId
-  """
-  id: ID!
-
-  """
-  true if present, false if absent, else null
-  """
-  isCheckedIn: Boolean
-    @deprecated(
-      reason: "Members are checked in when they enter the meeting now & not created beforehand"
-    )
-  meetingId: ID!
-  meetingType: MeetingTypeEnum!
-  teamId: ID!
-  teamMember: TeamMember!
-  user: User!
-  userId: ID!
-
-  """
-  The last time a meeting was updated (stage completed, finished, etc)
-  """
-  updatedAt: DateTime!
-
-  """
-  true if the user is not voting and does not want their vote to count towards aggregates
-  """
-  isSpectating: Boolean!
-}
-
-"""
-The action-specific meeting settings
-"""
-type ActionMeetingSettings implements TeamMeetingSettings {
-  id: ID!
-
-  """
-  The type of meeting these settings apply to
-  """
-  meetingType: MeetingTypeEnum!
-
-  """
-  The broad phase types that will be addressed during the meeting
-  """
-  phaseTypes: [NewMeetingPhaseTypeEnum!]!
-
-  """
-  FK
-  """
-  teamId: ID!
-
-  """
-  The team these settings belong to
-  """
-  team: Team!
-}
-
-"""
-All the meeting specifics for a user in a team prompt meeting
-"""
-type TeamPromptMeetingMember implements MeetingMember {
-  """
-  A composite of userId::meetingId
-  """
-  id: ID!
-
-  """
-  true if present, false if absent, else null
-  """
-  isCheckedIn: Boolean
-    @deprecated(
-      reason: "Members are checked in when they enter the meeting now & not created beforehand"
-    )
-  meetingId: ID!
-  meetingType: MeetingTypeEnum!
-  teamId: ID!
-  teamMember: TeamMember!
-  user: User!
-  userId: ID!
-
-  """
-  The last time a meeting was updated (stage completed, finished, etc)
-  """
-  updatedAt: DateTime!
-}
-
-"""
-The team prompt specific meeting settings
-"""
-type TeamPromptMeetingSettings implements TeamMeetingSettings {
-  id: ID!
-
-  """
-  The type of meeting these settings apply to
-  """
-  meetingType: MeetingTypeEnum!
-
-  """
-  The broad phase types that will be addressed during the meeting
-  """
-  phaseTypes: [NewMeetingPhaseTypeEnum!]!
-
-  """
-  FK
-  """
-  teamId: ID!
-
-  """
-  The team these settings belong to
-  """
-  team: Team!
-}
-
-"""
-A comment on a thread
-"""
-type Comment implements Reactable & Threadable {
-  """
-  shortid
-  """
-  id: ID!
-
-  """
-  The rich text body of the item, if inactive, a tombstone text
-  """
-  content: String!
-
-  """
-  The timestamp the item was created
-  """
-  createdAt: DateTime!
-
-  """
-  The userId that created the item, null if anonymous
-  """
-  createdBy: ID
-
-  """
-  The user that created the item, null if anonymous
-  """
-  createdByUser: User
-
-  """
-  the replies to this threadable item
-  """
-  replies: [Threadable!]!
-
-  """
-  The FK of the discussion this task was created in. Null if task was not created in a discussion
-  """
-  discussionId: ID
-
-  """
-  the parent, if this threadable is a reply, else null
-  """
-  threadParentId: ID
-
-  """
-  the order of this threadable, relative to threadParentId
-  """
-  threadSortOrder: Float
-
-  """
-  The timestamp the item was updated
-  """
-  updatedAt: DateTime!
-
-  """
-  All the reactjis for the given reflection
-  """
-  reactjis: [Reactji!]!
-
-  """
-  true if the agenda item has not been processed or deleted
-  """
-  isActive: Boolean!
-
-  """
-  true if the comment is anonymous, else false
-  """
-  isAnonymous: Boolean!
-
-  """
-  true if the viewer wrote this comment, else false
-  """
-  isViewerComment: Boolean!
-}
-
-type GetDemoEntitiesPayload {
-  error: StandardMutationError
-  entities: [GoogleAnalyzedEntity!]
-}
-
-type MassInvitationPayload {
-  errorType: TeamInvitationErrorEnum
-
-  """
-  The name of the person that sent the invitation, present if errorType is expired
-  """
-  inviterName: String
-
-  """
-  The teamId from the token
-  """
-  teamId: ID
-
-  """
-  name of the inviting team, present if invitation exists
-  """
-  teamName: String
-}
-
-type VerifiedInvitationPayload {
-  errorType: TeamInvitationErrorEnum
-
-  """
-  The name of the person that sent the invitation, present if errorType is expired
-  """
-  inviterName: String
-
-  """
-  The email of the person that send the invitation, present if errorType is expired
-  """
-  inviterEmail: String
-
-  """
-  true if the mx record is hosted by google, else falsy
-  """
-  isGoogle: Boolean
-
-  """
-  a string to redirect to the sso IdP, else null
-  """
-  ssoURL: String
-
-  """
-  The valid invitation, if any
-  """
-  teamInvitation: TeamInvitation
-
-  """
-  name of the inviting team, present if invitation exists
-  """
-  teamName: String
-  meetingId: ID
-  meetingName: String
-  meetingType: MeetingTypeEnum
-
-  """
-  The userId of the invitee, if already a parabol user
-  """
-  userId: ID
-
-  """
-  The invitee, if already a parabol user, present if errorType is null
-  """
-  user: User
-}
-
-type Mutation {
-  """
-  Create a new agenda item
-  """
-  addAgendaItem(
-    """
-    The new task including an id, teamMemberId, and content
-    """
-    newAgendaItem: CreateAgendaItemInput!
-  ): AddAgendaItemPayload
-  addAtlassianAuth(code: ID!, teamId: ID!): AddAtlassianAuthPayload!
-
-  """
-  Add a comment to a discussion
-  """
-  addComment(
-    """
-    A partial new comment
-    """
-    comment: AddCommentInput!
-  ): AddCommentPayload!
-
-  """
-  Add a new dimension for the poker template
-  """
-  addPokerTemplateDimension(templateId: ID!): AddPokerTemplateDimensionPayload!
-
-  """
-  Add a new scale for the poker template
-  """
-  addPokerTemplateScale(parentScaleId: ID, teamId: ID!): AddPokerTemplateScalePayload!
-
-  """
-  Add a new scale value for a scale in a poker template
-  """
-  addPokerTemplateScaleValue(
-    scaleId: ID!
-    scaleValue: AddTemplateScaleInput!
-  ): AddPokerTemplateScaleValuePayload!
-
-  """
-  Add a new template full of prompts
-  """
-  addReflectTemplatePrompt(templateId: ID!): AddReflectTemplatePromptPayload
-  addSlackAuth(code: ID!, teamId: ID!): AddSlackAuthPayload!
-
-  addGitHubAuth(code: ID!, teamId: ID!): AddGitHubAuthPayload!
-
-  """
-  Create a new team and add the first team member
-  """
-  addOrg(
-    """
-    The new team object with exactly 1 team member
-    """
-    newTeam: NewTeamInput!
-
-    """
-    The name of the new team
-    """
-    orgName: String!
-    invitees: [Email!]
-  ): AddOrgPayload!
-
-  """
-  Create a new team and add the first team member
-  """
-  addTeam(
-    """
-    The new team object
-    """
-    newTeam: NewTeamInput!
-    invitees: [Email!]
-  ): AddTeamPayload!
-  archiveOrganization(
-    """
-    The orgId to archive
-    """
-    orgId: ID!
-  ): ArchiveOrganizationPayload!
-  archiveTeam(
-    """
-    The teamId to archive (or delete, if team is unused)
-    """
-    teamId: ID!
-  ): ArchiveTeamPayload!
-
-  """
-  Archive a timeline event
-  """
-  archiveTimelineEvent(
-    """
-    the id for the timeline event
-    """
-    timelineEventId: ID!
-  ): ArchiveTimelineEventPayload!
-
-  """
-  Change the team a task is associated with. Also copy the viewers integration if necessary.
-  """
-  changeTaskTeam(
-    """
-    The task to change
-    """
-    taskId: ID!
-
-    """
-    The new team to assign the task to
-    """
-    teamId: ID!
-  ): ChangeTaskTeamPayload
-
-  """
-  set the interaction status of a notifcation
-  """
-  setNotificationStatus(
-    """
-    The id of the notification
-    """
-    notificationId: ID!
-    status: NotificationStatusEnum!
-  ): SetNotificationStatusPayload
-
-  createTaskIntegration(
-    """
-    Which integration to push the task to
-    """
-    integrationProviderService: IntegrationProviderServiceEnum!
-
-    """
-    Jira projectId, GitHub nameWithOwner etc.
-    """
-    integrationRepoId: ID!
-
-    """
-    The id of the task to convert to an issue
-    """
-    taskId: ID!
-  ): CreateTaskIntegrationPayload
-
-  """
-  Create a new mass inivtation and optionally void old ones
-  """
-  createMassInvitation(
-    """
-    the specific meeting where the invite occurred, if any
-    """
-    meetingId: ID
-
-    """
-    The teamId to create the mass invitation for
-    """
-    teamId: ID!
-
-    """
-    If true, will void all existing mass invitations for the team member
-    """
-    voidOld: Boolean
-  ): CreateMassInvitationPayload!
-
-  """
-  Generate a new OAuth1 request token and encode it in the authorization URL to start an oauth1 flow
-  """
-  createOAuth1AuthorizeUrl(
-    """
-    Id of the integration provider with OAuth1 auth strategy
-    """
-    providerId: ID!
-
-    """
-    Id of the team where the integration should be added
-    """
-    teamId: ID!
-  ): CreateOAuth1AuthorizationURLPayload
-
-  """
-  Create a new reflection
-  """
-  createReflection(input: CreateReflectionInput!): CreateReflectionPayload
-
-  """
-  Create a new task, triggering a CreateCard for other viewers
-  """
-  createTask(
-    """
-    The new task including an id, status, and type, and teamMemberId
-    """
-    newTask: CreateTaskInput!
-
-    """
-    The part of the site where the creation occurred
-    """
-    area: AreaEnum
-  ): CreateTaskPayload!
-
-  """
-  Delete a comment from a discussion
-  """
-  deleteComment(commentId: ID!, meetingId: ID!): DeleteCommentPayload!
-
-  """
-  Delete (not archive!) a task
-  """
-  deleteTask(
-    """
-    The taskId to delete
-    """
-    taskId: ID!
-  ): DeleteTaskPayload
-
-  """
-  Delete a user, removing them from all teams and orgs
-  """
-  deleteUser(
-    """
-    a userId
-    """
-    userId: ID
-
-    """
-    the user email
-    """
-    email: ID
-
-    """
-    the reason why the user wants to delete their account
-    """
-    reason: String
-  ): DeleteUserPayload!
-
-  """
-  Deny a user from joining via push invitation
-  """
-  denyPushInvitation(teamId: ID!, userId: ID!): DenyPushInvitationPayload
-
-  """
-  Redeem an invitation token for a logged in user
-  """
-  dismissNewFeature: DismissNewFeaturePayload!
-
-  """
-  Dismiss a suggested action
-  """
-  dismissSuggestedAction(
-    """
-    The id of the suggested action to dismiss
-    """
-    suggestedActionId: ID!
-  ): DismissSuggestedActionPayload!
-
-  """
-  Downgrade a paid account to the starter plan service
-  """
-  downgradeToStarter(
-    """
-    the org requesting the upgrade
-    """
-    orgId: ID!
-  ): DowngradeToStarterPayload
-
-  """
-  Changes the priority of the discussion topics
-  """
-  dragDiscussionTopic(meetingId: ID!, stageId: ID!, sortOrder: Float!): DragDiscussionTopicPayload
-
-  """
-  Changes the ordering of the estimating tasks
-  """
-  dragEstimatingTask(
-    meetingId: ID!
-    taskId: ID!
-
-    """
-    The index of the tasks will be moved to, in the list of estimating tasks sidebar section
-    """
-    newPositionIndex: Int!
-  ): DragEstimatingTaskPayload!
-
-  """
-  Send an email to reset a password
-  """
-  emailPasswordReset(
-    """
-    email to send the password reset code to
-    """
-    email: ID!
-  ): EmailPasswordResetPayload!
-
-  """
-  Track which users are commenting
-  """
-  editCommenting(
-    """
-    True if the user is commenting, false if the user has stopped commenting
-    """
-    isCommenting: Boolean!
-    discussionId: ID!
-  ): EditCommentingPayload
-
-  """
-  Finish a sprint poker meeting
-  """
-  endSprintPoker(
-    """
-    The meeting to end
-    """
-    meetingId: ID!
-  ): EndSprintPokerPayload!
-
-  """
-  Changes the editing state of a user for a phase item
-  """
-  editReflection(
-    """
-    Whether a reflectPrompt is being edited or not
-    """
-    isEditing: Boolean!
-    meetingId: ID!
-    promptId: ID!
-  ): EditReflectionPayload
-
-  """
-  Announce to everyone that you are editing a task
-  """
-  editTask(
-    """
-    The task id that is being edited
-    """
-    taskId: ID!
-
-    """
-    true if the editing is starting, false if it is stopping
-    """
-    isEditing: Boolean!
-  ): EditTaskPayload
-
-  """
-  Finish a check-in meeting
-  """
-  endCheckIn(
-    """
-    The meeting to end
-    """
-    meetingId: ID!
-  ): EndCheckInPayload!
-
-  """
-  Broadcast that the viewer stopped dragging a reflection
-  """
-  endDraggingReflection(
-    reflectionId: ID!
-
-    """
-    if it was a drop (isDragging = false), the type of item it was dropped on. null if there was no valid drop target
-    """
-    dropTargetType: DragReflectionDropTargetTypeEnum
-
-    """
-    if dropTargetType could refer to more than 1 component, this ID defines which one
-    """
-    dropTargetId: ID
-
-    """
-    the ID of the drag to connect to the start drag event
-    """
-    dragId: ID
-  ): EndDraggingReflectionPayload
-
-  """
-  Finish a retrospective meeting
-  """
-  endRetrospective(
-    """
-    The meeting to end
-    """
-    meetingId: ID!
-  ): EndRetrospectivePayload!
-
-  """
-  flag a viewer as ready to advance to the next stage of a meeting
-  """
-  flagReadyToAdvance(
-    meetingId: ID!
-
-    """
-    the stage that the viewer marked as ready
-    """
-    stageId: ID!
-
-    """
-    true if ready to advance, else false
-    """
-    isReady: Boolean!
-  ): FlagReadyToAdvancePayload!
-
-  """
-  pauses the subscription for a single user
-  """
-  inactivateUser(
-    """
-    the user to pause
-    """
-    userId: ID!
-  ): InactivateUserPayload
-
-  """
-  Invalidate all sessions by blacklisting all JWTs issued before now
-  """
-  invalidateSessions: InvalidateSessionsPayload!
-
-  """
-  Send a team invitation to an email address
-  """
-  inviteToTeam(
-    """
-    the specific meeting where the invite occurred, if any
-    """
-    meetingId: ID
-
-    """
-    The id of the inviting team
-    """
-    teamId: ID!
-    invitees: [Email!]!
-  ): InviteToTeamPayload!
-
-  """
-  Move a template dimension
-  """
-  movePokerTemplateDimension(
-    dimensionId: ID!
-    sortOrder: Float!
-  ): MovePokerTemplateDimensionPayload!
-
-  """
-  Move a reflect template
-  """
-  moveReflectTemplatePrompt(promptId: ID!, sortOrder: Float!): MoveReflectTemplatePromptPayload
-
-  """
-  Move a team to a different org. Requires billing leader rights on both orgs!
-  """
-  moveTeamToOrg(
-    """
-    The teamId that you want to move
-    """
-    teamIds: [ID!]!
-
-    """
-    The ID of the organization you want to move the team to
-    """
-    orgId: ID!
-  ): String
-
-  """
-  update a meeting by marking an item complete and setting the facilitator location
-  """
-  navigateMeeting(
-    """
-    The stage that the facilitator would like to mark as complete
-    """
-    completedStageId: ID
-
-    """
-    The stage where the facilitator is
-    """
-    facilitatorStageId: ID
-
-    """
-    The meeting ID
-    """
-    meetingId: ID!
-  ): NavigateMeetingPayload!
-
-  """
-  Check a member in as present or absent
-  """
-  newMeetingCheckIn(
-    """
-    The id of the user being marked present or absent
-    """
-    userId: ID!
-
-    """
-    the meeting currently in progress
-    """
-    meetingId: ID!
-
-    """
-    true if the member is present, false if absent, null if undecided
-    """
-    isCheckedIn: Boolean
-  ): NewMeetingCheckInPayload
-    @deprecated(reason: "Members now join lazily and joining means they are present")
-
-  """
-  Increment the count of times the org has clicked pay later
-  """
-  payLater(
-    """
-    the org that has clicked pay later
-    """
-    meetingId: ID!
-  ): PayLaterPayload!
-
-  """
-  Add or remove a task and its estimate phase from the meeting
-  """
-  persistJiraSearchQuery(
-    """
-    the team with the settings we add the query to
-    """
-    teamId: ID!
-
-    """
-    the jira search query to persist (or remove, if isRemove is true)
-    """
-    input: JiraSearchQueryInput!
-  ): PersistJiraSearchQueryPayload!
-
-  """
-  Request to be invited to a team in real time
-  """
-  pushInvitation(
-    """
-    the meeting ID the pusher would like to join
-    """
-    meetingId: ID
-    teamId: ID!
-  ): PushInvitationPayload
-
-  """
-  Change a facilitator while the meeting is in progress
-  """
-  promoteNewMeetingFacilitator(
-    """
-    userId of the new facilitator for this meeting
-    """
-    facilitatorUserId: ID!
-    meetingId: ID!
-  ): PromoteNewMeetingFacilitatorPayload
-
-  """
-  Promote another team member to be the leader
-  """
-  promoteToTeamLead(
-    """
-    Team id of the team which is about to get a new team leader
-    """
-    teamId: ID!
-
-    """
-    userId who will be set as a new team leader
-    """
-    userId: ID!
-  ): PromoteToTeamLeadPayload
-
-  """
-  Update the description of a reflection prompt
-  """
-  reflectTemplatePromptUpdateDescription(
-    promptId: ID!
-    description: String!
-  ): ReflectTemplatePromptUpdateDescriptionPayload
-
-  """
-  Update the description of a poker template dimension
-  """
-  pokerTemplateDimensionUpdateDescription(
-    dimensionId: ID!
-    description: String!
-  ): PokerTemplateDimensionUpdateDescriptionPayload
-  reflectTemplatePromptUpdateGroupColor(
-    promptId: ID!
-    groupColor: String!
-  ): ReflectTemplatePromptUpdateGroupColorPayload
-
-  """
-  Remove an agenda item
-  """
-  removeAgendaItem(
-    """
-    The agenda item unique id
-    """
-    agendaItemId: ID!
-  ): RemoveAgendaItemPayload
-
-  """
-  Disconnect a team member from atlassian
-  """
-  removeAtlassianAuth(
-    """
-    the teamId to disconnect from the token
-    """
-    teamId: ID!
-  ): RemoveAtlassianAuthPayload!
-
-  """
-  Disconnect a team member from GitHub
-  """
-  removeGitHubAuth(
-    """
-    the teamId to disconnect from the token
-    """
-    teamId: ID!
-  ): RemoveGitHubAuthPayload!
-
-  """
-  Remove a user from an org
-  """
-  removeOrgUser(
-    """
-    the user to remove
-    """
-    userId: ID!
-
-    """
-    the org that does not want them anymore
-    """
-    orgId: ID!
-  ): RemoveOrgUserPayload
-
-  """
-  Remove a poker meeting template
-  """
-  removePokerTemplate(templateId: ID!): RemovePokerTemplatePayload!
-
-  """
-  Remove a template full of prompts
-  """
-  removeReflectTemplate(templateId: ID!): RemoveReflectTemplatePayload
-
-  """
-  Remove a prompt from a template
-  """
-  removeReflectTemplatePrompt(promptId: ID!): RemoveReflectTemplatePromptPayload
-
-  """
-  Remove a dimension from a template
-  """
-  removePokerTemplateDimension(dimensionId: ID!): RemovePokerTemplateDimensionPayload!
-
-  """
-  Rename a meeting
-  """
-  renameMeeting(
-    """
-    the new meeting name
-    """
-    name: String!
-
-    """
-    the meeting with the new name
-    """
-    meetingId: ID!
-  ): RenameMeetingPayload!
-
-  """
-  Rename a meeting template
-  """
-  renameMeetingTemplate(templateId: ID!, name: String!): RenameMeetingTemplatePayload
-
-  """
-  Rename a reflect template prompt
-  """
-  renameReflectTemplatePrompt(promptId: ID!, question: String!): RenameReflectTemplatePromptPayload
-
-  """
-  Rename a poker template dimension
-  """
-  renamePokerTemplateDimension(
-    dimensionId: ID!
-    name: String!
-  ): RenamePokerTemplateDimensionPayload!
-
-  """
-  Rename a poker template scale
-  """
-  renamePokerTemplateScale(scaleId: ID!, name: String!): RenamePokerTemplateScalePayload!
-
-  """
-  Remove a scale from a template
-  """
-  removePokerTemplateScale(scaleId: ID!): RemovePokerTemplateScalePayload!
-
-  """
-  Remove a scale value from the scale of a template
-  """
-  removePokerTemplateScaleValue(scaleId: ID!, label: String!): RemovePokerTemplateScaleValuePayload!
-
-  """
-  Remove a reflection
-  """
-  removeReflection(reflectionId: ID!): RemoveReflectionPayload
-
-  """
-  Disconnect a team member from Slack
-  """
-  removeSlackAuth(
-    """
-    the teamId to disconnect from the token
-    """
-    teamId: ID!
-  ): RemoveSlackAuthPayload!
-
-  """
-  Remove a team member from the team
-  """
-  removeTeamMember(
-    """
-    The teamMemberId of the person who is being removed
-    """
-    teamMemberId: ID!
-  ): RemoveTeamMemberPayload
-
-  """
-  Reset the password for an account
-  """
-  resetPassword(
-    """
-    the password reset token
-    """
-    token: ID!
-
-    """
-    The new password for the account
-    """
-    newPassword: String!
-  ): ResetPasswordPayload!
-
-  """
-  Reset a retro meeting to group stage
-  """
-  resetRetroMeetingToGroupStage(meetingId: ID!): ResetRetroMeetingToGroupStagePayload!
-
-  """
-  Set the selected template for the upcoming retro meeting
-  """
-  selectTemplate(selectedTemplateId: ID!, teamId: ID!): SelectTemplatePayload
-
-  """
-  Share where in the app the viewer is
-  """
-  setAppLocation(
-    """
-    The location the viewer is currently at
-    """
-    location: String
-  ): SetAppLocationPayload!
-
-  """
-  Update the default Slack channel where notifications are sent
-  """
-  setDefaultSlackChannel(slackChannelId: ID!, teamId: ID!): SetDefaultSlackChannelPayload!
-
-  """
-  Focus (or unfocus) a phase item
-  """
-  setPhaseFocus(
-    meetingId: ID!
-
-    """
-    The currently focused phase item
-    """
-    focusedPromptId: ID
-  ): SetPhaseFocusPayload
-
-  """
-  Set or clear a timer for a meeting stage
-  """
-  setStageTimer(
-    """
-    the id of the meeting
-    """
-    meetingId: ID!
-
-    """
-    The time the timer is scheduled to go off (based on client clock), null if unsetting the timer
-    """
-    scheduledEndTime: DateTime
-
-    """
-    scheduledEndTime - now. Used to reconcile bad client clocks. Present for time limit, else null
-    """
-    timeRemaining: Float
-  ): SetStageTimerPayload!
-  setSlackNotification(
-    slackChannelId: ID
-    slackNotificationEvents: [SlackNotificationEventEnum!]!
-    teamId: ID!
-  ): SetSlackNotificationPayload!
-
-  """
-  Broadcast that the viewer started dragging a reflection
-  """
-  startDraggingReflection(
-    reflectionId: ID!
-    dragId: ID!
-    isSpotlight: Boolean
-  ): StartDraggingReflectionPayload
-
-  """
-  Start a new sprint poker meeting
-  """
-  startSprintPoker(
-    """
-    The team starting the meeting
-    """
-    teamId: ID!
-    """
-    The name of the meeting
-    """
-    name: String
-    """
-    The gcal input if creating a gcal event
-    """
-    gcalInput: CreateGcalEventInput
-  ): StartSprintPokerPayload!
-
-  """
-  Broadcast that the viewer highlights a task
-  """
-  setTaskHighlight(taskId: ID!, meetingId: ID!, isHighlighted: Boolean!): SetTaskHighlightPayload!
-
-  """
-  Update an agenda item
-  """
-  updateAgendaItem(
-    """
-    The updated item including an id, content, status, sortOrder
-    """
-    updatedAgendaItem: UpdateAgendaItemInput!
-  ): UpdateAgendaItemPayload
-
-  """
-  Update the content of a comment
-  """
-  updateCommentContent(
-    commentId: ID!
-
-    """
-    A stringified draft-js document containing thoughts
-    """
-    content: String!
-    meetingId: ID!
-  ): UpdateCommentContentPayload
-
-  """
-  Update an existing credit card on file
-  """
-  oldUpdateCreditCard(
-    """
-    the org requesting the changed billing
-    """
-    orgId: ID!
-
-    """
-    The token that came back from stripe
-    """
-    stripeToken: ID!
-  ): OldUpdateCreditCardPayload
-
-  """
-  Update the scale used for a dimension in a template
-  """
-  updatePokerTemplateDimensionScale(
-    dimensionId: ID!
-    scaleId: ID!
-  ): UpdatePokerTemplateDimensionScalePayload!
-
-  """
-  Update the label, numerical value or color of a scale value in a scale
-  """
-  updatePokerTemplateScaleValue(
-    scaleId: ID!
-    oldScaleValue: TemplateScaleInput!
-    newScaleValue: TemplateScaleInput!
-  ): UpdatePokerTemplateScaleValuePayload!
-
-  """
-  Update a Team's Icebreaker in a new meeting
-  """
-  updateNewCheckInQuestion(
-    """
-    ID of the Team which will have its Icebreaker updated
-    """
-    meetingId: ID!
-
-    """
-    The Team's new Icebreaker
-    """
-    checkInQuestion: String!
-  ): UpdateNewCheckInQuestionPayload
-
-  """
-  all the info required to provide an accurate display-specific location of where an item is
-  """
-  updateDragLocation(input: UpdateDragLocationInput!): Boolean
-
-  """
-  Add or remove a task and its estimate phase from the meeting
-  """
-  updatePokerScope(
-    """
-    the meeting with the estimate phases to modify
-    """
-    meetingId: ID!
-
-    """
-    The list of items to add/remove to the estimate phase
-    """
-    updates: [UpdatePokerScopeItemInput!]!
-  ): UpdatePokerScopePayload!
-
-  """
-  Update the content of a reflection
-  """
-  updateReflectionContent(
-    reflectionId: ID!
-
-    """
-    A stringified draft-js document containing thoughts
-    """
-    content: String!
-  ): UpdateReflectionContentPayload
-
-  """
-  Update the title of a reflection group
-  """
-  updateReflectionGroupTitle(
-    reflectionGroupId: ID!
-
-    """
-    The new title for the group
-    """
-    title: String!
-  ): UpdateReflectionGroupTitlePayload
-
-  """
-  Change the max votes for participants
-  """
-  updateRetroMaxVotes(
-    """
-    The total number of votes for each participant
-    """
-    totalVotes: Int!
-
-    """
-    The total number of votes for each participant to vote on a single topic
-    """
-    maxVotesPerGroup: Int!
-
-    """
-    the meeting to update
-    """
-    meetingId: ID!
-  ): UpdateRetroMaxVotesPayload!
-
-  """
-  Update a task with a change in content, ownership, or status
-  """
-  updateTask(
-    """
-    The part of the site where the creation occurred
-    """
-    area: AreaEnum
-
-    """
-    the updated task including the id, and at least one other field
-    """
-    updatedTask: UpdateTaskInput!
-  ): UpdateTaskPayload
-
-  """
-  Set or unset the due date of a task
-  """
-  updateTaskDueDate(
-    """
-    The task id
-    """
-    taskId: ID!
-
-    """
-    the new due date. if not a valid date, it will unset the due date
-    """
-    dueDate: DateTime
-  ): UpdateTaskDueDatePayload
-  updateTeamName(
-    """
-    The input object containing the teamId and any modified fields
-    """
-    updatedTeam: UpdatedTeamInput!
-  ): UpdateTeamNamePayload
-
-  """
-  Change the scope of a template
-  """
-  updateTemplateScope(
-    """
-    The id of the template
-    """
-    templateId: ID!
-
-    """
-    the new scope
-    """
-    scope: SharingScopeEnum!
-  ): UpdateTemplateScopePayload!
-
-  """
-  Upgrade an account to the paid service
-  """
-  oldUpgradeToTeamTier(
-    """
-    the org requesting the upgrade
-    """
-    orgId: ID!
-
-    """
-    The token that came back from stripe
-    """
-    stripeToken: ID!
-  ): OldUpgradeToTeamTierPayload
-
-  """
-  Cast your vote for a reflection group
-  """
-  voteForReflectionGroup(
-    """
-    true if the user wants to remove one of their votes
-    """
-    isUnvote: Boolean
-    reflectionGroupId: ID!
-  ): VoteForReflectionGroupPayload
-
-  """
-  Cast a vote for the estimated points for a given dimension
-  """
-  voteForPokerStory(
-    meetingId: ID!
-
-    """
-    The stage that contains the dimension to vote for
-    """
-    stageId: ID!
-
-    """
-    The label of the scaleValue to vote for. If null, remove the vote
-    """
-    score: String
-  ): VoteForPokerStoryPayload!
-
-  """
-  Progresses the stage dimension to the reveal & discuss step
-  """
-  pokerRevealVotes(meetingId: ID!, stageId: ID!): PokerRevealVotesPayload!
-
-  """
-  Remove all votes, the final vote, and reset the stage
-  """
-  pokerResetDimension(meetingId: ID!, stageId: ID!): PokerResetDimensionPayload!
-
-  """
-  """
-  pokerAnnounceDeckHover(
-    meetingId: ID!
-    stageId: ID!
-
-    """
-    true if the viewer has started hovering the deck, else false
-    """
-    isHover: Boolean!
-  ): PokerAnnounceDeckHoverPayload!
-
-  """
-  Move a scale value to an index
-  """
-  movePokerTemplateScaleValue(
-    scaleId: ID!
-
-    """
-    The label of the moving scale value
-    """
-    label: String!
-
-    """
-    The index position where the scale value is moving to
-    """
-    index: Int!
-  ): MovePokerTemplateScaleValuePayload!
-
-  """
-  Create a meeting member for a user
-  """
-  joinMeeting(meetingId: ID!): JoinMeetingPayload!
-
-  """
-  Set whether the user is spectating poker meeting
-  """
-  setPokerSpectate(
-    meetingId: ID!
-
-    """
-    true if the viewer is spectating poker and does not want to vote. else false
-    """
-    isSpectating: Boolean!
-  ): SetPokerSpectatePayload!
-
-  """
-  """
-  persistGitHubSearchQuery(
-    """
-    the team witht the settings we add the query to
-    """
-    teamId: ID!
-
-    """
-    The query string as sent to GitHub
-    """
-    queryString: String!
-
-    """
-    true if this query should be deleted
-    """
-    isRemove: Boolean
-  ): PersistGitHubSearchQueryPayload!
-
-  """
-  Update a task estimate
-  """
-  setTaskEstimate(taskEstimate: TaskEstimateInput!): SetTaskEstimatePayload!
-
-  """
-  Show/hide the drawer in the team dashboard
-  """
-  toggleTeamDrawer(
-    """
-    the team to show/hide the drawer for
-    """
-    teamId: ID!
-
-    """
-    The type of team drawer that the viewer is toggling. Null if closing the drawer.
-    """
-    teamDrawerType: TeamDrawer
-  ): ToggleTeamDrawerPayload!
-
-  """
-  Update how a parabol dimension maps to a GitHub label
-  """
-  updateGitHubDimensionField(
-    dimensionName: String!
-
-    """
-    The template string to map to a label
-    """
-    labelTemplate: String!
-
-    """
-    The repo the issue lives on
-    """
-    nameWithOwner: ID!
-
-    """
-    The meeting the update happend in. Returns a meeting object with updated serviceField
-    """
-    meetingId: ID!
-  ): UpdateGitHubDimensionFieldPayload!
-  createPoll(
-    """
-    The new poll including title and poll options
-    """
-    newPoll: CreatePollInput!
-  ): CreatePollPayload!
-
-  """
-  Adds a new Integration Provider configuration
-  """
-  addIntegrationProvider(
-    """
-    The new Integration Provider
-    """
-    input: AddIntegrationProviderInput!
-  ): AddIntegrationProviderPayload!
-
-  """
-  Update the Integration Provider settings
-  """
-  updateIntegrationProvider(
-    """
-    The new Integration Provider
-    """
-    provider: UpdateIntegrationProviderInput!
-  ): UpdateIntegrationProviderPayload!
-
-  """
-  Remove an Integration Provider, and any associated tokens
-  """
-  removeIntegrationProvider(
-    """
-    Id of the Integration Provider to remove
-    """
-    providerId: ID!
-  ): RemoveIntegrationProviderPayload!
-
-}
-
-type AddAgendaItemPayload {
-  error: StandardMutationError
-  agendaItem: AgendaItem
-  meetingId: ID
-
-  """
-  The meeting with the updated agenda item, if any
-  """
-  meeting: NewMeeting
-}
-
-input CreateAgendaItemInput {
-  """
-  The content of the agenda item
-  """
-  content: String!
-
-  """
-  True if the agenda item has been pinned
-  """
-  pinned: Boolean!
-  teamId: ID!
-
-  """
-  The team member ID of the person creating the agenda item
-  """
-  teamMemberId: ID!
-
-  """
-  The sort order of the agenda item in the list
-  """
-  sortOrder: Float
-
-  """
-  The meeting ID of the agenda item
-  """
-  meetingId: String
-}
-
-type AddAtlassianAuthPayload {
-  error: StandardMutationError
-
-  """
-  The newly created auth
-  """
-  atlassianIntegration: AtlassianIntegration
-  teamId: ID
-
-  """
-  The team member with the updated atlassianAuth
-  """
-  teamMember: TeamMember
-
-  """
-  The user with updated atlassianAuth
-  """
-  user: User
-}
-
-"""
-Return object for AddCommentPayload
-"""
-union AddCommentPayload = ErrorPayload | AddCommentSuccess
-
-type ErrorPayload {
-  error: StandardMutationError!
-}
-
-type AddCommentSuccess {
-  """
-  the comment just created
-  """
-  comment: Comment!
-
-  """
-  The id of the meeting where the comment was added
-  """
-  meetingId: ID!
-}
-
-input AddCommentInput {
-  """
-  A stringified draft-js document containing thoughts
-  """
-  content: String!
-
-  """
-  true if the comment should be anonymous
-  """
-  isAnonymous: Boolean
-
-  """
-  foreign key for the discussion this was created in
-  """
-  discussionId: ID!
-  threadSortOrder: Float!
-  threadParentId: ID
-}
-
-type AddPokerTemplateDimensionPayload {
-  error: StandardMutationError
-  dimension: TemplateDimension
-}
-
-type AddPokerTemplateScalePayload {
-  error: StandardMutationError
-  scale: TemplateScale
-}
-
-type AddPokerTemplateScaleValuePayload {
-  error: StandardMutationError
-  scale: TemplateScale
-}
-
-"""
-Input for adding a new scale
-"""
-input AddTemplateScaleInput {
-  """
-  The color used to visually group a scale value
-  """
-  color: String!
-
-  """
-  The label for this value, e.g., XS, M, L
-  """
-  label: String!
-}
-
-"""
-The type of reactable
-"""
-enum ReactableEnum {
-  COMMENT
-  REFLECTION
-  RESPONSE
-}
-
-enum GcalVideoTypeEnum {
-  meet
-  zoom
-}
-
-type AddReflectTemplatePromptPayload {
-  error: StandardMutationError
-  prompt: ReflectPrompt
-}
-
-type AddSlackAuthPayload {
-  error: StandardMutationError
-
-  """
-  The newly created auth
-  """
-  slackIntegration: SlackIntegration
-
-  """
-  The user with updated slackAuth
-  """
-  user: User
-}
-
-type AddGitHubAuthPayload {
-  error: StandardMutationError
-
-  """
-  The newly created auth
-  """
-  githubIntegration: GitHubIntegration
-
-  """
-  The team member with the updated auth
-  """
-  teamMember: TeamMember
-
-  """
-  The user with updated githubAuth
-  """
-  user: User
-}
-
-type AddOrgPayload {
-  organization: Organization
-  error: StandardMutationError
-
-  """
-  The new auth token sent to the mutator
-  """
-  authToken: ID
-  team: Team
-
-  """
-  The teamMember that just created the new team, if this is a creation
-  """
-  teamMember: TeamMember
-
-  """
-  The ID of the suggestion to create a new team
-  """
-  removedSuggestedActionId: ID
-}
-
-input NewTeamInput {
-  """
-  The name of the team
-  """
-  name: String!
-
-  """
-  The unique orginization ID that pays for the team
-  """
-  orgId: ID
-}
-
-type AddTeamPayload {
-  error: StandardMutationError
-
-  """
-  The new auth token sent to the mutator
-  """
-  authToken: ID
-  team: Team
-
-  """
-  The teamMember that just created the new team, if this is a creation
-  """
-  teamMember: TeamMember
-
-  """
-  The ID of the suggestion to create a new team
-  """
-  removedSuggestedActionId: ID
-}
-
-type ArchiveOrganizationPayload {
-  error: StandardMutationError
-  orgId: ID
-  teams: [Team!]
-
-  """
-  all the suggested actions that never happened
-  """
-  removedSuggestedActionIds: [ID]
-}
-
-type ArchiveTeamPayload {
-  error: StandardMutationError
-  team: Team
-
-  """
-  A notification explaining that the team was archived and removed from view
-  """
-  notification: NotifyTeamArchived
-
-  """
-  all the suggested actions that never happened
-  """
-  removedSuggestedActionIds: [ID]
-
-  """
-  A list of the ids of templates created by a team
-  """
-  teamTemplateIds: [ID!]!
-}
-
-"""
-A notification alerting the user that a team they were on is now archived
-"""
-type NotifyTeamArchived implements Notification {
-  """
-  the user that archived the team
-  """
-  archivor: User!
-  team: Team!
-
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-}
-
-"""
-Return object for ArchiveTimelineEventPayload
-"""
-union ArchiveTimelineEventPayload = ErrorPayload | ArchiveTimelineEventSuccess
-
-type ArchiveTimelineEventSuccess {
-  """
-  the archived timelineEvent
-  """
-  timelineEvent: TimelineEvent!
-}
-
-type ChangeTaskTeamPayload {
-  error: StandardMutationError
-  task: Task
-
-  """
-  the taskId sent to a user who is not on the new team so they can remove it from their client
-  """
-  removedTaskId: ID
-}
-
-type SetNotificationStatusPayload {
-  error: StandardMutationError
-
-  """
-  The updated notification
-  """
-  notification: Notification
-}
-
-type CreateTaskIntegrationPayload {
-  error: StandardMutationError
-  task: Task
-}
-
-"""
-Return object for CreateMassInvitationPayload
-"""
-union CreateMassInvitationPayload = ErrorPayload | CreateMassInvitationSuccess
-
-type CreateMassInvitationSuccess {
-  """
-  the team with the updated mass inivtation
-  """
-  team: Team!
-}
-
-"""
-Authorization URL constructed after creating a new request token
-"""
-type CreateOAuth1AuthorizationURLPayload {
-  error: StandardMutationError
-
-  """
-  Authorization URL including oauth_token to start authorization flow
-  """
-  url: String
-}
-
-type CreateReflectionPayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-  reflectionId: ID
-  reflection: RetroReflection
-
-  """
-  The group automatically created for the reflection
-  """
-  reflectionGroup: RetroReflectionGroup
-
-  """
-  The stages that were unlocked by navigating
-  """
-  unlockedStages: [NewMeetingStage!]
-}
-
-input CreateReflectionInput {
-  """
-  A stringified draft-js document containing thoughts
-  """
-  content: String
-  meetingId: ID!
-
-  """
-  The prompt the reflection belongs to
-  """
-  promptId: ID!
-  sortOrder: Float!
-}
-
-type CreateTaskPayload {
-  error: StandardMutationError
-  task: Task
-  involvementNotification: NotifyTaskInvolves
-}
-
-"""
-A notification sent to someone who was just added to a team
-"""
-type NotifyTaskInvolves implements Notification & TeamNotification {
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-
-  """
-  How the user is affiliated with the task
-  """
-  involvement: TaskInvolvementType!
-
-  """
-  The taskId that now involves the userId
-  """
-  taskId: ID!
-
-  """
-  The task that now involves the userId
-  """
-  task: Task
-
-  """
-  The teamMemberId of the person that made the change
-  """
-  changeAuthorId: ID
-
-  """
-  The TeamMember of the person that made the change
-  """
-  changeAuthor: TeamMember!
-  teamId: ID!
-
-  """
-  The team the task is on
-  """
-  team: Team!
-}
-
-"""
-How a user is involved with a task (listed in hierarchical order)
-"""
-enum TaskInvolvementType {
-  ASSIGNEE
-  MENTIONEE
-}
-
-input CreateTaskInput {
-  content: String
-  plaintextContent: String
-
-  """
-  foreign key for the meeting this was created in
-  """
-  meetingId: ID
-
-  """
-  foreign key for the thread this was created in
-  """
-  discussionId: ID
-  threadSortOrder: Float
-  threadParentId: ID
-  sortOrder: Float
-  status: TaskStatusEnum!
-
-  """
-  teamId, the team the task is on
-  """
-  teamId: ID!
-
-  """
-  userId, the owner of the task. This can be null if the task is not assigned to anyone.
-  """
-  userId: ID
-  integration: CreateTaskIntegrationInput
-}
-
-input CreateTaskIntegrationInput {
-  """
-  The service to push this new task to
-  """
-  service: TaskServiceEnum!
-
-  """
-  The key or composite key where the task should live in the service, e.g. nameWithOwner or cloudId:projectKey
-  """
-  serviceProjectHash: String!
-}
-
-"""
-The list of services for task integrations
-"""
-enum TaskServiceEnum {
-  github
-  jira
-  PARABOL
-}
-
-enum ServiceEnum {
-  PARABOL
-  github
-  jira
-  gitlab
-  mattermost
-  jiraServer
-  gcal
-  azureDevOps
-}
-
-"""
-The part of the site that is calling the mutation
-"""
-enum AreaEnum {
-  meeting
-  teamDash
-  userDash
-}
-
-"""
-Return object for DeleteCommentPayload
-"""
-union DeleteCommentPayload = ErrorPayload | DeleteCommentSuccess
-
-type DeleteCommentSuccess {
-  commentId: ID!
-
-  """
-  the comment just deleted
-  """
-  comment: Comment!
-}
-
-type DeleteTaskPayload {
-  error: StandardMutationError
-
-  """
-  The task that was deleted
-  """
-  task: Task
-}
-
-type DeleteUserPayload {
-  error: StandardMutationError
-}
-
-type DenyPushInvitationPayload {
-  error: StandardMutationError
-  teamId: ID
-  userId: ID
-}
-
-type DismissNewFeaturePayload {
-  error: StandardMutationError
-}
-
-type DismissSuggestedActionPayload {
-  error: StandardMutationError
-
-  """
-  The user that dismissed the action
-  """
-  user: User
-
-  """
-  The id of the removed suggested action
-  """
-  removedSuggestedActionId: ID
-}
-
-type DowngradeToStarterPayload {
-  error: StandardMutationError
-
-  """
-  The new Starter Org
-  """
-  organization: Organization
-
-  """
-  The updated teams under the org
-  """
-  teams: [Team]
-}
-
-type DragDiscussionTopicPayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-  stage: RetroDiscussStage
-}
-
-"""
-Return object for DragEstimatingTaskPayload
-"""
-union DragEstimatingTaskPayload = ErrorPayload | DragEstimatingTaskSuccess
-
-type DragEstimatingTaskSuccess {
-  meetingId: ID!
-  meeting: PokerMeeting!
-  stageIds: [ID!]!
-  stages: [EstimateStage!]!
-}
-
-"""
-Return object for EmailPasswordResetPayload
-"""
-union EmailPasswordResetPayload = ErrorPayload | EmailPasswordResetSuccess
-
-type EmailPasswordResetSuccess {
-  """
-  True if the email password reset was successfully sent
-  """
-  success: Boolean
-}
-
-"""
-Return object for EditCommentingPayload
-"""
-union EditCommentingPayload = ErrorPayload | EditCommentingSuccess
-
-type EditCommentingSuccess {
-  """
-  The discussion the comment was created in
-  """
-  discussionId: ID!
-
-  """
-  The discussion where the commenting state changed
-  """
-  discussion: Discussion!
-}
-
-"""
-Return object for EndSprintPokerPayload
-"""
-union EndSprintPokerPayload = ErrorPayload | EndSprintPokerSuccess
-
-type EndSprintPokerSuccess {
-  """
-  true if the meeting was killed (ended before reaching last stage)
-  """
-  isKill: Boolean!
-  meetingId: ID!
-  meeting: PokerMeeting!
-  removedTaskIds: [ID!]!
-  team: Team!
-  teamId: ID!
-}
-
-type EditReflectionPayload {
-  error: StandardMutationError
-  promptId: ID
-
-  """
-  The socketId of the client editing the card (uses socketId to maintain anonymity)
-  """
-  editorId: ID
-
-  """
-  true if the reflection is being edited, else false
-  """
-  isEditing: Boolean
-}
-
-type EditTaskPayload {
-  error: StandardMutationError
-  task: Task
-  editor: User
-
-  """
-  true if the editor is editing, false if they stopped editing
-  """
-  isEditing: Boolean
-}
-
-"""
-Return object for EndCheckInPayload
-"""
-union EndCheckInPayload = ErrorPayload | EndCheckInSuccess
-
-type EndCheckInSuccess {
-  """
-  true if the meeting was killed (ended before reaching last stage)
-  """
-  isKill: Boolean!
-  team: Team!
-  meeting: ActionMeeting!
-
-  """
-  The ID of the suggestion to try a check-in meeting, if tried
-  """
-  removedSuggestedActionId: ID
-  removedTaskIds: [ID!]
-
-  """
-  An event that is important to the viewer, e.g. an ended meeting
-  """
-  timelineEvent: TimelineEvent!
-  updatedTaskIds: [ID!]
-
-  """
-  Any tasks that were updated during the meeting
-  """
-  updatedTasks: [Task!]
-}
-
-type EndDraggingReflectionPayload {
-  error: StandardMutationError
-  dragId: ID
-
-  """
-  The drag as sent from the team member
-  """
-  remoteDrag: RemoteReflectionDrag
-
-  """
-  the type of item the reflection was dropped on
-  """
-  dropTargetType: DragReflectionDropTargetTypeEnum
-
-  """
-  The ID that the dragged item was dropped on, if dropTargetType is not specific enough
-  """
-  dropTargetId: ID
-  meeting: RetrospectiveMeeting
-  meetingId: ID
-  reflection: RetroReflection
-  reflectionGroupId: ID
-  reflectionId: ID
-
-  """
-  foreign key to get user
-  """
-  userId: ID
-
-  """
-  The group encapsulating the new reflection. A new one was created if one was not provided.
-  """
-  reflectionGroup: RetroReflectionGroup
-
-  """
-  The old group the reflection was in
-  """
-  oldReflectionGroup: RetroReflectionGroup
-}
-
-"""
-Info associated with a current drag
-"""
-type RemoteReflectionDrag {
-  id: ID!
-
-  """
-  The userId of the person currently dragging the reflection
-  """
-  dragUserId: ID
-
-  """
-  The name of the dragUser
-  """
-  dragUserName: String
-  isSpotlight: Boolean
-  clientHeight: Float
-  clientWidth: Float
-
-  """
-  The primary key of the item being drug
-  """
-  sourceId: ID!
-
-  """
-  The estimated destination of the item being drug
-  """
-  targetId: ID
-
-  """
-  horizontal distance from the top left of the target
-  """
-  targetOffsetX: Float
-
-  """
-  vertical distance from the top left of the target
-  """
-  targetOffsetY: Float
-
-  """
-  the left of the source, relative to the client window
-  """
-  clientX: Float
-
-  """
-  the top of the source, relative to the client window
-  """
-  clientY: Float
-}
-
-"""
-The possible places a reflection can be dropped
-"""
-enum DragReflectionDropTargetTypeEnum {
-  REFLECTION_GROUP
-  REFLECTION_GRID
-}
-
-"""
-Return object for EndRetrospectivePayload
-"""
-union EndRetrospectivePayload = ErrorPayload | EndRetrospectiveSuccess
-
-type EndRetrospectiveSuccess {
-  """
-  true if the meeting was killed (ended before reaching last stage)
-  """
-  isKill: Boolean!
-  team: Team!
-  meeting: RetrospectiveMeeting!
-
-  """
-  The ID of the suggestion to try a retro meeting, if tried
-  """
-  removedSuggestedActionId: ID
-  removedTaskIds: [ID!]!
-
-  """
-  An event that is important to the viewer, e.g. an ended meeting
-  """
-  timelineEvent: TimelineEvent!
-}
-
-"""
-Return object for FlagReadyToAdvancePayload
-"""
-union FlagReadyToAdvancePayload = ErrorPayload | FlagReadyToAdvanceSuccess
-
-type FlagReadyToAdvanceSuccess {
-  """
-  the meeting with the updated readyCount
-  """
-  meeting: NewMeeting!
-
-  """
-  the stage with the updated readyCount
-  """
-  stage: NewMeetingStage!
-}
-
-type InactivateUserPayload {
-  error: StandardMutationError
-
-  """
-  The user that has been inactivated
-  """
-  user: User
-}
-
-type InvalidateSessionsPayload {
-  error: StandardMutationError
-
-  """
-  The new, only valid auth token
-  """
-  authToken: ID
-}
-
-type InviteToTeamPayload {
-  error: StandardMutationError
-
-  """
-  The team the inviter is inviting the invitee to
-  """
-  team: Team
-
-  """
-  A list of email addresses the invitations were sent to
-  """
-  invitees: [Email!]
-
-  """
-  the notification ID if this payload is sent to a subscriber, else null
-  """
-  teamInvitationNotificationId: ID
-
-  """
-  The notification sent to the invitee if they are a parabol user
-  """
-  teamInvitationNotification: NotificationTeamInvitation
-
-  """
-  the `invite your team` suggested action that was removed, if any
-  """
-  removedSuggestedActionId: ID
-}
-
-type MovePokerTemplateDimensionPayload {
-  error: StandardMutationError
-  dimension: TemplateDimension
-}
-
-type MoveReflectTemplatePromptPayload {
-  error: StandardMutationError
-  prompt: ReflectPrompt
-}
-
-type NavigateMeetingPayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-
-  """
-  The stage that the facilitator is now on
-  """
-  facilitatorStage: NewMeetingStage
-
-  """
-  The stage that the facilitator left
-  """
-  oldFacilitatorStage: NewMeetingStage
-
-  """
-  Additional details triggered by completing certain phases
-  """
-  phaseComplete: PhaseCompletePayload
-
-  """
-  The stages that were unlocked by navigating
-  """
-  unlockedStages: [NewMeetingStage!]
-}
-
-type PhaseCompletePayload {
-  """
-  payload provided if the retro reflect phase was completed
-  """
-  reflect: ReflectPhaseCompletePayload
-
-  """
-  payload provided if the retro grouping phase was completed
-  """
-  group: GroupPhaseCompletePayload
-
-  """
-  payload provided if the retro voting phase was completed
-  """
-  vote: VotePhaseCompletePayload
-}
-
-type ReflectPhaseCompletePayload {
-  """
-  a list of empty reflection groups to remove
-  """
-  emptyReflectionGroupIds: [ID!]!
-
-  """
-  The grouped reflections
-  """
-  reflectionGroups: [RetroReflectionGroup!]!
-}
-
-type GroupPhaseCompletePayload {
-  """
-  a list of empty reflection groups to remove
-  """
-  emptyReflectionGroupIds: [ID!]!
-
-  """
-  the current meeting
-  """
-  meeting: RetrospectiveMeeting!
-
-  """
-  a list of updated reflection groups
-  """
-  reflectionGroups: [RetroReflectionGroup]
-}
-
-type VotePhaseCompletePayload {
-  """
-  the current meeting
-  """
-  meeting: RetrospectiveMeeting
-}
-
-type NewMeetingCheckInPayload {
-  error: StandardMutationError
-  meetingMember: MeetingMember
-  meeting: NewMeeting
-}
-
-type PayLaterPayload {
-  error: StandardMutationError
-
-  """
-  the ids of the meetings that were showing conversion modals
-  """
-  meetingId: ID
-
-  """
-  the meetings that were showing conversion modals
-  """
-  meeting: NewMeeting
-}
-
-"""
-Return object for PersistJiraSearchQueryPayload
-"""
-union PersistJiraSearchQueryPayload = ErrorPayload | PersistJiraSearchQuerySuccess
-
-type PersistJiraSearchQuerySuccess {
-  """
-  The newly created auth
-  """
-  atlassianIntegration: AtlassianIntegration
-}
-
-input JiraSearchQueryInput {
-  """
-  The query string, either simple or JQL depending on the isJQL flag
-  """
-  queryString: String!
-
-  """
-  true if the queryString is JQL, else false
-  """
-  isJQL: Boolean!
-
-  """
-  The list of project keys selected as a filter. null if not set
-  """
-  projectKeyFilters: [ID!]
-
-  """
-  true if this query should be deleted
-  """
-  isRemove: Boolean
-}
-
-type PushInvitationPayload {
-  error: StandardMutationError
-  user: User
-  meetingId: ID
-  team: Team
-}
-
-type PromoteNewMeetingFacilitatorPayload {
-  error: StandardMutationError
-
-  """
-  The meeting in progress
-  """
-  meeting: NewMeeting
-  facilitatorStage: NewMeetingStage
-
-  """
-  The old meeting facilitator
-  """
-  oldFacilitator: User
-}
-
-type PromoteToTeamLeadPayload {
-  error: StandardMutationError
-  team: Team
-  oldLeader: TeamMember
-  newLeader: TeamMember
-}
-
-type ReflectTemplatePromptUpdateDescriptionPayload {
-  error: StandardMutationError
-  prompt: ReflectPrompt
-}
-
-type PokerTemplateDimensionUpdateDescriptionPayload {
-  error: StandardMutationError
-  dimension: TemplateDimension
-}
-
-type ReflectTemplatePromptUpdateGroupColorPayload {
-  error: StandardMutationError
-  prompt: ReflectPrompt
-}
-
-type RemoveAgendaItemPayload {
-  error: StandardMutationError
-  agendaItem: AgendaItem
-  meetingId: ID
-
-  """
-  The meeting with the updated agenda item, if any
-  """
-  meeting: NewMeeting
-}
-
-type RemoveAtlassianAuthPayload {
-  error: StandardMutationError
-  teamId: ID
-
-  """
-  The team member with the updated auth
-  """
-  teamMember: TeamMember
-
-  """
-  The user with updated atlassianAuth
-  """
-  user: User
-}
-
-type RemoveGitHubAuthPayload {
-  error: StandardMutationError
-  teamId: ID
-
-  """
-  The team member with the updated auth
-  """
-  teamMember: TeamMember
-
-  """
-  The user with updated githubAuth
-  """
-  user: User
-}
-
-type RemoveOrgUserPayload {
-  error: StandardMutationError
-
-  """
-  The organization the user was removed from
-  """
-  organization: Organization
-
-  """
-  The teams the user was removed from
-  """
-  teams: [Team!]
-
-  """
-  The teamMembers removed
-  """
-  teamMembers: [TeamMember!]
-
-  """
-  The tasks that were archived or reassigned
-  """
-  updatedTasks: [Task!]
-
-  """
-  The user removed from the organization
-  """
-  user: User
-
-  """
-  The notifications for each team the user was kicked out of
-  """
-  kickOutNotifications: [NotifyKickedOut!]
-
-  """
-  The organization member that got removed
-  """
-  removedOrgMember: OrganizationUser
-  organizationUserId: String
-}
-
-"""
-A notification sent to someone who was just kicked off a team
-"""
-type NotifyKickedOut implements Notification {
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-
-  """
-  the user that evicted recipient
-  """
-  evictor: User!
-
-  """
-  The name of the team the user is joining
-  """
-  teamName: String!
-
-  """
-  The teamId the user was kicked out of
-  """
-  teamId: ID!
-
-  """
-  The team the task is on
-  """
-  team: Team!
-}
-
-type RemovePokerTemplatePayload {
-  error: StandardMutationError
-  pokerTemplate: PokerTemplate
-  pokerMeetingSettings: PokerMeetingSettings
-}
-
-type RemoveReflectTemplatePayload {
-  error: StandardMutationError
-  reflectTemplate: ReflectTemplate
-  retroMeetingSettings: RetrospectiveMeetingSettings
-}
-
-type RemoveReflectTemplatePromptPayload {
-  error: StandardMutationError
-  reflectTemplate: ReflectTemplate
-  prompt: ReflectPrompt
-}
-
-type RemovePokerTemplateDimensionPayload {
-  error: StandardMutationError
-  pokerTemplate: PokerTemplate
-  dimension: TemplateDimension
-}
-
-"""
-Return object for RenameMeetingPayload
-"""
-union RenameMeetingPayload = ErrorPayload | RenameMeetingSuccess
-
-type RenameMeetingSuccess {
-  """
-  the renamed meeting
-  """
-  meeting: NewMeeting!
-}
-
-type RenameMeetingTemplatePayload {
-  error: StandardMutationError
-  meetingTemplate: MeetingTemplate
-}
-
-type RenameReflectTemplatePromptPayload {
-  error: StandardMutationError
-  prompt: ReflectPrompt
-}
-
-type RenamePokerTemplateDimensionPayload {
-  error: StandardMutationError
-  dimension: TemplateDimension
-}
-
-type RenamePokerTemplateScalePayload {
-  error: StandardMutationError
-  scale: TemplateScale
-}
-
-type RemovePokerTemplateScalePayload {
-  error: StandardMutationError
-  scale: TemplateScale
-
-  """
-  A list of dimensions that were using the archived scale
-  """
-  dimensions: [TemplateDimension!]!
-}
-
-type RemovePokerTemplateScaleValuePayload {
-  error: StandardMutationError
-  scale: TemplateScale
-}
-
-type RemoveReflectionPayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-  reflection: RetroReflection
-
-  """
-  The stages that were unlocked by navigating
-  """
-  unlockedStages: [NewMeetingStage!]
-}
-
-type RemoveSlackAuthPayload {
-  error: StandardMutationError
-
-  """
-  The ID of the authorization removed
-  """
-  authId: ID
-  teamId: ID
-
-  """
-  The user with updated slackAuth
-  """
-  user: User
-}
-
-type RemoveTeamMemberPayload {
-  error: StandardMutationError
-
-  """
-  The team member removed
-  """
-  teamMember: TeamMember
-
-  """
-  The team the team member was removed from
-  """
-  team: Team
-
-  """
-  The tasks that got reassigned
-  """
-  updatedTasks: [Task!]
-
-  """
-  The user removed from the team
-  """
-  user: User
-
-  """
-  A notification if you were kicked out by the team leader
-  """
-  kickOutNotification: NotifyKickedOut
-}
-
-type ResetPasswordPayload {
-  error: StandardMutationError
-
-  """
-  The new auth token
-  """
-  authToken: ID
-  userId: ID
-
-  """
-  the user that changed their password
-  """
-  user: User
-}
-
-type ResetRetroMeetingToGroupStagePayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-}
-
-type SelectTemplatePayload {
-  error: StandardMutationError
-  meetingSettings: TeamMeetingSettings
-}
-
-"""
-Return object for SetAppLocationPayload
-"""
-union SetAppLocationPayload = ErrorPayload | SetAppLocationSuccess
-
-type SetAppLocationSuccess {
-  """
-  the user with the updated location
-  """
-  user: User!
-}
-
-type SetMeetingSettingsPayload {
-  error: StandardMutationError
-  settings: TeamMeetingSettings
-}
-
-"""
-Return object for SetDefaultSlackChannelPayload
-"""
-union SetDefaultSlackChannelPayload = ErrorPayload | SetDefaultSlackChannelSuccess
-
-type SetDefaultSlackChannelSuccess {
-  """
-  The id of the slack channel that is now the default slack channel
-  """
-  slackChannelId: ID!
-
-  """
-  The team member with the updated slack channel
-  """
-  teamMember: TeamMember!
-}
-
-type SetPhaseFocusPayload {
-  error: StandardMutationError
-  meeting: RetrospectiveMeeting!
-  reflectPhase: ReflectPhase!
-}
-
-type SetStageTimerPayload {
-  error: StandardMutationError
-
-  """
-  The updated stage
-  """
-  stage: NewMeetingStage
-}
-
-type SetSlackNotificationPayload {
-  error: StandardMutationError
-  slackNotifications: [SlackNotification!]
-
-  """
-  The user with updated slack notifications
-  """
-  user: User
-}
-
-type StartDraggingReflectionPayload {
-  error: StandardMutationError
-
-  """
-  The proposed start/end of a drag. Subject to race conditions, it is up to the client to decide to accept or ignore
-  """
-  remoteDrag: RemoteReflectionDrag
-  meeting: NewMeeting
-  meetingId: ID
-  reflection: RetroReflection
-  reflectionId: ID
-  teamId: ID
-}
-
-"""
-Return object for StartSprintPokerPayload
-"""
-union StartSprintPokerPayload = ErrorPayload | StartSprintPokerSuccess
-
-type StartSprintPokerSuccess {
-  meetingId: ID!
-  meeting: PokerMeeting!
-  team: Team!
-  teamId: ID!
-  hasGcalError: Boolean
-}
-
-"""
-Return object for SetTaskHighlightPayload
-"""
-union SetTaskHighlightPayload = ErrorPayload | SetTaskHighlightSuccess
-
-type SetTaskHighlightSuccess {
-  """
-  Meeting where the task is highlighted
-  """
-  meetingId: ID!
-
-  """
-  Task which highlight changed
-  """
-  taskId: ID!
-
-  """
-  Task which highlight changed
-  """
-  task: Task!
-}
-
-type UpdateAgendaItemPayload {
-  agendaItem: AgendaItem
-  meetingId: ID
-
-  """
-  The meeting with the updated agenda item, if any
-  """
-  meeting: NewMeeting
-  error: StandardMutationError
-}
-
-input UpdateAgendaItemInput {
-  """
-  The unique agenda item ID, composed of a teamId::shortid
-  """
-  id: ID!
-
-  """
-  The content of the agenda item
-  """
-  content: String
-
-  """
-  True if agenda item has been pinned
-  """
-  pinned: Boolean
-
-  """
-  True if not processed or deleted
-  """
-  isActive: Boolean
-
-  """
-  The sort order of the agenda item in the list
-  """
-  sortOrder: Float
-}
-
-"""
-Return object for UpdateCommentContentPayload
-"""
-union UpdateCommentContentPayload = ErrorPayload | UpdateCommentContentSuccess
-
-type UpdateCommentContentSuccess {
-  """
-  the comment with updated content
-  """
-  comment: Comment!
-}
-
-type OldUpdateCreditCardPayload {
-  error: StandardMutationError
-
-  """
-  The organization that received the updated credit card
-  """
-  organization: Organization
-
-  """
-  The teams that are now paid up
-  """
-  teamsUpdated: [Team]
-}
-
-type UpdatePokerTemplateDimensionScalePayload {
-  error: StandardMutationError
-  dimension: TemplateDimension
-}
-
-type UpdatePokerTemplateScaleValuePayload {
-  error: StandardMutationError
-  scale: TemplateScale
-}
-
-"""
-A value for a scale
-"""
-input TemplateScaleInput {
-  """
-  The color used to visually group a scale value
-  """
-  color: String!
-
-  """
-  The label for this value, e.g., XS, M, L
-  """
-  label: String!
-}
-
-type UpdateNewCheckInQuestionPayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-}
-
-input UpdateDragLocationInput {
-  id: ID!
-  clientHeight: Float!
-  clientWidth: Float!
-  meetingId: ID!
-
-  """
-  The primary key of the item being drug
-  """
-  sourceId: ID!
-
-  """
-  The estimated destination of the item being drug
-  """
-  targetId: ID
-
-  """
-  The teamId to broadcast the message to
-  """
-  teamId: ID!
-
-  """
-  horizontal distance from the top left of the target
-  """
-  targetOffsetX: Float
-
-  """
-  vertical distance from the top left of the target
-  """
-  targetOffsetY: Float
-
-  """
-  the left of the source, relative to the client window
-  """
-  clientX: Float
-
-  """
-  the top of the source, relative to the client window
-  """
-  clientY: Float
-}
-
-"""
-Return object for UpdatePokerScopePayload
-"""
-union UpdatePokerScopePayload = ErrorPayload | UpdatePokerScopeSuccess
-
-type UpdatePokerScopeSuccess {
-  """
-  The meeting with the updated estimate phases
-  """
-  meeting: PokerMeeting!
-
-  """
-  The estimate stages added to the meeting
-  """
-  newStages: [EstimateStage!]!
-}
-
-input UpdatePokerScopeItemInput {
-  """
-  The location of the single source of truth (e.g. a jira-integrated parabol task would be "jira")
-  """
-  service: TaskServiceEnum!
-
-  """
-  If vanilla parabol task, taskId. If integrated parabol task, integrationHash
-  """
-  serviceTaskId: ID!
-
-  """
-  The action to perform
-  """
-  action: AddOrDeleteEnum!
-}
-
-"""
-Option to add or delete
-"""
-enum AddOrDeleteEnum {
-  ADD
-  DELETE
-}
-
-type UpdateReflectionContentPayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-  reflection: RetroReflection
-}
-
-type UpdateReflectionGroupTitlePayload {
-  error: StandardMutationError
-  meeting: NewMeeting
-  reflectionGroup: RetroReflectionGroup
-}
-
-"""
-Return object for UpdateRetroMaxVotesPayload
-"""
-union UpdateRetroMaxVotesPayload = ErrorPayload | UpdateRetroMaxVotesSuccess
-
-type UpdateRetroMaxVotesSuccess {
-  """
-  the meeting with the updated max votes
-  """
-  meeting: RetrospectiveMeeting!
-}
-
-type UpdateTaskPayload {
-  error: StandardMutationError
-  task: Task
-
-  """
-  If a task was just turned private, this its ID, else null
-  """
-  privatizedTaskId: ID
-  addedNotification: NotifyTaskInvolves
-}
-
-input UpdateTaskInput {
-  """
-  The task id
-  """
-  id: ID!
-  content: String
-  sortOrder: Float
-  status: TaskStatusEnum
-
-  """
-  userId, the owner of the task. This can be null if the task is not assigned to anyone.
-  """
-  userId: ID
-}
-
-type UpdateTaskDueDatePayload {
-  error: StandardMutationError
-  task: Task
-}
-
-type UpdateTeamNamePayload {
-  error: StandardMutationError
-  team: Team
-}
-
-input UpdatedTeamInput {
-  id: ID!
-
-  """
-  The name of the team
-  """
-  name: String!
-
-  """
-  A link to the team’s profile image.
-  """
-  picture: URL
-}
-
-"""
-Return object for UpdateTemplateScopePayload
-"""
-union UpdateTemplateScopePayload = ErrorPayload | UpdateTemplateScopeSuccess
-
-type UpdateTemplateScopeSuccess {
-  """
-  the template that was just updated, if downscoped, does not provide whole story
-  """
-  template: MeetingTemplate!
-
-  """
-  if downscoping a previously used template, this will be the replacement
-  """
-  clonedTemplate: MeetingTemplate
-
-  """
-  The settings that contain the teamTemplates array that was modified
-  """
-  settings: TeamMeetingSettings!
-}
-
-type OldUpgradeToTeamTierPayload {
-  error: StandardMutationError
-
-  """
-  The new Team Org
-  """
-  organization: Organization
-
-  """
-  The updated teams under the org
-  """
-  teams: [Team!]
-
-  """
-  the ids of the meetings that were showing conversion modals
-  """
-  meetingIds: [ID!]
-
-  """
-  the meetings that were showing conversion modals
-  """
-  meetings: [NewMeeting!]
-}
-
-scalar File
-
-type VoteForReflectionGroupPayload {
-  error: StandardMutationError
-  meeting: RetrospectiveMeeting
-  meetingMember: RetrospectiveMeetingMember
-  reflectionGroup: RetroReflectionGroup
-
-  """
-  The stages that were locked or unlocked by having at least 1 vote
-  """
-  unlockedStages: [NewMeetingStage!]
-}
-
-"""
-Return object for VoteForPokerStoryPayload
-"""
-union VoteForPokerStoryPayload = ErrorPayload | VoteForPokerStorySuccess
-
-type VoteForPokerStorySuccess {
-  """
-  The stage that holds the updated scores
-  """
-  stage: EstimateStage!
-}
-
-"""
-Return object for PokerRevealVotesPayload
-"""
-union PokerRevealVotesPayload = ErrorPayload | PokerRevealVotesSuccess
-
-type PokerRevealVotesSuccess {
-  """
-  The stage that holds the updated isVoting step
-  """
-  stage: EstimateStage!
-}
-
-"""
-Return object for PokerResetDimensionPayload
-"""
-union PokerResetDimensionPayload = ErrorPayload | PokerResetDimensionSuccess
-
-type PokerResetDimensionSuccess {
-  """
-  The stage that holds the updated isVoting step
-  """
-  stage: EstimateStage!
-}
-
-"""
-Return object for PokerAnnounceDeckHoverPayload
-"""
-union PokerAnnounceDeckHoverPayload = ErrorPayload | PokerAnnounceDeckHoverSuccess
-
-type PokerAnnounceDeckHoverSuccess {
-  meetingId: ID!
-  stageId: ID!
-  userId: ID!
-  user: User!
-  isHover: Boolean!
-
-  """
-  The stage that holds the updated scores
-  """
-  stage: EstimateStage!
-}
-
-"""
-Return object for MovePokerTemplateScaleValuePayload
-"""
-union MovePokerTemplateScaleValuePayload = ErrorPayload | MovePokerTemplateScaleValueSuccess
-
-type MovePokerTemplateScaleValueSuccess {
-  """
-  The scale after values are moved
-  """
-  scale: TemplateScale!
-}
-
-"""
-Return object for JoinMeetingPayload
-"""
-union JoinMeetingPayload = ErrorPayload | JoinMeetingSuccess
-
-type JoinMeetingSuccess {
-  meetingId: ID!
-
-  """
-  The meeting with the updated stages, if any
-  """
-  meeting: NewMeeting!
-}
-
-"""
-Return object for SetPokerSpectatePayload
-"""
-union SetPokerSpectatePayload = ErrorPayload | SetPokerSpectateSuccess
-
-type SetPokerSpectateSuccess {
-  meetingId: ID!
-  userId: ID!
-
-  """
-  The meeting member with the updated isSpectating value
-  """
-  meetingMember: PokerMeetingMember!
-
-  """
-  The stages that were updated if the viewer voted and then changed to spectating
-  """
-  updatedStages: [EstimateStage!]!
-}
-
-"""
-Return object for PersistGitHubSearchQueryPayload
-"""
-union PersistGitHubSearchQueryPayload = ErrorPayload | PersistGitHubSearchQuerySuccess
-
-type PersistGitHubSearchQuerySuccess {
-  """
-  The affected teamId
-  """
-  teamId: ID!
-
-  """
-  The affected userId
-  """
-  userId: ID!
-
-  """
-  The auth with the updated search queries
-  """
-  githubIntegration: GitHubIntegration!
-}
-
-"""
-Return object for SetTaskEstimatePayload
-"""
-union SetTaskEstimatePayload = ErrorPayload | SetTaskEstimateSuccess
-
-type SetTaskEstimateSuccess {
-  task: Task!
-
-  """
-  The stage that holds the updated finalScore, if meetingId was provided
-  """
-  stage: EstimateStage
-}
-
-input TaskEstimateInput {
-  taskId: ID!
-
-  """
-  The new estimate value
-  """
-  value: String!
-
-  """
-  The name of the estimate, e.g. Story Points
-  """
-  dimensionName: String!
-  meetingId: ID
-}
-
-"""
-Return object for ToggleTeamDrawerPayload
-"""
-union ToggleTeamDrawerPayload = ErrorPayload | ToggleTeamDrawerSuccess
-
-type ToggleTeamDrawerSuccess {
-  teamMember: TeamMember!
-}
-
-"""
-Return object for UpdateGitHubDimensionFieldPayload
-"""
-union UpdateGitHubDimensionFieldPayload = ErrorPayload | UpdateGitHubDimensionFieldSuccess
-
-type UpdateGitHubDimensionFieldSuccess {
-  teamId: ID!
-  meetingId: ID!
-  team: Team!
-
-  """
-  The poker meeting the field was updated from
-  """
-  meeting: PokerMeeting!
-}
-
-"""
-Return object for CreatePollPayload
-"""
-union CreatePollPayload = ErrorPayload | CreatePollSuccess
-
-type CreatePollSuccess {
-  """
-  Poll id in a format of `poll:idGeneratedByDatabase`
-  """
-  pollId: ID!
-
-  """
-  the poll just created
-  """
-  poll: Poll!
-}
-
-"""
-A poll created during the meeting
-"""
-type Poll implements Threadable {
-  """
-  Poll id in a format of `poll:idGeneratedByDatabase`
-  """
-  id: ID!
-
-  """
-  The rich text body of the item
-  """
-  content: String!
-
-  """
-  The timestamp the item was created
-  """
-  createdAt: DateTime!
-
-  """
-  The userId that created the item
-  """
-  createdBy: ID
-
-  """
-  The user that created the item
-  """
-  createdByUser: User!
-
-  """
-  the replies to this threadable item
-  """
-  replies: [Threadable!]!
-
-  """
-  The FK of the discussion this task was created in. Null if task was not created in a discussion
-  """
-  discussionId: ID
-
-  """
-  the parent, if this threadable is a reply, else null
-  """
-  threadParentId: ID
-
-  """
-  the order of this threadable, relative to threadParentId
-  """
-  threadSortOrder: Float
-
-  """
-  The timestamp the item was updated
-  """
-  updatedAt: DateTime!
-
-  """
-  The foreign key for the meeting the poll was created in
-  """
-  meetingId: ID
-
-  """
-  The id of the team (indexed)
-  """
-  teamId: ID!
-
-  """
-  The team this poll belongs to
-  """
-  team: Team!
-
-  """
-  Poll title
-  """
-  title: String!
-
-  """
-  A list of all the poll options related to this poll
-  """
-  options: [PollOption!]!
-}
-
-"""
-Poll options for a given poll
-"""
-type PollOption {
-  """
-  Poll option id in a format of `pollOption:idGeneratedByDatabase`
-  """
-  id: ID!
-
-  """
-  The timestamp the item was created
-  """
-  createdAt: DateTime!
-
-  """
-  The timestamp the item was updated
-  """
-  updatedAt: DateTime!
-
-  """
-  The foreign key of the poll this option belongs to in a format of `poll:idGeneratedByDatabase`
-  """
-  pollId: ID!
-
-  """
-  The poll this option belongs to
-  """
-  poll: Poll!
-
-  """
-  The ids of the users who voted for this option
-  """
-  voteUserIds: [ID!]!
-
-  """
-  Poll option title
-  """
-  title: String!
-}
-
-input CreatePollInput {
-  """
-  Foreign key for the discussion this was created in
-  """
-  discussionId: ID!
-
-  """
-  The order of this threadable
-  """
-  threadSortOrder: Float!
-
-  """
-  Poll question
-  """
-  title: String!
-
-  """
-  All the poll voting options
-  """
-  options: [PollOptionInput!]!
-}
-
-input PollOptionInput {
-  """
-  Poll option title
-  """
-  title: String!
-}
-
-"""
-Return object for AddIntegrationProviderPayload
-"""
-union AddIntegrationProviderPayload = ErrorPayload | AddIntegrationProviderSuccess
-
-type AddIntegrationProviderSuccess {
-  """
-  The provider that was added
-  """
-  provider: IntegrationProvider!
-
-  """
-  Id of the team with the updated Integration Provider
-  """
-  teamId: ID!
-
-  """
-  The team with the updated Integration Provider
-  """
-  team: Team!
-}
-
-"""
-An Integration Provider configuration
-"""
-input AddIntegrationProviderInput {
-  """
-  The team that the token is linked to
-  """
-  teamId: ID!
-
-  """
-  The service this provider is associated with
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  The kind of token used by this provider
-  """
-  authStrategy: IntegrationProviderAuthStrategyEnum!
-
-  """
-  The scope this provider configuration was created at (org-wide, or by the team)
-  """
-  scope: IntegrationProviderEditableScopeEnum!
-
-  """
-  Webhook provider metadata, has to be non-null if token type is webhook, refactor once we get https://github.com/graphql/graphql-spec/pull/825
-  """
-  webhookProviderMetadataInput: IntegrationProviderMetadataInputWebhook
-
-  """
-  OAuth1 provider metadata, has to be non-null if token type is OAuth1, refactor once we get https://github.com/graphql/graphql-spec/pull/825
-  """
-  oAuth1ProviderMetadataInput: IntegrationProviderMetadataInputOAuth1
-
-  """
-  OAuth2 provider metadata, has to be non-null if token type is OAuth2, refactor once we get https://github.com/graphql/graphql-spec/pull/825
-  """
-  oAuth2ProviderMetadataInput: IntegrationProviderMetadataInputOAuth2
-}
-
-"""
-The scope this provider was created on by a user (excluding global scope)
-"""
-enum IntegrationProviderEditableScopeEnum {
-  org
-  team
-  global
-}
-
-"""
-Webhook provider metadata
-"""
-input IntegrationProviderMetadataInputWebhook {
-  """
-  Webhook URL to be used by the provider
-  """
-  webhookUrl: URL!
-}
-
-"""
-OAuth1 provider metadata
-"""
-input IntegrationProviderMetadataInputOAuth1 {
-  """
-  The base URL used to access the provider
-  """
-  serverBaseUrl: URL!
-
-  """
-  The client key to give to the provider
-  """
-  consumerKey: ID!
-
-  """
-  Secret or Private key of the generate private/public key pair
-  """
-  consumerSecret: String!
-}
-
-"""
-OAuth2 provider metadata
-"""
-input IntegrationProviderMetadataInputOAuth2 {
-  """
-  The base URL used to access the provider
-  """
-  serverBaseUrl: URL!
-
-  """
-  The client id to give to the provider
-  """
-  clientId: String!
-
-  """
-  The client id to give to the provider
-  """
-  clientSecret: String!
-}
-
-"""
-Return object for UpdateIntegrationProviderPayload
-"""
-union UpdateIntegrationProviderPayload = ErrorPayload | UpdateIntegrationProviderSuccess
-
-type UpdateIntegrationProviderSuccess {
-  """
-  The provider that was updated
-  """
-  provider: IntegrationProvider!
-
-  """
-  The team member with the updated auth
-  """
-  teamMember: TeamMember!
-
-  """
-  The user who updated TeamMemberIntegrationAuth object
-  """
-  user: User!
-}
-
-"""
-An Integration Provider configuration
-"""
-input UpdateIntegrationProviderInput {
-  """
-  The the id of the Integration Provider to update
-  """
-  id: ID!
-
-  """
-  The new scope for this provider (org, team)
-  """
-  scope: IntegrationProviderEditableScopeEnum
-
-  """
-  Webhook provider metadata, has to be non-null if token type is webhook, refactor once we get https://github.com/graphql/graphql-spec/pull/825
-  """
-  webhookProviderMetadataInput: IntegrationProviderMetadataInputWebhook
-
-  """
-  OAuth2 provider metadata, has to be non-null if token type is OAuth2, refactor once we get https://github.com/graphql/graphql-spec/pull/825
-  """
-  oAuth2ProviderMetadataInput: IntegrationProviderMetadataInputOAuth2
-}
-
-type AddReactjiToReflectionSuccess {
-  """
-  the reflection with the updated list of reactjis
-  """
-  reflection: RetroReflection!
-}
-
-type UpdateDragLocationPayload {
-  """
-  The drag as sent from the team member
-  """
-  remoteDrag: RemoteReflectionDrag
-  userId: ID!
-}
-
-type AddNewFeaturePayload {
-  """
-  the new feature broadcast
-  """
-  newFeature: NewFeatureBroadcast
-}
-
-type DisconnectSocketPayload {
-  """
-  The user that disconnected
-  """
-  user: User
-}
-
-type MeetingStageTimeLimitPayload {
-  """
-  The new notification that was just created
-  """
-  notification: NotificationMeetingStageTimeLimitEnd!
-}
-
-"""
-A notification sent to a facilitator that the stage time limit has ended
-"""
-type NotificationMeetingStageTimeLimitEnd implements Notification & TeamNotification {
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-
-  """
-  FK
-  """
-  meetingId: ID!
-
-  """
-  The meeting that had the time limit expire
-  """
-  meeting: NewMeeting!
-}
-
-type StripeFailPaymentPayload {
-  error: StandardMutationError
-  organization: Organization
-
-  """
-  The notification to a billing leader stating the payment was rejected
-  """
-  notification: NotifyPaymentRejected!
-}
-
-"""
-A notification sent to a user when their payment has been rejected
-"""
-type NotifyPaymentRejected implements Notification {
-  organization: Organization!
-
-  """
-  A shortid for the notification
-  """
-  id: ID!
-
-  """
-  UNREAD if new, READ if viewer has seen it, CLICKED if viewed clicked it
-  """
-  status: NotificationStatusEnum!
-
-  """
-  The datetime to activate the notification & send it to the client
-  """
-  createdAt: DateTime!
-  type: NotificationEnum!
-
-  """
-  *The userId that should see this notification
-  """
-  userId: ID!
-}
-
-"""
-An auth token provided by Parabol to the client
-"""
-type AuthTokenPayload {
-  """
-  The encoded JWT
-  """
-  id: ID!
-}
-
-type RenamePokerTemplatePayload {
-  error: StandardMutationError
-  pokerTemplate: PokerTemplate
-}
diff --git a/packages/server/graphql/public/typeDefs/github.graphql b/packages/server/graphql/public/typeDefs/_xGitHub.graphql
similarity index 100%
rename from packages/server/graphql/public/typeDefs/github.graphql
rename to packages/server/graphql/public/typeDefs/_xGitHub.graphql
diff --git a/packages/server/graphql/public/typeDefs/gitlab.graphql b/packages/server/graphql/public/typeDefs/_xGitLab.graphql
similarity index 100%
rename from packages/server/graphql/public/typeDefs/gitlab.graphql
rename to packages/server/graphql/public/typeDefs/_xGitLab.graphql
diff --git a/packages/server/graphql/public/typeDefs/acceptRequestToJoinDomain.graphql b/packages/server/graphql/public/typeDefs/acceptRequestToJoinDomain.graphql
deleted file mode 100644
index bd7fe7b031f..00000000000
--- a/packages/server/graphql/public/typeDefs/acceptRequestToJoinDomain.graphql
+++ /dev/null
@@ -1,28 +0,0 @@
-extend type Mutation {
-  """
-  Adds the request user to multiple selected teams on the domain
-  """
-  acceptRequestToJoinDomain(
-    """
-    DomainJoinRequest id
-    """
-    requestId: ID!
-
-    """
-    Array of team ids
-    """
-    teamIds: [ID!]!
-  ): AcceptRequestToJoinDomainPayload!
-}
-
-"""
-Return value for acceptRequestToJoinDomain, which could be an error
-"""
-union AcceptRequestToJoinDomainPayload = ErrorPayload | AcceptRequestToJoinDomainSuccess
-
-type AcceptRequestToJoinDomainSuccess {
-  """
-  Viewer
-  """
-  viewer: User!
-}
diff --git a/packages/server/graphql/public/typeDefs/addApprovedOrganizationDomains.graphql b/packages/server/graphql/public/typeDefs/addApprovedOrganizationDomains.graphql
deleted file mode 100644
index 518d301f39f..00000000000
--- a/packages/server/graphql/public/typeDefs/addApprovedOrganizationDomains.graphql
+++ /dev/null
@@ -1,35 +0,0 @@
-extend type Mutation {
-  """
-  Restrict accepting team invites to a list of approved domains
-  """
-  addApprovedOrganizationDomains(
-    """
-    The organization ID
-    """
-    orgId: ID!
-
-    """
-    A list of domains or email addressed allowed to join the organization
-    """
-    emailDomains: [String!]!
-  ): AddApprovedOrganizationDomainsPayload!
-}
-
-union AddApprovedOrganizationDomainsPayload = ErrorPayload | AddApprovedOrganizationDomainsSuccess
-
-type AddApprovedOrganizationDomainsSuccess {
-  orgId: ID!
-
-  """
-  Organization with the updated approvals
-  """
-  organization: Organization!
-}
-
-extend type Organization {
-  """
-  A list of domains approved by the organization to join.
-  Empty if all domains are allowed
-  """
-  approvedDomains: [String!]!
-}
diff --git a/packages/server/graphql/public/typeDefs/addReactjiToReactable.graphql b/packages/server/graphql/public/typeDefs/addReactjiToReactable.graphql
deleted file mode 100644
index edf4952b266..00000000000
--- a/packages/server/graphql/public/typeDefs/addReactjiToReactable.graphql
+++ /dev/null
@@ -1,31 +0,0 @@
-extend type Mutation {
-  """
-  Add or remove a reactji from a reactable
-  """
-  addReactjiToReactable(
-    """
-    The id of the reactable
-    """
-    reactableId: ID!
-
-    """
-    the type of the
-    """
-    reactableType: ReactableEnum!
-
-    """
-    the id of the reactji to add
-    """
-    reactji: String!
-
-    """
-    If true, remove the reaction, else add it
-    """
-    isRemove: Boolean
-
-    """
-    The id of the meeting
-    """
-    meetingId: ID!
-  ): AddReactjiToReactablePayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/addTeamMemberIntegrationAuth.graphql b/packages/server/graphql/public/typeDefs/addTeamMemberIntegrationAuth.graphql
deleted file mode 100644
index f121abe6032..00000000000
--- a/packages/server/graphql/public/typeDefs/addTeamMemberIntegrationAuth.graphql
+++ /dev/null
@@ -1,51 +0,0 @@
-extend type Mutation {
-  """
-  Add an integration authorization for a specific team member
-  """
-  addTeamMemberIntegrationAuth(
-    providerId: ID!
-    teamId: ID!
-
-    """
-    The OAuth2 code or personal access token. Null for webhook auth
-    """
-    oauthCodeOrPat: ID
-
-    """
-    OAuth1 token verifier
-    """
-    oauthVerifier: ID
-
-    """
-    The URL the OAuth2 token will be sent to. Null for webhook auth
-    """
-    redirectUri: URL
-  ): AddTeamMemberIntegrationAuthPayload!
-}
-
-"""
-Return object for AddTeamMemberIntegrationAuthPayload
-"""
-union AddTeamMemberIntegrationAuthPayload = ErrorPayload | AddTeamMemberIntegrationAuthSuccess
-
-type AddTeamMemberIntegrationAuthSuccess {
-  """
-  The auth that was just added
-  """
-  integrationAuth: TeamMemberIntegrationAuth!
-
-  """
-  The service this provider is associated with
-  """
-  service: IntegrationProviderServiceEnum!
-
-  """
-  The team member with the updated auth
-  """
-  teamMember: TeamMember!
-
-  """
-  The user who updated TeamMemberIntegrationAuth object
-  """
-  user: User!
-}
diff --git a/packages/server/graphql/public/typeDefs/addTranscriptionBot.graphql b/packages/server/graphql/public/typeDefs/addTranscriptionBot.graphql
deleted file mode 100644
index e9c5f47f53c..00000000000
--- a/packages/server/graphql/public/typeDefs/addTranscriptionBot.graphql
+++ /dev/null
@@ -1,18 +0,0 @@
-extend type Mutation {
-  """
-  Add the transcription bot to the Zoom meeting
-  """
-  addTranscriptionBot(meetingId: ID!, videoMeetingURL: String!): AddTranscriptionBotPayload!
-}
-
-"""
-Return value for addTranscriptionBot, which could be an error
-"""
-union AddTranscriptionBotPayload = ErrorPayload | AddTranscriptionBotSuccess
-
-type AddTranscriptionBotSuccess {
-  """
-  The Parabol meeting where the videoMeetingURL and recallBotId were added
-  """
-  meeting: RetrospectiveMeeting!
-}
diff --git a/packages/server/graphql/public/typeDefs/autogroup.graphql b/packages/server/graphql/public/typeDefs/autogroup.graphql
deleted file mode 100644
index ce1b49e2030..00000000000
--- a/packages/server/graphql/public/typeDefs/autogroup.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-extend type Mutation {
-  """
-  Creates suggested reflection groups using OpenAI
-  """
-  autogroup(meetingId: ID!): AutogroupPayload!
-}
-
-"""
-Return value for autogroup, which could be an error
-"""
-union AutogroupPayload = ErrorPayload | AutogroupSuccess
-
-type AutogroupSuccess {
-  meeting: RetrospectiveMeeting!
-}
diff --git a/packages/server/graphql/public/typeDefs/batchArchiveTasks.graphql b/packages/server/graphql/public/typeDefs/batchArchiveTasks.graphql
deleted file mode 100644
index 862a63407be..00000000000
--- a/packages/server/graphql/public/typeDefs/batchArchiveTasks.graphql
+++ /dev/null
@@ -1,27 +0,0 @@
-extend type Mutation {
-  """
-  Batch archive tasks
-  """
-  batchArchiveTasks(
-    """
-    ids of the tasks to archive
-    """
-    taskIds: [ID!]!
-  ): BatchArchiveTasksPayload!
-}
-
-"""
-Return value for batchArchiveTasks, which could be an error
-"""
-union BatchArchiveTasksPayload = ErrorPayload | BatchArchiveTasksSuccess
-
-type BatchArchiveTasksSuccess {
-  """
-  the id of achived tasks
-  """
-  archivedTaskIds: [ID!]
-  """
-  the archived tasks
-  """
-  archivedTasks: [Task!]
-}
diff --git a/packages/server/graphql/public/typeDefs/createImposterToken.graphql b/packages/server/graphql/public/typeDefs/createImposterToken.graphql
deleted file mode 100644
index b4fe2a5a618..00000000000
--- a/packages/server/graphql/public/typeDefs/createImposterToken.graphql
+++ /dev/null
@@ -1,30 +0,0 @@
-extend type Mutation {
-  """
-  for troubleshooting by admins, create a JWT for a given userId
-  """
-  createImposterToken(
-    """
-    The target userId to impersonate
-    """
-    userId: ID
-
-    """
-    The email address of the user to impersonate
-    """
-    email: Email
-  ): CreateImposterTokenPayload!
-}
-
-type CreateImposterTokenPayload {
-  error: StandardMutationError
-
-  """
-  The new JWT
-  """
-  authToken: ID
-
-  """
-  The user you have assumed
-  """
-  user: User
-}
diff --git a/packages/server/graphql/public/typeDefs/createStripeSubscription.graphql b/packages/server/graphql/public/typeDefs/createStripeSubscription.graphql
deleted file mode 100644
index 6a14944bd76..00000000000
--- a/packages/server/graphql/public/typeDefs/createStripeSubscription.graphql
+++ /dev/null
@@ -1,18 +0,0 @@
-extend type Mutation {
-  """
-  Create the Stripe subscription for the given org
-  """
-  createStripeSubscription(orgId: ID!, paymentMethodId: ID!): CreateStripeSubscriptionPayload!
-}
-
-"""
-Return value for createStripeSubscription, which could be an error
-"""
-union CreateStripeSubscriptionPayload = ErrorPayload | CreateStripeSubscriptionSuccess
-
-type CreateStripeSubscriptionSuccess {
-  """
-  The client secret from the Stripe subscription. Used for client-side retrieval using a publishable key.
-  """
-  stripeSubscriptionClientSecret: String!
-}
diff --git a/packages/server/graphql/public/typeDefs/generateGroups.graphql b/packages/server/graphql/public/typeDefs/generateGroups.graphql
deleted file mode 100644
index 3a35abcbbd4..00000000000
--- a/packages/server/graphql/public/typeDefs/generateGroups.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-"""
-The success response needed by the meeting subscription
-"""
-type GenerateGroupsSuccess {
-  meeting: RetrospectiveMeeting!
-}
diff --git a/packages/server/graphql/public/typeDefs/getTemplateSuggestion.graphql b/packages/server/graphql/public/typeDefs/getTemplateSuggestion.graphql
deleted file mode 100644
index f1a61a6413b..00000000000
--- a/packages/server/graphql/public/typeDefs/getTemplateSuggestion.graphql
+++ /dev/null
@@ -1,28 +0,0 @@
-extend type Mutation {
-  """
-  Ask the AI for a template suggestion
-  """
-  getTemplateSuggestion(
-    """
-    The question the user has for the AI
-    """
-    prompt: String!
-  ): GetTemplateSuggestionPayload!
-}
-
-"""
-Return value for getTemplateSuggestion, which could be an error
-"""
-union GetTemplateSuggestionPayload = ErrorPayload | GetTemplateSuggestionSuccess
-
-type GetTemplateSuggestionSuccess {
-  """
-  The template the AI suggested
-  """
-  suggestedTemplate: MeetingTemplate!
-
-  """
-  The explanation from the AI
-  """
-  explanation: String!
-}
diff --git a/packages/server/graphql/public/typeDefs/loginWithGoogle.graphql b/packages/server/graphql/public/typeDefs/loginWithGoogle.graphql
deleted file mode 100644
index 99fb567e99a..00000000000
--- a/packages/server/graphql/public/typeDefs/loginWithGoogle.graphql
+++ /dev/null
@@ -1,26 +0,0 @@
-extend type Mutation {
-  """
-  Sign up or login using Google
-  """
-  loginWithGoogle(
-    """
-    The code provided from the OAuth2 flow
-    """
-    code: ID!
-
-    """
-    optional pseudo id created before they were a user
-    """
-    pseudoId: ID
-
-    """
-    if present, the user is also joining a team
-    """
-    invitationToken: ID
-
-    """
-    query params on the login page, used to maybe add feature flag
-    """
-    params: String!
-  ): UserLogInPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/loginWithMicrosoft.graphql b/packages/server/graphql/public/typeDefs/loginWithMicrosoft.graphql
deleted file mode 100644
index 5ec6850562e..00000000000
--- a/packages/server/graphql/public/typeDefs/loginWithMicrosoft.graphql
+++ /dev/null
@@ -1,26 +0,0 @@
-extend type Mutation {
-  """
-  Sign up or login using Microsoft
-  """
-  loginWithMicrosoft(
-    """
-    The code provided from the OAuth2 flow
-    """
-    code: ID!
-
-    """
-    optional pseudo id created before they were a user
-    """
-    pseudoId: ID
-
-    """
-    if present, the user is also joining a team
-    """
-    invitationToken: ID
-
-    """
-    query params on the login page, used to maybe add feature flag
-    """
-    params: String!
-  ): UserLogInPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/loginWithPassword.graphql b/packages/server/graphql/public/typeDefs/loginWithPassword.graphql
deleted file mode 100644
index 8c5c0548842..00000000000
--- a/packages/server/graphql/public/typeDefs/loginWithPassword.graphql
+++ /dev/null
@@ -1,6 +0,0 @@
-extend type Mutation {
-  """
-  Login using an email address and password
-  """
-  loginWithPassword(email: ID!, password: String!): UserLogInPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/modifyCheckInQuestion.graphql b/packages/server/graphql/public/typeDefs/modifyCheckInQuestion.graphql
deleted file mode 100644
index 44d4ba066b8..00000000000
--- a/packages/server/graphql/public/typeDefs/modifyCheckInQuestion.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-enum ModifyType {
-  SERIOUS
-  FUNNY
-  EXCITING
-}
-
-extend type Mutation {
-  """
-  Describe the mutation here
-  """
-  modifyCheckInQuestion(
-    meetingId: ID!
-    checkInQuestion: String!
-    modifyType: ModifyType!
-  ): ModifyCheckInQuestionPayload!
-}
-
-"""
-Return value for modifyCheckInQuestion, which could be an error
-"""
-union ModifyCheckInQuestionPayload = ErrorPayload | ModifyCheckInQuestionSuccess
-
-type ModifyCheckInQuestionSuccess {
-  modifiedCheckInQuestion: String
-}
diff --git a/packages/server/graphql/public/typeDefs/persistIntegrationSearchQuery.graphql b/packages/server/graphql/public/typeDefs/persistIntegrationSearchQuery.graphql
deleted file mode 100644
index 99addd56f2f..00000000000
--- a/packages/server/graphql/public/typeDefs/persistIntegrationSearchQuery.graphql
+++ /dev/null
@@ -1,22 +0,0 @@
-extend type Mutation {
-  persistIntegrationSearchQuery(
-    teamId: ID!
-    service: IntegrationProviderServiceEnum!
-    providerId: ID
-    jiraServerSearchQuery: JiraServerSearchQueryInput
-  ): PersistIntegrationSearchQueryPayload!
-}
-
-input JiraServerSearchQueryInput {
-  queryString: String!
-  isJQL: Boolean!
-  projectKeyFilters: [ID!]!
-}
-
-type PersistIntegrationSearchQuerySuccess {
-  userId: ID
-  teamId: ID
-  jiraServerIntegration: JiraServerIntegration
-}
-
-union PersistIntegrationSearchQueryPayload = PersistIntegrationSearchQuerySuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql b/packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql
deleted file mode 100644
index 44039d7c1c1..00000000000
--- a/packages/server/graphql/public/typeDefs/removeApprovedOrganizationDomains.graphql
+++ /dev/null
@@ -1,29 +0,0 @@
-extend type Mutation {
-  """
-  Remove the approved domains for a given organization
-  """
-  removeApprovedOrganizationDomains(
-    """
-    The ID for the organization to remove the restriction from
-    """
-    orgId: ID!
-    """
-    The list of emails and/or domains to unrestrict from the org
-    """
-    emailDomains: [String!]!
-  ): RemoveApprovedOrganizationDomainsPayload!
-}
-
-"""
-Return value for removeApprovedOrganizationDomains, which could be an error
-"""
-union RemoveApprovedOrganizationDomainsPayload =
-  | ErrorPayload
-  | RemoveApprovedOrganizationDomainsSuccess
-
-type RemoveApprovedOrganizationDomainsSuccess {
-  """
-  The organization with updated restrictions
-  """
-  organization: Organization!
-}
diff --git a/packages/server/graphql/public/typeDefs/removeIntegrationSearchQuery.graphql b/packages/server/graphql/public/typeDefs/removeIntegrationSearchQuery.graphql
deleted file mode 100644
index eb44a8d69be..00000000000
--- a/packages/server/graphql/public/typeDefs/removeIntegrationSearchQuery.graphql
+++ /dev/null
@@ -1,23 +0,0 @@
-extend type Mutation {
-  """
-  Describe the mutation here
-  """
-  removeIntegrationSearchQuery(
-    """
-    integration search query ID
-    """
-    id: ID!
-    teamId: ID!
-  ): RemoveIntegrationSearchQueryPayload!
-}
-
-type RemoveIntegrationSearchQuerySuccess {
-  userId: ID
-  teamId: ID
-  jiraServerIntegration: JiraServerIntegration
-}
-
-"""
-Return value for removeIntegrationSearchQuery, which could be an error
-"""
-union RemoveIntegrationSearchQueryPayload = ErrorPayload | RemoveIntegrationSearchQuerySuccess
diff --git a/packages/server/graphql/public/typeDefs/removeTeamMemberIntegrationAuth.graphql b/packages/server/graphql/public/typeDefs/removeTeamMemberIntegrationAuth.graphql
deleted file mode 100644
index 17b0548d259..00000000000
--- a/packages/server/graphql/public/typeDefs/removeTeamMemberIntegrationAuth.graphql
+++ /dev/null
@@ -1,50 +0,0 @@
-extend type Mutation {
-  """
-  Remove the integrated auth for a given team member
-  """
-  removeTeamMemberIntegrationAuth(
-    """
-    The Integration Provider service name related to the token
-    """
-    service: IntegrationProviderServiceEnum!
-
-    """
-    The team id related to the token
-    """
-    teamId: ID!
-  ): RemoveTeamMemberIntegrationAuthPayload!
-}
-
-"""
-Return object for RemoveIntegrationProviderPayload
-"""
-union RemoveIntegrationProviderPayload = ErrorPayload | RemoveIntegrationProviderSuccess
-
-type RemoveIntegrationProviderSuccess {
-  """
-  The team member with the updated auth
-  """
-  teamMember: TeamMember!
-
-  """
-  The user who updated TeamMemberIntegrationAuth object
-  """
-  user: User!
-}
-
-"""
-Return object for RemoveTeamMemberIntegrationAuthPayload
-"""
-union RemoveTeamMemberIntegrationAuthPayload = ErrorPayload | RemoveTeamMemberIntegrationAuthSuccess
-
-type RemoveTeamMemberIntegrationAuthSuccess {
-  """
-  The team member with the updated auth
-  """
-  teamMember: TeamMember!
-
-  """
-  The user who updated TeamMemberIntegrationAuth object
-  """
-  user: User!
-}
diff --git a/packages/server/graphql/public/typeDefs/requestToJoinDomain.graphql b/packages/server/graphql/public/typeDefs/requestToJoinDomain.graphql
deleted file mode 100644
index ee7330ba96d..00000000000
--- a/packages/server/graphql/public/typeDefs/requestToJoinDomain.graphql
+++ /dev/null
@@ -1,18 +0,0 @@
-extend type Mutation {
-  """
-  Sends the request to the appropriate organizations on the viewer's domain
-  """
-  requestToJoinDomain: RequestToJoinDomainPayload!
-}
-
-"""
-Return value for requestToJoinDomain, which could be an error
-"""
-union RequestToJoinDomainPayload = ErrorPayload | RequestToJoinDomainSuccess
-
-type RequestToJoinDomainSuccess {
-  """
-  Was the request created successfully
-  """
-  success: Boolean!
-}
diff --git a/packages/server/graphql/public/typeDefs/resetReflectionGroups.graphql b/packages/server/graphql/public/typeDefs/resetReflectionGroups.graphql
deleted file mode 100644
index ff52312ebe5..00000000000
--- a/packages/server/graphql/public/typeDefs/resetReflectionGroups.graphql
+++ /dev/null
@@ -1,15 +0,0 @@
-extend type Mutation {
-  """
-  Resets the reflection groups to the state they were in before autogrouping
-  """
-  resetReflectionGroups(meetingId: ID!): ResetReflectionGroupsPayload!
-}
-
-"""
-Return value for resetReflectionGroups, which could be an error
-"""
-union ResetReflectionGroupsPayload = ErrorPayload | ResetReflectionGroupsSuccess
-
-type ResetReflectionGroupsSuccess {
-  meeting: RetrospectiveMeeting!
-}
diff --git a/packages/server/graphql/public/typeDefs/revealTeamHealthVotes.graphql b/packages/server/graphql/public/typeDefs/revealTeamHealthVotes.graphql
deleted file mode 100644
index 989098c4e38..00000000000
--- a/packages/server/graphql/public/typeDefs/revealTeamHealthVotes.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-type RevealTeamHealthVotesSuccess {
-  meetingId: ID!
-  stageId: ID!
-  stage: TeamHealthStage!
-}
-
-union RevealTeamHealthVotesPayload = ErrorPayload | RevealTeamHealthVotesSuccess
-
-extend type Mutation {
-  revealTeamHealthVotes(meetingId: ID!, stageId: ID!): RevealTeamHealthVotesPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/setMeetingSettings.graphql b/packages/server/graphql/public/typeDefs/setMeetingSettings.graphql
deleted file mode 100644
index 63710b1048d..00000000000
--- a/packages/server/graphql/public/typeDefs/setMeetingSettings.graphql
+++ /dev/null
@@ -1,27 +0,0 @@
-extend type Mutation {
-  """
-  Enabled or disable the icebreaker round
-  """
-  setMeetingSettings(
-    settingsId: ID!
-
-    """
-    true to turn icebreaker phase on, false to turn it off
-    """
-    checkinEnabled: Boolean
-
-    """
-    true to turn team health phase on, false to turn it off
-    """
-    teamHealthEnabled: Boolean
-
-    """
-    disables anonymity of reflections
-    """
-    disableAnonymity: Boolean
-    """
-    the url of the video meeting, e.g. the Zoom link
-    """
-    videoMeetingURL: String
-  ): SetMeetingSettingsPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/setOrgUserRole.graphql b/packages/server/graphql/public/typeDefs/setOrgUserRole.graphql
deleted file mode 100644
index 30f3f46aa31..00000000000
--- a/packages/server/graphql/public/typeDefs/setOrgUserRole.graphql
+++ /dev/null
@@ -1,24 +0,0 @@
-extend type Mutation {
-  """
-  Update the role of the org user
-  """
-  setOrgUserRole(
-    orgId: ID!
-    userId: ID!
-    """
-    The role to set the user to, e.g. billing leader. Null to remove the role
-    """
-    role: OrgUserRole
-  ): SetOrgUserRolePayload!
-}
-
-"""
-Return value for setOrgUserRole, which could be an error
-"""
-union SetOrgUserRolePayload = ErrorPayload | SetOrgUserRoleSuccess
-
-type SetOrgUserRoleSuccess {
-  organization: Organization!
-  updatedOrgMember: OrganizationUser!
-  notificationsAdded: [Notification!]!
-}
diff --git a/packages/server/graphql/public/typeDefs/setTeamHealthVote.graphql b/packages/server/graphql/public/typeDefs/setTeamHealthVote.graphql
deleted file mode 100644
index da0ddbd1d9a..00000000000
--- a/packages/server/graphql/public/typeDefs/setTeamHealthVote.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-type SetTeamHealthVoteSuccess {
-  meetingId: ID!
-  stageId: ID!
-  stage: TeamHealthStage!
-}
-
-union SetTeamHealthVotePayload = ErrorPayload | SetTeamHealthVoteSuccess
-
-extend type Mutation {
-  setTeamHealthVote(
-    meetingId: ID!
-
-    stageId: ID!
-
-    label: String!
-  ): SetTeamHealthVotePayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/shareTopic.graphql b/packages/server/graphql/public/typeDefs/shareTopic.graphql
deleted file mode 100644
index 023a0ee0626..00000000000
--- a/packages/server/graphql/public/typeDefs/shareTopic.graphql
+++ /dev/null
@@ -1,33 +0,0 @@
-extend type Mutation {
-  """
-  Shares retro discussion to integration
-  """
-  shareTopic(
-    """
-    Discussion stage id
-    """
-    stageId: ID!
-
-    """
-    meetingId
-    """
-    meetingId: ID!
-
-    """
-    Integration channelId
-    """
-    channelId: ID!
-  ): ShareTopicPayload!
-}
-
-"""
-Return value for shareTopic, which could be an error
-"""
-union ShareTopicPayload = ErrorPayload | ShareTopicSuccess
-
-type ShareTopicSuccess {
-  """
-  Meeting
-  """
-  meeting: NewMeeting
-}
diff --git a/packages/server/graphql/public/typeDefs/signUpWithPassword.graphql b/packages/server/graphql/public/typeDefs/signUpWithPassword.graphql
deleted file mode 100644
index 19cdc16462a..00000000000
--- a/packages/server/graphql/public/typeDefs/signUpWithPassword.graphql
+++ /dev/null
@@ -1,24 +0,0 @@
-extend type Mutation {
-  """
-  Sign up using an email address and password
-  """
-  signUpWithPassword(
-    email: ID!
-    password: String!
-
-    """
-    optional pseudo id created before they were a user
-    """
-    pseudoId: ID
-
-    """
-    used to determine what suggested actions to create
-    """
-    invitationToken: ID
-
-    """
-    query params on the login page, used to maybe add feature flag
-    """
-    params: String!
-  ): UserLogInPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/startCheckIn.graphql b/packages/server/graphql/public/typeDefs/startCheckIn.graphql
deleted file mode 100644
index ba6eb2e8cc9..00000000000
--- a/packages/server/graphql/public/typeDefs/startCheckIn.graphql
+++ /dev/null
@@ -1,31 +0,0 @@
-"""
-Return object for StartCheckInPayload
-"""
-union StartCheckInPayload = StartCheckInSuccess | ErrorPayload
-
-type StartCheckInSuccess {
-  meeting: ActionMeeting!
-  meetingId: ID!
-  team: Team!
-  hasGcalError: Boolean
-}
-
-extend type Mutation {
-  """
-  Start a new meeting
-  """
-  startCheckIn(
-    """
-    The team starting the meeting
-    """
-    teamId: ID!
-    """
-    The name of the meeting
-    """
-    name: String
-    """
-    The gcal input if creating a gcal event
-    """
-    gcalInput: CreateGcalEventInput
-  ): StartCheckInPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/startRetrospective.graphql b/packages/server/graphql/public/typeDefs/startRetrospective.graphql
deleted file mode 100644
index 8c60c60d8ef..00000000000
--- a/packages/server/graphql/public/typeDefs/startRetrospective.graphql
+++ /dev/null
@@ -1,35 +0,0 @@
-extend type Mutation {
-  """
-  Start a new meeting
-  """
-  startRetrospective(
-    """
-    The team starting the meeting
-    """
-    teamId: ID!
-    """
-    Name of the meeting or series
-    """
-    name: String
-    """
-    The recurrence rule for the meeting series in RRULE format
-    """
-    rrule: RRule
-    """
-    The gcal input if creating a gcal event
-    """
-    gcalInput: CreateGcalEventInput
-  ): StartRetrospectivePayload!
-}
-
-"""
-Return object for StartRetrospectivePayload
-"""
-union StartRetrospectivePayload = ErrorPayload | StartRetrospectiveSuccess
-
-type StartRetrospectiveSuccess {
-  meeting: RetrospectiveMeeting!
-  meetingId: ID!
-  team: Team!
-  hasGcalError: Boolean
-}
diff --git a/packages/server/graphql/public/typeDefs/startTeamPrompt.graphql b/packages/server/graphql/public/typeDefs/startTeamPrompt.graphql
deleted file mode 100644
index ea02edf4a2b..00000000000
--- a/packages/server/graphql/public/typeDefs/startTeamPrompt.graphql
+++ /dev/null
@@ -1,43 +0,0 @@
-extend type Mutation {
-  """
-  Starts a new team prompt meeting
-  """
-  startTeamPrompt(
-    """
-    Id of the team starting the meeting
-    """
-    teamId: ID!
-    """
-    Meeting or series name, by default "Standup"
-    """
-    name: String
-    """
-    The recurrence rule for the meeting series in RRULE format
-    """
-    rrule: RRule
-    """
-    The gcal input if creating a gcal event. If not provided, no gcal event will be created
-    """
-    gcalInput: CreateGcalEventInput
-  ): StartTeamPromptPayload!
-}
-
-"""
-Return value for updateRecurrenceSettings, which could be an error
-"""
-union StartTeamPromptPayload = StartTeamPromptSuccess | ErrorPayload
-
-type StartTeamPromptSuccess {
-  """
-  The started meeting
-  """
-  meeting: TeamPromptMeeting!
-  """
-  The team that started the meeting
-  """
-  team: Team!
-  """
-  True if there was an error creating the Google Calendar event. False if there was no error or no gcalInput was provided.
-  """
-  hasGcalError: Boolean
-}
diff --git a/packages/server/graphql/public/typeDefs/toggleFavoriteTemplate.graphql b/packages/server/graphql/public/typeDefs/toggleFavoriteTemplate.graphql
deleted file mode 100644
index 1e046e2becd..00000000000
--- a/packages/server/graphql/public/typeDefs/toggleFavoriteTemplate.graphql
+++ /dev/null
@@ -1,20 +0,0 @@
-extend type Mutation {
-  """
-  Add or remove the template to the user's favorite templates
-  """
-  toggleFavoriteTemplate(
-    """
-    The ID of the template to be toggled as a favorite
-    """
-    templateId: ID!
-  ): ToggleFavoriteTemplatePayload!
-}
-
-union ToggleFavoriteTemplatePayload = ErrorPayload | ToggleFavoriteTemplateSuccess
-
-type ToggleFavoriteTemplateSuccess {
-  """
-  The user who's favorite templates were updated
-  """
-  user: User!
-}
diff --git a/packages/server/graphql/public/typeDefs/toggleSummaryEmail.graphql b/packages/server/graphql/public/typeDefs/toggleSummaryEmail.graphql
deleted file mode 100644
index c38bd2f3e62..00000000000
--- a/packages/server/graphql/public/typeDefs/toggleSummaryEmail.graphql
+++ /dev/null
@@ -1,18 +0,0 @@
-extend type Mutation {
-  """
-  Toggles the sendSummaryEmail value on the User object which determines whether summary emails are sent to the user
-  """
-  toggleSummaryEmail: ToggleSummaryEmailPayload!
-}
-
-"""
-Return value for toggleSummaryEmail, which could be an error
-"""
-union ToggleSummaryEmailPayload = ErrorPayload | ToggleSummaryEmailSuccess
-
-type ToggleSummaryEmailSuccess {
-  """
-  The user whose summary email settings have changed
-  """
-  user: User!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateAutoJoin.graphql b/packages/server/graphql/public/typeDefs/updateAutoJoin.graphql
deleted file mode 100644
index 50a4392c593..00000000000
--- a/packages/server/graphql/public/typeDefs/updateAutoJoin.graphql
+++ /dev/null
@@ -1,27 +0,0 @@
-extend type Mutation {
-  """
-  Update the autoJoin value for a set of teams
-  """
-  updateAutoJoin(
-    """
-    The team ids to update
-    """
-    teamIds: [ID!]!
-    """
-    The new autoJoin value for the teams
-    """
-    autoJoin: Boolean!
-  ): UpdateAutoJoinPayload!
-}
-
-"""
-Return value for updateAutoJoin, which could be an error
-"""
-union UpdateAutoJoinPayload = ErrorPayload | UpdateAutoJoinSuccess
-
-type UpdateAutoJoinSuccess {
-  """
-  The teams that were updated
-  """
-  updatedTeams: [Team!]!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateCreditCard.graphql b/packages/server/graphql/public/typeDefs/updateCreditCard.graphql
deleted file mode 100644
index 8b0688ff763..00000000000
--- a/packages/server/graphql/public/typeDefs/updateCreditCard.graphql
+++ /dev/null
@@ -1,35 +0,0 @@
-extend type Mutation {
-  """
-  Update an org's credit card
-  """
-  updateCreditCard(
-    """
-    The id of the org that is updating their credit card
-    """
-    orgId: ID!
-    """
-    The id of the new payment method from Stripe
-    """
-    paymentMethodId: ID!
-  ): UpdateCreditCardPayload!
-}
-
-"""
-Return value for updateCreditCard, which could be an error
-"""
-union UpdateCreditCardPayload = ErrorPayload | UpdateCreditCardSuccess
-
-type UpdateCreditCardSuccess {
-  """
-  The teams that were updated with the new payment method
-  """
-  teamsUpdated: [Team!]!
-  """
-  The org that was updated with the new payment method
-  """
-  organization: Organization!
-  """
-  The client secret from the Stripe subscription. Used for client-side retrieval using a publishable key.
-  """
-  stripeSubscriptionClientSecret: String!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql b/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
deleted file mode 100644
index f76df918087..00000000000
--- a/packages/server/graphql/public/typeDefs/updateFeatureFlag.graphql
+++ /dev/null
@@ -1,65 +0,0 @@
-"""
-A flag to give an individual user super powers
-"""
-enum UserFlagEnum {
-  standups
-  insights
-  recurrence
-  noAISummary
-  noMeetingHistoryLimit
-  signUpDestinationTeam
-}
-
-"""
-The types of flags that give an individual user super powers
-"""
-type UserFeatureFlags {
-  standups: Boolean!
-  insights: Boolean!
-  recurrence: Boolean!
-  noAISummary: Boolean!
-  noMeetingHistoryLimit: Boolean!
-  signUpDestinationTeam: Boolean!
-}
-
-extend type Mutation {
-  """
-  Give someone advanced features in a flag
-  """
-  updateFeatureFlag(
-    """
-    a list of the complete or partial email of the person to whom you are giving advanced features.
-          Matches via a regex to support entire domains
-    """
-    emails: [String!]
-
-    """
-    grant access to an entire domain. the part of the email after the @
-    """
-    domain: String
-
-    """
-    the flag that you want to give to the user
-    """
-    flag: UserFlagEnum!
-
-    """
-    whether to add or remove the flag
-    """
-    addFlag: Boolean!
-  ): UpdateFeatureFlagPayload!
-}
-
-type UpdateFeatureFlagPayload {
-  error: StandardMutationError
-
-  """
-  the user that was given the super power. Use users instead in GraphiQL since it may affect multiple users
-  """
-  user: User
-
-  """
-  the users given the super power
-  """
-  users: [User]
-}
diff --git a/packages/server/graphql/public/typeDefs/updateGitLabDimensionField.graphql b/packages/server/graphql/public/typeDefs/updateGitLabDimensionField.graphql
deleted file mode 100644
index f2bfc864f1a..00000000000
--- a/packages/server/graphql/public/typeDefs/updateGitLabDimensionField.graphql
+++ /dev/null
@@ -1,32 +0,0 @@
-extend type Mutation {
-  """
-  Update how a parabol dimension maps to a GitLab label
-  """
-  updateGitLabDimensionField(
-    """
-    The Poker dimension that we're updating, e.g. story points
-    """
-    dimensionName: String!
-    """
-    The template string to map to a label, e.g. __comment
-    """
-    labelTemplate: String!
-    """
-    The meeting the update happend in. Returns a meeting object with updated serviceField.
-    """
-    meetingId: ID!
-    """
-    The id of the project the issue belongs to
-    """
-    projectId: Int!
-  ): UpdateGitLabDimensionFieldPayload!
-}
-
-union UpdateGitLabDimensionFieldPayload = ErrorPayload | UpdateGitLabDimensionFieldSuccess
-
-type UpdateGitLabDimensionFieldSuccess {
-  teamId: ID
-  meetingId: ID
-  team: Team
-  meeting: NewMeeting
-}
diff --git a/packages/server/graphql/public/typeDefs/updateJiraDimensionField.graphql b/packages/server/graphql/public/typeDefs/updateJiraDimensionField.graphql
deleted file mode 100644
index c65dc29fb29..00000000000
--- a/packages/server/graphql/public/typeDefs/updateJiraDimensionField.graphql
+++ /dev/null
@@ -1,26 +0,0 @@
-extend type Mutation {
-  """
-  Set the jira field that the poker dimension should map to
-  """
-  updateJiraDimensionField(
-    """
-    Id of the parabol task on which the dimension was updated
-    """
-    taskId: ID!
-
-    """
-    Dimension name from the template used
-    """
-    dimensionName: String!
-
-    """
-    The jira field id that we should push estimates to
-    """
-    fieldId: ID!
-
-    """
-    The meeting the update happend in. Returns a meeting object with updated serviceField
-    """
-    meetingId: ID!
-  ): UpdateDimensionFieldPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateJiraServerDimensionField.graphql b/packages/server/graphql/public/typeDefs/updateJiraServerDimensionField.graphql
deleted file mode 100644
index f5578054750..00000000000
--- a/packages/server/graphql/public/typeDefs/updateJiraServerDimensionField.graphql
+++ /dev/null
@@ -1,28 +0,0 @@
-extend type Mutation {
-  """
-  Set the JiraServer field that the poker dimension should map to`,
-  """
-  updateJiraServerDimensionField(
-    dimensionName: String!
-
-    """
-    The Jira Server field name that we should push estimates to
-    """
-    fieldName: ID!
-
-    """
-    The Jira Server issue type for which to set the dimension
-    """
-    issueType: ID!
-
-    """
-    Project id for this setting
-    """
-    projectId: ID!
-
-    """
-    The meeting the update happend in. Returns a meeting object with updated serviceField
-    """
-    meetingId: ID!
-  ): UpdateDimensionFieldPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateMeetingPrompt.graphql b/packages/server/graphql/public/typeDefs/updateMeetingPrompt.graphql
deleted file mode 100644
index fce3ec42515..00000000000
--- a/packages/server/graphql/public/typeDefs/updateMeetingPrompt.graphql
+++ /dev/null
@@ -1,30 +0,0 @@
-extend type Mutation {
-  """
-  Describe the mutation here
-  """
-  updateMeetingPrompt(
-    """
-    The meeting to update the prompt
-    """
-    meetingId: ID!
-
-    """
-    The updated prompt
-    """
-    newPrompt: String!
-  ): UpdateMeetingPromptPayload!
-}
-
-"""
-Return value for updateMeetingPrompt, which could be an error
-"""
-union UpdateMeetingPromptPayload = UpdateMeetingPromptSuccess | ErrorPayload
-
-type UpdateMeetingPromptSuccess {
-  meetingId: ID!
-
-  """
-  the updated meeting
-  """
-  meeting: TeamPromptMeeting!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql b/packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql
deleted file mode 100644
index 1f378e42dbe..00000000000
--- a/packages/server/graphql/public/typeDefs/updateMeetingTemplate.graphql
+++ /dev/null
@@ -1,27 +0,0 @@
-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/typeDefs/updateOrg.graphql b/packages/server/graphql/public/typeDefs/updateOrg.graphql
deleted file mode 100644
index 244183bacfc..00000000000
--- a/packages/server/graphql/public/typeDefs/updateOrg.graphql
+++ /dev/null
@@ -1,32 +0,0 @@
-extend type Mutation {
-  """
-  Update an with a change in name, avatar
-  """
-  updateOrg(
-    """
-    the updated org including the id, and at least one other field
-    """
-    updatedOrg: UpdateOrgInput!
-  ): UpdateOrgPayload!
-}
-
-type UpdateOrgPayload {
-  error: StandardMutationError
-
-  """
-  The updated org
-  """
-  organization: Organization
-}
-
-input UpdateOrgInput {
-  """
-  The unique action ID
-  """
-  id: ID!
-
-  """
-  The name of the org
-  """
-  name: String
-}
diff --git a/packages/server/graphql/public/typeDefs/updateRecurrenceSettings.graphql b/packages/server/graphql/public/typeDefs/updateRecurrenceSettings.graphql
deleted file mode 100644
index fad9895053d..00000000000
--- a/packages/server/graphql/public/typeDefs/updateRecurrenceSettings.graphql
+++ /dev/null
@@ -1,36 +0,0 @@
-extend type Mutation {
-  """
-  Updates the recurrence settings for a meeting
-  1. When the meeting is not recurring, this will start the meeting recurring with the given recurrenceRule
-  2. When the meeting is recurring and the provided recurrenceRule is defined, this will update the recurrence rule with the given recurrenceRule
-  3. When the meeting is recurring and the provided recurrenceRule is null, this will stop the meeting from recurring
-  """
-  updateRecurrenceSettings(
-    """
-    ID of the meeting to update recurrence settings for
-    """
-    meetingId: ID!
-
-    """
-    New meeting series name
-    """
-    name: String
-
-    """
-    The recurrence rule for the meeting series in RRULE format
-    """
-    rrule: RRule
-  ): UpdateRecurrenceSettingsPayload!
-}
-
-"""
-Return value for updateRecurrenceSettings, which could be an error
-"""
-union UpdateRecurrenceSettingsPayload = UpdateRecurrenceSettingsSuccess | ErrorPayload
-
-type UpdateRecurrenceSettingsSuccess {
-  """
-  The updated meeting
-  """
-  meeting: TeamPromptMeeting!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateTemplateCategory.graphql b/packages/server/graphql/public/typeDefs/updateTemplateCategory.graphql
deleted file mode 100644
index a6a7688f355..00000000000
--- a/packages/server/graphql/public/typeDefs/updateTemplateCategory.graphql
+++ /dev/null
@@ -1,27 +0,0 @@
-extend type Mutation {
-  """
-  Updates the mainCategory for the given template
-  """
-  updateTemplateCategory(
-    """
-    The ID of the template
-    """
-    templateId: ID!
-    """
-    The new category for the template
-    """
-    mainCategory: String!
-  ): UpdateTemplateCategoryPayload!
-}
-
-"""
-Return value for updateTemplateCategory, which could be an error
-"""
-union UpdateTemplateCategoryPayload = ErrorPayload | UpdateTemplateCategorySuccess
-
-type UpdateTemplateCategorySuccess {
-  """
-  The template with the updated mainCategory
-  """
-  template: MeetingTemplate!
-}
diff --git a/packages/server/graphql/public/typeDefs/updateUserProfile.graphql b/packages/server/graphql/public/typeDefs/updateUserProfile.graphql
deleted file mode 100644
index aa8d553ea5e..00000000000
--- a/packages/server/graphql/public/typeDefs/updateUserProfile.graphql
+++ /dev/null
@@ -1,25 +0,0 @@
-extend type Mutation {
-  updateUserProfile(
-    """
-    The input object containing the user profile fields that can be changed
-    """
-    updatedUser: UpdateUserProfileInput!
-  ): UpdateUserProfilePayload
-}
-
-input UpdateUserProfileInput {
-  """
-  The name, as confirmed by the user
-  """
-  preferredName: String
-}
-
-type UpdateUserProfilePayload {
-  error: StandardMutationError
-  user: User
-
-  """
-  The updated team member
-  """
-  teamMembers: [TeamMember!]
-}
diff --git a/packages/server/graphql/public/typeDefs/uploadIdPMetadata.graphql b/packages/server/graphql/public/typeDefs/uploadIdPMetadata.graphql
deleted file mode 100644
index 346824208d0..00000000000
--- a/packages/server/graphql/public/typeDefs/uploadIdPMetadata.graphql
+++ /dev/null
@@ -1,22 +0,0 @@
-extend type Mutation {
-  """
-  Upload the IdP Metadata file for an org for those who cannot self-host the file
-  """
-  uploadIdPMetadata(
-    """
-    the XML Metadata file for the IdP
-    """
-    file: File!
-
-    """
-    The orgId to upload the IdP Metadata for
-    """
-    orgId: ID!
-  ): UploadIdPMetadataPayload!
-}
-
-union UploadIdPMetadataPayload = ErrorPayload | UploadIdPMetadataSuccess
-
-type UploadIdPMetadataSuccess {
-  url: String!
-}
diff --git a/packages/server/graphql/public/typeDefs/uploadOrgImage.graphql b/packages/server/graphql/public/typeDefs/uploadOrgImage.graphql
deleted file mode 100644
index dc633241fb5..00000000000
--- a/packages/server/graphql/public/typeDefs/uploadOrgImage.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-extend type Mutation {
-  """
-  Upload an image for an org avatar
-  """
-  uploadOrgImage(
-    """
-    the org avatar image file
-    """
-    file: File!
-
-    """
-    The org id to upload an avatar for
-    """
-    orgId: ID!
-  ): UpdateOrgPayload!
-}
diff --git a/packages/server/graphql/public/typeDefs/uploadUserImage.graphql b/packages/server/graphql/public/typeDefs/uploadUserImage.graphql
deleted file mode 100644
index 240ddcf14c2..00000000000
--- a/packages/server/graphql/public/typeDefs/uploadUserImage.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-extend type Mutation {
-  """
-  Upload an image for a user avatar
-  """
-  uploadUserImage(
-    """
-    the user avatar image file
-    """
-    file: File!
-  ): UpdateUserProfilePayload
-}
diff --git a/packages/server/graphql/public/typeDefs/upsertTeamPromptResponse.graphql b/packages/server/graphql/public/typeDefs/upsertTeamPromptResponse.graphql
deleted file mode 100644
index 7681dc4cd46..00000000000
--- a/packages/server/graphql/public/typeDefs/upsertTeamPromptResponse.graphql
+++ /dev/null
@@ -1,37 +0,0 @@
-extend type Mutation {
-  """
-  upsert the content of a team prompt response
-  """
-  upsertTeamPromptResponse(
-    """
-    The id of the team prompt response to upsert
-    """
-    teamPromptResponseId: ID
-
-    """
-    The id of the team prompt meeting
-    """
-    meetingId: ID!
-
-    """
-    The stringified content of the team prompt response
-    """
-    content: String!
-  ): UpsertTeamPromptResponsePayload!
-}
-
-type UpsertTeamPromptResponseSuccess {
-  teamPromptResponseId: ID!
-  meetingId: ID!
-
-  """
-  the created/updated team prompt response
-  """
-  teamPromptResponse: TeamPromptResponse
-  """
-  the updated meeting
-  """
-  meeting: NewMeeting
-}
-
-union UpsertTeamPromptResponsePayload = UpsertTeamPromptResponseSuccess | ErrorPayload
diff --git a/packages/server/graphql/public/typeDefs/verifyEmail.graphql b/packages/server/graphql/public/typeDefs/verifyEmail.graphql
deleted file mode 100644
index 59a5ac3f683..00000000000
--- a/packages/server/graphql/public/typeDefs/verifyEmail.graphql
+++ /dev/null
@@ -1,11 +0,0 @@
-extend type Mutation {
-  """
-  Verify an email address and sign in if not already a user
-  """
-  verifyEmail(
-    """
-    The 48-byte url-safe base64 encoded verification token
-    """
-    verificationToken: ID!
-  ): UserLogInPayload!
-}

From 77e163add65765641936bd56b83aa91f58e5b21a Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Thu, 25 Jul 2024 12:32:37 -0700
Subject: [PATCH 12/18] chore(rethinkdb): TemplateDimension: One-shot (#10033)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 codegen.json                                  |   2 +-
 .../components/AddPokerTemplateDimension.tsx  |   6 +-
 .../components/TemplateDimensionList.tsx      |  17 +--
 .../AddPokerTemplateDimensionMutation.ts      |   2 +-
 .../MovePokerTemplateDimensionMutation.ts     |   2 +-
 .../utils => client/shared}/sortOrder.ts      |   8 +-
 packages/server/database/rethinkDriver.ts     |   5 -
 .../database/types/TemplateDimension.ts       |  36 -----
 .../dataloader/foreignKeyLoaderMakers.ts      |  21 ++-
 .../dataloader/primaryKeyLoaderMakers.ts      |   6 +-
 .../rethinkForeignKeyLoaderMakers.ts          |  17 ---
 .../rethinkPrimaryKeyLoaderMakers.ts          |   1 -
 .../mutations/addPokerTemplateDimension.ts    |  60 +++-----
 .../mutations/addPokerTemplateScale.ts        |   2 +-
 .../mutations/addPokerTemplateScaleValue.ts   |  18 +--
 .../mutations/movePokerTemplateDimension.ts   |  31 ++--
 .../mutations/movePokerTemplateScaleValue.ts  |  18 +--
 ...pokerTemplateDimensionUpdateDescription.ts |  22 ++-
 .../graphql/mutations/removePokerTemplate.ts  |  23 ++-
 .../mutations/removePokerTemplateDimension.ts |  27 ++--
 .../mutations/removePokerTemplateScale.ts     |  38 ++---
 .../removePokerTemplateScaleValue.ts          |  16 --
 .../mutations/renamePokerTemplateDimension.ts |  43 ++----
 .../mutations/renamePokerTemplateScale.ts     |  16 --
 .../updatePokerTemplateDimensionScale.ts      |  15 +-
 .../updatePokerTemplateScaleValue.ts          |  16 --
 .../graphql/mutations/updateTemplateScope.ts  |  60 +++++---
 .../public/mutations/addPokerTemplate.ts      |  56 +++----
 .../graphql/public/typeDefs/Mutation.graphql  |   2 +-
 .../public/typeDefs/TemplateDimension.graphql |   2 +-
 .../graphql/public/types/TemplateScale.ts     |  13 +-
 .../server/graphql/types/TemplateDimension.ts |  11 +-
 .../1614030642692_refs-for-meetings.ts        |   3 +-
 ...698265600000_addPrioritizationTemplates.ts |   3 +-
 .../1721858364099_TemplateDimension.ts        | 143 ++++++++++++++++++
 .../queries/updateMeetingTemplateScope.ts     |   9 --
 packages/server/postgres/select.ts            |   4 +
 37 files changed, 359 insertions(+), 415 deletions(-)
 rename packages/{server/utils => client/shared}/sortOrder.ts (93%)
 delete mode 100644 packages/server/database/types/TemplateDimension.ts
 create mode 100644 packages/server/postgres/migrations/1721858364099_TemplateDimension.ts
 delete mode 100644 packages/server/postgres/queries/updateMeetingTemplateScope.ts

diff --git a/codegen.json b/codegen.json
index 00dd488587c..0ba70d7a8f5 100644
--- a/codegen.json
+++ b/codegen.json
@@ -156,7 +156,7 @@
           "TeamPromptMeeting": "../../database/types/MeetingTeamPrompt#default as MeetingTeamPromptDB",
           "TeamPromptMeetingMember": "../../database/types/TeamPromptMeetingMember#default as TeamPromptMeetingMemberDB",
           "TeamPromptResponse": "../../postgres/queries/getTeamPromptResponsesByIds#TeamPromptResponse",
-          "TemplateDimension": "../../database/types/TemplateDimension#default",
+          "TemplateDimension": "../../postgres/types/index#TemplateDimension as TemplateDimensionDB",
           "TimelineEventTeamPromptComplete": "./types/TimelineEventTeamPromptComplete#TimelineEventTeamPromptCompleteSource",
           "ToggleFavoriteTemplateSuccess": "./types/ToggleFavoriteTemplateSuccess#ToggleFavoriteTemplateSuccessSource",
           "ToggleSummaryEmailSuccess": "./types/ToggleSummaryEmailSuccess#ToggleSummaryEmailSuccessSource",
diff --git a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
index d9fb3314fea..97a13eb59dc 100644
--- a/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
+++ b/packages/client/modules/meeting/components/AddPokerTemplateDimension.tsx
@@ -9,7 +9,7 @@ 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 {positionAfter} from '../../../shared/sortOrder'
 
 const AddDimensionLink = styled(LinkButton)({
   alignItems: 'center',
@@ -49,8 +49,8 @@ const AddPokerTemplateDimension = (props: Props) => {
   const addDimension = () => {
     if (submitting) return
     submitMutation()
-    const sortOrders = dimensions.map(({sortOrder}) => sortOrder)
-    const sortOrder = Math.max(0, ...sortOrders) + 1 + dndNoise()
+    const lastSortOrder = dimensions.at(-1)?.sortOrder ?? ''
+    const sortOrder = positionAfter(lastSortOrder)
     const dimensionCount = dimensions.length
     AddPokerTemplateDimensionMutation(
       atmosphere,
diff --git a/packages/client/modules/meeting/components/TemplateDimensionList.tsx b/packages/client/modules/meeting/components/TemplateDimensionList.tsx
index 7d352ab5ba4..cfef49ef476 100644
--- a/packages/client/modules/meeting/components/TemplateDimensionList.tsx
+++ b/packages/client/modules/meeting/components/TemplateDimensionList.tsx
@@ -6,8 +6,8 @@ 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 {getSortOrder} from '../../../shared/sortOrder'
 import {TEMPLATE_DIMENSION} from '../../../utils/constants'
-import dndNoise from '../../../utils/dndNoise'
 import TemplateDimensionItem from './TemplateDimensionItem'
 
 interface Props {
@@ -52,20 +52,7 @@ const TemplateDimensionList = (props: Props) => {
     ) {
       return
     }
-
-    let sortOrder
-    if (destination.index === 0) {
-      sortOrder = destinationDimension.sortOrder - 1 + dndNoise()
-    } else if (destination.index === dimensions.length - 1) {
-      sortOrder = destinationDimension.sortOrder + 1 + dndNoise()
-    } else {
-      const offset = source.index > destination.index ? -1 : 1
-      sortOrder =
-        ((dimensions[destination.index + offset]?.sortOrder ?? 0) +
-          destinationDimension.sortOrder) /
-          2 +
-        dndNoise()
-    }
+    const sortOrder = getSortOrder(dimensions, source.index, destination.index)
 
     const {id: dimensionId} = sourceDimension
     const variables = {dimensionId, sortOrder}
diff --git a/packages/client/mutations/AddPokerTemplateDimensionMutation.ts b/packages/client/mutations/AddPokerTemplateDimensionMutation.ts
index 5eb276afcd2..8b61fec9adf 100644
--- a/packages/client/mutations/AddPokerTemplateDimensionMutation.ts
+++ b/packages/client/mutations/AddPokerTemplateDimensionMutation.ts
@@ -9,7 +9,7 @@ import handleAddPokerTemplateDimension from './handlers/handleAddPokerTemplateDi
 
 interface Handlers extends BaseLocalHandlers {
   dimensionCount: number
-  sortOrder: number
+  sortOrder: string
 }
 
 graphql`
diff --git a/packages/client/mutations/MovePokerTemplateDimensionMutation.ts b/packages/client/mutations/MovePokerTemplateDimensionMutation.ts
index 3e20d7d7e75..e99e40c8232 100644
--- a/packages/client/mutations/MovePokerTemplateDimensionMutation.ts
+++ b/packages/client/mutations/MovePokerTemplateDimensionMutation.ts
@@ -15,7 +15,7 @@ graphql`
 `
 
 const mutation = graphql`
-  mutation MovePokerTemplateDimensionMutation($dimensionId: ID!, $sortOrder: Float!) {
+  mutation MovePokerTemplateDimensionMutation($dimensionId: ID!, $sortOrder: String!) {
     movePokerTemplateDimension(dimensionId: $dimensionId, sortOrder: $sortOrder) {
       error {
         message
diff --git a/packages/server/utils/sortOrder.ts b/packages/client/shared/sortOrder.ts
similarity index 93%
rename from packages/server/utils/sortOrder.ts
rename to packages/client/shared/sortOrder.ts
index aa03d336ded..87b6cf68531 100644
--- a/packages/server/utils/sortOrder.ts
+++ b/packages/client/shared/sortOrder.ts
@@ -5,6 +5,8 @@
 // WARNING: the lexicographical sort assumes a C collation (i.e. compare strings via ASCII code)
 // CloudSQL assumes a utf-8 (byte-code) comparision by default, so make sure the column is collated correctly!
 
+import {MaybeReadonly} from '../types/generics'
+
 const START_CHAR_CODE = 32
 const END_CHAR_CODE = 126
 
@@ -57,7 +59,11 @@ function positionBetween(firstPos: string, secondPos: string) {
   return position + String.fromCharCode(avg(START_CHAR_CODE, END_CHAR_CODE))
 }
 
-export function getSortOrder(arr: {sortOrder: string}[], fromIdx: number, toIdx: number) {
+export function getSortOrder(
+  arr: MaybeReadonly<{sortOrder: string}[]>,
+  fromIdx: number,
+  toIdx: number
+) {
   const secondPosIdx = fromIdx < toIdx ? toIdx + 1 : toIdx
   const firstPos = arr[secondPosIdx - 1]?.sortOrder
   const secondPos = arr[secondPosIdx]?.sortOrder
diff --git a/packages/server/database/rethinkDriver.ts b/packages/server/database/rethinkDriver.ts
index 0e47dcf664c..31b7aea2a4d 100644
--- a/packages/server/database/rethinkDriver.ts
+++ b/packages/server/database/rethinkDriver.ts
@@ -30,7 +30,6 @@ import SuggestedActionCreateNewTeam from './types/SuggestedActionCreateNewTeam'
 import SuggestedActionInviteYourTeam from './types/SuggestedActionInviteYourTeam'
 import SuggestedActionTryTheDemo from './types/SuggestedActionTryTheDemo'
 import Task from './types/Task'
-import TemplateDimension from './types/TemplateDimension'
 
 export type RethinkSchema = {
   AgendaItem: {
@@ -149,10 +148,6 @@ export type RethinkSchema = {
     type: TeamInvitation
     index: 'email' | 'teamId' | 'token'
   }
-  TemplateDimension: {
-    type: TemplateDimension
-    index: 'teamId' | 'templateId' | 'scaleId'
-  }
 }
 
 export type DBType = {
diff --git a/packages/server/database/types/TemplateDimension.ts b/packages/server/database/types/TemplateDimension.ts
deleted file mode 100644
index 6ad9bac59f2..00000000000
--- a/packages/server/database/types/TemplateDimension.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import generateUID from '../../generateUID'
-
-export interface TemplateDimensionInput {
-  name: string
-  description: string
-  teamId: string
-  templateId: string
-  sortOrder: number
-  scaleId: string
-  removedAt?: Date
-}
-
-export default class TemplateDimension {
-  id: string
-  name: string
-  description: string
-  teamId: string
-  templateId: string
-  sortOrder: number
-  scaleId: string
-  createdAt = new Date()
-  updatedAt = new Date()
-  removedAt?: Date
-
-  constructor(input: TemplateDimensionInput) {
-    const {name, description, teamId, templateId, sortOrder, scaleId, removedAt} = input
-    this.id = generateUID()
-    this.name = name
-    this.description = description
-    this.teamId = teamId
-    this.templateId = templateId
-    this.sortOrder = sortOrder
-    this.scaleId = scaleId
-    this.removedAt = removedAt
-  }
-}
diff --git a/packages/server/dataloader/foreignKeyLoaderMakers.ts b/packages/server/dataloader/foreignKeyLoaderMakers.ts
index 58579aceec5..ce59a0b4126 100644
--- a/packages/server/dataloader/foreignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/foreignKeyLoaderMakers.ts
@@ -1,5 +1,5 @@
 import getKysely from '../postgres/getKysely'
-import {selectTemplateScale} from '../postgres/select'
+import {selectTemplateDimension, selectTemplateScale} from '../postgres/select'
 import {foreignKeyLoaderMaker} from './foreignKeyLoaderMaker'
 import {selectOrganizations, selectRetroReflections, selectTeams} from './primaryKeyLoaderMakers'
 
@@ -132,3 +132,22 @@ export const scalesByTeamId = foreignKeyLoaderMaker('templateScales', 'teamId',
     .orderBy(['isStarter', 'name'])
     .execute()
 })
+
+export const templateDimensionsByTemplateId = foreignKeyLoaderMaker(
+  'templateDimensions',
+  'templateId',
+  async (templateIds) => {
+    return selectTemplateDimension()
+      .where('templateId', 'in', templateIds)
+      .orderBy('sortOrder')
+      .execute()
+  }
+)
+
+export const templateDimensionsByScaleId = foreignKeyLoaderMaker(
+  'templateDimensions',
+  'scaleId',
+  async (scaleIds) => {
+    return selectTemplateDimension().where('scaleId', 'in', scaleIds).orderBy('sortOrder').execute()
+  }
+)
diff --git a/packages/server/dataloader/primaryKeyLoaderMakers.ts b/packages/server/dataloader/primaryKeyLoaderMakers.ts
index 0f9c8a053f9..7f8f900fd37 100644
--- a/packages/server/dataloader/primaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/primaryKeyLoaderMakers.ts
@@ -7,7 +7,7 @@ import {getTeamPromptResponsesByIds} from '../postgres/queries/getTeamPromptResp
 import getTemplateRefsByIds from '../postgres/queries/getTemplateRefsByIds'
 import getTemplateScaleRefsByIds from '../postgres/queries/getTemplateScaleRefsByIds'
 import {getUsersByIds} from '../postgres/queries/getUsersByIds'
-import {selectTemplateScale} from '../postgres/select'
+import {selectTemplateDimension, selectTemplateScale} from '../postgres/select'
 import {primaryKeyLoaderMaker} from './primaryKeyLoaderMaker'
 
 export const users = primaryKeyLoaderMaker(getUsersByIds)
@@ -155,3 +155,7 @@ export const teamMembers = primaryKeyLoaderMaker((ids: readonly string[]) => {
 export const templateScales = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return selectTemplateScale().where('TemplateScale.id', 'in', ids).execute()
 })
+
+export const templateDimensions = primaryKeyLoaderMaker((ids: readonly string[]) => {
+  return selectTemplateDimension().where('id', 'in', ids).execute()
+})
diff --git a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
index bdd7d47e595..a0da54c416f 100644
--- a/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
+++ b/packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts
@@ -116,23 +116,6 @@ export const meetingMembersByUserId = new RethinkForeignKeyLoaderMaker(
   }
 )
 
-export const templateDimensionsByTemplateId = new RethinkForeignKeyLoaderMaker(
-  'templateDimensions',
-  'templateId',
-  async (templateIds) => {
-    const r = await getRethink()
-    return (
-      r
-        .table('TemplateDimension')
-        .getAll(r.args(templateIds), {index: 'templateId'})
-        // NOTE: isActive must be false so we can see meetings in the past that use a now-inactive template
-        // .filter({isActive: true})
-        .orderBy('sortOrder')
-        .run()
-    )
-  }
-)
-
 export const slackAuthByUserId = new RethinkForeignKeyLoaderMaker(
   'slackAuths',
   'userId',
diff --git a/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts b/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
index cf77db7ba68..95c481cfd25 100644
--- a/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
+++ b/packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts
@@ -18,4 +18,3 @@ export const slackNotifications = new RethinkPrimaryKeyLoaderMaker('SlackNotific
 export const suggestedActions = new RethinkPrimaryKeyLoaderMaker('SuggestedAction')
 export const tasks = new RethinkPrimaryKeyLoaderMaker('Task')
 export const teamInvitations = new RethinkPrimaryKeyLoaderMaker('TeamInvitation')
-export const templateDimensions = new RethinkPrimaryKeyLoaderMaker('TemplateDimension')
diff --git a/packages/server/graphql/mutations/addPokerTemplateDimension.ts b/packages/server/graphql/mutations/addPokerTemplateDimension.ts
index 41fed4f6b99..b9b144517dc 100644
--- a/packages/server/graphql/mutations/addPokerTemplateDimension.ts
+++ b/packages/server/graphql/mutations/addPokerTemplateDimension.ts
@@ -1,9 +1,7 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SprintPokerDefaults, SubscriptionChannel, Threshold} from 'parabol-client/types/constEnums'
-import dndNoise from 'parabol-client/utils/dndNoise'
-import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
-import TemplateDimension from '../../database/types/TemplateDimension'
+import {positionAfter} from '../../../client/shared/sortOrder'
+import generateUID from '../../generateUID'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -24,11 +22,13 @@ const addPokerTemplateDimension = {
     {templateId}: {templateId: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
-    const template = await dataLoader.get('meetingTemplates').load(templateId)
+    const [template, activeDimensions] = await Promise.all([
+      dataLoader.get('meetingTemplates').load(templateId),
+      dataLoader.get('templateDimensionsByTemplateId').load(templateId)
+    ])
     const viewerId = getUserId(authToken)
 
     // AUTH
@@ -41,45 +41,31 @@ const addPokerTemplateDimension = {
 
     // VALIDATION
     const {teamId} = template
-    const activeDimensions = await r
-      .table('TemplateDimension')
-      .getAll(teamId, {index: 'teamId'})
-      .filter({templateId})
-      .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-      .run()
     if (activeDimensions.length >= Threshold.MAX_POKER_TEMPLATE_DIMENSIONS) {
       return standardError(new Error('Too many dimensions'), {userId: viewerId})
     }
 
     // RESOLUTION
-    const sortOrder =
-      Math.max(0, ...activeDimensions.map((dimension) => dimension.sortOrder)) + 1 + dndNoise()
+    const lastSortOrder = activeDimensions.at(-1)?.sortOrder ?? ''
+    const sortOrder = positionAfter(lastSortOrder)
     const rawAvailableScales = await dataLoader.get('scalesByTeamId').load(teamId)
     const availableScales = rawAvailableScales.sort((a, b) => (a.updatedAt > b.updatedAt ? -1 : 1))
-    const defaultScaleId =
-      availableScales.length > 0
-        ? availableScales.map((teamScale) => teamScale.id)[0]
-        : SprintPokerDefaults.DEFAULT_SCALE_ID
-
-    const newDimension = new TemplateDimension({
-      scaleId: defaultScaleId as string,
-      description: '',
-      sortOrder: sortOrder,
-      name: `*New Dimension #${activeDimensions.length + 1}`,
-      teamId,
-      templateId
-    })
-
-    await Promise.all([
-      r.table('TemplateDimension').insert(newDimension).run(),
-      pg
-        .updateTable('MeetingTemplate')
-        .set({updatedAt: new Date()})
-        .where('id', '=', templateId)
-        .execute()
-    ])
+    const defaultScaleId = availableScales[0]?.id ?? SprintPokerDefaults.DEFAULT_SCALE_ID
 
-    const dimensionId = newDimension.id
+    const res = await pg
+      .insertInto('TemplateDimension')
+      .values({
+        id: generateUID(),
+        scaleId: defaultScaleId as string,
+        sortOrder,
+        name: `*New Dimension #${activeDimensions.length + 1}`,
+        teamId,
+        templateId
+      })
+      .returning('id')
+      .executeTakeFirstOrThrow()
+    dataLoader.clearAll('templateDimensions')
+    const dimensionId = res.id
     const data = {dimensionId}
     publish(SubscriptionChannel.TEAM, teamId, 'AddPokerTemplateDimensionPayload', data, subOptions)
     return data
diff --git a/packages/server/graphql/mutations/addPokerTemplateScale.ts b/packages/server/graphql/mutations/addPokerTemplateScale.ts
index f4c7f69dc91..6b000c0f9f1 100644
--- a/packages/server/graphql/mutations/addPokerTemplateScale.ts
+++ b/packages/server/graphql/mutations/addPokerTemplateScale.ts
@@ -1,12 +1,12 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {PokerCards, SubscriptionChannel, Threshold} from 'parabol-client/types/constEnums'
+import {positionAfter} from '../../../client/shared/sortOrder'
 import {PALETTE} from '../../../client/styles/paletteV3'
 import generateUID from '../../generateUID'
 import getKysely from '../../postgres/getKysely'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
-import {positionAfter} from '../../utils/sortOrder'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import AddPokerTemplateScalePayload from '../types/AddPokerTemplateScalePayload'
diff --git a/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts b/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts
index 2d379081848..c54f600e950 100644
--- a/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/addPokerTemplateScaleValue.ts
@@ -1,10 +1,9 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
+import {getSortOrder} from '../../../client/shared/sortOrder'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
-import {getSortOrder} from '../../utils/sortOrder'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import AddPokerTemplateScaleValuePayload from '../types/AddPokerTemplateScaleValuePayload'
@@ -27,9 +26,7 @@ const addPokerTemplateScaleValue = {
     {scaleId, scaleValue}: {scaleId: string; scaleValue: AddTemplateScaleInputType},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
     const viewerId = getUserId(authToken)
@@ -71,19 +68,6 @@ const addPokerTemplateScaleValue = {
       return {error: {message: 'Could not add scale value'}}
     }
     dataLoader.clearAll('templateScales')
-    // mark all templates using this scale as updated
-    const updatedDimensions = await r
-      .table('TemplateDimension')
-      .getAll(scaleId, {index: 'scaleId'})
-      .run()
-    const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    if (updatedTemplateIds.length) {
-      await pg
-        .updateTable('MeetingTemplate')
-        .set({updatedAt: now})
-        .where('id', 'in', updatedTemplateIds)
-        .execute()
-    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/movePokerTemplateDimension.ts b/packages/server/graphql/mutations/movePokerTemplateDimension.ts
index 3f037e6e223..404c99fe7ea 100644
--- a/packages/server/graphql/mutations/movePokerTemplateDimension.ts
+++ b/packages/server/graphql/mutations/movePokerTemplateDimension.ts
@@ -1,6 +1,5 @@
-import {GraphQLFloat, GraphQLID, GraphQLNonNull} from 'graphql'
+import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -16,20 +15,18 @@ const movePokerTemplateDimension = {
       type: new GraphQLNonNull(GraphQLID)
     },
     sortOrder: {
-      type: new GraphQLNonNull(GraphQLFloat)
+      type: new GraphQLNonNull(GraphQLString)
     }
   },
   async resolve(
     _source: unknown,
-    {dimensionId, sortOrder}: {dimensionId: string; sortOrder: number},
+    {dimensionId, sortOrder}: {dimensionId: string; sortOrder: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
-    const dimension = await r.table('TemplateDimension').get(dimensionId).run()
+    const dimension = await dataLoader.get('templateDimensions').load(dimensionId)
     const viewerId = getUserId(authToken)
 
     // AUTH
@@ -41,20 +38,14 @@ const movePokerTemplateDimension = {
     }
 
     // RESOLUTION
-    const {teamId, templateId} = dimension
-
-    await Promise.all([
-      r
-        .table('TemplateDimension')
-        .get(dimensionId)
-        .update({
-          sortOrder,
-          updatedAt: now
-        })
-        .run(),
-      pg.updateTable('MeetingTemplate').set({updatedAt: now}).where('id', '=', templateId).execute()
-    ])
+    const {teamId} = dimension
 
+    await pg
+      .updateTable('TemplateDimension')
+      .set({sortOrder})
+      .where('id', '=', dimensionId)
+      .execute()
+    dataLoader.clearAll('templateDimensions')
     const data = {dimensionId}
     publish(SubscriptionChannel.TEAM, teamId, 'MovePokerTemplateDimensionPayload', data, subOptions)
     return data
diff --git a/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts b/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts
index d445953c1ed..5a8084c14cf 100644
--- a/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/movePokerTemplateScaleValue.ts
@@ -1,10 +1,9 @@
 import {GraphQLID, GraphQLInt, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
+import {getSortOrder} from '../../../client/shared/sortOrder'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
-import {getSortOrder} from '../../utils/sortOrder'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
 import MovePokerTemplateScaleValuePayload from '../types/MovePokerTemplateScaleValuePayload'
@@ -30,10 +29,8 @@ const movePokerTemplateScaleValue = {
     {scaleId, label, index}: {scaleId: string; label: string; index: number},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) => {
-    const r = await getRethink()
     const pg = getKysely()
     const viewerId = getUserId(authToken)
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {mutatorId, operationId}
     const scale = await dataLoader.get('templateScales').load(scaleId)
@@ -66,19 +63,6 @@ const movePokerTemplateScaleValue = {
       .where('label', '=', label)
       .execute()
     dataLoader.clearAll('templateScales')
-    // mark all templates using this scale as updated
-    const updatedDimensions = await r
-      .table('TemplateDimension')
-      .getAll(scaleId, {index: 'scaleId'})
-      .run()
-    const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    if (updatedTemplateIds.length) {
-      await pg
-        .updateTable('MeetingTemplate')
-        .set({updatedAt: now})
-        .where('id', 'in', updatedTemplateIds)
-        .execute()
-    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/pokerTemplateDimensionUpdateDescription.ts b/packages/server/graphql/mutations/pokerTemplateDimensionUpdateDescription.ts
index cbbb93323cd..28c4674a8f7 100644
--- a/packages/server/graphql/mutations/pokerTemplateDimensionUpdateDescription.ts
+++ b/packages/server/graphql/mutations/pokerTemplateDimensionUpdateDescription.ts
@@ -1,6 +1,6 @@
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
+import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
@@ -23,11 +23,10 @@ const pokerTemplateDimensionUpdateDescription = {
     {dimensionId, description}: {dimensionId: string; description: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
-    const now = new Date()
+    const pg = getKysely()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
-    const dimension = await r.table('TemplateDimension').get(dimensionId).run()
+    const dimension = await dataLoader.get('templateDimensions').load(dimensionId)
     const viewerId = getUserId(authToken)
 
     // AUTH
@@ -43,15 +42,12 @@ const pokerTemplateDimensionUpdateDescription = {
     const normalizedDescription = description.trim().slice(0, 256) || ''
 
     // RESOLUTION
-    await r
-      .table('TemplateDimension')
-      .get(dimensionId)
-      .update({
-        description: normalizedDescription,
-        updatedAt: now
-      })
-      .run()
-
+    await pg
+      .updateTable('TemplateDimension')
+      .set({description: normalizedDescription})
+      .where('id', '=', dimensionId)
+      .execute()
+    dataLoader.clearAll('templateDimensions')
     const data = {dimensionId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/removePokerTemplate.ts b/packages/server/graphql/mutations/removePokerTemplate.ts
index 4d0d85c4036..660b5622633 100644
--- a/packages/server/graphql/mutations/removePokerTemplate.ts
+++ b/packages/server/graphql/mutations/removePokerTemplate.ts
@@ -2,7 +2,7 @@ import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/constEnums'
 import getRethink from '../../database/rethinkDriver'
 import MeetingSettingsPoker from '../../database/types/MeetingSettingsPoker'
-import removeMeetingTemplate from '../../postgres/queries/removeMeetingTemplate'
+import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
@@ -24,6 +24,7 @@ const removePokerTemplate = {
   ) {
     const r = await getRethink()
     const now = new Date()
+    const pg = getKysely()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
     const template = await dataLoader.get('meetingTemplates').load(templateId)
@@ -52,17 +53,15 @@ const removePokerTemplate = {
     // RESOLUTION
     const {id: settingsId} = settings
     template.isActive = false
-    await Promise.all([
-      removeMeetingTemplate(templateId),
-      r
-        .table('TemplateDimension')
-        .getAll(teamId, {index: 'teamId'})
-        .filter({
-          templateId
-        })
-        .update({removedAt: now})
-        .run()
-    ])
+    await pg
+      .with('MeetingTemplateDelete', (qc) =>
+        qc.updateTable('MeetingTemplate').set({isActive: false}).where('id', '=', templateId)
+      )
+      .updateTable('TemplateDimension')
+      .set({removedAt: now})
+      .where('templateId', '=', templateId)
+      .execute()
+    dataLoader.clearAll(['meetingTemplates', 'templateDimensions'])
 
     if (settings.selectedTemplateId === templateId) {
       const nextTemplate = templates.find((template) => template.id !== templateId)
diff --git a/packages/server/graphql/mutations/removePokerTemplateDimension.ts b/packages/server/graphql/mutations/removePokerTemplateDimension.ts
index 308ba0850b0..40fd5ca2c23 100644
--- a/packages/server/graphql/mutations/removePokerTemplateDimension.ts
+++ b/packages/server/graphql/mutations/removePokerTemplateDimension.ts
@@ -1,7 +1,5 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -22,12 +20,11 @@ const removePokerTemplateDimension = {
     {dimensionId}: {dimensionId: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
     const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
-    const dimension = await r.table('TemplateDimension').get(dimensionId).run()
+    const dimension = await dataLoader.get('templateDimensions').load(dimensionId)
     const viewerId = getUserId(authToken)
 
     // AUTH
@@ -40,25 +37,19 @@ const removePokerTemplateDimension = {
 
     // VALIDATION
     const {teamId, templateId} = dimension
-    const dimensionCount = await r
-      .table('TemplateDimension')
-      .getAll(teamId, {index: 'teamId'})
-      .filter({templateId})
-      .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-      .count()
-      .default(0)
-      .run()
+    const dimensions = await dataLoader.get('templateDimensionsByTemplateId').load(templateId)
 
-    if (dimensionCount <= 1) {
+    if (dimensions.length <= 1) {
       return standardError(new Error('No dimensions remain'), {userId: viewerId})
     }
 
     // RESOLUTION
-    await Promise.all([
-      r.table('TemplateDimension').get(dimensionId).update({removedAt: now}).run(),
-      pg.updateTable('MeetingTemplate').set({updatedAt: now}).where('id', '=', templateId).execute()
-    ])
-
+    await pg
+      .updateTable('TemplateDimension')
+      .set({removedAt: now})
+      .where('id', '=', dimensionId)
+      .execute()
+    dataLoader.clearAll('templateDimensions')
     const data = {dimensionId, templateId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/removePokerTemplateScale.ts b/packages/server/graphql/mutations/removePokerTemplateScale.ts
index fd2b48a35f4..7a29e02a756 100644
--- a/packages/server/graphql/mutations/removePokerTemplateScale.ts
+++ b/packages/server/graphql/mutations/removePokerTemplateScale.ts
@@ -1,8 +1,6 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {sql} from 'kysely'
 import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -23,9 +21,7 @@ const removePokerTemplateScale = {
     {scaleId}: {scaleId: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
     const scale = await dataLoader.get('templateScales').load(scaleId)
@@ -48,30 +44,16 @@ const removePokerTemplateScale = {
       .execute()
 
     const nextDefaultScaleId = SprintPokerDefaults.DEFAULT_SCALE_ID
-    const dimensions = await r
-      .table('TemplateDimension')
-      .getAll(teamId, {index: 'teamId'})
-      .filter((row: RDatum) =>
-        row('removedAt').default(null).eq(null).and(row('scaleId').eq(scaleId))
-      )
-      .update(
-        {
-          scaleId: nextDefaultScaleId,
-          updatedAt: now
-        },
-        {returnChanges: true}
-      )('changes')('new_val')
-      .default([])
-      .run()
-    // mark templates as updated
-    const updatedTemplateIds = dimensions.map(({templateId}: any) => templateId)
-    if (updatedTemplateIds.length) {
-      await pg
-        .updateTable('MeetingTemplate')
-        .set({updatedAt: now})
-        .where('id', 'in', updatedTemplateIds)
-        .execute()
-    }
+
+    await pg
+      .updateTable('TemplateDimension')
+      .set({scaleId: nextDefaultScaleId})
+      .where('scaleId', '=', scaleId)
+      .where('removedAt', 'is', null)
+      .execute()
+    dataLoader.clearAll(['templateDimensions', 'templateScales'])
+    const dimensions = await dataLoader.get('templateDimensionsByScaleId').load(scaleId)
+
     const data = {scaleId, dimensions}
     publish(SubscriptionChannel.TEAM, teamId, 'RemovePokerTemplateScalePayload', data, subOptions)
     return data
diff --git a/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts b/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts
index 739ed5ce0ea..eaacf57794f 100644
--- a/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/removePokerTemplateScaleValue.ts
@@ -1,6 +1,5 @@
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -24,9 +23,7 @@ const removePokerTemplateScaleValue = {
     {scaleId, label}: {scaleId: string; label: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
     const viewerId = getUserId(authToken)
@@ -56,19 +53,6 @@ const removePokerTemplateScaleValue = {
       .where('label', '=', label)
       .execute()
     dataLoader.clearAll('templateScales')
-    // mark all templates using this scale as updated
-    const updatedDimensions = await r
-      .table('TemplateDimension')
-      .getAll(scaleId, {index: 'scaleId'})
-      .run()
-    const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    if (updatedTemplateIds.length) {
-      await pg
-        .updateTable('MeetingTemplate')
-        .set({updatedAt: now})
-        .where('id', 'in', updatedTemplateIds)
-        .execute()
-    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/renamePokerTemplateDimension.ts b/packages/server/graphql/mutations/renamePokerTemplateDimension.ts
index 21b76b33471..e0598838ceb 100644
--- a/packages/server/graphql/mutations/renamePokerTemplateDimension.ts
+++ b/packages/server/graphql/mutations/renamePokerTemplateDimension.ts
@@ -1,7 +1,5 @@
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel, Threshold} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
-import {RDatum} from '../../database/stricterR'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -25,12 +23,10 @@ const renamePokerTemplateDimension = {
     {dimensionId, name}: {dimensionId: string; name: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
-    const dimension = await r.table('TemplateDimension').get(dimensionId).run()
+    const dimension = await dataLoader.get('templateDimensions').load(dimensionId)
     const viewerId = getUserId(authToken)
 
     // AUTH
@@ -42,33 +38,24 @@ const renamePokerTemplateDimension = {
     }
 
     // VALIDATION
-    const {teamId, templateId} = dimension
+    const {teamId} = dimension
     const trimmedName = name.trim().slice(0, Threshold.MAX_POKER_DIMENSION_NAME)
     const normalizedName = trimmedName || 'Unnamed Dimension'
 
-    const allDimensions = await r
-      .table('TemplateDimension')
-      .getAll(teamId, {index: 'teamId'})
-      .filter({templateId})
-      .filter((row: RDatum) => row('removedAt').default(null).eq(null))
-      .run()
-    if (allDimensions.find((dimension) => dimension.name === normalizedName)) {
-      return standardError(new Error('Duplicate name dimension'), {userId: viewerId})
+    try {
+      await pg
+        .updateTable('TemplateDimension')
+        .set({name: normalizedName})
+        .where('id', '=', dimensionId)
+        .execute()
+    } catch (e) {
+      const error =
+        (e as any).constraint === 'TemplateDimension_teamId_name_removedAt_key'
+          ? 'Duplicate name dimension'
+          : (e as any).message
+      return {error: {message: error}}
     }
-
-    // RESOLUTION
-    await Promise.all([
-      r
-        .table('TemplateDimension')
-        .get(dimensionId)
-        .update({
-          name: normalizedName,
-          updatedAt: now
-        })
-        .run(),
-      pg.updateTable('MeetingTemplate').set({updatedAt: now}).where('id', '=', templateId).execute()
-    ])
-
+    dataLoader.clearAll('templateDimensions')
     const data = {dimensionId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/renamePokerTemplateScale.ts b/packages/server/graphql/mutations/renamePokerTemplateScale.ts
index 6d2ce4eea06..9bae150f230 100644
--- a/packages/server/graphql/mutations/renamePokerTemplateScale.ts
+++ b/packages/server/graphql/mutations/renamePokerTemplateScale.ts
@@ -1,6 +1,5 @@
 import {GraphQLID, GraphQLNonNull, GraphQLString} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -24,9 +23,7 @@ const renamePokerTemplateScale = {
     {scaleId, name}: {scaleId: string; name: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
     const scale = await dataLoader.get('templateScales').load(scaleId)
@@ -57,19 +54,6 @@ const renamePokerTemplateScale = {
       .where('id', '=', scaleId)
       .execute()
     dataLoader.clearAll('templateScales')
-    // mark all templates using this scale as updated
-    const updatedDimensions = await r
-      .table('TemplateDimension')
-      .getAll(scaleId, {index: 'scaleId'})
-      .run()
-    const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    if (updatedTemplateIds.length) {
-      await pg
-        .updateTable('MeetingTemplate')
-        .set({updatedAt: now})
-        .where('id', 'in', updatedTemplateIds)
-        .execute()
-    }
     const data = {scaleId}
     publish(SubscriptionChannel.TEAM, teamId, 'RenamePokerTemplateScalePayload', data, subOptions)
     return data
diff --git a/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts b/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts
index af6c5dc86d3..71c986557d6 100644
--- a/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts
+++ b/packages/server/graphql/mutations/updatePokerTemplateDimensionScale.ts
@@ -1,6 +1,5 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -24,14 +23,11 @@ const updatePokerTemplateDimensionScale = {
     {dimensionId, scaleId}: {dimensionId: string; scaleId: string},
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
-    const dimension = await r.table('TemplateDimension').get(dimensionId).run()
+    const dimension = await dataLoader.get('templateDimensions').load(dimensionId)
     const viewerId = getUserId(authToken)
-    const teamId = dimension.teamId
 
     // AUTH
     if (!dimension || dimension.removedAt) {
@@ -42,17 +38,14 @@ const updatePokerTemplateDimensionScale = {
     }
 
     // VALIDATION
+    const {teamId} = dimension
     const scale = await dataLoader.get('templateScales').load(scaleId)
     if (!scale || scale.removedAt || (!scale.isStarter && scale.teamId !== teamId)) {
       return standardError(new Error('Scale not found'), {userId: viewerId})
     }
 
-    const {templateId} = dimension
-    await Promise.all([
-      r.table('TemplateDimension').get(dimensionId).update({scaleId, updatedAt: now}).run(),
-      pg.updateTable('MeetingTemplate').set({updatedAt: now}).where('id', '=', templateId).execute()
-    ])
-
+    await pg.updateTable('TemplateDimension').set({scaleId}).where('id', '=', dimensionId).execute()
+    dataLoader.get('templateDimensions').clear(dimensionId)
     const data = {dimensionId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts b/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts
index b19dbd65478..992001d69b5 100644
--- a/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts
+++ b/packages/server/graphql/mutations/updatePokerTemplateScaleValue.ts
@@ -1,7 +1,6 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
 import isSpecialPokerLabel from 'parabol-client/utils/isSpecialPokerLabel'
-import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -38,9 +37,7 @@ const updatePokerTemplateScaleValue = {
     },
     {authToken, dataLoader, socketId: mutatorId}: GQLContext
   ) {
-    const r = await getRethink()
     const pg = getKysely()
-    const now = new Date()
     const operationId = dataLoader.share()
     const subOptions = {operationId, mutatorId}
     const viewerId = getUserId(authToken)
@@ -86,19 +83,6 @@ const updatePokerTemplateScaleValue = {
       .execute()
     dataLoader.clearAll('templateScales')
 
-    // mark all templates using this scale as updated
-    const updatedDimensions = await r
-      .table('TemplateDimension')
-      .getAll(scaleId, {index: 'scaleId'})
-      .run()
-    const updatedTemplateIds = updatedDimensions.map(({templateId}) => templateId)
-    if (updatedTemplateIds.length) {
-      await pg
-        .updateTable('MeetingTemplate')
-        .set({updatedAt: now})
-        .where('id', 'in', updatedTemplateIds)
-        .execute()
-    }
     const data = {scaleId}
     publish(
       SubscriptionChannel.TEAM,
diff --git a/packages/server/graphql/mutations/updateTemplateScope.ts b/packages/server/graphql/mutations/updateTemplateScope.ts
index 65eae40746b..b11f778856d 100644
--- a/packages/server/graphql/mutations/updateTemplateScope.ts
+++ b/packages/server/graphql/mutations/updateTemplateScope.ts
@@ -6,10 +6,8 @@ import {SharingScopeEnum as ESharingScope} from '../../database/types/MeetingTem
 import PokerTemplate from '../../database/types/PokerTemplate'
 import ReflectTemplate from '../../database/types/ReflectTemplate'
 import RetrospectivePrompt from '../../database/types/RetrospectivePrompt'
-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 generateUID from '../../generateUID'
+import getKysely from '../../postgres/getKysely'
 import {analytics} from '../../utils/analytics/analytics'
 import {getUserId, isTeamMember} from '../../utils/authorization'
 import publish from '../../utils/publish'
@@ -75,6 +73,7 @@ const updateTemplateScope = {
     let clonedTemplateId: string | undefined
 
     const cloneReflectTemplate = async () => {
+      const pg = getKysely()
       const clonedTemplate = new ReflectTemplate({
         name,
         teamId,
@@ -98,11 +97,17 @@ const updateTemplateScope = {
         })
       })
       await Promise.all([
-        insertMeetingTemplate(clonedTemplate),
-        removeMeetingTemplate(templateId),
+        pg
+          .with('MeetingTemplateInsert', (qc) =>
+            qc.insertInto('MeetingTemplate').values(clonedTemplate)
+          )
+          .with('MeetingTemplateDeactivate', (qc) =>
+            qc.updateTable('MeetingTemplate').set({isActive: false}).where('id', '=', templateId)
+          ),
         r.table('ReflectPrompt').insert(clonedPrompts).run(),
         r.table('ReflectPrompt').getAll(r.args(promptIds)).update({removedAt: now}).run()
       ])
+      dataLoader.clearAll(['reflectPrompts', 'meetingTemplates'])
     }
 
     const clonePokerTemplate = async () => {
@@ -117,22 +122,31 @@ const updateTemplateScope = {
         mainCategory: template.mainCategory
       })
       clonedTemplateId = clonedTemplate.id
-      const dimensions = await dataLoader.get('templateDimensionsByTemplateId').load(templateId)
-      const activeDimensions = dimensions.filter(({removedAt}) => !removedAt)
+      const activeDimensions = await dataLoader
+        .get('templateDimensionsByTemplateId')
+        .load(templateId)
       const dimensionIds = activeDimensions.map(({id}) => id)
-      const clonedDimensions = activeDimensions.map((dimension) => {
-        return new TemplateDimension({
-          ...dimension,
-          templateId: clonedTemplateId!
-        })
-      })
+      const clonedDimensions = activeDimensions.map((dimension) => ({
+        ...dimension,
+        id: generateUID(),
+        templateId: clonedTemplateId!
+      }))
 
-      await Promise.all([
-        insertMeetingTemplate(clonedTemplate),
-        removeMeetingTemplate(templateId),
-        r.table('TemplateDimension').insert(clonedDimensions).run(),
-        r.table('TemplateDimension').getAll(r.args(dimensionIds)).update({removedAt: now}).run()
-      ])
+      await getKysely()
+        .with('MeetingTemplateInsert', (qc) =>
+          qc.insertInto('MeetingTemplate').values(clonedTemplate)
+        )
+        .with('MeetingTemplateDeactivate', (qc) =>
+          qc.updateTable('MeetingTemplate').set({isActive: false}).where('id', '=', templateId)
+        )
+        .with('TemplateDimensionInsert', (qc) =>
+          qc.insertInto('TemplateDimension').values(clonedDimensions)
+        )
+        .updateTable('TemplateDimension')
+        .set({removedAt: now})
+        .where('id', 'in', dimensionIds)
+        .execute()
+      dataLoader.clearAll(['templateDimensions', 'meetingTemplates'])
     }
 
     if (shouldClone) {
@@ -142,7 +156,11 @@ const updateTemplateScope = {
         clonePokerTemplate()
       }
     } else {
-      await updateMeetingTemplateScope(templateId, newScope)
+      await getKysely()
+        .updateTable('MeetingTemplate')
+        .set({scope: newScope})
+        .where('id', '=', templateId)
+        .execute()
     }
     const data = {templateId, teamId, clonedTemplateId}
 
diff --git a/packages/server/graphql/public/mutations/addPokerTemplate.ts b/packages/server/graphql/public/mutations/addPokerTemplate.ts
index 1da1a915a99..d12d13ae2aa 100644
--- a/packages/server/graphql/public/mutations/addPokerTemplate.ts
+++ b/packages/server/graphql/public/mutations/addPokerTemplate.ts
@@ -1,9 +1,9 @@
 import {SprintPokerDefaults, SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../../database/rethinkDriver'
+import {positionAfter} from '../../../../client/shared/sortOrder'
 import PokerTemplate from '../../../database/types/PokerTemplate'
-import TemplateDimension from '../../../database/types/TemplateDimension'
+import generateUID from '../../../generateUID'
+import getKysely from '../../../postgres/getKysely'
 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'
@@ -17,7 +17,6 @@ const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async (
   {teamId, parentTemplateId},
   {authToken, dataLoader, socketId: mutatorId}
 ) => {
-  const r = await getRethink()
   const operationId = dataLoader.share()
   const subOptions = {operationId, mutatorId}
   const viewerId = getUserId(authToken)
@@ -78,23 +77,24 @@ const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async (
       illustrationUrl: parentTemplate.illustrationUrl
     })
 
-    const dimensions = await dataLoader
+    const activeDimensions = 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
-      })
-    })
-
+    const newTemplateDimensions = activeDimensions.map((dimension) => ({
+      ...dimension,
+      id: generateUID(),
+      teamId,
+      templateId: newTemplate.id
+    }))
     await Promise.all([
-      r.table('TemplateDimension').insert(newTemplateDimensions).run(),
-      insertMeetingTemplate(newTemplate),
+      getKysely()
+        .with('MeetingTemplateInsert', (qc) => qc.insertInto('MeetingTemplate').values(newTemplate))
+        .insertInto('TemplateDimension')
+        .values(newTemplateDimensions)
+        .execute(),
       decrementFreeTemplatesRemaining(viewerId, 'poker')
     ])
+    dataLoader.clearAll(['users', 'meetingTemplates', 'templateDimensions'])
     viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
     analytics.templateMetrics(viewer, newTemplate, 'Template Cloned')
     data = {templateId: newTemplate.id}
@@ -110,20 +110,24 @@ const addPokerTemplate: MutationResolvers['addPokerTemplate'] = async (
       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),
+      getKysely()
+        .with('MeetingTemplateInsert', (qc) => qc.insertInto('MeetingTemplate').values(newTemplate))
+        .insertInto('TemplateDimension')
+        .values({
+          id: generateUID(),
+          scaleId: SprintPokerDefaults.DEFAULT_SCALE_ID,
+          description: '',
+          sortOrder: positionAfter(''),
+          name: '*New Dimension',
+          teamId,
+          templateId
+        })
+        .execute(),
       decrementFreeTemplatesRemaining(viewerId, 'poker')
     ])
+    dataLoader.clearAll(['users', 'meetingTemplates', 'templateDimensions'])
     viewer.freeCustomPokerTemplatesRemaining = viewer.freeCustomPokerTemplatesRemaining - 1
     analytics.templateMetrics(viewer, newTemplate, 'Template Created')
     data = {templateId}
diff --git a/packages/server/graphql/public/typeDefs/Mutation.graphql b/packages/server/graphql/public/typeDefs/Mutation.graphql
index 3c86c1c9f20..0a58cdfde64 100644
--- a/packages/server/graphql/public/typeDefs/Mutation.graphql
+++ b/packages/server/graphql/public/typeDefs/Mutation.graphql
@@ -427,7 +427,7 @@ type Mutation {
   """
   movePokerTemplateDimension(
     dimensionId: ID!
-    sortOrder: Float!
+    sortOrder: String!
   ): MovePokerTemplateDimensionPayload!
 
   """
diff --git a/packages/server/graphql/public/typeDefs/TemplateDimension.graphql b/packages/server/graphql/public/typeDefs/TemplateDimension.graphql
index fd9686e2661..84f86685aee 100644
--- a/packages/server/graphql/public/typeDefs/TemplateDimension.graphql
+++ b/packages/server/graphql/public/typeDefs/TemplateDimension.graphql
@@ -32,7 +32,7 @@ type TemplateDimension {
   """
   the order of the dimensions in the template
   """
-  sortOrder: Float!
+  sortOrder: String!
 
   """
   FK for template
diff --git a/packages/server/graphql/public/types/TemplateScale.ts b/packages/server/graphql/public/types/TemplateScale.ts
index 44b3e15b292..780f7ec6ad8 100644
--- a/packages/server/graphql/public/types/TemplateScale.ts
+++ b/packages/server/graphql/public/types/TemplateScale.ts
@@ -1,5 +1,3 @@
-import getRethink from '../../../database/rethinkDriver'
-import {RDatum} from '../../../database/stricterR'
 import {TemplateScaleResolvers} from '../resolverTypes'
 
 const TemplateScale: TemplateScaleResolvers = {
@@ -8,15 +6,8 @@ const TemplateScale: TemplateScaleResolvers = {
     return dataLoader.get('teams').loadNonNull(teamId)
   },
 
-  dimensions: async ({id: scaleId, teamId}) => {
-    const r = await getRethink()
-    return r
-      .table('TemplateDimension')
-      .getAll(teamId, {index: 'teamId'})
-      .filter((row: RDatum) =>
-        row('removedAt').default(null).eq(null).and(row('scaleId').eq(scaleId))
-      )
-      .run()
+  dimensions: async ({id: scaleId}, _args, {dataLoader}) => {
+    return dataLoader.get('templateDimensionsByScaleId').load(scaleId)
   },
 
   values: ({id, values}) => {
diff --git a/packages/server/graphql/types/TemplateDimension.ts b/packages/server/graphql/types/TemplateDimension.ts
index 34cd99de4f9..6e997c93c36 100644
--- a/packages/server/graphql/types/TemplateDimension.ts
+++ b/packages/server/graphql/types/TemplateDimension.ts
@@ -1,11 +1,4 @@
-import {
-  GraphQLBoolean,
-  GraphQLFloat,
-  GraphQLID,
-  GraphQLNonNull,
-  GraphQLObjectType,
-  GraphQLString
-} from 'graphql'
+import {GraphQLBoolean, GraphQLID, GraphQLNonNull, GraphQLObjectType, GraphQLString} from 'graphql'
 import {GQLContext} from '../graphql'
 import {resolveTeam} from '../resolvers'
 import GraphQLISO8601Type from './GraphQLISO8601Type'
@@ -46,7 +39,7 @@ const TemplateDimension: GraphQLObjectType = new GraphQLObjectType<any, GQLConte
       type: new GraphQLNonNull(GraphQLISO8601Type)
     },
     sortOrder: {
-      type: new GraphQLNonNull(GraphQLFloat),
+      type: new GraphQLNonNull(GraphQLString),
       description: 'the order of the dimensions in the template'
     },
     templateId: {
diff --git a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
index b024cd537d8..73a4b0d98f1 100644
--- a/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
+++ b/packages/server/postgres/migrations/1614030642692_refs-for-meetings.ts
@@ -7,7 +7,6 @@ import {Client} from 'pg'
 import {RValue, r} from 'rethinkdb-ts'
 import {parse} from 'url'
 import MeetingPoker from '../../database/types/MeetingPoker'
-import TemplateDimension from '../../database/types/TemplateDimension'
 import {insertTemplateRefQuery, insertTemplateScaleRefQuery} from '../generatedMigrationHelpers'
 import getPgConfig from '../getPgConfig'
 
@@ -57,7 +56,7 @@ export async function up(): Promise<void> {
     .run()) as {
     id: string
     name: string
-    dimensions: (TemplateDimension & {scale: any})[]
+    dimensions: (any & {scale: any})[]
   }[]
 
   const uniqueScaleIdSet = new Set<string>()
diff --git a/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts b/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts
index 49bf054d3bd..b91e51a285c 100644
--- a/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts
+++ b/packages/server/postgres/migrations/1698265600000_addPrioritizationTemplates.ts
@@ -2,7 +2,6 @@ import {PALETTE} from 'parabol-client/styles/paletteV3'
 import {Client} from 'pg'
 import {r} from 'rethinkdb-ts'
 import connectRethinkDB from '../../database/connectRethinkDB'
-import TemplateDimension from '../../database/types/TemplateDimension'
 import getPgConfig from '../getPgConfig'
 import getPgp from '../getPgp'
 
@@ -133,7 +132,7 @@ type DimensionInfo = {
   templateId: string
 }
 
-const makeDimension = (dimensionInfo: DimensionInfo): TemplateDimension => {
+const makeDimension = (dimensionInfo: DimensionInfo) => {
   const {id, name, scaleId, sortOrder, templateId} = dimensionInfo
   return {
     createdAt,
diff --git a/packages/server/postgres/migrations/1721858364099_TemplateDimension.ts b/packages/server/postgres/migrations/1721858364099_TemplateDimension.ts
new file mode 100644
index 00000000000..7b118043775
--- /dev/null
+++ b/packages/server/postgres/migrations/1721858364099_TemplateDimension.ts
@@ -0,0 +1,143 @@
+import {Kysely, PostgresDialect, sql} from 'kysely'
+import {Client} from 'pg'
+import {r} from 'rethinkdb-ts'
+import connectRethinkDB from '../../database/connectRethinkDB'
+import getPg from '../getPg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  const START_CHAR_CODE = 32
+  const END_CHAR_CODE = 126
+
+  function positionAfter(pos: string) {
+    for (let i = pos.length - 1; i >= 0; i--) {
+      const curCharCode = pos.charCodeAt(i)
+      if (curCharCode < END_CHAR_CODE) {
+        return pos.substr(0, i) + String.fromCharCode(curCharCode + 1)
+      }
+    }
+    return pos + String.fromCharCode(START_CHAR_CODE + 1)
+  }
+
+  await connectRethinkDB()
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  await sql`
+  DO $$
+  BEGIN
+    CREATE TABLE IF NOT EXISTS "TemplateDimension" (
+      "id" VARCHAR(100) PRIMARY KEY,
+      "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+      "name" VARCHAR(50) NOT NULL,
+      "description" VARCHAR(256) NOT NULL DEFAULT '',
+      "teamId" VARCHAR(100) NOT NULL,
+      "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+      "templateId" VARCHAR(100) NOT NULL,
+      "scaleId" VARCHAR(100) NOT NULL,
+      "sortOrder" VARCHAR(64) NOT NULL COLLATE "C",
+      "removedAt" TIMESTAMP WITH TIME ZONE,
+      UNIQUE ("teamId","name","removedAt"),
+      CONSTRAINT "fk_teamId"
+        FOREIGN KEY("teamId")
+          REFERENCES "Team"("id")
+          ON DELETE CASCADE,
+      CONSTRAINT "fk_templateId"
+        FOREIGN KEY("templateId")
+          REFERENCES "MeetingTemplate"("id")
+          ON DELETE CASCADE,
+      CONSTRAINT "fk_scaleId"
+        FOREIGN KEY("scaleId")
+          REFERENCES "TemplateScale"("id")
+          ON DELETE CASCADE
+    );
+    CREATE INDEX IF NOT EXISTS "idx_TemplateDimension_teamId" ON "TemplateDimension"("teamId") WHERE "removedAt" IS NULL;
+    CREATE INDEX IF NOT EXISTS "idx_TemplateDimension_scaleId" ON "TemplateDimension"("scaleId") WHERE "removedAt" IS NULL;
+    CREATE INDEX IF NOT EXISTS "idx_TemplateDimension_templateId" ON "TemplateDimension"("templateId") WHERE "removedAt" IS NULL;
+    DROP TRIGGER IF EXISTS "update_TemplateDimension_updatedAt" ON "TemplateDimension";
+    CREATE TRIGGER "update_TemplateDimension_updatedAt" BEFORE UPDATE ON "TemplateDimension" FOR EACH ROW EXECUTE PROCEDURE "set_updatedAt"();
+    CREATE OR REPLACE FUNCTION "set_TemplateDimension_updatedAt"()
+      RETURNS TRIGGER AS $t$
+      BEGIN
+          -- Update the updatedAt column in TemplateDimension
+          UPDATE "TemplateDimension"
+          SET "updatedAt" = CURRENT_TIMESTAMP
+          WHERE "scaleId" = NEW."id";
+          RETURN NEW;
+      END;
+      $t$ LANGUAGE plpgsql;
+    CREATE OR REPLACE TRIGGER "update_TemplateDimension_updatedAt_from_TemplateScale"
+    AFTER INSERT OR UPDATE OR DELETE ON "TemplateScale"
+    FOR EACH ROW
+    EXECUTE FUNCTION "set_TemplateDimension_updatedAt"();
+
+    CREATE OR REPLACE FUNCTION "set_MeetingTemplate_updatedAt"()
+      RETURNS TRIGGER AS $t$
+      BEGIN
+          -- Update the updatedAt column in MeetingTemplate
+          UPDATE "MeetingTemplate"
+          SET "updatedAt" = CURRENT_TIMESTAMP
+          WHERE "id" = NEW."templateId";
+          RETURN NEW;
+      END;
+      $t$ LANGUAGE plpgsql;
+    CREATE OR REPLACE TRIGGER "update_MeetingTemplate_updatedAt_from_TemplateDimension"
+    AFTER INSERT OR UPDATE OR DELETE ON "TemplateDimension"
+    FOR EACH ROW
+    EXECUTE FUNCTION "set_MeetingTemplate_updatedAt"();
+  END $$;
+`.execute(pg)
+
+  const rDimensions = await r
+    .table('TemplateDimension')
+    .orderBy('sortOrder')
+    .coerceTo('array')
+    .run()
+  const chunk = (arr: any[], size: number) =>
+    Array.from({length: Math.ceil(arr.length / size)}, (_, i) =>
+      arr.slice(i * size, i * size + size)
+    )
+  const curSortOrder = positionAfter('')
+  const dimensions = rDimensions.map((dimension) => {
+    const sortOrder = positionAfter(curSortOrder)
+    return {
+      ...dimension,
+      sortOrder,
+      description: dimension.description || ''
+    }
+  })
+  const chunks = chunk(dimensions, 5000)
+
+  await Promise.all(
+    chunks.map(async (chunk) => {
+      try {
+        return await pg.insertInto('TemplateDimension').values(chunk).execute()
+      } catch (e) {
+        await Promise.all(
+          chunk.map(async (row) => {
+            try {
+              await pg
+                .insertInto('TemplateDimension')
+                .values(row)
+                .onConflict((oc) => oc.doNothing())
+                .execute()
+            } catch (e) {
+              console.log(e, row)
+            }
+          })
+        )
+      }
+    })
+  )
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DROP TABLE IF EXISTS "TemplateDimension";
+    ` /* Do undo magic */)
+  await client.end()
+}
diff --git a/packages/server/postgres/queries/updateMeetingTemplateScope.ts b/packages/server/postgres/queries/updateMeetingTemplateScope.ts
deleted file mode 100644
index 5f1ce9a30c4..00000000000
--- a/packages/server/postgres/queries/updateMeetingTemplateScope.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {SharingScopeEnum} from '../../database/types/MeetingTemplate'
-import getPg from '../getPg'
-
-const updateMeetingTemplateScope = async (templateId: string, scope: SharingScopeEnum) => {
-  const pg = getPg()
-  await pg.query(`UPDATE "MeetingTemplate" SET scope = $1 WHERE id = $2;`, [scope, templateId])
-}
-
-export default updateMeetingTemplateScope
diff --git a/packages/server/postgres/select.ts b/packages/server/postgres/select.ts
index 59af2b66533..e63cd74062e 100644
--- a/packages/server/postgres/select.ts
+++ b/packages/server/postgres/select.ts
@@ -16,3 +16,7 @@ export const selectTemplateScale = () => {
       )
     ])
 }
+
+export const selectTemplateDimension = () => {
+  return getKysely().selectFrom('TemplateDimension').selectAll().where('removedAt', 'is', null)
+}

From a653a61b279631aa66d461ebd2012c4136358bd0 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Thu, 25 Jul 2024 13:50:15 -0700
Subject: [PATCH 13/18] chore: migrate EmailVerification to pg (#9492)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
Co-authored-by: Matt Krick <matt.krick@gmail.com>
---
 packages/server/__tests__/autoJoin.test.ts    | 22 ++++----
 .../database/types/EmailVerification.ts       | 32 -----------
 .../createEmailVerficationForExistingUser.ts  | 25 +++++----
 .../server/email/createEmailVerification.ts   | 26 ++++-----
 .../public/mutations/signUpWithPassword.ts    | 19 +++----
 .../graphql/public/mutations/verifyEmail.ts   | 16 +++---
 .../1721868364099_addEmailVerification.ts     | 53 +++++++++++++++++++
 7 files changed, 108 insertions(+), 85 deletions(-)
 delete mode 100644 packages/server/database/types/EmailVerification.ts
 create mode 100644 packages/server/postgres/migrations/1721868364099_addEmailVerification.ts

diff --git a/packages/server/__tests__/autoJoin.test.ts b/packages/server/__tests__/autoJoin.test.ts
index 3fe4564e6eb..e48415ee854 100644
--- a/packages/server/__tests__/autoJoin.test.ts
+++ b/packages/server/__tests__/autoJoin.test.ts
@@ -1,6 +1,6 @@
 import faker from 'faker'
-import getRethink from '../database/rethinkDriver'
 import createEmailVerification from '../email/createEmailVerification'
+import getKysely from '../postgres/getKysely'
 import {getUserTeams, sendIntranet, sendPublic} from './common'
 
 const signUpVerified = async (email: string) => {
@@ -23,12 +23,14 @@ const signUpVerified = async (email: string) => {
   // manually generate verification token so also the founder can be verified
   await createEmailVerification({email, password})
 
-  const r = await getRethink()
-  const verificationToken = await r
-    .table('EmailVerification')
-    .getAll(email, {index: 'email'})
-    .nth(0)('token')
-    .run()
+  const pg = getKysely()
+  const verificationToken = (
+    await pg
+      .selectFrom('EmailVerification')
+      .select('token')
+      .where('email', '=', email)
+      .executeTakeFirstOrThrow(() => new Error(`No verification token found for ${email}`))
+  ).token
 
   const verifyEmail = await sendPublic({
     query: `
@@ -55,9 +57,9 @@ const signUpVerified = async (email: string) => {
   expect(verifyEmail).toMatchObject({
     data: {
       verifyEmail: {
-        authToken: expect.toBeString(),
+        authToken: expect.any(String),
         user: {
-          id: expect.toBeString()
+          id: expect.any(String)
         }
       }
     }
@@ -153,7 +155,7 @@ test.skip('autoJoin on multiple teams does not create duplicate `OrganizationUse
   const newEmail = `${faker.internet.userName()}@${domain}`.toLowerCase()
   const {user: newUser} = await signUpVerified(newEmail)
 
-  expect(newUser.tms).toIncludeSameMembers(teamIds)
+  expect(newUser.tms).toEqual(expect.arrayContaining(teamIds))
   expect(newUser.organizations).toMatchObject([
     {
       id: orgId
diff --git a/packages/server/database/types/EmailVerification.ts b/packages/server/database/types/EmailVerification.ts
deleted file mode 100644
index 0288eae2421..00000000000
--- a/packages/server/database/types/EmailVerification.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {Threshold} from 'parabol-client/types/constEnums'
-import generateUID from '../../generateUID'
-
-interface Input {
-  id?: string
-  token: string
-  email: string
-  expiration?: Date
-  hashedPassword?: string
-  pseudoId?: string | null
-  invitationToken?: string | null
-}
-
-export default class EmailVerification {
-  id: string
-  invitationToken?: string
-  token: string
-  email: string
-  expiration: Date
-  hashedPassword?: string
-  pseudoId?: string
-  constructor(input: Input) {
-    const {id, invitationToken, token, email, expiration, hashedPassword, pseudoId} = input
-    this.id = id || generateUID()
-    this.invitationToken = invitationToken || undefined
-    this.token = token
-    this.email = email
-    this.expiration = expiration || new Date(Date.now() + Threshold.EMAIL_VERIFICATION_LIFESPAN)
-    this.hashedPassword = hashedPassword
-    this.pseudoId = pseudoId || undefined
-  }
-}
diff --git a/packages/server/email/createEmailVerficationForExistingUser.ts b/packages/server/email/createEmailVerficationForExistingUser.ts
index c72337f2708..a54b4c33968 100644
--- a/packages/server/email/createEmailVerficationForExistingUser.ts
+++ b/packages/server/email/createEmailVerficationForExistingUser.ts
@@ -1,9 +1,9 @@
 import base64url from 'base64url'
 import crypto from 'crypto'
-import getRethink from '../database/rethinkDriver'
+import {Threshold} from 'parabol-client/types/constEnums'
 import AuthIdentityLocal from '../database/types/AuthIdentityLocal'
-import EmailVerification from '../database/types/EmailVerification'
 import {DataLoaderWorker} from '../graphql/graphql'
+import getKysely from '../postgres/getKysely'
 import emailVerificationEmailCreator from './emailVerificationEmailCreator'
 import getMailManager from './getMailManager'
 
@@ -34,15 +34,18 @@ const createEmailVerficationForExistingUser = async (
   if (!success) {
     return new Error('Unable to send verification email')
   }
-  const r = await getRethink()
-  const emailVerification = new EmailVerification({
-    email,
-    token: verifiedEmailToken,
-    hashedPassword,
-    pseudoId,
-    invitationToken
-  })
-  await r.table('EmailVerification').insert(emailVerification).run()
+  const pg = getKysely()
+  await pg
+    .insertInto('EmailVerification')
+    .values({
+      email,
+      token: verifiedEmailToken,
+      hashedPassword,
+      pseudoId,
+      invitationToken,
+      expiration: new Date(Date.now() + Threshold.EMAIL_VERIFICATION_LIFESPAN)
+    })
+    .execute()
   return undefined
 }
 
diff --git a/packages/server/email/createEmailVerification.ts b/packages/server/email/createEmailVerification.ts
index 2271c82163a..5a73d4716bc 100644
--- a/packages/server/email/createEmailVerification.ts
+++ b/packages/server/email/createEmailVerification.ts
@@ -1,9 +1,8 @@
 import base64url from 'base64url'
 import bcrypt from 'bcryptjs'
 import crypto from 'crypto'
-import {Security} from 'parabol-client/types/constEnums'
-import getRethink from '../database/rethinkDriver'
-import EmailVerification from '../database/types/EmailVerification'
+import {Security, Threshold} from 'parabol-client/types/constEnums'
+import getKysely from '../postgres/getKysely'
 import emailVerificationEmailCreator from './emailVerificationEmailCreator'
 import getMailManager from './getMailManager'
 
@@ -35,16 +34,19 @@ const createEmailVerification = async (props: SignUpWithPasswordMutationVariable
   if (!success) {
     return {error: {message: 'Unable to send verification email'}}
   }
-  const r = await getRethink()
   const hashedPassword = await bcrypt.hash(password, Security.SALT_ROUNDS)
-  const emailVerification = new EmailVerification({
-    email,
-    token: verifiedEmailToken,
-    hashedPassword,
-    pseudoId,
-    invitationToken
-  })
-  await r.table('EmailVerification').insert(emailVerification).run()
+  const pg = getKysely()
+  await pg
+    .insertInto('EmailVerification')
+    .values({
+      email,
+      token: verifiedEmailToken,
+      hashedPassword,
+      pseudoId,
+      invitationToken,
+      expiration: new Date(Date.now() + Threshold.EMAIL_VERIFICATION_LIFESPAN)
+    })
+    .execute()
   return {error: {message: 'Verification required. Check your inbox.'}}
 }
 
diff --git a/packages/server/graphql/public/mutations/signUpWithPassword.ts b/packages/server/graphql/public/mutations/signUpWithPassword.ts
index 2982d3fbdc9..29828d789c9 100644
--- a/packages/server/graphql/public/mutations/signUpWithPassword.ts
+++ b/packages/server/graphql/public/mutations/signUpWithPassword.ts
@@ -1,10 +1,8 @@
 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'
 import {USER_PREFERRED_NAME_LIMIT} from '../../../postgres/constants'
+import getKysely from '../../../postgres/getKysely'
 import createNewLocalUser from '../../../utils/createNewLocalUser'
 import encodeAuthToken from '../../../utils/encodeAuthToken'
 import isEmailVerificationRequired from '../../../utils/isEmailVerificationRequired'
@@ -21,7 +19,7 @@ const signUpWithPassword: MutationResolvers['signUpWithPassword'] = async (
   if (email.length > USER_PREFERRED_NAME_LIMIT) {
     return {error: {message: 'Email is too long'}}
   }
-  const r = await getRethink()
+  const pg = getKysely()
   const isOrganic = !invitationToken
   const {ip, dataLoader} = context
   const loginAttempt = await attemptLogin(email, password, ip)
@@ -49,13 +47,12 @@ const signUpWithPassword: MutationResolvers['signUpWithPassword'] = async (
   }
   const verificationRequired = await isEmailVerificationRequired(email, dataLoader)
   if (verificationRequired) {
-    const existingVerification = await r
-      .table('EmailVerification')
-      .getAll(email, {index: 'email'})
-      .filter((row: RValue) => row('expiration').gt(new Date()))
-      .nth(0)
-      .default(null)
-      .run()
+    const existingVerification = await pg
+      .selectFrom('EmailVerification')
+      .selectAll()
+      .where('email', '=', email)
+      .where('expiration', '>', new Date())
+      .executeTakeFirst()
     if (existingVerification) {
       return {error: {message: 'Verification email already sent'}}
     }
diff --git a/packages/server/graphql/public/mutations/verifyEmail.ts b/packages/server/graphql/public/mutations/verifyEmail.ts
index 8f210c96e7e..f9b8be46b9d 100644
--- a/packages/server/graphql/public/mutations/verifyEmail.ts
+++ b/packages/server/graphql/public/mutations/verifyEmail.ts
@@ -1,8 +1,7 @@
 import {AuthIdentityTypeEnum} from '../../../../client/types/constEnums'
-import getRethink from '../../../database/rethinkDriver'
 import AuthIdentityLocal from '../../../database/types/AuthIdentityLocal'
 import AuthToken from '../../../database/types/AuthToken'
-import EmailVerification from '../../../database/types/EmailVerification'
+import getKysely from '../../../postgres/getKysely'
 import {getUserByEmail} from '../../../postgres/queries/getUsersByEmails'
 import updateUser from '../../../postgres/queries/updateUser'
 import createNewLocalUser from '../../../utils/createNewLocalUser'
@@ -16,14 +15,13 @@ const verifyEmail: MutationResolvers['verifyEmail'] = async (
   context
 ) => {
   const {dataLoader} = context
-  const r = await getRethink()
+  const pg = getKysely()
   const now = new Date()
-  const emailVerification = (await r
-    .table('EmailVerification')
-    .getAll(verificationToken, {index: 'token'})
-    .nth(0)
-    .default(null)
-    .run()) as EmailVerification
+  const emailVerification = await pg
+    .selectFrom('EmailVerification')
+    .selectAll()
+    .where('token', '=', verificationToken)
+    .executeTakeFirst()
 
   if (!emailVerification) {
     return {error: {message: 'Invalid verification token'}}
diff --git a/packages/server/postgres/migrations/1721868364099_addEmailVerification.ts b/packages/server/postgres/migrations/1721868364099_addEmailVerification.ts
new file mode 100644
index 00000000000..b725ec8f65f
--- /dev/null
+++ b/packages/server/postgres/migrations/1721868364099_addEmailVerification.ts
@@ -0,0 +1,53 @@
+import {Kysely, PostgresDialect, sql} from 'kysely'
+import {Client} from 'pg'
+import {r} from 'rethinkdb-ts'
+import connectRethinkDB from '../../database/connectRethinkDB'
+import getPg from '../getPg'
+import getPgConfig from '../getPgConfig'
+
+export async function up() {
+  await connectRethinkDB()
+  const pg = new Kysely<any>({
+    dialect: new PostgresDialect({
+      pool: getPg()
+    })
+  })
+  await sql`
+    CREATE TABLE "EmailVerification" (
+      "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+      "email" "citext" NOT NULL,
+      "expiration" TIMESTAMP WITH TIME ZONE NOT NULL,
+      "token" VARCHAR(100) NOT NULL,
+      "hashedPassword" VARCHAR(100),
+      "invitationToken" VARCHAR(100),
+      "pseudoId" VARCHAR(100)
+    );
+
+    CREATE INDEX IF NOT EXISTS "idx_EmailVerification_email" ON "EmailVerification"("email");
+    CREATE INDEX IF NOT EXISTS "idx_EmailVerification_token" ON "EmailVerification"("token");
+  `.execute(pg)
+
+  const rData = await r.table('EmailVerification').coerceTo('array').run()
+  const insertData = rData.map((row) => {
+    const {email, expiration, hashedPassword, token, invitationToken, pseudoId} = row
+    return {
+      email,
+      expiration,
+      hashedPassword,
+      token,
+      invitationToken,
+      pseudoId
+    }
+  })
+  if (insertData.length === 0) return
+  await pg.insertInto('EmailVerification').values(insertData).execute()
+}
+
+export async function down() {
+  const client = new Client(getPgConfig())
+  await client.connect()
+  await client.query(`
+    DROP TABLE IF EXISTS "EmailVerification";
+  `)
+  await client.end()
+}

From 0f6d8a40ad7e8490ba9503b56c5bc9e9a20620c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 09:57:48 -0700
Subject: [PATCH 14/18] chore(deps): bump braces from 3.0.2 to 3.0.3 (#9843)

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

diff --git a/yarn.lock b/yarn.lock
index 0e96a64ad3b..e255bcfccb8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9658,14 +9658,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
   integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -12412,7 +12405,7 @@ filelist@^1.0.1:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1, fill-range@^7.1.1:
+fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
   integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
@@ -20196,7 +20189,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==
@@ -20214,6 +20207,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"
@@ -20285,7 +20287,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==
@@ -20299,6 +20301,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"
@@ -22131,7 +22140,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==
@@ -22149,6 +22158,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 861612ae13fe07cf10abb4277695ead7090b8661 Mon Sep 17 00:00:00 2001
From: "parabol-release-bot[bot]"
 <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 15:35:09 -0700
Subject: [PATCH 15/18] chore(release): release v7.40.0 (#10034)

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 2f8093d94f6..61d1fd0e340 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.39.3"
+  ".": "7.40.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6654a361cd2..f2143150fd2 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.40.0](https://github.com/ParabolInc/parabol/compare/v7.39.3...v7.40.0) (2024-07-26)
+
+
+### Added
+
+* nav updates ([#9973](https://github.com/ParabolInc/parabol/issues/9973)) ([2dd490a](https://github.com/ParabolInc/parabol/commit/2dd490ac75578f73d7a7b3e1f8ccfb1cd2164884))
+
+
+### Fixed
+
+* Disable SAML on downgrade to starter ([#10026](https://github.com/ParabolInc/parabol/issues/10026)) ([fa52c46](https://github.com/ParabolInc/parabol/commit/fa52c4638629fcf9c5c3453798d1320b9d8da2dd))
+
+
+### Changed
+
+* **deps:** bump braces from 3.0.2 to 3.0.3 ([#9843](https://github.com/ParabolInc/parabol/issues/9843)) ([0f6d8a4](https://github.com/ParabolInc/parabol/commit/0f6d8a40ad7e8490ba9503b56c5bc9e9a20620c2))
+* migrate EmailVerification to pg ([#9492](https://github.com/ParabolInc/parabol/issues/9492)) ([a653a61](https://github.com/ParabolInc/parabol/commit/a653a61b279631aa66d461ebd2012c4136358bd0))
+* **rethinkdb:** TemplateDimension: One-shot ([#10033](https://github.com/ParabolInc/parabol/issues/10033)) ([77e163a](https://github.com/ParabolInc/parabol/commit/77e163add65765641936bd56b83aa91f58e5b21a))
+* **SDL:** refactor _legacy.graphql into individual typeDefs ([#10019](https://github.com/ParabolInc/parabol/issues/10019)) ([f8b029d](https://github.com/ParabolInc/parabol/commit/f8b029d60b78e50e8afa5f0a0f44c863afce753a))
+
 ## [7.39.3](https://github.com/ParabolInc/parabol/compare/v7.39.2...v7.39.3) (2024-07-25)
 
 
diff --git a/package.json b/package.json
index 94dd7ffa721..25996a84dc9 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.39.3",
+  "version": "7.40.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/chronos/package.json b/packages/chronos/package.json
index a48ced587a5..9ef1b27f43a 100644
--- a/packages/chronos/package.json
+++ b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.39.3",
+  "version": "7.40.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.39.3"
+    "parabol-server": "7.40.0"
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 00da4eecb33..2e2f99e0240 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.39.3",
+  "version": "7.40.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
diff --git a/packages/embedder/package.json b/packages/embedder/package.json
index a5258421eac..28ef2a400f1 100644
--- a/packages/embedder/package.json
+++ b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.39.3",
+  "version": "7.40.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 1623ef6af34..335d0232e69 100644
--- a/packages/gql-executor/package.json
+++ b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.39.3",
+  "version": "7.40.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.39.3",
-    "parabol-server": "7.39.3",
+    "parabol-client": "7.40.0",
+    "parabol-server": "7.40.0",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index 95a50e4e3af..75980880673 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.39.3",
+  "version": "7.40.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index f9156cd8334..32707f4bef4 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.39.3",
+  "version": "7.40.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"
@@ -124,7 +124,7 @@
     "openai": "^4.24.1",
     "openapi-fetch": "^0.9.7",
     "oy-vey": "^0.12.1",
-    "parabol-client": "7.39.3",
+    "parabol-client": "7.40.0",
     "pg": "^8.5.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

From 8b3b1b80e436f33ae64580ec71c7ed098e076875 Mon Sep 17 00:00:00 2001
From: Rafa <101704572+rafaelromcar-parabol@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:16:09 +0100
Subject: [PATCH 16/18] chore(docker-stack): force network to be called parabol
 on the single-tenant compose stack (#10041)

---
 docker/stacks/single-tenant-host/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/stacks/single-tenant-host/docker-compose.yml b/docker/stacks/single-tenant-host/docker-compose.yml
index 7a5e74d7dd5..3c23afa7f8a 100644
--- a/docker/stacks/single-tenant-host/docker-compose.yml
+++ b/docker/stacks/single-tenant-host/docker-compose.yml
@@ -198,3 +198,4 @@ services:
       - parabol-network
 networks:
   parabol-network:
+    name: parabol

From 8e4040f8d69ac938a78f704804f6ae38523ad175 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 30 Jul 2024 08:00:12 -0700
Subject: [PATCH 17/18] [Snyk] Upgrade @radix-ui/react-alert-dialog from 1.0.5
 to 1.1.0 (#9954)

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

diff --git a/packages/client/package.json b/packages/client/package.json
index 2e2f99e0240..2dea8d4d73e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -72,7 +72,7 @@
     "@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-alert-dialog": "1.1.0",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dialog": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index e255bcfccb8..1b2a6c23a76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5761,18 +5761,22 @@
   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==
+"@radix-ui/primitive@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"
+  integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==
+
+"@radix-ui/react-alert-dialog@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.0.tgz#a13098b9b239bc31582615c95948fd2a8a866b22"
+  integrity sha512-kM8Pfn78tg0aqFD2E1KfO0sZDY75hTkrZd9DIWkncQFwlIB1FV96J0+KsNvK1AotgQO8IMxntRyPMrh8+2vghA==
   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/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-dialog" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-slot" "1.1.0"
 
 "@radix-ui/react-arrow@1.0.3":
   version "1.0.3"
@@ -5844,6 +5848,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-compose-refs@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74"
+  integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==
+
 "@radix-ui/react-context@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.0.0.tgz#f38e30c5859a9fb5e9aa9a9da452ee3ed9e0aee0"
@@ -5858,26 +5867,30 @@
   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"
+"@radix-ui/react-context@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.0.tgz#6df8d983546cfd1999c8512f3a8ad85a6e7fcee8"
+  integrity sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==
+
+"@radix-ui/react-dialog@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.0.tgz#9d354a8c7f534d49fffd2544fb7b371cb49da71c"
+  integrity sha512-oiSJcsjbdC8JqbXrOuhOd7oaEaPp3x2L2zn6V7ie6SSpEjrAha/WabDX4po6laGwbhAu9DT0XxHL0DmcIXrR0A==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-dismissable-layer" "1.1.0"
+    "@radix-ui/react-focus-guards" "1.1.0"
+    "@radix-ui/react-focus-scope" "1.1.0"
+    "@radix-ui/react-id" "1.1.0"
+    "@radix-ui/react-portal" "1.1.0"
+    "@radix-ui/react-presence" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-slot" "1.1.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
     aria-hidden "^1.1.1"
-    react-remove-scroll "2.5.5"
+    react-remove-scroll "2.5.7"
 
 "@radix-ui/react-dialog@^1.0.4":
   version "1.0.4"
@@ -5938,6 +5951,17 @@
     "@radix-ui/react-use-callback-ref" "1.0.1"
     "@radix-ui/react-use-escape-keydown" "1.0.3"
 
+"@radix-ui/react-dismissable-layer@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.0.tgz#2cd0a49a732372513733754e6032d3fb7988834e"
+  integrity sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-escape-keydown" "1.1.0"
+
 "@radix-ui/react-dropdown-menu@^2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.0.5.tgz#19bf4de8ffa348b4eb6a86842f14eff93d741170"
@@ -5973,6 +5997,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-focus-guards@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.0.tgz#8e9abb472a9a394f59a1b45f3dd26cfe3fc6da13"
+  integrity sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==
+
 "@radix-ui/react-focus-scope@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.3.tgz#9c2e8d4ed1189a1d419ee61edd5c1828726472f9"
@@ -5993,6 +6022,15 @@
     "@radix-ui/react-primitive" "1.0.3"
     "@radix-ui/react-use-callback-ref" "1.0.1"
 
+"@radix-ui/react-focus-scope@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz#ebe2891a298e0a33ad34daab2aad8dea31caf0b2"
+  integrity sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+
 "@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"
@@ -6009,6 +6047,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-use-layout-effect" "1.0.1"
 
+"@radix-ui/react-id@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-id/-/react-id-1.1.0.tgz#de47339656594ad722eb87f94a6b25f9cffae0ed"
+  integrity sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==
+  dependencies:
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
 "@radix-ui/react-menu@2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-2.0.5.tgz#a7d78b0808c4d38269240bf5d5c7ffea3e225e16"
@@ -6109,6 +6154,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
+"@radix-ui/react-portal@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.0.tgz#7d8591034d85478c172a91b1b879df8cf8b60bf0"
+  integrity sha512-0tXZ5O6qAVvuN9SWP0X+zadHf9hzHiMf/vxOU+kXO+fbtS8lS57MXa6EmikDxk9s/Bmkk80+dcxgbvisIyeqxg==
+  dependencies:
+    "@radix-ui/react-primitive" "2.0.0"
+
 "@radix-ui/react-presence@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.0.0.tgz#814fe46df11f9a468808a6010e3f3ca7e0b2e84a"
@@ -6127,6 +6179,14 @@
     "@radix-ui/react-compose-refs" "1.0.1"
     "@radix-ui/react-use-layout-effect" "1.0.1"
 
+"@radix-ui/react-presence@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.0.tgz#227d84d20ca6bfe7da97104b1a8b48a833bfb478"
+  integrity sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
+
 "@radix-ui/react-primitive@1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz#54e22f49ca59ba88d8143090276d50b93f8a7053"
@@ -6143,6 +6203,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-slot" "1.0.2"
 
+"@radix-ui/react-primitive@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884"
+  integrity sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==
+  dependencies:
+    "@radix-ui/react-slot" "1.1.0"
+
 "@radix-ui/react-radio-group@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-radio-group/-/react-radio-group-1.1.2.tgz#9b21ab66a125f60476f272a9c07e9c16e77d4e7b"
@@ -6252,6 +6319,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-compose-refs" "1.0.1"
 
+"@radix-ui/react-slot@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84"
+  integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==
+  dependencies:
+    "@radix-ui/react-compose-refs" "1.1.0"
+
 "@radix-ui/react-tooltip@^1.0.6", "@radix-ui/react-tooltip@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.0.7.tgz#8f55070f852e7e7450cc1d9210b793d2e5a7686e"
@@ -6285,6 +6359,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-use-callback-ref@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz#bce938ca413675bc937944b0d01ef6f4a6dc5bf1"
+  integrity sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==
+
 "@radix-ui/react-use-controllable-state@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.0.tgz#a64deaafbbc52d5d407afaa22d493d687c538b7f"
@@ -6301,6 +6380,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-use-callback-ref" "1.0.1"
 
+"@radix-ui/react-use-controllable-state@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz#1321446857bb786917df54c0d4d084877aab04b0"
+  integrity sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==
+  dependencies:
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+
 "@radix-ui/react-use-escape-keydown@1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz#217b840c250541609c66f67ed7bab2b733620755"
@@ -6309,6 +6395,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-use-callback-ref" "1.0.1"
 
+"@radix-ui/react-use-escape-keydown@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz#31a5b87c3b726504b74e05dac1edce7437b98754"
+  integrity sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==
+  dependencies:
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+
 "@radix-ui/react-use-layout-effect@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.0.tgz#2fc19e97223a81de64cd3ba1dc42ceffd82374dc"
@@ -6323,6 +6416,11 @@
   dependencies:
     "@babel/runtime" "^7.13.10"
 
+"@radix-ui/react-use-layout-effect@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz#3c2c8ce04827b26a39e442ff4888d9212268bd27"
+  integrity sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==
+
 "@radix-ui/react-use-previous@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-use-previous/-/react-use-previous-1.0.0.tgz#e48a69c3a7d8078a967084038df66d0d181c56ac"
@@ -18618,6 +18716,14 @@ react-remove-scroll-bar@^2.3.3:
     react-style-singleton "^2.2.1"
     tslib "^2.0.0"
 
+react-remove-scroll-bar@^2.3.4:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz#3e585e9d163be84a010180b18721e851ac81a29c"
+  integrity sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==
+  dependencies:
+    react-style-singleton "^2.2.1"
+    tslib "^2.0.0"
+
 react-remove-scroll@2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz#1e31a1260df08887a8a0e46d09271b52b3a37e77"
@@ -18629,6 +18735,17 @@ react-remove-scroll@2.5.5:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
+react-remove-scroll@2.5.7:
+  version "2.5.7"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.7.tgz#15a1fd038e8497f65a695bf26a4a57970cac1ccb"
+  integrity sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==
+  dependencies:
+    react-remove-scroll-bar "^2.3.4"
+    react-style-singleton "^2.2.1"
+    tslib "^2.1.0"
+    use-callback-ref "^1.3.0"
+    use-sidecar "^1.1.2"
+
 react-router-dom@^5.0.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363"

From 936f1f62fc474e94618ebb64dbbdd8678706a984 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 30 Jul 2024 09:30:32 -0700
Subject: [PATCH 18/18] chore: update @radix-ui/react-alert-dialog  (#9986)

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Nick O'Ferrall <nickoferrall@gmail.com>
---
 packages/client/package.json |  2 +-
 yarn.lock                    | 60 +++++++++++-------------------------
 2 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 2dea8d4d73e..34921d3aeff 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -72,7 +72,7 @@
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.9.2",
     "@mui/x-date-pickers": "^6.3.1",
-    "@radix-ui/react-alert-dialog": "1.1.0",
+    "@radix-ui/react-alert-dialog": "1.1.1",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dialog": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index 1b2a6c23a76..07f1a8e8861 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5766,15 +5766,15 @@
   resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2"
   integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==
 
-"@radix-ui/react-alert-dialog@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.0.tgz#a13098b9b239bc31582615c95948fd2a8a866b22"
-  integrity sha512-kM8Pfn78tg0aqFD2E1KfO0sZDY75hTkrZd9DIWkncQFwlIB1FV96J0+KsNvK1AotgQO8IMxntRyPMrh8+2vghA==
+"@radix-ui/react-alert-dialog@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.1.tgz#f49c987b9e4f2bf37005b3864933e2b3beac907a"
+  integrity sha512-wmCoJwj7byuVuiLKqDLlX7ClSUU0vd9sdCeM+2Ls+uf13+cpSJoMgwysHq1SGVVkJj5Xn0XWi1NoRCdkMpr6Mw==
   dependencies:
     "@radix-ui/primitive" "1.1.0"
     "@radix-ui/react-compose-refs" "1.1.0"
     "@radix-ui/react-context" "1.1.0"
-    "@radix-ui/react-dialog" "1.1.0"
+    "@radix-ui/react-dialog" "1.1.1"
     "@radix-ui/react-primitive" "2.0.0"
     "@radix-ui/react-slot" "1.1.0"
 
@@ -5872,10 +5872,10 @@
   resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.0.tgz#6df8d983546cfd1999c8512f3a8ad85a6e7fcee8"
   integrity sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==
 
-"@radix-ui/react-dialog@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.0.tgz#9d354a8c7f534d49fffd2544fb7b371cb49da71c"
-  integrity sha512-oiSJcsjbdC8JqbXrOuhOd7oaEaPp3x2L2zn6V7ie6SSpEjrAha/WabDX4po6laGwbhAu9DT0XxHL0DmcIXrR0A==
+"@radix-ui/react-dialog@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.1.tgz#4906507f7b4ad31e22d7dad69d9330c87c431d44"
+  integrity sha512-zysS+iU4YP3STKNS6USvFVqI4qqx8EpiwmT5TuCApVEBca+eRCbONi4EgzfNSuVnOXvC5UPHHMjs8RXO6DH9Bg==
   dependencies:
     "@radix-ui/primitive" "1.1.0"
     "@radix-ui/react-compose-refs" "1.1.0"
@@ -5884,7 +5884,7 @@
     "@radix-ui/react-focus-guards" "1.1.0"
     "@radix-ui/react-focus-scope" "1.1.0"
     "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-portal" "1.1.0"
+    "@radix-ui/react-portal" "1.1.1"
     "@radix-ui/react-presence" "1.1.0"
     "@radix-ui/react-primitive" "2.0.0"
     "@radix-ui/react-slot" "1.1.0"
@@ -6154,12 +6154,13 @@
     "@babel/runtime" "^7.13.10"
     "@radix-ui/react-primitive" "1.0.3"
 
-"@radix-ui/react-portal@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.0.tgz#7d8591034d85478c172a91b1b879df8cf8b60bf0"
-  integrity sha512-0tXZ5O6qAVvuN9SWP0X+zadHf9hzHiMf/vxOU+kXO+fbtS8lS57MXa6EmikDxk9s/Bmkk80+dcxgbvisIyeqxg==
+"@radix-ui/react-portal@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.1.tgz#1957f1eb2e1aedfb4a5475bd6867d67b50b1d15f"
+  integrity sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==
   dependencies:
     "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-layout-effect" "1.1.0"
 
 "@radix-ui/react-presence@1.0.0":
   version "1.0.0"
@@ -20306,7 +20307,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==
@@ -20324,15 +20325,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"
@@ -20404,7 +20396,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==
@@ -20418,13 +20410,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"
@@ -22257,7 +22242,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==
@@ -22275,15 +22260,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"