chore(release): Test v7.48.1 (#10277)

Signed-off-by: Matt Krick <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com> Co-authored-by: Nick O'Ferrall <[email protected]> Co-authored-by: Georg Bremer <[email protected]> Co-authored-by: Jordan Husney <[email protected]> Co-authored-by: Bruce Tian <[email protected]> Co-authored-by: Matt Krick <[email protected]> Co-authored-by: Terry Acker <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rafa <[email protected]> Co-authored-by: Rafael Romero <[email protected]> Co-authored-by: snyk-bot <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: github-actions <[email protected]>
ParabolInc · Sep 30, 2024 · 47bf71b · 47bf71b
1 parent a95098b
commit 47bf71b
Show file tree

Hide file tree

Showing 147 changed files with 1,702 additions and 639 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "7.48.0"
+  ".": "7.48.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.48.1](https://github.com/ParabolInc/parabol/compare/v7.48.0...v7.48.1) (2024-09-27)
+
+
+### Fixed
+
+* stop series when team is no more ([#10268](https://github.com/ParabolInc/parabol/issues/10268)) ([203835e](https://github.com/ParabolInc/parabol/commit/203835e4296f17f51c8d6f968b41f7fb64e820ab))
+
+
+### Changed
+
+* **rethinkdb:** NewMeeting: Phase 1a ([#10216](https://github.com/ParabolInc/parabol/issues/10216)) ([6273411](https://github.com/ParabolInc/parabol/commit/6273411f5c5e7e03dc569b3359a49902b88dc11c))
+* **rethinkdb:** NewMeeting: Phase 1b ([#10250](https://github.com/ParabolInc/parabol/issues/10250)) ([8070a7e](https://github.com/ParabolInc/parabol/commit/8070a7e82d156d7b587742f1bde8279419ea85db))
+
 ## [7.48.0](https://github.com/ParabolInc/parabol/compare/v7.47.5...v7.48.0) (2024-09-24)
 
 

diff --git a/codegen.json b/codegen.json
@@ -26,7 +26,7 @@
           "PingableServices": "./types/PingableServices#PingableServicesSource",
           "ProcessRecurrenceSuccess": "./types/ProcessRecurrenceSuccess#ProcessRecurrenceSuccessSource",
           "RemoveAuthIdentitySuccess": "./types/RemoveAuthIdentitySuccess#RemoveAuthIdentitySuccessSource",
-          "RetrospectiveMeeting": "../../database/types/MeetingRetrospective#default",
+          "RetrospectiveMeeting": "../../postgres/types/Meeting#RetrospectiveMeeting",
           "SAML": "./types/SAML#SAMLSource",
           "SetIsFreeMeetingTemplateSuccess": "./types/SetIsFreeMeetingTemplateSuccess#SetIsFreeMeetingTemplateSuccessSource",
           "SignupsPayload": "./types/SignupsPayload#SignupsPayloadSource",
@@ -73,7 +73,7 @@
           "EndTeamPromptSuccess": "./types/EndTeamPromptSuccess#EndTeamPromptSuccessSource",
           "AcceptRequestToJoinDomainSuccess": "./types/AcceptRequestToJoinDomainSuccess#AcceptRequestToJoinDomainSuccessSource",
           "AcceptTeamInvitationPayload": "./types/AcceptTeamInvitationPayload#AcceptTeamInvitationPayloadSource",
-          "ActionMeeting": "../../database/types/MeetingAction#default",
+          "ActionMeeting": "../../postgres/types/Meeting#CheckInMeeting",
           "ActionMeetingMember": "../../database/types/ActionMeetingMember#default as ActionMeetingMemberDB",
           "AddApprovedOrganizationDomainsSuccess": "./types/AddApprovedOrganizationDomainsSuccess#AddApprovedOrganizationDomainsSuccessSource",
           "AddPokerTemplateSuccess": "./types/AddPokerTemplateSuccess#AddPokerTemplateSuccessSource",
@@ -143,7 +143,7 @@
           "Threadable": "./types/Threadable#ThreadableSource",
           "OrgIntegrationProviders": "./types/OrgIntegrationProviders#OrgIntegrationProvidersSource",
           "OrganizationUser": "../../postgres/types/index#OrganizationUser as OrganizationUserDB",
-          "PokerMeeting": "../../database/types/MeetingPoker#default as MeetingPoker",
+          "PokerMeeting": "../../postgres/types/Meeting#PokerMeeting",
           "PokerMeetingMember": "../../database/types/MeetingPokerMeetingMember#default as PokerMeetingMemberDB",
           "PokerTemplate": "../../database/types/PokerTemplate#default as PokerTemplateDB",
           "RRule": "rrule-rust#RRuleSet",
@@ -159,7 +159,7 @@
           "ResetReflectionGroupsSuccess": "./types/ResetReflectionGroupsSuccess#ResetReflectionGroupsSuccessSource",
           "RetroReflection": "../../postgres/types/index#RetroReflection as RetroReflectionDB",
           "RetroReflectionGroup": "./types/RetroReflectionGroup#RetroReflectionGroupSource",
-          "RetrospectiveMeeting": "../../database/types/MeetingRetrospective#default",
+          "RetrospectiveMeeting": "../../postgres/types/Meeting#RetrospectiveMeeting",
           "RetrospectiveMeetingMember": "../../database/types/RetroMeetingMember#default",
           "SAML": "./types/SAML#SAMLSource",
           "SetMeetingSettingsPayload": "../types/SetMeetingSettingsPayload#SetMeetingSettingsPayloadSource",
@@ -182,7 +182,7 @@
           "TeamMemberIntegrationAuthOAuth1": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrationAuthOAuth2": "../../postgres/queries/getTeamMemberIntegrationAuth#TeamMemberIntegrationAuth",
           "TeamMemberIntegrations": "./types/TeamMemberIntegrations#TeamMemberIntegrationsSource",
-          "TeamPromptMeeting": "../../database/types/MeetingTeamPrompt#default as MeetingTeamPromptDB",
+          "TeamPromptMeeting": "../../postgres/types/Meeting#TeamPromptMeeting",
           "TeamPromptMeetingMember": "../../database/types/TeamPromptMeetingMember#default as TeamPromptMeetingMemberDB",
           "TeamPromptResponse": "../../postgres/types/index#TeamPromptResponse as TeamPromptResponseDB",
           "TemplateDimension": "../../postgres/types/index#TemplateDimension as TemplateDimensionDB",

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.48.0",
+  "version": "7.48.1",
   "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.48.0",
+  "version": "7.48.1",
   "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.48.0"
+    "parabol-server": "7.48.1"
   }
 }
diff --git a/packages/client/modules/demo/ClientGraphQLServer.ts b/packages/client/modules/demo/ClientGraphQLServer.ts
@@ -8,13 +8,15 @@ import stringSimilarity from 'string-similarity'
 import {ReactableEnum} from '~/__generated__/AddReactjiToReactableMutation.graphql'
 import {DragReflectionDropTargetTypeEnum} from '~/__generated__/EndDraggingReflectionMutation.graphql'
 import {PALETTE} from '~/styles/paletteV3'
-import DiscussPhase from '../../../server/database/types/DiscussPhase'
-import DiscussStage from '../../../server/database/types/DiscussStage'
-import NewMeetingPhase from '../../../server/database/types/GenericMeetingPhase'
-import NewMeetingStage from '../../../server/database/types/GenericMeetingStage'
 import GoogleAnalyzedEntity from '../../../server/database/types/GoogleAnalyzedEntity'
 import ReflectPhase from '../../../server/database/types/ReflectPhase'
 import ITask from '../../../server/database/types/Task'
+import {NewMeetingStage} from '../../../server/graphql/private/resolverTypes'
+import {
+  DiscussPhase,
+  DiscussStage,
+  NewMeetingPhase
+} from '../../../server/postgres/types/NewMeetingPhase'
 import {
   ExternalLinks,
   MeetingSettingsThreshold,
@@ -100,11 +102,7 @@ export type DemoReflectionGroup = {
   voterIds: string[]
 }
 
-export type IDiscussPhase = Omit<DiscussPhase, 'readyToAdvance' | 'endAt' | 'startAt'> & {
-  readyToAdvance: any
-  startAt: string | Date
-  endAt: string | Date
-}
+export type IDiscussPhase = DiscussPhase
 
 export type IReflectPhase = Omit<ReflectPhase, 'endAt' | 'startAt'> & {
   startAt: string | Date
@@ -1048,7 +1046,6 @@ class ClientGraphQLServer extends (EventEmitter as GQLDemoEmitter) {
           reflectionGroupId: newReflectionGroupId,
           updatedAt: now
         })
-        this.db.newMeeting.nextAutoGroupThreshold = null
         const nextTitle = getGroupSmartTitle([reflection as DemoReflection])
         newReflectionGroup.smartTitle = nextTitle
         newReflectionGroup.title = nextTitle
@@ -1523,7 +1520,7 @@ class ClientGraphQLServer extends (EventEmitter as GQLDemoEmitter) {
     },
     EndRetrospectiveMutation: ({meetingId}: {meetingId: string}, userId: string) => {
       const phases = this.db.newMeeting.phases as INewMeetingPhase[]
-      const lastPhase = phases[phases.length - 1] as IDiscussPhase
+      const lastPhase = phases[phases.length - 1]!
       const currentStage = lastPhase.stages.find(
         (stage) => stage.startAt && !stage.endAt
       ) as IDiscussStage

diff --git a/packages/client/modules/demo/initDB.ts b/packages/client/modules/demo/initDB.ts
@@ -1,7 +1,7 @@
 import {SlackNotificationEventEnum} from '~/__generated__/SlackNotificationList_viewer.graphql'
 import {PALETTE} from '~/styles/paletteV3'
-import RetrospectiveMeeting from '../../../server/database/types/MeetingRetrospective'
 import ITask from '../../../server/database/types/Task'
+import {RetrospectiveMeeting} from '../../../server/postgres/types/Meeting'
 import JiraProjectId from '../../shared/gqlIds/JiraProjectId'
 import demoUserAvatar from '../../styles/theme/images/avatar-user.svg'
 import {ExternalLinks, MeetingSettingsThreshold, RetroDemo} from '../../types/constEnums'

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

diff --git a/packages/client/types/generics.ts b/packages/client/types/generics.ts
@@ -32,6 +32,10 @@ type DeepNonNullableObject<T> = {
   [P in keyof T]-?: DeepNonNullable<NonNullable<T[P]>>
 }
 
+export type NonNullableProps<T> = {
+  [K in keyof T]: NonNullable<T[K]>
+}
+
 // export type DeepNullableObject<T> = {
 //   [P in keyof T]: T[P] extends Array<infer U>
 //     ? Array<DeepNullable<U>> | null

diff --git a/packages/client/utils/meetings/lookups.ts b/packages/client/utils/meetings/lookups.ts
@@ -1,6 +1,6 @@
 import React from 'react'
-import {MeetingTypeEnum} from '~/../server/postgres/types/Meeting'
 import {NewMeetingPhaseTypeEnum} from '~/__generated__/ActionMeetingSidebar_meeting.graphql'
+import {MeetingTypeEnum} from '../../__generated__/SummarySheet_meeting.graphql'
 import CardsSVG from '../../components/CardsSVG'
 import {ACTION, POKER, RETROSPECTIVE, TEAM_PROMPT} from '../constants'
 

diff --git a/packages/embedder/indexing/retrospectiveDiscussionTopic.ts b/packages/embedder/indexing/retrospectiveDiscussionTopic.ts
@@ -1,4 +1,3 @@
-import {isMeetingRetrospective} from 'parabol-server/database/types/MeetingRetrospective'
 import {DataLoaderInstance} from 'parabol-server/dataloader/RootDataLoader'
 import prettier from 'prettier'
 import {Comment} from '../../server/postgres/types'
@@ -73,7 +72,7 @@ export const createTextFromRetrospectiveDiscussionTopic = async (
     dataLoader.get('retroReflectionGroups').load(reflectionGroupId),
     dataLoader.get('retroReflectionsByGroupId').load(reflectionGroupId)
   ])
-  if (!isMeetingRetrospective(newMeeting)) throw new Error('Meeting is not a retro')
+  if (newMeeting.meetingType !== 'retrospective') throw new Error('Meeting is not a retro')
   // It should never be undefined, but our data integrity in RethinkDB is bad
   const templateId = newMeeting?.templateId ?? ''
 

diff --git a/packages/embedder/package.json b/packages/embedder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parabol-embedder",
-  "version": "7.48.0",
+  "version": "7.48.1",
   "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/embedder/workflows/helpers/publishSimilarRetroTopics.ts b/packages/embedder/workflows/helpers/publishSimilarRetroTopics.ts
@@ -2,7 +2,6 @@ import {SubscriptionChannel} from '../../../client/types/constEnums'
 import makeAppURL from '../../../client/utils/makeAppURL'
 import appOrigin from '../../../server/appOrigin'
 import {DataLoaderInstance} from '../../../server/dataloader/RootDataLoader'
-import {isRetroMeeting} from '../../../server/graphql/meetingTypePredicates'
 import {
   buildCommentContentBlock,
   createAIComment
@@ -25,7 +24,7 @@ const makeSimilarDiscussionLink = async (
     dataLoader.get('retroReflectionGroups').loadNonNull(reflectionGroupId)
   ])
 
-  if (!meeting || !isRetroMeeting(meeting)) throw new Error('invalid meeting type')
+  if (!meeting || meeting.meetingType !== 'retrospective') throw new Error('invalid meeting type')
   const {phases, name: meetingName} = meeting
   const {title: topic} = reflectionGroup
   const discussPhase = getPhase(phases, 'discuss')

diff --git a/packages/gql-executor/package.json b/packages/gql-executor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.48.0",
+  "version": "7.48.1",
   "description": "A Stateless GraphQL Executor",
   "author": "Matt Krick <[email protected]>",
   "homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/gqlExecutor#readme",
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "dd-trace": "^4.2.0",
-    "parabol-client": "7.48.0",
-    "parabol-server": "7.48.0",
+    "parabol-client": "7.48.1",
+    "parabol-server": "7.48.1",
     "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.48.0",
+  "version": "7.48.1",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/packages/server/__tests__/processRecurrence.test.ts b/packages/server/__tests__/processRecurrence.test.ts
@@ -10,6 +10,7 @@ import ReflectPhase from '../database/types/ReflectPhase'
 import TeamPromptResponsesPhase from '../database/types/TeamPromptResponsesPhase'
 import generateUID from '../generateUID'
 import {insertMeetingSeries as insertMeetingSeriesQuery} from '../postgres/queries/insertMeetingSeries'
+import {RetroMeetingPhase} from '../postgres/types/NewMeetingPhase'
 import {getUserTeams, sendIntranet, signUp} from './common'
 
 const PROCESS_RECURRENCE = `
@@ -273,7 +274,10 @@ RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR,SA,SU`
     id: meetingId,
     teamId,
     meetingCount: 0,
-    phases: [new ReflectPhase(teamId, []), new DiscussPhase(undefined)],
+    phases: [
+      new ReflectPhase(teamId, []) as RetroMeetingPhase,
+      new DiscussPhase(undefined) as RetroMeetingPhase
+    ],
     facilitatorUserId: userId,
     scheduledEndTime: new Date(Date.now() - ms('5m')),
     meetingSeriesId,

diff --git a/packages/server/database/types/GenericMeetingStage.ts b/packages/server/database/types/GenericMeetingStage.ts
@@ -36,17 +36,17 @@ export interface GenericMeetingStageInput {
 
 export default class GenericMeetingStage {
   id: string
-  isAsync: boolean | undefined | null
+  isAsync?: boolean | undefined | null
   isComplete = false
   isNavigable: boolean
   isNavigableByFacilitator: boolean
-  startAt: Date | undefined
-  endAt: Date | undefined = undefined
-  scheduledEndTime: Date | undefined | null
-  suggestedEndTime: Date | undefined
-  suggestedTimeLimit: number | undefined
+  startAt?: Date | undefined
+  endAt?: Date | undefined = undefined
+  scheduledEndTime?: Date | undefined | null
+  suggestedEndTime?: Date | undefined
+  suggestedTimeLimit?: number | undefined
   viewCount: number
-  readyToAdvance: string[] | undefined = []
+  readyToAdvance?: string[] | undefined = []
   phaseType: string
   constructor(input: GenericMeetingStageInput) {
     const {durations, phaseType, id, isNavigable, isNavigableByFacilitator, startAt, viewCount} =

diff --git a/packages/server/database/types/Meeting.ts b/packages/server/database/types/Meeting.ts
@@ -1,21 +1,22 @@
 import generateUID from '../../generateUID'
 import {MeetingTypeEnum} from '../../postgres/types/Meeting'
+import {NewMeetingPhase} from '../../postgres/types/NewMeetingPhase'
 import GenericMeetingPhase from './GenericMeetingPhase'
 
 interface Input {
-  id?: string
+  id?: string | null
   teamId: string
   meetingType: MeetingTypeEnum
   meetingCount: number
-  name?: string
+  name?: string | null
   // Every meeting has at least one phase
-  phases: [GenericMeetingPhase, ...GenericMeetingPhase[]]
+  phases: [NewMeetingPhase, ...NewMeetingPhase[]]
   facilitatorUserId: string
-  showConversionModal?: boolean
-  meetingSeriesId?: number
+  showConversionModal?: boolean | null
+  meetingSeriesId?: number | null
   scheduledEndTime?: Date | null
-  summary?: string
-  sentimentScore?: number
+  summary?: string | null
+  sentimentScore?: number | null
 }
 
 const namePrefix = {
@@ -29,23 +30,23 @@ export default abstract class Meeting {
   updatedAt = new Date()
   createdBy: string | null
   endedAt: Date | undefined | null = undefined
-  facilitatorStageId: string | undefined
-  facilitatorUserId: string
+  facilitatorStageId: string
+  facilitatorUserId: string | null
   meetingCount: number
   meetingNumber: number
   name: string
-  summarySentAt: Date | undefined = undefined
+  summarySentAt: Date | undefined | null = undefined
   teamId: string
   meetingType: MeetingTypeEnum
   phases: GenericMeetingPhase[]
-  showConversionModal?: boolean
-  meetingSeriesId?: number
+  showConversionModal?: boolean | null
+  meetingSeriesId?: number | null
   scheduledEndTime?: Date | null
-  summary?: string
-  sentimentScore?: number
-  usedReactjis?: Record<string, number>
-  slackTs?: string
-  engagement?: number
+  summary?: string | null
+  sentimentScore?: number | null
+  usedReactjis?: Record<string, number> | null
+  slackTs?: string | number | null
+  engagement?: number | null
 
   constructor(input: Input) {
     const {

diff --git a/packages/server/database/types/MeetingAction.ts b/packages/server/database/types/MeetingAction.ts
@@ -1,10 +1,6 @@
-import AgendaItemsPhase from './AgendaItemsPhase'
-import CheckInPhase from './CheckInPhase'
-import GenericMeetingPhase from './GenericMeetingPhase'
+import {CheckInMeetingPhase} from '../../postgres/types/NewMeetingPhase'
 import Meeting from './Meeting'
-import UpdatesPhase from './UpdatesPhase'
 
-type CheckInMeetingPhase = CheckInPhase | UpdatesPhase | GenericMeetingPhase | AgendaItemsPhase
 interface Input {
   id?: string
   teamId: string
@@ -14,10 +10,6 @@ interface Input {
   facilitatorUserId: string
 }
 
-export function isMeetingAction(meeting: Meeting): meeting is MeetingAction {
-  return meeting.meetingType === 'action'
-}
-
 export default class MeetingAction extends Meeting {
   meetingType!: 'action'
   taskCount?: number