chore(release): Test v7.50.7

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "7.50.6"
+  ".": "7.50.7"
 }

CHANGELOG.md

@@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.50.7](https://github.com/ParabolInc/parabol/compare/v7.50.6...v7.50.7) (2024-10-10)
+
+
+### Changed
+
+* **rethinkdb:** NewFeature: OneShot ([#10312](https://github.com/ParabolInc/parabol/issues/10312)) ([92deddf](https://github.com/ParabolInc/parabol/commit/92deddf30645ad4d479f29eb7ab66737a3218946))
+* **rethinkdb:** TeamInvitation: Phase 1 ([#10325](https://github.com/ParabolInc/parabol/issues/10325)) ([72ea4e1](https://github.com/ParabolInc/parabol/commit/72ea4e1bde79cdec9d9d4eda80932e32e880d19c))
+
 ## [7.50.6](https://github.com/ParabolInc/parabol/compare/v7.50.5...v7.50.6) (2024-10-09)
 
 

codegen.json

@@ -25,6 +25,7 @@
           "GenerateMeetingSummarySuccess": "./types/GenerateMeetingSummarySuccess#GenerateMeetingSummarySuccessSource",
           "LoginsPayload": "./types/LoginsPayload#LoginsPayloadSource",
           "MeetingTemplate": "../../database/types/MeetingTemplate#default as IMeetingTemplate",
+          "NewFeatureBroadcast": "../../postgres/types/index#NewFeature",
           "NewMeeting": "../../postgres/types/Meeting#AnyMeeting",
           "Organization": "../../postgres/types/index#Organization as OrganizationDB",
           "PingableServices": "./types/PingableServices#PingableServicesSource",
@@ -50,6 +51,7 @@
         "contextType": "../graphql#GQLContext",
         "mappers": {
           "ReflectTemplatePromptUpdateDescriptionPayload": "./types/ReflectTemplatePromptUpdateDescriptionPayload#ReflectTemplatePromptUpdateDescriptionPayloadSource",
+          "NewFeatureBroadcast": "../../postgres/types/index#NewFeature",
           "ReflectTemplatePromptUpdateGroupColorPayload": "./types/ReflectTemplatePromptUpdateGroupColorPayload#ReflectTemplatePromptUpdateGroupColorPayloadSource",
           "RemoveReflectTemplatePromptPayload": "./types/RemoveReflectTemplatePromptPayload#RemoveReflectTemplatePromptPayloadSource",
           "RenameReflectTemplatePromptPayload": "./types/RenameReflectTemplatePromptPayload#RenameReflectTemplatePromptPayloadSource",
@@ -178,7 +180,7 @@
           "Team": "../../postgres/types/index#Team as TeamDB",
           "TeamHealthPhase": "./types/TeamHealthPhase#TeamHealthPhaseSource",
           "TeamHealthStage": "./types/TeamHealthStage#TeamHealthStageSource",
-          "TeamInvitation": "../../database/types/TeamInvitation#default",
+          "TeamInvitation": "../../postgres/types/index/#TeamInvitation",
           "TeamMember": "../../postgres/types/index#TeamMember as TeamMember",
           "TeamMemberIntegrationAuthOAuth1": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrationAuthOAuth2": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",

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.50.6",
+  "version": "7.50.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

packages/chronos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.50.6",
+  "version": "7.50.7",
   "description": "A cron job scheduler",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.50.6"
+    "parabol-server": "7.50.7"
   }
 }

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.50.6",
+  "version": "7.50.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

packages/embedder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.50.6",
+  "version": "7.50.7",
   "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",

packages/gql-executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.50.6",
+  "version": "7.50.7",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <matt.krick@gmail.com>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.50.6",
-    "parabol-server": "7.50.6",
+    "parabol-client": "7.50.7",
+    "parabol-server": "7.50.7",
     "undici": "^5.26.2"
   }
 }

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.50.6",
+  "version": "7.50.7",
   "description": "",
   "main": "index.js",
   "scripts": {

packages/server/database/rethinkDriver.ts

@@ -1,5 +1,5 @@
 import {MasterPool, r} from 'rethinkdb-ts'
-import TeamInvitation from '../database/types/TeamInvitation'
+import {TeamInvitation} from '../postgres/types/index'
 import getRethinkConfig from './getRethinkConfig'
 import {R} from './stricterR'
 import NotificationKickedOut from './types/NotificationKickedOut'

packages/server/database/types/User.ts

@@ -32,7 +32,7 @@ export default class User {
   lastSeenAt: Date
   lastSeenAtURLs: string[] | null
   updatedAt: Date
-  newFeatureId?: string | null
+  newFeatureId?: number | null
   overLimitCopy?: string | null
   picture: string
   inactive: boolean

packages/server/dataloader/foreignKeyLoaderMakers.ts

@@ -1,3 +1,4 @@
+import {sql} from 'kysely'
 import getKysely from '../postgres/getKysely'
 import {getTeamPromptResponsesByMeetingIds} from '../postgres/queries/getTeamPromptResponsesByMeetingIds'
 import {
@@ -12,6 +13,7 @@ import {
   selectSlackAuths,
   selectSlackNotifications,
   selectSuggestedAction,
+  selectTeamInvitations,
   selectTeams,
   selectTemplateDimension,
   selectTemplateScale,
@@ -280,3 +282,15 @@ export const massInvitationsByTeamMemberId = foreignKeyLoaderMaker(
       .execute()
   }
 )
+
+export const _pgteamInvitationsByTeamId = foreignKeyLoaderMaker(
+  '_pgteamInvitations',
+  'teamId',
+  async (teamIds) => {
+    return selectTeamInvitations()
+      .where('teamId', 'in', teamIds)
+      .where('acceptedAt', 'is', null)
+      .where('expiresAt', '>=', sql<Date>`CURRENT_TIMESTAMP`)
+      .execute()
+  }
+)

packages/server/dataloader/primaryKeyLoaderMakers.ts

@@ -11,13 +11,15 @@ import {
   selectMassInvitations,
   selectMeetingMembers,
   selectMeetingSettings,
+  selectNewFeatures,
   selectNewMeetings,
   selectOrganizations,
   selectReflectPrompts,
   selectRetroReflections,
   selectSlackAuths,
   selectSlackNotifications,
   selectSuggestedAction,
+  selectTeamInvitations,
   selectTeamPromptResponses,
   selectTeams,
   selectTemplateDimension,
@@ -134,3 +136,11 @@ export const meetingMembers = primaryKeyLoaderMaker((ids: readonly string[]) =>
 export const massInvitations = primaryKeyLoaderMaker((ids: readonly string[]) => {
   return selectMassInvitations().where('id', 'in', ids).execute()
 })
+
+export const newFeatures = primaryKeyLoaderMaker((ids: readonly number[]) => {
+  return selectNewFeatures().where('id', 'in', ids).execute()
+})
+
+export const _pgteamInvitations = primaryKeyLoaderMaker((ids: readonly string[]) => {
+  return selectTeamInvitations().where('id', 'in', ids).execute()
+})

packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts

@@ -3,7 +3,6 @@ import RethinkPrimaryKeyLoaderMaker from './RethinkPrimaryKeyLoaderMaker'
 /**
  * all rethink dataloader types which also must exist in {@link rethinkDriver/RethinkSchema}
  */
-export const newFeatures = new RethinkPrimaryKeyLoaderMaker('NewFeature')
 export const notifications = new RethinkPrimaryKeyLoaderMaker('Notification')
 export const tasks = new RethinkPrimaryKeyLoaderMaker('Task')
 export const teamInvitations = new RethinkPrimaryKeyLoaderMaker('TeamInvitation')

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

@@ -1,6 +1,7 @@
 import {InvitationTokenError} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
-import TeamInvitation from '../../../database/types/TeamInvitation'
+import generateUID from '../../../generateUID'
+import getKysely from '../../../postgres/getKysely'
 import {verifyMassInviteToken} from '../../../utils/massInviteToken'
 import {DataLoaderWorker} from '../../graphql'
 
@@ -17,15 +18,22 @@ const handleMassInviteToken = async (
   if (tms?.includes(teamId)) {
     return {error: InvitationTokenError.ALREADY_ACCEPTED, teamId, meetingId}
   }
-  const invitation = new TeamInvitation({
+  const invitation = {
+    id: generateUID(),
     token: invitationToken,
     invitedBy,
     meetingId,
     teamId,
     expiresAt,
-    email
-  })
-  await r.table('TeamInvitation').insert(invitation).run()
+    email,
+    isMassInvite: true,
+    acceptedAt: null
+  }
+  await getKysely().insertInto('TeamInvitation').values(invitation).execute()
+  await r
+    .table('TeamInvitation')
+    .insert({...invitation, createdAt: new Date()})
+    .run()
   return {invitation}
 }
 

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

@@ -1,6 +1,6 @@
 import {InvitationTokenError} from 'parabol-client/types/constEnums'
 import getRethink from '../../../database/rethinkDriver'
-import TeamInvitation from '../../../database/types/TeamInvitation'
+import {TeamInvitation} from '../../../postgres/types'
 
 const handleTeamInviteToken = async (
   invitationToken: string,

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

@@ -7,9 +7,10 @@ import {isNotNull} from '../../../../client/utils/predicates'
 import appOrigin from '../../../appOrigin'
 import getRethink from '../../../database/rethinkDriver'
 import NotificationTeamInvitation from '../../../database/types/NotificationTeamInvitation'
-import TeamInvitation from '../../../database/types/TeamInvitation'
 import getMailManager from '../../../email/getMailManager'
 import teamInviteEmailCreator from '../../../email/teamInviteEmailCreator'
+import generateUID from '../../../generateUID'
+import getKysely from '../../../postgres/getKysely'
 import {getUsersByEmails} from '../../../postgres/queries/getUsersByEmails'
 import removeSuggestedAction from '../../../safeMutations/removeSuggestedAction'
 import {analytics} from '../../../utils/analytics/analytics'
@@ -34,6 +35,7 @@ const inviteToTeamHelper = async (
   const {authToken, dataLoader, socketId: mutatorId} = context
   const viewerId = getUserId(authToken)
   const r = await getRethink()
+  const pg = getKysely()
   const operationId = dataLoader.share()
   const subOptions = {mutatorId, operationId}
 
@@ -112,18 +114,20 @@ const inviteToTeamHelper = async (
   )
   const expiresAt = new Date(Date.now() + Threshold.TEAM_INVITATION_LIFESPAN)
   // insert invitation records
-  const teamInvitationsToInsert = newAllowedInvitees.map((email, idx) => {
-    return new TeamInvitation({
-      expiresAt,
-      email,
-      invitedBy: viewerId,
-      meetingId: meetingId ?? undefined,
-      teamId,
-      token: tokens[idx]!
-    })
-  })
+  const teamInvitationsToInsert = newAllowedInvitees.map((email, idx) => ({
+    id: generateUID(),
+    expiresAt,
+    email,
+    invitedBy: viewerId,
+    meetingId: meetingId ?? undefined,
+    teamId,
+    token: tokens[idx]!,
+    isMassInvite: false,
+    createdAt: new Date(),
+    acceptedAt: null
+  }))
   await r.table('TeamInvitation').insert(teamInvitationsToInsert).run()
-
+  await pg.insertInto('TeamInvitation').values(teamInvitationsToInsert).execute()
   // remove suggested action, if any
   let removedSuggestedActionId
   if (isOnboardTeam) {

packages/server/graphql/private/mutations/addNewFeature.ts

@@ -1,6 +1,4 @@
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import getRethink from '../../../database/rethinkDriver'
-import generateUID from '../../../generateUID'
 import getKysely from '../../../postgres/getKysely'
 import getRedis from '../../../utils/getRedis'
 import publish from '../../../utils/publish'
@@ -12,7 +10,6 @@ const addNewFeature: MutationResolvers['addNewFeature'] = async (
   {actionButtonCopy, snackbarMessage, url},
   {dataLoader}
 ) => {
-  const r = await getRethink()
   const redis = getRedis()
   const pg = getKysely()
 
@@ -21,18 +18,16 @@ const addNewFeature: MutationResolvers['addNewFeature'] = async (
   const subOptions = {operationId}
 
   // RESOLUTION
-  const newFeatureId = generateUID()
-  const newFeature = {
-    id: newFeatureId,
-    actionButtonCopy,
-    snackbarMessage,
-    url
-  }
-  await Promise.all([
-    r.table('NewFeature').insert(newFeature).run(),
-    pg.updateTable('User').set({newFeatureId}).execute()
-  ])
+  const newFeatureRes = await pg
+    .with('NewFeatureInsert', (qb) =>
+      qb.insertInto('NewFeature').values({actionButtonCopy, snackbarMessage, url}).returning('id')
+    )
+    .updateTable('User')
+    .set((eb) => ({newFeatureId: eb.selectFrom('NewFeatureInsert').select('NewFeatureInsert.id')}))
+    .returning((eb) => [eb.selectFrom('NewFeatureInsert').select('NewFeatureInsert.id').as('id')])
+    .executeTakeFirstOrThrow()
 
+  const newFeature = {actionButtonCopy, snackbarMessage, url, id: newFeatureRes.id!}
   const onlineUserIds = new Set()
   const stream = redis.scanStream({match: 'presence:*'})
   stream.on('data', (keys) => {

packages/server/graphql/public/types/AcceptTeamInvitationPayload.ts

@@ -6,7 +6,7 @@ import isValid from '../../isValid'
 import {AcceptTeamInvitationPayloadResolvers} from '../resolverTypes'
 
 export type AcceptTeamInvitationPayloadSource = {
-  meetingId?: string
+  meetingId?: string | null
   teamId?: string
   teamMemberId?: string
   invitationNotificationIds?: string[]

packages/server/graphql/public/types/NewFeatureBroadcast.ts

@@ -0,0 +1,7 @@
+import {NewFeatureBroadcastResolvers} from '../resolverTypes'
+
+const NewFeatureBroadcast: NewFeatureBroadcastResolvers = {
+  id: ({id}) => `NewFeature:${id}`
+}
+
+export default NewFeatureBroadcast

packages/server/graphql/public/types/User.ts

@@ -411,7 +411,7 @@ const User: ReqResolvers<'User'> = {
   },
 
   newFeature: ({newFeatureId}, _args, {dataLoader}) => {
-    return newFeatureId ? dataLoader.get('newFeatures').load(newFeatureId) : null
+    return newFeatureId ? dataLoader.get('newFeatures').loadNonNull(newFeatureId) : null
   },
 
   lastSeenAtURLs: async ({id: userId}) => {