This repository has been archived by the owner on Sep 30, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
truncate commit message in commit view if necessary #59913
Open
jasonhawkharris
wants to merge
9
commits into
main
Choose a base branch
from
jhh/truncate-commit-message
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3e57c50
truncate commit message in commit view if necessary
jasonhawkharris 7089103
remove superfluous fragment
jasonhawkharris ecdfcf4
make it more concise
jasonhawkharris 8bab4cd
make it simpler
jasonhawkharris 56a71c0
more simple
jasonhawkharris bd969a5
var name change
jasonhawkharris 4e76b19
tweaks
jasonhawkharris 8be617a
remove unnessecary commit message body from blobview
jasonhawkharris ee8bdd3
Merge branch 'main' into jhh/truncate-commit-message
jasonhawkharris File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,6 +22,7 @@ import { GitCommitNodeByline } from './GitCommitNodeByline' | |
|
||
import styles from './GitCommitNode.module.scss' | ||
|
||
const TRUNCATED_COMMIT_MESSAGE_LENGTH = 240 | ||
export interface GitCommitNodeProps { | ||
node: GitCommitFields | ||
|
||
|
@@ -90,6 +91,7 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC | |
const settings = useSettings() | ||
|
||
const [showCommitMessageBody, setShowCommitMessageBody] = useState<boolean>(false) | ||
const [truncateCommitMessage, setTruncateCommitMessage] = useState<boolean>(true) | ||
const [flashCopiedToClipboardMessage, setFlashCopiedToClipboardMessage] = useState<boolean>(false) | ||
|
||
const sourceType = node.perforceChangelist ? RepositoryType.PERFORCE_DEPOT : RepositoryType.GIT_REPOSITORY | ||
|
@@ -166,14 +168,30 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC | |
</div> | ||
) | ||
|
||
const commitMessageBody = | ||
expandCommitMessageBody || showCommitMessageBody ? ( | ||
<div className="w-100"> | ||
<pre className={styles.messageBody}> | ||
{node.body && <Linkified input={node.body} externalURLs={node.externalURLs} />} | ||
</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 | ||
|
@@ -362,7 +380,6 @@ export const GitCommitNode: React.FunctionComponent<React.PropsWithChildren<GitC | |
{!extraCompact && <Link to={canonicalURL}>{oidElement}</Link>} | ||
{afterElement} | ||
</div> | ||
{commitMessageBody} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm surprised to see this line deleted. Doesn't this just make it impossible to actually show the commit message body? |
||
</div> | ||
)} | ||
</> | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We also use the
commitMessageBody
to render the byline below. I do not think we ever want an expand/collapse button in the byline