Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Render blob panel even if the highlighting request failed #11034

Merged
merged 1 commit into from
May 27, 2020

Conversation

eseliger
Copy link
Member

This caused #10999 where no git history would show up, because the
request for the highlighted content fails, as the file is binary.

The Blob panel should be rendered independently of the blob content. That way

  • it's possible to still show the history when the render failed
  • the fetch for the history data can happen earlier, before the blob is done highlighting

Closes #10999

This caused #10999 where no git history would show up, because the
request for the highlighted content fails, as the file is binary.
@eseliger eseliger added bug An error, flaw or fault that produces an incorrect or unexpected result, or behavior. webapp labels May 27, 2020
@eseliger eseliger requested a review from a team May 27, 2020 18:30
Copy link
Contributor

@felixfbecker felixfbecker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@@ -240,6 +240,14 @@ export class BlobPage extends React.PureComponent<Props, State> {
}
repoHeaderContributionsLifecycleProps={this.props.repoHeaderContributionsLifecycleProps}
/>
<BlobPanel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make no difference that this is now in the top of the DOM (before the file content) and not at the end?

Wish this component had screenshot tests...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It actually renders nothing, it's just a view provider wrapper. If that sounds safe enough, wanna approve? :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very weird

@eseliger eseliger merged commit 3bf6fa1 into master May 27, 2020
@eseliger eseliger deleted the es/fix-git-history-binary branch May 27, 2020 23:47
@keegancsmith
Copy link
Member

Changelog entry pls :)

eseliger added a commit that referenced this pull request May 28, 2020
eseliger added a commit that referenced this pull request May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug An error, flaw or fault that produces an incorrect or unexpected result, or behavior. webapp
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No Git file history for binary files
3 participants