Skip to content

Commit

Permalink
chore: upgrade GraphQL to v16 (#10052)
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Krick <[email protected]>
  • Loading branch information
mattkrick authored Aug 1, 2024
1 parent 1ed6a82 commit a27769c
Show file tree
Hide file tree
Showing 166 changed files with 2,281 additions and 3,087 deletions.
9 changes: 8 additions & 1 deletion codegen.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
"contextType": "../graphql#GQLContext",
"showUnusedMappers": false,
"mappers": {
"JiraRemoteAvatarUrls": "./types/JiraRemoteAvatarUrls#JiraRemoteAvatarUrlsSource",
"TemplateDimensionRef": "./types/TemplateDimensionRef#TemplateDimensionRefSource",
"UpdateIntegrationProviderSuccess": "./types/UpdateIntegrationProviderSuccess#UpdateIntegrationProviderSuccessSource",
"EndTeamPromptSuccess": "./types/EndTeamPromptSuccess#EndTeamPromptSuccessSource",
"_xGitLabProject": "./types/_xGitLabProject#_xGitLabProjectSource as _xGitLabProject",
"JiraServerIntegration": "./types/JiraServerIntegration#JiraServerIntegrationSource",
"GitHubIntegration": "../../postgres/queries/getGitHubAuthByUserIdTeamId#GitHubAuth",
Expand Down Expand Up @@ -97,7 +101,8 @@
"MeetingSeries": "../../postgres/types/MeetingSeries#MeetingSeries",
"MeetingTemplate": "../../database/types/MeetingTemplate#default",
"NewMeeting": "../../postgres/types/Meeting#AnyMeeting",
"NewMeetingPhase": "../../database/types/GenericMeetingPhase #default as GenericMeetingPhaseDB",
"NewMeetingStage": "./types/NewMeetingStage#NewMeetingStageSource",
"NewMeetingPhase": "./types/NewMeetingPhase#NewMeetingPhaseSource",
"NotificationMeetingStageTimeLimitEnd": "../../database/types/NotificationMeetingStageTimeLimitEnd#default as NotificationMeetingStageTimeLimitEndDB",
"NotificationTeamInvitation": "../../database/types/NotificationTeamInvitation#default as NotificationTeamInvitationDB",
"NotifyDiscussionMentioned": "../../database/types/NotificationDiscussionMentioned#default as NotificationDiscussionMentionedDB",
Expand All @@ -114,6 +119,7 @@
"TemplateScaleValue": "./types/TemplateScaleValue#TemplateScaleValueSource as TemplateScaleValueSourceDB",
"TemplateScale": "../../postgres/types/index#TemplateScale as TemplateScaleDB",
"TemplateScaleRef": "../../postgres/types/index#TemplateScaleRef as TemplateScaleRefDB",
"Threadable": "./types/Threadable#ThreadableSource",
"OrganizationUser": "../../postgres/types/index#OrganizationUser as OrganizationUserDB",
"PokerMeeting": "../../database/types/MeetingPoker#default as MeetingPoker",
"PokerMeetingMember": "../../database/types/MeetingPokerMeetingMember#default as PokerMeetingMemberDB",
Expand Down Expand Up @@ -145,6 +151,7 @@
"StripeFailPaymentPayload": "./types/StripeFailPaymentPayload#StripeFailPaymentPayloadSource",
"Task": "../../database/types/Task#default",
"Team": "./types/Team#TeamSource",
"TeamPromptMeetingSettings": "../../database/types/MeetingSettingsTeamPrompt#default as MeetingSettingsTeamPromptDB",
"TeamHealthPhase": "./types/TeamHealthPhase#TeamHealthPhaseSource",
"TeamHealthStage": "./types/TeamHealthStage#TeamHealthStageSource",
"TeamInvitation": "../../database/types/TeamInvitation#default",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
},
"devDependencies": {
"@babel/core": "^7.20.12",
"@babel/preset-env": "7.18.6",
"@babel/preset-env": "^7.25.0",
"@datadog/datadog-ci": "^2.33.0",
"@graphql-codegen/add": "^5.0.0",
"@graphql-codegen/cli": "^5.0.0",
Expand All @@ -100,7 +100,7 @@
"copy-webpack-plugin": "^11.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"graphql": "15.8.0",
"graphql": "16.9.0",
"html-webpack-plugin": "^5.5.0",
"husky": "^7.0.4",
"jscodeshift": "^0.14.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/client/components/ScopingSearchInput.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styled from '@emotion/styled'
import {Close} from '@mui/icons-material'
import {ServiceEnumType} from 'parabol-server/graphql/types/ServiceEnum'
import React, {useEffect, useRef} from 'react'
import {commitLocalUpdate} from 'react-relay'
import {TaskServiceEnum} from '../__generated__/CreateTaskMutation.graphql'
import useAtmosphere from '../hooks/useAtmosphere'
import {PALETTE} from '../styles/paletteV3'
import SendClientSideEvent from '../utils/SendClientSideEvent'
Expand Down Expand Up @@ -38,7 +38,7 @@ interface Props {
queryString: string
meetingId: string
linkedRecordName: string
service: ServiceEnumType
service: TaskServiceEnum
defaultInput?: string
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,24 @@ const query = graphql`
edges {
node {
__typename
content
... on Task {
content
}
... on Comment {
content
}
createdAt
createdByUser {
preferredName
}
replies {
__typename
content
... on Task {
content
}
... on Comment {
content
}
createdAt
createdByUser {
preferredName
Expand Down Expand Up @@ -232,7 +242,7 @@ const ExportToCSV = (props: Props) => {
const {node} = edge
const {createdAt, createdByUser, __typename: type, replies, content} = node
const author = createdByUser?.preferredName ?? 'Anonymous'
const discussionThread = extractTextFromDraftString(content)
const discussionThread = extractTextFromDraftString(content!)
rows.push({
reflectionGroup: title!,
author,
Expand All @@ -254,7 +264,7 @@ const ExportToCSV = (props: Props) => {
createdAt,
discussionThread,
prompt: '',
content: extractTextFromDraftString(reply.content)
content: extractTextFromDraftString(reply.content!)
})
})
})
Expand All @@ -277,7 +287,7 @@ const ExportToCSV = (props: Props) => {
const {node} = edge
const {createdAt, createdByUser, __typename: type, replies, content} = node
const author = createdByUser?.preferredName ?? 'Anonymous'
const discussionThread = extractTextFromDraftString(content)
const discussionThread = extractTextFromDraftString(content!)
rows.push({
author,
status: 'present',
Expand All @@ -297,7 +307,7 @@ const ExportToCSV = (props: Props) => {
type: reply.__typename === 'Task' ? 'Task' : 'Reply',
createdAt,
discussionThread,
content: extractTextFromDraftString(reply.content)
content: extractTextFromDraftString(reply.content!)
})
})
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import styled from '@emotion/styled'
import graphql from 'babel-plugin-relay/macro'
import {UpgradeCTALocationEnumType} from 'parabol-server/graphql/types/UpgradeCTALocationEnum'
import React, {useEffect} from 'react'
import {PreloadedQuery, usePreloadedQuery} from 'react-relay'
import {UnpaidTeamModalQuery} from '../../../../__generated__/UnpaidTeamModalQuery.graphql'
Expand All @@ -11,6 +10,7 @@ import IconLabel from '../../../../components/IconLabel'
import PrimaryButton from '../../../../components/PrimaryButton'
import useAtmosphere from '../../../../hooks/useAtmosphere'
import useRouter from '../../../../hooks/useRouter'
import type {UpgradeCTALocationEnumType} from '../../../../shared/UpgradeCTALocationEnumType'
import {PALETTE} from '../../../../styles/paletteV3'
import {ExternalLinks, Threshold} from '../../../../types/constEnums'
import SendClientSideEvent from '../../../../utils/SendClientSideEvent'
Expand Down
18 changes: 18 additions & 0 deletions packages/client/shared/UpgradeCTALocationEnumType.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export type UpgradeCTALocationEnumType =
| 'publicTemplate'
| 'teamTemplate'
| 'orgTemplate'
| 'createNewTemplate'
| 'createTeam'
| 'usageStats'
| 'directMeetingLinkLock'
| 'timelineHistoryLock'
| 'teamsLimitReminderSnackbar'
| 'teamsLimitReminderNotification'
| 'meetingSidebar'
| 'unpaidTeamModal'
| 'organizationLockedModal'
| 'startNewMeetingOrganizationLockedError'
| 'createNewTemplateAL'
| 'cloneTemplateAL'
| 'meetingSettingsTeamHealth'
2 changes: 2 additions & 0 deletions packages/client/types/shared.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// The client require things from the server package, but it does, so we need this
import '../../server/types/modules'
2 changes: 1 addition & 1 deletion packages/server/billing/stripeWebhookHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ const stripeWebhookHandler = uWSAsyncHandler(async (res: HttpResponse, req: Http

const {getVars, query} = actionHandler
const variables = getVars(payload)
const result = await publishWebhookGQL(query, variables)
const result = await publishWebhookGQL<{data: any}>(query, variables)
if (result?.data) {
res.writeStatus('200').end()
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/server/database/types/MeetingMember.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import toTeamMemberId from 'parabol-client/utils/relay/toTeamMemberId'
import {MeetingTypeEnum} from '../../postgres/types/Meeting'
import {MeetingTypeEnum} from '../../graphql/public/resolverTypes'

interface MeetingMemberInput {
id?: string
Expand Down
2 changes: 1 addition & 1 deletion packages/server/database/types/MeetingSettings.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import generateUID from '../../generateUID'
import {MeetingTypeEnum} from '../../postgres/types/Meeting'
import {MeetingTypeEnum} from '../../graphql/public/resolverTypes'
import {NewMeetingPhaseTypeEnum} from './GenericMeetingPhase'

interface Input {
Expand Down
8 changes: 0 additions & 8 deletions packages/server/database/types/Threadable.ts

This file was deleted.

7 changes: 2 additions & 5 deletions packages/server/dataloader/foreignKeyLoaderMakers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import getKysely from '../postgres/getKysely'
import {selectTemplateDimension, selectTemplateScale} from '../postgres/select'
import {selectTemplateDimension, selectTemplateScale, selectTimelineEvent} from '../postgres/select'
import {foreignKeyLoaderMaker} from './foreignKeyLoaderMaker'
import {selectOrganizations, selectRetroReflections, selectTeams} from './primaryKeyLoaderMakers'

Expand Down Expand Up @@ -82,10 +82,7 @@ export const timelineEventsByMeetingId = foreignKeyLoaderMaker(
'timelineEvents',
'meetingId',
async (meetingIds) => {
const pg = getKysely()
return pg
.selectFrom('TimelineEvent')
.selectAll()
return selectTimelineEvent()
.where('meetingId', 'in', meetingIds)
.where('isActive', '=', true)
.execute()
Expand Down
14 changes: 10 additions & 4 deletions packages/server/dataloader/primaryKeyLoaderMakers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ import getMeetingSeriesByIds from '../postgres/queries/getMeetingSeriesByIds'
import getMeetingTemplatesByIds from '../postgres/queries/getMeetingTemplatesByIds'
import {getTeamPromptResponsesByIds} from '../postgres/queries/getTeamPromptResponsesByIds'
import getTemplateRefsByIds from '../postgres/queries/getTemplateRefsByIds'
import getTemplateScaleRefsByIds from '../postgres/queries/getTemplateScaleRefsByIds'
import {getUsersByIds} from '../postgres/queries/getUsersByIds'
import {selectTemplateDimension, selectTemplateScale} from '../postgres/select'
import {
selectTemplateDimension,
selectTemplateScale,
selectTemplateScaleRef,
selectTimelineEvent
} from '../postgres/select'
import {primaryKeyLoaderMaker} from './primaryKeyLoaderMaker'

export const users = primaryKeyLoaderMaker(getUsersByIds)
Expand Down Expand Up @@ -55,7 +59,9 @@ export const teams = primaryKeyLoaderMaker((ids: readonly string[]) => {
})
export const discussions = primaryKeyLoaderMaker(getDiscussionsByIds)
export const templateRefs = primaryKeyLoaderMaker(getTemplateRefsByIds)
export const templateScaleRefs = primaryKeyLoaderMaker(getTemplateScaleRefsByIds)
export const templateScaleRefs = primaryKeyLoaderMaker((ids: readonly string[]) => {
return selectTemplateScaleRef().where('id', 'in', ids).execute()
})
export const teamPromptResponses = primaryKeyLoaderMaker(getTeamPromptResponsesByIds)
export const meetingSeries = primaryKeyLoaderMaker(getMeetingSeriesByIds)
export const meetingTemplates = primaryKeyLoaderMaker(getMeetingTemplatesByIds)
Expand Down Expand Up @@ -96,7 +102,7 @@ export const retroReflections = primaryKeyLoaderMaker((ids: readonly string[]) =
})

export const timelineEvents = primaryKeyLoaderMaker((ids: readonly string[]) => {
return getKysely().selectFrom('TimelineEvent').selectAll().where('id', 'in', ids).execute()
return selectTimelineEvent().where('id', 'in', ids).execute()
})

export const selectOrganizations = () =>
Expand Down
42 changes: 0 additions & 42 deletions packages/server/graphql/mutations/endTeamPrompt.ts

This file was deleted.

93 changes: 0 additions & 93 deletions packages/server/graphql/mutations/updateIntegrationProvider.ts

This file was deleted.

Loading

0 comments on commit a27769c

Please sign in to comment.