ParabolInc · github-actions · Mar 26, 2024 · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.38.10"
+  ".": "7.38.11"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,22 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.38.11](https://github.com/ParabolInc/parabol/compare/v7.38.10...v7.38.11) (2024-07-19)
+
+
+### Fixed
+
+* Filipino checkin greeting ([#9997](https://github.com/ParabolInc/parabol/issues/9997)) ([5c45379](https://github.com/ParabolInc/parabol/commit/5c453794fa3ebb6f1948a2f6c8c7f70be2a0d009))
+
+
+### Changed
+
+* fix broken build mig file ([#10006](https://github.com/ParabolInc/parabol/issues/10006)) ([892cbd6](https://github.com/ParabolInc/parabol/commit/892cbd654d030a6884a4c50cecf6fb5244e153c8))
+* move some integrations to SDL pattern ([#10000](https://github.com/ParabolInc/parabol/issues/10000)) ([6d01097](https://github.com/ParabolInc/parabol/commit/6d01097ef68bbbe33eea1faf1367d7ad6120f1db))
+* **rethinkdb:** QueryMap: One-shot ([#10005](https://github.com/ParabolInc/parabol/issues/10005)) ([28553e4](https://github.com/ParabolInc/parabol/commit/28553e49c64206fde3e88d47ac48175639b8b6cb))
+* **rethinkdb:** TaskHistory: One-shot ([#10004](https://github.com/ParabolInc/parabol/issues/10004)) ([7100a23](https://github.com/ParabolInc/parabol/commit/7100a231fc6bbc750398daec03d882e5afc7a57c))
+* **rethinkdb:** TeamMember: Phase 1 ([#9979](https://github.com/ParabolInc/parabol/issues/9979)) ([b0c2cf2](https://github.com/ParabolInc/parabol/commit/b0c2cf2aa40aa08c8de24bfdcb2a9a150178271e))
+
 ## [7.38.10](https://github.com/ParabolInc/parabol/compare/v7.38.9...v7.38.10) (2024-07-17)
 
 

diff --git a/codegen.json b/codegen.json
@@ -43,7 +43,19 @@
     "packages/server/graphql/public/resolverTypes.ts": {
       "config": {
         "contextType": "../graphql#GQLContext",
+        "showUnusedMappers": false,
         "mappers": {
+          "_xGitLabProject": "./types/_xGitLabProject#_xGitLabProjectSource as _xGitLabProject",
+          "JiraServerIntegration": "./types/JiraServerIntegration#JiraServerIntegrationSource",
+          "GitHubIntegration": "../../postgres/queries/getGitHubAuthByUserIdTeamId#GitHubAuth",
+          "GitLabIntegration": "./types/GitLabIntegration#GitLabIntegrationSource",
+          "MattermostIntegration": "./types/MattermostIntegration#MattermostIntegrationSource",
+          "MSTeamsIntegration": "./types/MSTeamsIntegration#MSTeamsIntegrationSource",
+          "SlackIntegration": "../../database/types/SlackAuth#default as SlackAuthDB",
+          "SlackNotification": "../../database/types/SlackNotification#default as SlackNotificationDB",
+          "AzureDevOpsIntegration": ".types/AzureDevOpsIntegration#AzureDevOpsIntegrationSource",
+          "AzureDevOpsWorkItem": "../../dataloader/azureDevOpsLoaders#AzureDevOpsWorkItem",
+          "AzureDevOpsRemoteProject": "./types/AzureDevOpsRemoteProject#AzureDevOpsRemoteProjectSource",
           "AcceptRequestToJoinDomainSuccess": "./types/AcceptRequestToJoinDomainSuccess#AcceptRequestToJoinDomainSuccessSource",
           "AcceptTeamInvitationPayload": "./types/AcceptTeamInvitationPayload#AcceptTeamInvitationPayloadSource",
           "ActionMeeting": "../../database/types/MeetingAction#default",
@@ -56,6 +68,8 @@
           "AddedNotification": "./types/AddedNotification#AddedNotificationSource",
           "AgendaItem": "../../database/types/AgendaItem#default as AgendaItemDB",
           "ArchiveTeamPayload": "./types/ArchiveTeamPayload#ArchiveTeamPayloadSource",
+          "AtlassianIntegration": "../../postgres/queries/getAtlassianAuthByUserIdTeamId#AtlassianAuth as AtlassianAuthDB",
+          "JiraSearchQuery": "../../database/types/JiraSearchQuery#default as JiraSearchQueryDB",
           "AuthTokenPayload": "./types/AuthTokenPayload#AuthTokenPayloadSource",
           "AutogroupSuccess": "./types/AutogroupSuccess#AutogroupSuccessSource",
           "BatchArchiveTasksSuccess": "./types/BatchArchiveTasksSuccess#BatchArchiveTasksSuccessSource",
@@ -71,8 +85,12 @@
           "GcalIntegration": "./types/GcalIntegration#GcalIntegrationSource",
           "GenerateGroupsSuccess": "./types/GenerateGroupsSuccess#GenerateGroupsSuccessSource",
           "GetTemplateSuggestionSuccess": "./types/GetTemplateSuggestionSuccess#GetTemplateSuggestionSuccessSource",
+          "IntegrationProviderWebhook": "../../postgres/queries/getIntegrationProvidersByIds#TIntegrationProvider",
+          "IntegrationProviderOAuth1": "../../postgres/queries/getIntegrationProvidersByIds#TIntegrationProvider",
           "IntegrationProviderOAuth2": "../../postgres/queries/getIntegrationProvidersByIds#TIntegrationProvider",
           "InviteToTeamPayload": "./types/InviteToTeamPayload#InviteToTeamPayloadSource",
+          "JiraServerIssue": "./types/JiraServerIssue#JiraServerIssueSource",
+          "JiraServerRemoteProject": "../../dataloader/jiraServerLoaders#JiraServerProject",
           "JiraIssue": "./types/JiraIssue#JiraIssueSource",
           "JiraRemoteProject": "../types/JiraRemoteProject#JiraRemoteProjectSource",
           "MeetingSeries": "../../postgres/types/MeetingSeries#MeetingSeries",
@@ -126,6 +144,8 @@
           "TeamHealthStage": "./types/TeamHealthStage#TeamHealthStageSource",
           "TeamInvitation": "../../database/types/TeamInvitation#default",
           "TeamMember": "../../database/types/TeamMember#default as TeamMemberDB",
+          "TeamMemberIntegrationAuthWebhook": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
+          "TeamMemberIntegrationAuthOAuth1": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrationAuthOAuth2": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrations": "./types/TeamMemberIntegrations#TeamMemberIntegrationsSource",
           "TeamPromptMeeting": "../../database/types/MeetingTeamPrompt#default as MeetingTeamPromptDB",

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "An open-source app for building smarter, more agile teams.",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.38.10",
+  "version": "7.38.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/chronos/package.json b/packages/chronos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.38.10",
+  "version": "7.38.11",
   "description": "A cron job scheduler",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
@@ -25,6 +25,6 @@
   },
   "dependencies": {
     "cron": "^2.3.1",
-    "parabol-server": "7.38.10"
+    "parabol-server": "7.38.11"
   }
 }
diff --git a/packages/client/hooks/useSnacksForNewMeetings.ts b/packages/client/hooks/useSnacksForNewMeetings.ts
@@ -43,7 +43,7 @@ const useSnacksForNewMeetings = (meetingsRef: readonly useSnacksForNewMeetings_m
     const [snackedMeeting] = sortedMeetings
     if (!snackedMeeting) return
     const {id: meetingId, createdBy, createdByUser, name: meetingName} = snackedMeeting
-    const {preferredName} = createdByUser
+    const preferredName = createdByUser?.preferredName ?? 'Unknown'
     const isInit = createdBy === viewerId
     const name = isInit ? 'You' : preferredName
     atmosphere.eventEmitter.emit('addSnackbar', {

diff --git 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. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.38.10",
+  "version": "7.38.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/ParabolInc/parabol"

diff --git a/packages/client/utils/makeCheckinGreeting.ts b/packages/client/utils/makeCheckinGreeting.ts
@@ -76,8 +76,8 @@ const greetings = [
     language: 'Arabic'
   },
   {
-    content: 'Filipino',
-    language: 'Kumusta'
+    content: 'Kumusta',
+    language: 'Filipino'
   },
   {
     content: 'Pryvit',

diff --git a/packages/embedder/package.json b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.38.10",
+  "version": "7.38.11",
   "description": "A service that computes embedding vectors from Parabol objects",
   "author": "Jordan Husney <[email protected]>",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.38.10",
+  "version": "7.38.11",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <[email protected]>",
   "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.10",
-    "parabol-server": "7.38.10",
+    "parabol-client": "7.38.11",
+    "parabol-server": "7.38.11",
     "undici": "^5.26.2"
   }
 }
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
@@ -2,7 +2,7 @@
   "name": "integration-tests",
   "author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
   "license": "AGPL-3.0",
-  "version": "7.38.10",
+  "version": "7.38.11",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/packages/server/__tests__/common.ts b/packages/server/__tests__/common.ts
@@ -49,14 +49,18 @@ const persistFunction = (text: string) => {
 }
 
 const persistQuery = async (query: string) => {
-  const r = await getRethink()
+  const pg = getKysely()
   const id = persistFunction(query.trim())
   const record = {
     id,
     query,
     createdAt: new Date()
   }
-  await r.table('QueryMap').insert(record, {conflict: 'replace'}).run()
+  await pg
+    .insertInto('QueryMap')
+    .values(record)
+    .onConflict((oc) => oc.doNothing())
+    .execute()
   return id
 }
 

diff --git a/packages/server/database/rethinkDriver.ts b/packages/server/database/rethinkDriver.ts
@@ -119,10 +119,6 @@ export type RethinkSchema = {
     type: PushInvitation
     index: 'userId'
   }
-  QueryMap: {
-    type: any
-    index: ''
-  }
   MeetingTemplate: {
     type: MeetingTemplate
     index: 'teamId' | 'orgId'
@@ -156,10 +152,6 @@ export type RethinkSchema = {
       | 'userId'
       | 'integrationHash'
   }
-  TaskHistory: {
-    type: any
-    index: 'taskIdUpdatedAt' | 'teamMemberId'
-  }
   TeamInvitation: {
     type: TeamInvitation
     index: 'email' | 'teamId' | 'token'

diff --git a/packages/server/database/types/Meeting.ts b/packages/server/database/types/Meeting.ts
@@ -27,7 +27,7 @@ export default abstract class Meeting {
   isLegacy?: boolean // true if old version of action meeting
   createdAt = new Date()
   updatedAt = new Date()
-  createdBy: string
+  createdBy: string | null
   endedAt: Date | undefined | null = undefined
   facilitatorStageId: string | undefined
   facilitatorUserId: string

diff --git a/packages/server/dataloader/RootDataLoader.ts b/packages/server/dataloader/RootDataLoader.ts
@@ -48,7 +48,7 @@ export type RegisterDependsOn = (primaryLoaders: AllPrimaryLoaders | AllPrimaryL
 
 // The RethinkDB logic is a leaky abstraction! It will be gone soon & this will be generic enough to put in its own package
 interface GenericDataLoader<TLoaders, TPrimaryLoaderNames> {
-  clearAll(pkLoaderName: TPrimaryLoaderNames): void
+  clearAll(pkLoaderName: TPrimaryLoaderNames | TPrimaryLoaderNames[]): void
   get<LoaderName extends keyof TLoaders, Loader extends TLoaders[LoaderName]>(
     loaderName: LoaderName
   ): Loader extends (...args: any[]) => any
@@ -85,8 +85,9 @@ export default class RootDataLoader<
     this.dataLoaderOptions = dataLoaderOptions
   }
 
-  clearAll: DataLoaderInstance['clearAll'] = (pkLoaderName) => {
-    const dependencies = [pkLoaderName, ...(this.dependentLoaders[pkLoaderName] ?? [])]
+  clearAll: DataLoaderInstance['clearAll'] = (inPkLoaderName) => {
+    const pkLoaderNames = Array.isArray(inPkLoaderName) ? inPkLoaderName : [inPkLoaderName]
+    const dependencies = pkLoaderNames.flatMap((pk) => [pk, ...(this.dependentLoaders[pk] ?? [])])
     dependencies.forEach((loaderName) => {
       this.loaders[loaderName]?.clearAll()
     })
@@ -95,22 +96,19 @@ export default class RootDataLoader<
     let loader = this.loaders[loaderName]
     if (loader) return loader
     const loaderMaker = loaderMakers[loaderName as keyof typeof loaderMakers]
+    const dependsOn: RegisterDependsOn = (inPrimaryLoaders) => {
+      const primaryLoaders = Array.isArray(inPrimaryLoaders) ? inPrimaryLoaders : [inPrimaryLoaders]
+      primaryLoaders.forEach((primaryLoader) => {
+        ;(this.dependentLoaders[primaryLoader] ??= []).push(loaderName)
+      })
+    }
     if (loaderMaker instanceof RethinkPrimaryKeyLoaderMaker) {
       const {table} = loaderMaker
       loader = rethinkPrimaryKeyLoader(this.dataLoaderOptions, table)
     } else if (loaderMaker instanceof RethinkForeignKeyLoaderMaker) {
       const {fetch, field, pk} = loaderMaker
-      const basePkLoader = this.get(pk) as any
-      loader = rethinkForeignKeyLoader(basePkLoader, this.dataLoaderOptions, field, fetch)
+      loader = rethinkForeignKeyLoader(this, dependsOn, pk, field, fetch)
     } else {
-      const dependsOn: RegisterDependsOn = (inPrimaryLoaders) => {
-        const primaryLoaders = Array.isArray(inPrimaryLoaders)
-          ? inPrimaryLoaders
-          : [inPrimaryLoaders]
-        primaryLoaders.forEach((primaryLoader) => {
-          ;(this.dependentLoaders[primaryLoader] ??= []).push(loaderName)
-        })
-      }
       loader = (loaderMaker as any)(this, dependsOn)
     }
     this.loaders[loaderName] = loader!

diff --git a/packages/server/dataloader/azureDevOpsLoaders.ts b/packages/server/dataloader/azureDevOpsLoaders.ts
@@ -103,6 +103,8 @@ export interface AzureDevOpsWorkItem {
   type: string
   descriptionHTML: string
   service: 'azureDevOps'
+  teamId: string
+  userId: string
 }
 
 export interface AzureUserInfo {
@@ -123,7 +125,7 @@ export interface AzureAccountProject extends TeamProjectReference {
   service: 'azureDevOps'
 }
 
-interface AzureProject extends ProjectRes {
+export interface AzureProject extends ProjectRes {
   userId: string
   teamId: string
   service: 'azureDevOps'

diff --git a/packages/server/dataloader/jiraServerLoaders.ts b/packages/server/dataloader/jiraServerLoaders.ts
@@ -55,6 +55,8 @@ type TeamUserKey = {
 export type JiraServerProject = JiraServerRestProject & {
   service: 'jiraServer'
   providerId: number
+  userId: string
+  teamId: string
 }
 
 export const jiraServerIssue = (parent: RootDataLoader) => {
@@ -123,7 +125,9 @@ export const allJiraServerProjects = (parent: RootDataLoader) => {
           .map((project) => ({
             ...project,
             service: 'jiraServer' as const,
-            providerId: provider.id
+            providerId: provider.id,
+            userId,
+            teamId
           }))
       })
     )

diff --git a/packages/server/dataloader/rethinkForeignKeyLoader.ts b/packages/server/dataloader/rethinkForeignKeyLoader.ts
@@ -1,21 +1,25 @@
-import DataLoader from 'dataloader'
 import {DBType} from '../database/rethinkDriver'
+import RootDataLoader, {RegisterDependsOn} from './RootDataLoader'
 import UpdatableCacheDataLoader from './UpdatableCacheDataLoader'
+import * as rethinkPrimaryKeyLoaderMakers from './rethinkPrimaryKeyLoaderMakers'
 
 const rethinkForeignKeyLoader = <T extends keyof DBType>(
-  standardLoader: DataLoader<string, DBType[T]>,
-  options: DataLoader.Options<string, DBType[T]>,
+  parent: RootDataLoader,
+  dependsOn: RegisterDependsOn,
+  primaryKeyLoaderName: keyof typeof rethinkPrimaryKeyLoaderMakers,
   field: string,
   fetchFn: (ids: readonly string[]) => any[] | Promise<any[]>
 ) => {
+  const standardLoader = parent.get(primaryKeyLoaderName)
+  dependsOn(primaryKeyLoaderName)
   const batchFn = async (ids: readonly string[]) => {
     const items = await fetchFn(ids)
     items.forEach((item) => {
       standardLoader.clear(item.id).prime(item.id, item)
     })
     return ids.map((id) => items.filter((item) => item[field] === id))
   }
-  return new UpdatableCacheDataLoader<string, DBType[T][]>(batchFn, options)
+  return new UpdatableCacheDataLoader<string, DBType[T][]>(batchFn, {...parent.dataLoaderOptions})
 }
 
 export default rethinkForeignKeyLoader
diff --git a/packages/server/graphql/CompiledQueryCache.ts b/packages/server/graphql/CompiledQueryCache.ts
@@ -1,7 +1,7 @@
 import tracer from 'dd-trace'
 import {GraphQLSchema, parse} from 'graphql'
 import {CompiledQuery} from 'graphql-jit'
-import getRethink from '../database/rethinkDriver'
+import getKysely from '../postgres/getKysely'
 import {MutationResolvers, QueryResolvers, Resolver} from './public/resolverTypes'
 import {tracedCompileQuery} from './traceGraphQL'
 
@@ -42,8 +42,13 @@ export default class CompiledQueryCache {
   async fromID(docId: string, schema: GraphQLSchema) {
     const compiledQuery = this.store[docId]
     if (compiledQuery) return compiledQuery
-    const r = await getRethink()
-    let queryString = await r.table('QueryMap').get(docId)('query').default(null).run()
+    const pg = getKysely()
+    const queryStringRes = await pg
+      .selectFrom('QueryMap')
+      .select('query')
+      .where('id', '=', docId)
+      .executeTakeFirst()
+    let queryString = queryStringRes?.query
     if (!queryString && !__PRODUCTION__) {
       // try/catch block required for building the toolbox
       try {

diff --git a/packages/server/graphql/DocumentCache.ts b/packages/server/graphql/DocumentCache.ts
@@ -5,7 +5,7 @@
  */
 
 import {DocumentNode, parse} from 'graphql'
-import getRethink from '../database/rethinkDriver'
+import getKysely from '../postgres/getKysely'
 
 export default class DocumentCache {
   store = {} as {[docId: string]: DocumentNode}
@@ -16,8 +16,13 @@ export default class DocumentCache {
     // looks up query string for a persisted query, parses into an AST, caches and returns it
     let document = this.store[docId]
     if (!document) {
-      const r = await getRethink()
-      let queryString = await r.table('QueryMap').get(docId)('query').default(null).run()
+      const pg = getKysely()
+      const queryStringRes = await pg
+        .selectFrom('QueryMap')
+        .select('query')
+        .where('id', '=', docId)
+        .executeTakeFirst()
+      let queryString = queryStringRes?.query
       if (!queryString && !__PRODUCTION__) {
         // In development, use the frequently changing queryMap to look up persisted queries by hash
         const queryMap = require('../../../queryMap.json')