From 3e57c5049a2f1240ac366412624240bbf995c4b6 Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Tue, 23 Jan 2024 09:20:57 -0800
Subject: [PATCH 1/8] truncate commit message in commit view if necessary

---
 client/web/src/repo/commits/GitCommitNode.tsx | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index 5d614f31e0061..e652217eecd00 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -83,6 +83,7 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
     wrapperElement: WrapperElement = 'div',
 }) => {
     const [showCommitMessageBody, setShowCommitMessageBody] = useState<boolean>(false)
+    const [truncatedCommitMessage, setTruncatedCommitMessage] = useState<boolean>(true)
     const [flashCopiedToClipboardMessage, setFlashCopiedToClipboardMessage] = useState<boolean>(false)
 
     const sourceType = node.perforceChangelist ? RepositoryType.PERFORCE_DEPOT : RepositoryType.GIT_REPOSITORY
@@ -160,9 +161,37 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
     const commitMessageBody =
         expandCommitMessageBody || showCommitMessageBody ? (
             <div className="w-100">
-                <pre className={styles.messageBody}>
-                    {node.body && <Linkified input={node.body} externalURLs={node.externalURLs} />}
-                </pre>
+                {truncatedCommitMessage ? (
+                    <pre className={styles.messageBody}>
+                        <>
+                            {node.body && (
+                                <Linkified input={`${node.body.slice(0, 240)}...`} externalURLs={node.externalURLs} />
+                            )}
+                            <Button
+                                variant="link"
+                                size="sm"
+                                display="inline"
+                                onClick={() => setTruncatedCommitMessage(false)}
+                            >
+                                see more
+                            </Button>
+                        </>
+                    </pre>
+                ) : (
+                    <>
+                        <pre className={styles.messageBody}>
+                            {node.body && <Linkified input={node.body} externalURLs={node.externalURLs} />}
+                        </pre>
+                        <Button
+                            variant="link"
+                            size="sm"
+                            display="inline"
+                            onClick={() => setTruncatedCommitMessage(true)}
+                        >
+                            see less
+                        </Button>
+                    </>
+                )}
             </div>
         ) : undefined
 

From 7089103fdc52d01ec92b6d42eb2489052d4cd2b5 Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Tue, 23 Jan 2024 09:32:46 -0800
Subject: [PATCH 2/8] remove superfluous fragment

---
 client/web/src/repo/commits/GitCommitNode.tsx | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index e652217eecd00..29b5d70d86148 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -163,19 +163,17 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
             <div className="w-100">
                 {truncatedCommitMessage ? (
                     <pre className={styles.messageBody}>
-                        <>
-                            {node.body && (
-                                <Linkified input={`${node.body.slice(0, 240)}...`} externalURLs={node.externalURLs} />
-                            )}
-                            <Button
-                                variant="link"
-                                size="sm"
-                                display="inline"
-                                onClick={() => setTruncatedCommitMessage(false)}
-                            >
-                                see more
-                            </Button>
-                        </>
+                        {node.body && (
+                            <Linkified input={`${node.body.slice(0, 240)}...`} externalURLs={node.externalURLs} />
+                        )}
+                        <Button
+                            variant="link"
+                            size="sm"
+                            display="inline"
+                            onClick={() => setTruncatedCommitMessage(false)}
+                        >
+                            see more
+                        </Button>
                     </pre>
                 ) : (
                     <>

From ecdfcf4ea5fffbc294b918845ce2c2ddb7cfcb81 Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Tue, 23 Jan 2024 14:04:27 -0800
Subject: [PATCH 3/8] make it more concise

---
 client/web/src/repo/commits/GitCommitNode.tsx | 41 ++++++++-----------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index 29b5d70d86148..898ab8e8072e0 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -158,37 +158,28 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
         </div>
     )
 
+    const commitContent = truncatedCommitMessage && node.body ? `${node.body.slice(0, 240)}...` : node.body
+
     const commitMessageBody =
         expandCommitMessageBody || showCommitMessageBody ? (
             <div className="w-100">
-                {truncatedCommitMessage ? (
+                {commitContent && node.body && (
                     <pre className={styles.messageBody}>
-                        {node.body && (
-                            <Linkified input={`${node.body.slice(0, 240)}...`} externalURLs={node.externalURLs} />
+                        <Linkified
+                            input={node.body.length < 240 ? node.body : commitContent}
+                            externalURLs={node.externalURLs}
+                        />
+                        {node.body.length > 240 && (
+                            <Button
+                                variant="link"
+                                size="sm"
+                                display="inline"
+                                onClick={() => setTruncatedCommitMessage(!truncatedCommitMessage)}
+                            >
+                                {truncatedCommitMessage ? 'see more' : 'see less'}
+                            </Button>
                         )}
-                        <Button
-                            variant="link"
-                            size="sm"
-                            display="inline"
-                            onClick={() => setTruncatedCommitMessage(false)}
-                        >
-                            see more
-                        </Button>
                     </pre>
-                ) : (
-                    <>
-                        <pre className={styles.messageBody}>
-                            {node.body && <Linkified input={node.body} externalURLs={node.externalURLs} />}
-                        </pre>
-                        <Button
-                            variant="link"
-                            size="sm"
-                            display="inline"
-                            onClick={() => setTruncatedCommitMessage(true)}
-                        >
-                            see less
-                        </Button>
-                    </>
                 )}
             </div>
         ) : undefined

From 8bab4cd1be920e55d7d4bf619d28452d0df58bf9 Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Wed, 24 Jan 2024 13:17:40 -0800
Subject: [PATCH 4/8] make it simpler

---
 client/web/src/repo/commits/GitCommitNode.tsx | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index 898ab8e8072e0..6d8036ead46ad 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -158,31 +158,29 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
         </div>
     )
 
-    const commitContent = truncatedCommitMessage && node.body ? `${node.body.slice(0, 240)}...` : node.body
-
-    const commitMessageBody =
-        expandCommitMessageBody || showCommitMessageBody ? (
-            <div className="w-100">
-                {commitContent && node.body && (
-                    <pre className={styles.messageBody}>
-                        <Linkified
-                            input={node.body.length < 240 ? node.body : commitContent}
-                            externalURLs={node.externalURLs}
-                        />
-                        {node.body.length > 240 && (
-                            <Button
-                                variant="link"
-                                size="sm"
-                                display="inline"
-                                onClick={() => setTruncatedCommitMessage(!truncatedCommitMessage)}
-                            >
-                                {truncatedCommitMessage ? 'see more' : 'see less'}
-                            </Button>
-                        )}
-                    </pre>
-                )}
-            </div>
-        ) : undefined
+    const showCommitMessage = expandCommitMessageBody || showCommitMessageBody
+    const commitContent = truncatedCommitMessage && node.body ? `${node.body.slice(0, 240)}` : node.body
+
+    const commitMessageBody = showCommitMessage && commitContent ? (
+        <div className="w-100">
+            <pre className={styles.messageBody}>
+                <Linkified
+                    input={commitContent}
+                    externalURLs={node.externalURLs}
+                />
+                {commitContent.length >= 240 &&
+                    <Button
+                        variant="link"
+                        size="sm"
+                        display="inline"
+                        onClick={() => setTruncatedCommitMessage(!truncatedCommitMessage)}
+                    >
+                        {truncatedCommitMessage ? '... see more' : 'see less'}
+                    </Button>
+                }
+            </pre>
+        </div>
+    ) : undefined
 
     const bylineElement = (
         <GitCommitNodeByline

From 56a71c048fe6539f40170a66b220e59f5ae8cb6e Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Wed, 24 Jan 2024 14:21:44 -0800
Subject: [PATCH 5/8] more simple

---
 client/web/src/repo/commits/GitCommitNode.tsx | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index 6d8036ead46ad..96ab8c5bf966b 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -158,29 +158,25 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
         </div>
     )
 
+    const handleTruncate = () => setTruncatedCommitMessage(!truncatedCommitMessage)
     const showCommitMessage = expandCommitMessageBody || showCommitMessageBody
-    const commitContent = truncatedCommitMessage && node.body ? `${node.body.slice(0, 240)}` : node.body
-
-    const commitMessageBody = showCommitMessage && commitContent ? (
-        <div className="w-100">
-            <pre className={styles.messageBody}>
-                <Linkified
-                    input={commitContent}
-                    externalURLs={node.externalURLs}
-                />
-                {commitContent.length >= 240 &&
-                    <Button
-                        variant="link"
-                        size="sm"
-                        display="inline"
-                        onClick={() => setTruncatedCommitMessage(!truncatedCommitMessage)}
-                    >
-                        {truncatedCommitMessage ? '... see more' : 'see less'}
-                    </Button>
-                }
-            </pre>
-        </div>
-    ) : undefined
+    const commitContent =
+        truncatedCommitMessage && node.body && node.body.length > 240 ? `${node.body.slice(0, 240)}...` : node.body
+    const truncationNeeded = commitContent && commitContent.length > 240
+
+    const commitMessageBody =
+        showCommitMessage && commitContent ? (
+            <div className="w-100">
+                <pre className={styles.messageBody}>
+                    <Linkified input={commitContent} externalURLs={node.externalURLs} />
+                    {truncationNeeded && (
+                        <Button variant="link" size="sm" display="inline" onClick={handleTruncate}>
+                            {truncatedCommitMessage ? 'see more' : 'see less'}
+                        </Button>
+                    )}
+                </pre>
+            </div>
+        ) : undefined
 
     const bylineElement = (
         <GitCommitNodeByline

From bd969a5236cd0df5dce893aa2d508324d25252e8 Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Wed, 24 Jan 2024 17:50:55 -0800
Subject: [PATCH 6/8] var name change

---
 client/web/src/repo/commits/GitCommitNode.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index 96ab8c5bf966b..80a9f5c66a4fb 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -83,7 +83,7 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
     wrapperElement: WrapperElement = 'div',
 }) => {
     const [showCommitMessageBody, setShowCommitMessageBody] = useState<boolean>(false)
-    const [truncatedCommitMessage, setTruncatedCommitMessage] = useState<boolean>(true)
+    const [truncateCommitMessage, setTruncateCommitMessage] = useState<boolean>(true)
     const [flashCopiedToClipboardMessage, setFlashCopiedToClipboardMessage] = useState<boolean>(false)
 
     const sourceType = node.perforceChangelist ? RepositoryType.PERFORCE_DEPOT : RepositoryType.GIT_REPOSITORY
@@ -158,10 +158,10 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
         </div>
     )
 
-    const handleTruncate = () => setTruncatedCommitMessage(!truncatedCommitMessage)
+    const handleTruncate = () => setTruncateCommitMessage(!truncateCommitMessage)
     const showCommitMessage = expandCommitMessageBody || showCommitMessageBody
     const commitContent =
-        truncatedCommitMessage && node.body && node.body.length > 240 ? `${node.body.slice(0, 240)}...` : node.body
+        truncateCommitMessage && node.body && node.body.length > 240 ? `${node.body.slice(0, 240)}...` : node.body
     const truncationNeeded = commitContent && commitContent.length > 240
 
     const commitMessageBody =
@@ -171,7 +171,7 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
                     <Linkified input={commitContent} externalURLs={node.externalURLs} />
                     {truncationNeeded && (
                         <Button variant="link" size="sm" display="inline" onClick={handleTruncate}>
-                            {truncatedCommitMessage ? 'see more' : 'see less'}
+                            {truncateCommitMessage ? 'see more' : 'see less'}
                         </Button>
                     )}
                 </pre>

From 4e76b19ffc93a7d0921f989656c7fb1c96788e99 Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Thu, 25 Jan 2024 10:17:58 -0800
Subject: [PATCH 7/8] tweaks

---
 client/web/src/repo/commits/GitCommitNode.tsx | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index 80a9f5c66a4fb..7bdee47de490a 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -21,6 +21,7 @@ import { GitCommitNodeByline } from './GitCommitNodeByline'
 
 import styles from './GitCommitNode.module.scss'
 
+const TRUNCATED_COMMIT_MESSAGE_LENGTH = 240
 export interface GitCommitNodeProps {
     node: GitCommitFields
 
@@ -158,25 +159,30 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
         </div>
     )
 
-    const handleTruncate = () => setTruncateCommitMessage(!truncateCommitMessage)
-    const showCommitMessage = expandCommitMessageBody || showCommitMessageBody
-    const commitContent =
-        truncateCommitMessage && node.body && node.body.length > 240 ? `${node.body.slice(0, 240)}...` : node.body
-    const truncationNeeded = commitContent && commitContent.length > 240
-
-    const commitMessageBody =
-        showCommitMessage && commitContent ? (
-            <div className="w-100">
-                <pre className={styles.messageBody}>
-                    <Linkified input={commitContent} externalURLs={node.externalURLs} />
-                    {truncationNeeded && (
-                        <Button variant="link" size="sm" display="inline" onClick={handleTruncate}>
-                            {truncateCommitMessage ? 'see more' : 'see less'}
-                        </Button>
-                    )}
-                </pre>
-            </div>
-        ) : undefined
+    const commitMessage = node.body ?? ''
+    const truncationNeeded = commitMessage.length > TRUNCATED_COMMIT_MESSAGE_LENGTH
+    const truncatedCommitMessage =
+        truncateCommitMessage && truncationNeeded
+            ? `${commitMessage.slice(0, TRUNCATED_COMMIT_MESSAGE_LENGTH)}...`
+            : commitMessage
+
+    const commitMessageBody = (
+        <div className="w-100">
+            <pre className={styles.messageBody}>
+                <Linkified input={truncatedCommitMessage} externalURLs={node.externalURLs} />
+                {truncationNeeded && (
+                    <Button
+                        variant="link"
+                        size="sm"
+                        display="inline"
+                        onClick={() => setTruncateCommitMessage(!truncateCommitMessage)}
+                    >
+                        {truncateCommitMessage ? 'see more' : 'see less'}
+                    </Button>
+                )}
+            </pre>
+        </div>
+    )
 
     const bylineElement = (
         <GitCommitNodeByline

From 8be617a514244b489006e46c3f4e55ad8a0fd3a0 Mon Sep 17 00:00:00 2001
From: Jason Harris <jason.harris@sourcegraph.com>
Date: Fri, 26 Jan 2024 13:25:24 -0800
Subject: [PATCH 8/8] remove unnessecary commit message body from blobview

---
 client/web/src/repo/commits/GitCommitNode.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/web/src/repo/commits/GitCommitNode.tsx b/client/web/src/repo/commits/GitCommitNode.tsx
index 7bdee47de490a..75f8bb45daed2 100644
--- a/client/web/src/repo/commits/GitCommitNode.tsx
+++ b/client/web/src/repo/commits/GitCommitNode.tsx
@@ -371,7 +371,6 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC
                             {!extraCompact && <Link to={canonicalURL}>{oidElement}</Link>}
                             {afterElement}
                         </div>
-                        {commitMessageBody}
                     </div>
                 )}
             </>