chore(release): Test v7.35.1 (#9828)

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Matt Krick <[email protected]>
Co-authored-by: Rafa <[email protected]>
Co-authored-by: Georg Bremer <[email protected]>
Co-authored-by: Nick O'Ferrall <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Krick <[email protected]>
Co-authored-by: Jordan Husney <[email protected]>
Co-authored-by: adaniels-parabol <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Dale Bumblis <[email protected]>
Co-authored-by: Bartosz Jarocki <[email protected]>
Co-authored-by: Marcus Wermuth <[email protected]>
Co-authored-by: Rafael Romero <[email protected]>
Co-authored-by: Bruce Tian <[email protected]>
Co-authored-by: GitHub Action <[email protected]>
Co-authored-by: Mohd Muneeb <[email protected]>
Co-authored-by: Muneeb-Ventures <[email protected]>
Co-authored-by: github-actions <[email protected]>

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "7.35.0"
+  ".": "7.35.1"
 }

CHANGELOG.md

@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).
 
+## [7.35.1](https://github.com/ParabolInc/parabol/compare/v7.35.0...v7.35.1) (2024-06-04)
+
+
+### Fixed
+
+* remove custom activity badge ([#9812](https://github.com/ParabolInc/parabol/issues/9812)) ([652a9c0](https://github.com/ParabolInc/parabol/commit/652a9c034267f9c53f4cf9c04b4f29b6f854eb1c))
+
+
+### Changed
+
+* read ReflectionGroups from PG ([#9801](https://github.com/ParabolInc/parabol/issues/9801)) ([52b80b5](https://github.com/ParabolInc/parabol/commit/52b80b5cdb7fa4834004516bc8fc997fda9c3369))
+
 ## [7.35.0](https://github.com/ParabolInc/parabol/compare/v7.34.0...v7.35.0) (2024-05-30)
 
 

codegen.json

@@ -105,7 +105,7 @@
           "RequestToJoinDomainSuccess": "./types/RequestToJoinDomainSuccess#RequestToJoinDomainSuccessSource",
           "ResetReflectionGroupsSuccess": "./types/ResetReflectionGroupsSuccess#ResetReflectionGroupsSuccessSource",
           "RetroReflection": "../../database/types/RetroReflection#default as RetroReflectionDB",
-          "RetroReflectionGroup": "../../database/types/RetroReflectionGroup#default as RetroReflectionGroupDB",
+          "RetroReflectionGroup": "./types/RetroReflectionGroup#RetroReflectionGroupSource",
           "RetrospectiveMeeting": "../../database/types/MeetingRetrospective#default",
           "RetrospectiveMeetingMember": "../../database/types/RetroMeetingMember#default",
           "RetrospectiveMeetingSettings": "../../database/types/MeetingSettingsRetrospective#default",

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

packages/chronos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chronos",
-  "version": "7.35.0",
+  "version": "7.35.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.35.0"
+    "parabol-server": "7.35.1"
   }
 }

packages/client/components/ActivityLibrary/ActivityCard.tsx

@@ -50,14 +50,13 @@ export interface ActivityCardProps {
   className?: string
   theme: CardTheme
   title?: string
-  badge?: React.ReactNode
   children?: React.ReactNode
   type?: MeetingTypeEnum
   templateRef?: ActivityCard_template$key
 }
 
 export const ActivityCard = (props: ActivityCardProps) => {
-  const {className, theme, title, children, type, badge, templateRef} = props
+  const {className, theme, title, children, type, templateRef} = props
   const category = type && MEETING_TYPE_TO_CATEGORY[type]
   const [showTooltip, setShowTooltip] = useState(false)
   const hoverTimeout = useRef<NodeJS.Timeout | null>(null)
@@ -105,10 +104,7 @@ export const ActivityCard = (props: ActivityCardProps) => {
           className
         )}
       >
-        <div className='flex-1'>
-          {children}
-          <div className='absolute bottom-0 right-0'>{badge}</div>
-        </div>
+        <div className='flex-1'>{children}</div>
         {template && (
           <Tooltip open={showTooltip}>
             <TooltipTrigger asChild>

packages/client/components/ActivityLibrary/ActivityDetails/ActivityDetails.tsx

@@ -106,7 +106,6 @@ const ActivityDetails = (props: Props) => {
                 <ActivityCard
                   className='mb-8 w-80 max-md:hidden sm:ml-14 xl:ml-0 xl:mb-0'
                   theme={CATEGORY_THEMES[category as CategoryID]}
-                  badge={null}
                   type={type}
                 >
                   <ActivityCardImage src={illustrationUrl} category={category as CategoryID} />

packages/client/components/ActivityLibrary/ActivityGrid.tsx

@@ -3,7 +3,6 @@ import React from 'react'
 import {useFragment} from 'react-relay'
 import {Link} from 'react-router-dom'
 import {ActivityGrid_user$key} from '../../__generated__/ActivityGrid_user.graphql'
-import {ActivityBadge} from './ActivityBadge'
 import {ActivityCard, ActivityCardImage} from './ActivityCard'
 import ActivityCardFavorite from './ActivityCardFavorite'
 import {Template} from './ActivityLibrary'
@@ -45,11 +44,6 @@ const ActivityGrid = (props: ActivityGridProps) => {
               title={template.name}
               type={template.type}
               templateRef={template}
-              badge={
-                template.scope !== 'PUBLIC' ? (
-                  <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Custom</ActivityBadge>
-                ) : null
-              }
             >
               <ActivityCardImage
                 className='group-hover/card:hidden'

packages/client/components/RetroDrawerTemplateCard.tsx

@@ -6,7 +6,6 @@ import useAtmosphere from '../hooks/useAtmosphere'
 import useMutationProps from '../hooks/useMutationProps'
 import UpdateMeetingTemplateMutation from '../mutations/UpdateMeetingTemplateMutation'
 import {CATEGORY_THEMES, CategoryID} from '././ActivityLibrary/Categories'
-import {ActivityBadge} from './ActivityLibrary/ActivityBadge'
 import {ActivityCard, ActivityCardImage} from './ActivityLibrary/ActivityCard'
 import {ActivityLibraryCardDescription} from './ActivityLibrary/ActivityLibraryCardDescription'
 
@@ -28,7 +27,6 @@ const RetroDrawerTemplateCard = (props: Props) => {
         name
         category
         illustrationUrl
-        scope
       }
     `,
     templateRef
@@ -54,11 +52,6 @@ const RetroDrawerTemplateCard = (props: Props) => {
           theme={CATEGORY_THEMES[template.category as CategoryID]}
           title={template.name}
           type='retrospective'
-          badge={
-            template.scope !== 'PUBLIC' ? (
-              <ActivityBadge className='m-2 bg-gold-300 text-grape-700'>Custom</ActivityBadge>
-            ) : null
-          }
         >
           <ActivityCardImage
             className='group-hover/card:hidden'

packages/client/modules/demo/ClientGraphQLServer.ts

@@ -15,7 +15,6 @@ import NewMeetingStage from '../../../server/database/types/GenericMeetingStage'
 import GoogleAnalyzedEntity from '../../../server/database/types/GoogleAnalyzedEntity'
 import ReflectPhase from '../../../server/database/types/ReflectPhase'
 import Reflection from '../../../server/database/types/Reflection'
-import ReflectionGroup from '../../../server/database/types/ReflectionGroup'
 import ITask from '../../../server/database/types/Task'
 import {
   ExternalLinks,
@@ -69,8 +68,17 @@ export type DemoReflection = Omit<Reflection, 'reactjis' | 'createdAt' | 'update
   updatedAt: string | Date
 }
 
-export type DemoReflectionGroup = Omit<ReflectionGroup, 'team' | 'createdAt' | 'updatedAt'> & {
+export type DemoReflectionGroup = {
   __typename: string
+  id: string
+  isActive: boolean
+  meetingId: string
+  promptId: string
+  sortOrder: number
+  smartTitle: string | null
+  summary: string | null
+  title: string | null
+  discussionPromptQuestion: string | null
   commentors: any
   createdAt: string | Date
   meeting: any

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

packages/embedder/package.json

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

packages/embedder/workflows/helpers/publishSimilarRetroTopics.ts

@@ -22,7 +22,7 @@ const makeSimilarDiscussionLink = async (
   const {meetingId, discussionTopicId: reflectionGroupId} = discussion
   const [meeting, reflectionGroup] = await Promise.all([
     dataLoader.get('newMeetings').load(meetingId),
-    dataLoader.get('retroReflectionGroups').load(reflectionGroupId)
+    dataLoader.get('retroReflectionGroups').loadNonNull(reflectionGroupId)
   ])
 
   if (!meeting || !isRetroMeeting(meeting)) throw new Error('invalid meeting type')

packages/gql-executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gql-executor",
-  "version": "7.35.0",
+  "version": "7.35.1",
   "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.35.0",
-    "parabol-server": "7.35.0",
+    "parabol-client": "7.35.1",
+    "parabol-server": "7.35.1",
     "undici": "^5.26.2"
   }
 }

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

packages/server/database/rethinkDriver.ts

@@ -30,7 +30,6 @@ import OrganizationUser from './types/OrganizationUser'
 import PasswordResetRequest from './types/PasswordResetRequest'
 import PushInvitation from './types/PushInvitation'
 import Reflection from './types/Reflection'
-import ReflectionGroup from './types/ReflectionGroup'
 import RetrospectivePrompt from './types/RetrospectivePrompt'
 import SAML from './types/SAML'
 import SuggestedActionCreateNewTeam from './types/SuggestedActionCreateNewTeam'
@@ -143,10 +142,6 @@ export type RethinkSchema = {
     type: MeetingTemplate
     index: 'teamId' | 'orgId'
   }
-  RetroReflectionGroup: {
-    type: ReflectionGroup
-    index: 'meetingId'
-  }
   RetroReflection: {
     type: Reflection
     index: 'meetingId' | 'reflectionGroupId'

packages/server/dataloader/foreignKeyLoaderMakers.ts

@@ -23,3 +23,17 @@ export const embeddingsMetadataByRefId = foreignKeyLoaderMaker(
     return pg.selectFrom('EmbeddingsMetadata').selectAll().where('refId', 'in', refId).execute()
   }
 )
+
+export const retroReflectionGroupsByMeetingId = foreignKeyLoaderMaker(
+  'retroReflectionGroups',
+  'meetingId',
+  async (meetingIds) => {
+    const pg = getKysely()
+    return pg
+      .selectFrom('RetroReflectionGroup')
+      .selectAll()
+      .where('meetingId', 'in', meetingIds)
+      .where('isActive', '=', true)
+      .execute()
+  }
+)

packages/server/dataloader/primaryKeyLoaderMakers.ts

@@ -23,3 +23,7 @@ export const domainJoinRequests = primaryKeyLoaderMaker(getDomainJoinRequestsByI
 export const embeddingsMetadata = primaryKeyLoaderMaker((ids: readonly number[]) => {
   return getKysely().selectFrom('EmbeddingsMetadata').selectAll().where('id', 'in', ids).execute()
 })
+
+export const retroReflectionGroups = primaryKeyLoaderMaker((ids: readonly string[]) => {
+  return getKysely().selectFrom('RetroReflectionGroup').selectAll().where('id', 'in', ids).execute()
+})

packages/server/dataloader/rethinkForeignKeyLoaderMakers.ts

@@ -152,19 +152,6 @@ export const organizationUsersByUserId = new RethinkForeignKeyLoaderMaker(
   }
 )
 
-export const retroReflectionGroupsByMeetingId = new RethinkForeignKeyLoaderMaker(
-  'retroReflectionGroups',
-  'meetingId',
-  async (meetingIds) => {
-    const r = await getRethink()
-    return r
-      .table('RetroReflectionGroup')
-      .getAll(r.args(meetingIds), {index: 'meetingId'})
-      .filter({isActive: true})
-      .run()
-  }
-)
-
 export const scalesByTeamId = new RethinkForeignKeyLoaderMaker(
   'templateScales',
   'teamId',

packages/server/dataloader/rethinkPrimaryKeyLoaderMakers.ts

@@ -16,7 +16,6 @@ export const notifications = new RethinkPrimaryKeyLoaderMaker('Notification')
 export const organizations = new RethinkPrimaryKeyLoaderMaker('Organization')
 export const organizationUsers = new RethinkPrimaryKeyLoaderMaker('OrganizationUser')
 export const templateScales = new RethinkPrimaryKeyLoaderMaker('TemplateScale')
-export const retroReflectionGroups = new RethinkPrimaryKeyLoaderMaker('RetroReflectionGroup')
 export const retroReflections = new RethinkPrimaryKeyLoaderMaker('RetroReflection')
 export const slackAuths = new RethinkPrimaryKeyLoaderMaker('SlackAuth')
 export const slackNotifications = new RethinkPrimaryKeyLoaderMaker('SlackNotification')

packages/server/graphql/mutations/createReflection.ts

@@ -99,7 +99,6 @@ export default {
 
     await Promise.all([
       pg.insertInto('RetroReflectionGroup').values(reflectionGroup).execute(),
-      r.table('RetroReflectionGroup').insert(reflectionGroup).run(),
       r.table('RetroReflection').insert(reflection).run()
     ])
 

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

@@ -1,4 +1,3 @@
-import getRethink from '../../../database/rethinkDriver'
 import getKysely from '../../../postgres/getKysely'
 import OpenAIServerManager from '../../../utils/OpenAIServerManager'
 import sendToSentry from '../../../utils/sendToSentry'
@@ -26,7 +25,6 @@ const generateDiscussionPrompt = async (
     dataLoader.get('retroReflectionsByMeetingId').load(meetingId),
     dataLoader.get('retroReflectionGroupsByMeetingId').load(meetingId)
   ])
-  const r = await getRethink()
   const pg = getKysely()
   const manager = new OpenAIServerManager()
   if (!reflectionGroups.length) {
@@ -46,14 +44,11 @@ const generateDiscussionPrompt = async (
       )
       if (!fullQuestion) return
       const discussionPromptQuestion = fullQuestion?.slice(0, 2000)
-      return Promise.all([
-        pg
-          .updateTable('RetroReflectionGroup')
-          .set({discussionPromptQuestion})
-          .where('id', '=', group.id)
-          .execute(),
-        r.table('RetroReflectionGroup').get(group.id).update({discussionPromptQuestion}).run()
-      ])
+      return pg
+        .updateTable('RetroReflectionGroup')
+        .set({discussionPromptQuestion})
+        .where('id', '=', group.id)
+        .execute()
     })
   )
 }

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

@@ -35,7 +35,6 @@ const handleCompletedRetrospectiveStage = async (
     if (stage.phaseType === REFLECT) {
       const r = await getRethink()
       const pg = getKysely()
-      const now = new Date()
 
       const [reflectionGroups, reflections] = await Promise.all([
         dataLoader.get('retroReflectionGroupsByMeetingId').load(meeting.id),
@@ -60,21 +59,11 @@ const handleCompletedRetrospectiveStage = async (
       await Promise.all(
         sortedReflectionGroups.map((group, index) => {
           group.sortOrder = index
-          return Promise.all([
-            pg
-              .updateTable('RetroReflectionGroup')
-              .set({sortOrder: index})
-              .where('id', '=', group.id)
-              .execute(),
-            r
-              .table('RetroReflectionGroup')
-              .get(group.id)
-              .update({
-                sortOrder: index,
-                updatedAt: now
-              } as any)
-              .run()
-          ])
+          return pg
+            .updateTable('RetroReflectionGroup')
+            .set({sortOrder: index})
+            .where('id', '=', group.id)
+            .execute()
         })
       )
 

packages/server/graphql/mutations/helpers/notifications/SlackNotifier.ts

@@ -597,7 +597,7 @@ export const SlackNotifier = {
       dataLoader.get('teams').loadNonNull(teamId),
       dataLoader.get('users').loadNonNull(userId),
       dataLoader.get('newMeetings').load(meetingId),
-      dataLoader.get('retroReflectionGroups').load(reflectionGroupId),
+      dataLoader.get('retroReflectionGroups').loadNonNull(reflectionGroupId),
       r.table('RetroReflection').getAll(reflectionGroupId, {index: 'reflectionGroupId'}).run(),
       r
         .table('SlackAuth')