chore(rethinkdb): SuggestedAction: Phase 3

codegen.json

@@ -81,6 +81,7 @@
           "Comment": "../../database/types/Comment#default as CommentDB",
           "Company": "./types/Company#CompanySource",
           "CreateGcalEventInput": "./types/CreateGcalEventInput#default",
+          "CreateGcalEventInput": "./types/CreateGcalEventInput#default",
           "CreateImposterTokenPayload": "./types/CreateImposterTokenPayload#CreateImposterTokenPayloadSource",
           "CreateStripeSubscriptionSuccess": "./types/CreateStripeSubscriptionSuccess#CreateStripeSubscriptionSuccessSource",
           "CreateTaskPayload": "./types/CreateTaskPayload#CreateTaskPayloadSource",
@@ -117,6 +118,7 @@
           "NotifyTeamArchived": "../../database/types/NotificationTeamArchived#default",
           "Organization": "./types/Organization#OrganizationSource",
           "TemplateScaleValue": "./types/TemplateScaleValue#TemplateScaleValueSource as TemplateScaleValueSourceDB",
+          "SuggestedAction": "../../postgres/types/index#SuggestedAction as SuggestedActionDB",
           "TemplateScale": "../../postgres/types/index#TemplateScale as TemplateScaleDB",
           "TemplateScaleRef": "../../postgres/types/index#TemplateScaleRef as TemplateScaleRefDB",
           "Threadable": "./types/Threadable#ThreadableSource",

packages/client/modules/email/components/MeetingSummaryEmailRootSSR.tsx

@@ -9,7 +9,7 @@ import MeetingSummaryEmail from './SummaryEmail/MeetingSummaryEmail/MeetingSumma
 const query = graphql`
   query MeetingSummaryEmailRootSSRQuery($meetingId: ID!) {
     viewer {
-      newMeeting(meetingId: $meetingId) {
+      meeting(meetingId: $meetingId) {
         meetingType
         team {
           id
@@ -42,9 +42,9 @@ const MeetingSummaryEmailRootSSR = (props: Props) => {
   // viewer will be null on initial SSR render
   if (!data?.viewer) return null
   const {viewer} = data
-  const {newMeeting} = viewer
-  if (!newMeeting) return null
-  const {team} = newMeeting
+  const {meeting} = viewer
+  if (!meeting) return null
+  const {team} = meeting
   const {id: teamId} = team
   const options = {searchParams: meetingSummaryUrlParams}
   const referrerUrl = makeAppURL(appOrigin, `new-summary/${meetingId}`, options)
@@ -53,7 +53,7 @@ const MeetingSummaryEmailRootSSR = (props: Props) => {
   const emailCSVUrl = makeAppURL(appOrigin, `new-summary/${meetingId}/csv`, options)
   return (
     <MeetingSummaryEmail
-      meeting={newMeeting}
+      meeting={meeting}
       referrer={'email'}
       teamDashUrl={teamDashUrl}
       meetingUrl={meetingUrl}

packages/client/modules/email/components/SummaryEmail/ExportToCSV.tsx

@@ -23,7 +23,7 @@ interface Props extends WithMutationProps {
 const query = graphql`
   query ExportToCSVQuery($meetingId: ID!) {
     viewer {
-      newMeeting(meetingId: $meetingId) {
+      meeting(meetingId: $meetingId) {
         meetingType
         team {
           name
@@ -126,7 +126,7 @@ const query = graphql`
   }
 `
 
-type Meeting = NonNullable<NonNullable<ExportToCSVQuery['response']['viewer']>['newMeeting']>
+type Meeting = NonNullable<NonNullable<ExportToCSVQuery['response']['viewer']>['meeting']>
 type ExportableTypeName = 'Task' | 'Reflection' | 'Comment' | 'Reply'
 
 interface CSVPokerRow {
@@ -336,7 +336,7 @@ const ExportToCSV = (props: Props) => {
     onCompleted()
     if (!data) return
     const {viewer} = data
-    const {newMeeting} = viewer
+    const {meeting: newMeeting} = viewer
     if (!newMeeting) return
     const rows = getRows(newMeeting)
     if (rows.length === 0) return

packages/client/modules/summary/components/NewMeetingSummary.tsx

@@ -26,7 +26,7 @@ const query = graphql`
     ...DashTopBar_query
     viewer {
       ...DashSidebar_viewer
-      newMeeting(meetingId: $meetingId) {
+      meeting(meetingId: $meetingId) {
         ...MeetingSummaryEmail_meeting
         ...MeetingLockedOverlay_meeting
         id
@@ -49,7 +49,7 @@ const NewMeetingSummary = (props: Props) => {
   const {urlAction, queryRef} = props
   const data = usePreloadedQuery<NewMeetingSummaryQuery>(query, queryRef)
   const {viewer} = data
-  const {newMeeting, teams} = viewer
+  const {meeting: newMeeting, teams} = viewer
   const activeMeetings = teams.flatMap((team) => team.activeMeetings).filter(Boolean)
   const {history} = useRouter()
   useEffect(() => {

packages/server/database/rethinkDriver.ts

@@ -26,9 +26,6 @@ import NotificationTeamInvitation from './types/NotificationTeamInvitation'
 import PasswordResetRequest from './types/PasswordResetRequest'
 import PushInvitation from './types/PushInvitation'
 import RetrospectivePrompt from './types/RetrospectivePrompt'
-import SuggestedActionCreateNewTeam from './types/SuggestedActionCreateNewTeam'
-import SuggestedActionInviteYourTeam from './types/SuggestedActionInviteYourTeam'
-import SuggestedActionTryTheDemo from './types/SuggestedActionTryTheDemo'
 import Task from './types/Task'
 
 export type RethinkSchema = {
@@ -127,12 +124,6 @@ export type RethinkSchema = {
     type: SlackNotification
     index: 'teamId' | 'userId'
   }
-  SuggestedAction: {
-    // tryRetroMeeting = 'tryRetroMeeting',
-    // tryActionMeeting = 'tryActionMeeting'
-    type: SuggestedActionCreateNewTeam | SuggestedActionInviteYourTeam | SuggestedActionTryTheDemo
-    index: 'userId' | 'teamId'
-  }
   Task: {
     type: Task
     index:

packages/server/dataloader/customLoaderMakers.ts

@@ -55,12 +55,12 @@ export interface ReactablesKey {
 
 export interface UserTasksKey {
   first: number
-  after?: Date
+  after?: Date | null
   userIds: string[]
   teamIds: string[]
   archived?: boolean
-  statusFilters: TaskStatusEnum[]
-  filterQuery?: string
+  statusFilters?: TaskStatusEnum[] | null
+  filterQuery?: string | null
   includeUnassigned?: boolean
 }
 

packages/server/dataloader/foreignKeyLoaderMakers.ts

@@ -154,8 +154,8 @@ export const templateDimensionsByScaleId = foreignKeyLoaderMaker(
   }
 )
 
-export const _suggestedActionsByUserId = foreignKeyLoaderMaker(
-  '_suggestedActions',
+export const suggestedActionsByUserId = foreignKeyLoaderMaker(
+  'suggestedActions',
   'userId',
   async (userIds) => {
     return selectSuggestedAction().where('userId', 'in', userIds).execute()

packages/server/dataloader/primaryKeyLoaderMakers.ts

@@ -167,6 +167,6 @@ export const templateDimensions = primaryKeyLoaderMaker((ids: readonly string[])
   return selectTemplateDimension().where('id', 'in', ids).execute()
 })
 
-export const _suggestedActions = primaryKeyLoaderMaker((ids: readonly string[]) => {
+export const suggestedActions = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return selectSuggestedAction().where('id', 'in', ids).execute()
 })

packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts

@@ -134,19 +134,6 @@ export const slackNotificationsByTeamId = new RethinkForeignKeyLoaderMaker(
   }
 )
 
-export const suggestedActionsByUserId = new RethinkForeignKeyLoaderMaker(
-  'suggestedActions',
-  'userId',
-  async (userIds) => {
-    const r = await getRethink()
-    return r
-      .table('SuggestedAction')
-      .getAll(r.args(userIds), {index: 'userId'})
-      .filter((row: any) => row('removedAt').default(null).eq(null))
-      .run()
-  }
-)
-
 export const tasksByDiscussionId = new RethinkForeignKeyLoaderMaker(
   'tasks',
   'discussionId',

packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts

@@ -15,6 +15,5 @@ export const newFeatures = new RethinkPrimaryKeyLoaderMaker('NewFeature')
 export const notifications = new RethinkPrimaryKeyLoaderMaker('Notification')
 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 teamInvitations = new RethinkPrimaryKeyLoaderMaker('TeamInvitation')

packages/server/graphql/mutations/dismissSuggestedAction.ts

@@ -1,5 +1,4 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
-import getRethink from '../../database/rethinkDriver'
 import getKysely from '../../postgres/getKysely'
 import {getUserId} from '../../utils/authorization'
 import standardError from '../../utils/standardError'
@@ -20,7 +19,6 @@ export default {
     {suggestedActionId}: {suggestedActionId: string},
     {authToken, dataLoader}: GQLContext
   ) => {
-    const r = await getRethink()
     const now = new Date()
     const viewerId = getUserId(authToken)
 
@@ -40,7 +38,6 @@ export default {
       .set({removedAt: now})
       .where('id', '=', suggestedActionId)
       .execute()
-    await r.table('SuggestedAction').get(suggestedActionId).update({removedAt: now}).run()
 
     // no need to publish since that'll only affect their other open tabs
     return {

packages/server/graphql/mutations/helpers/bootstrapNewUser.ts

@@ -1,4 +1,3 @@
-import getRethink from '../../../database/rethinkDriver'
 import AuthToken from '../../../database/types/AuthToken'
 import TimelineEventJoinedParabol from '../../../database/types/TimelineEventJoinedParabol'
 import User from '../../../database/types/User'
@@ -21,7 +20,6 @@ const bootstrapNewUser = async (
   isOrganic: boolean,
   dataLoader: DataLoaderWorker
 ) => {
-  const r = await getRethink()
   const {
     id: userId,
     createdAt,
@@ -115,14 +113,9 @@ const bootstrapNewUser = async (
         return Promise.all([
           acceptTeamInvitation(team, userId, dataLoader),
           isOrganic
-            ? Promise.all([
-                pg.insertInto('SuggestedAction').values(inviteYourTeam).execute(),
-                r.table('SuggestedAction').insert(inviteYourTeam).run()
-              ])
-            : Promise.all([
-                pg.insertInto('SuggestedAction').values(actions).execute(),
-                r.table('SuggestedAction').insert(actions).run()
-              ]),
+            ? pg.insertInto('SuggestedAction').values(inviteYourTeam).execute()
+            : pg.insertInto('SuggestedAction').values(actions).execute(),
+          ,
           analytics.autoJoined(newUser, teamId)
         ])
       })
@@ -147,7 +140,6 @@ const bootstrapNewUser = async (
     analytics.newOrg(newUser, orgId, teamId, true)
   } else {
     await pg.insertInto('SuggestedAction').values(actions).execute()
-    await r.table('SuggestedAction').insert(actions).run()
   }
 
   analytics.accountCreated(newUser, !isOrganic, isPatient0)

packages/server/graphql/mutations/helpers/createTeamAndLeader.ts

@@ -83,15 +83,5 @@ export default async function createTeamAndLeader(
     // add meeting settings
     r.table('MeetingSettings').insert(meetingSettings).run()
   ])
-  const hasSuggestedAction = await r
-    .table('SuggestedAction')
-    .getAll(userId, {index: 'userId'})
-    .filter({type: 'inviteYourTeam'})
-    .count()
-    .ge(1)
-    .run()
-  if (!hasSuggestedAction) {
-    await r.table('SuggestedAction').insert(suggestedAction).run()
-  }
   dataLoader.clearAll(['teams', 'users', 'teamMembers', 'timelineEvents', 'meetingSettings'])
 }

packages/server/graphql/public/typeDefs/SuggestedAction.graphql

@@ -20,7 +20,7 @@ interface SuggestedAction {
   """
   * The timestamp the action was removed at
   """
-  removedAt: DateTime!
+  removedAt: DateTime
 
   """
   The specific type of suggested action

packages/server/graphql/public/typeDefs/SuggestedActionCreateNewTeam.graphql

@@ -20,7 +20,7 @@ type SuggestedActionCreateNewTeam implements SuggestedAction {
   """
   * The timestamp the action was removed at
   """
-  removedAt: DateTime!
+  removedAt: DateTime
 
   """
   The specific type of suggested action

packages/server/graphql/public/typeDefs/SuggestedActionInviteYourTeam.graphql

@@ -20,7 +20,7 @@ type SuggestedActionInviteYourTeam implements SuggestedAction {
   """
   * The timestamp the action was removed at
   """
-  removedAt: DateTime!
+  removedAt: DateTime
 
   """
   The specific type of suggested action

packages/server/graphql/public/typeDefs/SuggestedActionTryActionMeeting.graphql

@@ -20,7 +20,7 @@ type SuggestedActionTryActionMeeting implements SuggestedAction {
   """
   * The timestamp the action was removed at
   """
-  removedAt: DateTime!
+  removedAt: DateTime
 
   """
   The specific type of suggested action

packages/server/graphql/public/typeDefs/SuggestedActionTryRetroMeeting.graphql

@@ -20,7 +20,7 @@ type SuggestedActionTryRetroMeeting implements SuggestedAction {
   """
   * The timestamp the action was removed at
   """
-  removedAt: DateTime!
+  removedAt: DateTime
 
   """
   The specific type of suggested action

packages/server/graphql/public/typeDefs/SuggestedActionTryTheDemo.graphql

@@ -20,7 +20,7 @@ type SuggestedActionTryTheDemo implements SuggestedAction {
   """
   * The timestamp the action was removed at
   """
-  removedAt: DateTime!
+  removedAt: DateTime
 
   """
   The specific type of suggested action