chore: Make meeting series naming consistent

packages/client/components/ActivityLibrary/ActivityDetailsSidebar.tsx

@@ -5,16 +5,14 @@ import clsx from 'clsx'
 import React, {useEffect, useRef, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {useHistory} from 'react-router'
+import {RRule} from 'rrule'
 import {ActivityDetailsSidebar_teams$key} from '~/__generated__/ActivityDetailsSidebar_teams.graphql'
 import {ActivityDetailsSidebar_template$key} from '~/__generated__/ActivityDetailsSidebar_template.graphql'
 import StartRetrospectiveMutation from '~/mutations/StartRetrospectiveMutation'
 import StartSprintPokerMutation from '~/mutations/StartSprintPokerMutation'
 import UpdateReflectTemplateScopeMutation from '~/mutations/UpdateReflectTemplateScopeMutation'
 import {MeetingTypeEnum} from '../../__generated__/ActivityDetailsQuery.graphql'
-import {
-  CreateGcalEventInput,
-  RecurrenceSettingsInput
-} from '../../__generated__/StartRetrospectiveMutation.graphql'
+import {CreateGcalEventInput} from '../../__generated__/StartRetrospectiveMutation.graphql'
 import useAtmosphere from '../../hooks/useAtmosphere'
 import useMutationProps from '../../hooks/useMutationProps'
 import SelectTemplateMutation from '../../mutations/SelectTemplateMutation'
@@ -116,23 +114,16 @@ const ActivityDetailsSidebar = (props: Props) => {
   const {onError, onCompleted, submitting, submitMutation, error} = mutationProps
   const history = useHistory()
 
-  const handleStartActivity = (
-    gcalInput?: CreateGcalEventInput,
-    recurrenceSettings?: RecurrenceSettingsInput
-  ) => {
+  const handleStartActivity = (name?: string, rrule?: RRule, gcalInput?: CreateGcalEventInput) => {
     if (submitting) return
     submitMutation()
     if (type === 'teamPrompt') {
       StartTeamPromptMutation(
         atmosphere,
         {
           teamId: selectedTeam.id,
-          recurrenceSettings: recurrenceSettings
-            ? {
-                rrule: recurrenceSettings.rrule?.toString(),
-                name: recurrenceSettings.name
-              }
-            : undefined,
+          name,
+          rrule: rrule?.toString(),
           gcalInput
         },
         {history, onError, onCompleted}
@@ -155,12 +146,8 @@ const ActivityDetailsSidebar = (props: Props) => {
                 atmosphere,
                 {
                   teamId: selectedTeam.id,
-                  recurrenceSettings: recurrenceSettings
-                    ? {
-                        rrule: recurrenceSettings.rrule?.toString(),
-                        name: recurrenceSettings.name
-                      }
-                    : undefined,
+                  name,
+                  rrule: rrule?.toString(),
                   gcalInput
                 },
                 {history, onError, onCompleted}

packages/client/components/ActivityLibrary/ScheduleMeetingButton.tsx

@@ -1,11 +1,9 @@
 import graphql from 'babel-plugin-relay/macro'
 import React from 'react'
 import {useFragment} from 'react-relay'
+import {RRule} from 'rrule'
 import {ScheduleMeetingButton_team$key} from '~/__generated__/ScheduleMeetingButton_team.graphql'
-import {
-  CreateGcalEventInput,
-  RecurrenceSettingsInput
-} from '../../__generated__/StartRetrospectiveMutation.graphql'
+import {CreateGcalEventInput} from '../../__generated__/StartRetrospectiveMutation.graphql'
 import useModal from '../../hooks/useModal'
 import {MenuMutationProps} from '../../hooks/useMutationProps'
 import DialogContainer from '../DialogContainer'
@@ -14,10 +12,7 @@ import SecondaryButton from '../SecondaryButton'
 
 type Props = {
   mutationProps: MenuMutationProps
-  handleStartActivity: (
-    gcalInput?: CreateGcalEventInput,
-    recurrenceInput?: RecurrenceSettingsInput
-  ) => void
+  handleStartActivity: (name?: string, rrule?: RRule, gcalInput?: CreateGcalEventInput) => void
   teamRef: ScheduleMeetingButton_team$key
   placeholder: string
   withRecurrence?: boolean
@@ -60,11 +55,8 @@ const ScheduleMeetingButton = (props: Props) => {
   const handleClick = () => {
     toggleModal()
   }
-  const onStartActivity = (
-    gcalInput?: CreateGcalEventInput,
-    recurrenceInput?: RecurrenceSettingsInput
-  ) => {
-    handleStartActivity(gcalInput, recurrenceInput)
+  const onStartActivity = (name?: string, rrule?: RRule, gcalInput?: CreateGcalEventInput) => {
+    handleStartActivity(name, rrule, gcalInput)
     closeModal()
   }
 

packages/client/components/Recurrence/EndRecurringMeetingModal.tsx

@@ -86,7 +86,7 @@ export const EndRecurringMeetingModal = (props: Props) => {
     if (!isMeetingOnly) {
       UpdateRecurrenceSettingsMutation(
         atmosphere,
-        {meetingId, recurrenceSettings: {name: null, rrule: null}},
+        {meetingId, name: null, rrule: null},
         {onError, onCompleted}
       )
     } else {

packages/client/components/Recurrence/RecurrenceSettings.tsx

@@ -255,7 +255,7 @@ export const RecurrenceSettings = (props: Props) => {
           <Description>
             The next meeting in this series will be called{' '}
             <span className='font-semibold'>
-              "{title} - {dayjs(recurrenceStartTime).format('MMM DD')}"
+              "{title} - {dayjs(new Date()).format('MMM DD')}"
             </span>
           </Description>
         )}

packages/client/components/Recurrence/UpdateRecurrenceSettingsModal.tsx

@@ -175,10 +175,8 @@ export const UpdateRecurrenceSettingsModal = (props: Props) => {
       atmosphere,
       {
         meetingId: meeting.id,
-        recurrenceSettings: {
-          rrule: rrule?.toString(),
-          name: title
-        }
+        rrule: rrule?.toString(),
+        name: title
       },
       {onError, onCompleted: onRecurrenceSettingsUpdated}
     )
@@ -190,7 +188,7 @@ export const UpdateRecurrenceSettingsModal = (props: Props) => {
 
     UpdateRecurrenceSettingsMutation(
       atmosphere,
-      {meetingId: meeting.id, recurrenceSettings: {rrule: null}},
+      {meetingId: meeting.id, rrule: null},
       {onError, onCompleted: onRecurrenceSettingsUpdated}
     )
   }

packages/client/components/ScheduleDialog.tsx

@@ -7,10 +7,7 @@ import React, {ChangeEvent, useState} from 'react'
 import {useFragment} from 'react-relay'
 import {RRule} from 'rrule'
 import {ScheduleDialog_team$key} from '~/__generated__/ScheduleDialog_team.graphql'
-import {
-  CreateGcalEventInput,
-  RecurrenceSettingsInput
-} from '../__generated__/StartRetrospectiveMutation.graphql'
+import {CreateGcalEventInput} from '../__generated__/StartRetrospectiveMutation.graphql'
 import useAtmosphere from '../hooks/useAtmosphere'
 import useForm from '../hooks/useForm'
 import {MenuMutationProps} from '../hooks/useMutationProps'
@@ -34,7 +31,7 @@ const validateTitle = (title: string) =>
   new Legitity(title).trim().min(2, `C’mon, you call that a title?`)
 
 interface Props {
-  onStartActivity: (gcalInput?: CreateGcalEventInput, recurrence?: RecurrenceSettingsInput) => void
+  onStartActivity: (name?: string, rrule?: RRule, gcalInput?: CreateGcalEventInput) => void
   placeholder: string
   teamRef: ScheduleDialog_team$key
   onCancel: () => void
@@ -101,24 +98,23 @@ export const ScheduleDialog = (props: Props) => {
   }
 
   const handleSubmit = () => {
-    const title = fields.title.value || placeholder
-    const titleRes = validateTitle(title)
-    if (titleRes.error) {
-      fields.title.setError(titleRes.error)
+    const name = fields.title.value || placeholder
+    const nameRes = validateTitle(name)
+    if (nameRes.error) {
+      fields.title.setError(nameRes.error)
       return
     }
 
     const gcalEventInput = addedInvite
       ? {
-          title,
           startTimestamp: gcalInput.start.unix(),
           endTimestamp: gcalInput.end.unix(),
           timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
           invitees: gcalInput.invitees,
           videoType: gcalInput.videoType ?? undefined
         }
       : undefined
-    props.onStartActivity(gcalEventInput, rrule ? {rrule} : undefined)
+    props.onStartActivity(name, rrule ?? undefined, gcalEventInput)
   }
 
   const onAddInvite = () => {
@@ -201,7 +197,11 @@ export const ScheduleDialog = (props: Props) => {
             <ExpandMore className={clsx(openRecurrence && 'rotate-180')} />
           </Collapsible.Trigger>
           <Collapsible.Content className='space-y-4'>
-            <RecurrenceSettings title={title} rrule={rrule} onRruleUpdated={setRrule} />
+            <RecurrenceSettings
+              title={title || placeholder}
+              rrule={rrule}
+              onRruleUpdated={setRrule}
+            />
           </Collapsible.Content>
         </Collapsible.Root>
       )}

packages/client/mutations/StartRetrospectiveMutation.ts

@@ -25,14 +25,11 @@ graphql`
 const mutation = graphql`
   mutation StartRetrospectiveMutation(
     $teamId: ID!
-    $recurrenceSettings: RecurrenceSettingsInput
+    $name: String
+    $rrule: RRule
     $gcalInput: CreateGcalEventInput
   ) {
-    startRetrospective(
-      teamId: $teamId
-      recurrenceSettings: $recurrenceSettings
-      gcalInput: $gcalInput
-    ) {
+    startRetrospective(teamId: $teamId, name: $name, rrule: $rrule, gcalInput: $gcalInput) {
       ... on ErrorPayload {
         error {
           message

packages/client/mutations/StartTeamPromptMutation.ts

@@ -19,14 +19,11 @@ graphql`
 const mutation = graphql`
   mutation StartTeamPromptMutation(
     $teamId: ID!
-    $recurrenceSettings: RecurrenceSettingsInput
+    $name: String
+    $rrule: RRule
     $gcalInput: CreateGcalEventInput
   ) {
-    startTeamPrompt(
-      teamId: $teamId
-      recurrenceSettings: $recurrenceSettings
-      gcalInput: $gcalInput
-    ) {
+    startTeamPrompt(teamId: $teamId, name: $name, rrule: $rrule, gcalInput: $gcalInput) {
       ... on ErrorPayload {
         error {
           message

packages/client/mutations/UpdateRecurrenceSettingsMutation.ts

@@ -21,11 +21,8 @@ graphql`
 `
 
 const mutation = graphql`
-  mutation UpdateRecurrenceSettingsMutation(
-    $meetingId: ID!
-    $recurrenceSettings: RecurrenceSettingsInput!
-  ) {
-    updateRecurrenceSettings(meetingId: $meetingId, recurrenceSettings: $recurrenceSettings) {
+  mutation UpdateRecurrenceSettingsMutation($meetingId: ID!, $name: String, $rrule: RRule) {
+    updateRecurrenceSettings(meetingId: $meetingId, name: $name, rrule: $rrule) {
       ... on ErrorPayload {
         error {
           message

packages/server/__tests__/startRetrospective.test.ts

@@ -8,8 +8,8 @@ test('Retro is named Retro #1 by default', async () => {
 
   const newRetro = await sendPublic({
     query: `
-      mutation StartRetrospectiveMutation($teamId: ID!, $recurrenceSettings: RecurrenceSettingsInput, $gcalInput: CreateGcalEventInput) {
-        startRetrospective(teamId: $teamId, recurrenceSettings: $recurrenceSettings, gcalInput: $gcalInput) {
+      mutation StartRetrospectiveMutation($teamId: ID!, $name: String, $rrule: RRule, $gcalInput: CreateGcalEventInput) {
+        startRetrospective(teamId: $teamId, name: $name, rrule: $rrule, gcalInput: $gcalInput) {
           ... on ErrorPayload {
             error {
               message
@@ -34,7 +34,49 @@ test('Retro is named Retro #1 by default', async () => {
       startRetrospective: {
         meeting: {
           id: expect.anything(),
-          name: 'Retro 1'
+          name: 'Retro #1'
+        }
+      }
+    }
+  })
+})
+
+test('Single Retro can be named', async () => {
+  await getRethink()
+  const {userId, authToken} = await signUp()
+  const {id: teamId} = (await getUserTeams(userId))[0]
+
+  const name = 'My Retro'
+  const newRetro = await sendPublic({
+    query: `
+      mutation StartRetrospectiveMutation($teamId: ID!, $name: String, $rrule: RRule, $gcalInput: CreateGcalEventInput) {
+        startRetrospective(teamId: $teamId, name: $name, rrule: $rrule, gcalInput: $gcalInput) {
+          ... on ErrorPayload {
+            error {
+              message
+            }
+          }
+          ... on StartRetrospectiveSuccess {
+            meeting {
+              id
+              name
+            }
+          }
+        }
+      }
+    `,
+    variables: {
+      teamId,
+      name
+    },
+    authToken
+  })
+  expect(newRetro).toMatchObject({
+    data: {
+      startRetrospective: {
+        meeting: {
+          id: expect.anything(),
+          name
         }
       }
     }
@@ -49,8 +91,8 @@ test('Recurring retro is named like RetroSeries Jan 1', async () => {
   const now = new Date()
   const newRetro = await sendPublic({
     query: `
-      mutation StartRetrospectiveMutation($teamId: ID!, $recurrenceSettings: RecurrenceSettingsInput, $gcalInput: CreateGcalEventInput) {
-        startRetrospective(teamId: $teamId, recurrenceSettings: $recurrenceSettings, gcalInput: $gcalInput) {
+      mutation StartRetrospectiveMutation($teamId: ID!, $name: String, $rrule: RRule, $gcalInput: CreateGcalEventInput) {
+        startRetrospective(teamId: $teamId, name: $name, rrule: $rrule, gcalInput: $gcalInput) {
           ... on ErrorPayload {
             error {
               message
@@ -67,10 +109,8 @@ test('Recurring retro is named like RetroSeries Jan 1', async () => {
     `,
     variables: {
       teamId,
-      recurrenceSettings: {
-        rrule: 'DTSTART;TZID=Europe/Berlin:20240117T060000\nRRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=WE',
-        name: 'RetroSeries'
-      }
+      rrule: 'DTSTART;TZID=Europe/Berlin:20240117T060000\nRRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=WE',
+      name: 'RetroSeries'
     },
     authToken
   })

packages/server/database/types/MeetingAction.ts

@@ -9,7 +9,7 @@ interface Input {
   id?: string
   teamId: string
   meetingCount: number
-  name?: string
+  name: string
   phases: [CheckInMeetingPhase, ...CheckInMeetingPhase[]]
   facilitatorUserId: string
 }
@@ -32,7 +32,7 @@ export default class MeetingAction extends Meeting {
       phases,
       facilitatorUserId,
       meetingType: 'action',
-      name: name ?? `Check-in #${meetingCount + 1}`
+      name
     })
   }
 }

packages/server/database/types/MeetingPoker.ts

@@ -8,7 +8,7 @@ interface Input {
   id: string
   teamId: string
   meetingCount: number
-  name?: string
+  name: string
   phases: [PokerPhase, ...PokerPhase[]]
   facilitatorUserId: string
   templateId: string
@@ -35,7 +35,7 @@ export default class MeetingPoker extends Meeting {
       phases,
       facilitatorUserId,
       meetingType: 'poker',
-      name: name ?? `Sprint Poker #${meetingCount + 1}`
+      name
     })
     this.templateId = templateId
     this.templateRefId = templateRefId