From a8cfa03ab9bbc259bcb3f5e6d01bad3ad86861a5 Mon Sep 17 00:00:00 2001
From: Matt Krick <matt.krick@gmail.com>
Date: Tue, 26 Nov 2024 18:43:22 -0800
Subject: [PATCH] feat: TipTap Tasks add new line for jira tasks (#10530)

Signed-off-by: Matt Krick <matt.krick@gmail.com>
---
 .../client/shared/tiptap/splitTipTapContent.ts     |  4 ++++
 .../server/graphql/mutations/changeTaskTeam.ts     | 14 +-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/client/shared/tiptap/splitTipTapContent.ts b/packages/client/shared/tiptap/splitTipTapContent.ts
index fd57bac164d..76cd76913e9 100644
--- a/packages/client/shared/tiptap/splitTipTapContent.ts
+++ b/packages/client/shared/tiptap/splitTipTapContent.ts
@@ -4,6 +4,10 @@ import {serverTipTapExtensions} from './serverTipTapExtensions'
 export const splitTipTapContent = (doc: JSONContent, maxLength = 256) => {
   const [firstBlock, ...bodyBlocks] = doc.content!
   const fullTitle = generateText({...doc, content: [firstBlock!]}, serverTipTapExtensions)
+    // Remove newlines from the title
+    .split(/\s/)
+    .filter((s) => s.length)
+    .join(' ')
   if (fullTitle.length < maxLength) {
     const bodyText = generateText({...doc, content: bodyBlocks}, serverTipTapExtensions)
     const content = bodyText.trim().length > 0 ? bodyBlocks : doc.content!
diff --git a/packages/server/graphql/mutations/changeTaskTeam.ts b/packages/server/graphql/mutations/changeTaskTeam.ts
index b6491536ab9..ab6565ff21e 100644
--- a/packages/server/graphql/mutations/changeTaskTeam.ts
+++ b/packages/server/graphql/mutations/changeTaskTeam.ts
@@ -1,13 +1,11 @@
 import {GraphQLID, GraphQLNonNull} from 'graphql'
 import {SubscriptionChannel} from 'parabol-client/types/constEnums'
-import {removeMentionKeepText} from '../../../client/shared/tiptap/removeMentionKeepText'
 import getKysely from '../../postgres/getKysely'
 import {AtlassianAuth} from '../../postgres/queries/getAtlassianAuthByUserIdTeamId'
 import {GitHubAuth} from '../../postgres/queries/getGitHubAuthByUserIdTeamId'
 import upsertAtlassianAuths from '../../postgres/queries/upsertAtlassianAuths'
 import upsertGitHubAuth from '../../postgres/queries/upsertGitHubAuth'
 import {getUserId, isTeamMember} from '../../utils/authorization'
-import {convertToTipTap} from '../../utils/convertToTipTap'
 import publish from '../../utils/publish'
 import standardError from '../../utils/standardError'
 import {GQLContext} from '../graphql'
@@ -46,7 +44,7 @@ export default {
     if (!task) {
       return standardError(new Error('Task not found'), {userId: viewerId})
     }
-    const {content, tags, teamId: oldTeamId} = task
+    const {tags, teamId: oldTeamId} = task
     if (!isTeamMember(authToken, oldTeamId)) {
       return standardError(new Error('Team not found'), {userId: viewerId})
     }
@@ -122,15 +120,6 @@ export default {
     ).filter(isValid)
     const oldTeamMembers = teamMemberRes[0]!
     const newTeamMembers = teamMemberRes[1]!
-    const oldTeamUserIds = oldTeamMembers.map(({userId}) => userId)
-    const newTeamUserIds = newTeamMembers.map(({userId}) => userId)
-    const userIdsOnlyOnOldTeam = oldTeamUserIds.filter((oldTeamUserId) => {
-      return !newTeamUserIds.find((newTeamUserId) => newTeamUserId === oldTeamUserId)
-    })
-    const rawContent = convertToTipTap(content)
-    const eqFn = (userId: string) => userIdsOnlyOnOldTeam.includes(userId)
-    const {rawContent: nextRawContent} = removeMentionKeepText(rawContent, eqFn)
-
     // If there is a task with the same integration hash in the new team, then delete it first.
     // This is done so there are no duplicates and also solves the issue of the conflicting task being
     // private or archived.
@@ -155,7 +144,6 @@ export default {
     await pg
       .updateTable('Task')
       .set({
-        content: rawContent === nextRawContent ? undefined : JSON.stringify(nextRawContent),
         teamId,
         integration: JSON.stringify(integration)
       })