Skip to content

[Code] code viewer for APM integration#46884

Merged
spacedragon merged 14 commits intoelastic:masterfrom
spacedragon:apm_codebrowser
Oct 18, 2019
Merged

[Code] code viewer for APM integration#46884
spacedragon merged 14 commits intoelastic:masterfrom
spacedragon:apm_codebrowser

Conversation

@spacedragon
Copy link
Copy Markdown
Contributor

@spacedragon spacedragon commented Sep 29, 2019

Summary

https://github.com/elastic/code/issues/1634
image

Checklist

Use strikethroughs to remove checklist items you don't feel are applicable to this PR.

For maintainers

@spacedragon spacedragon requested a review from mw-ding September 29, 2019 09:46
@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/code

@mw-ding mw-ding requested a review from rylnd September 30, 2019 22:02
@spacedragon
Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@spacedragon spacedragon force-pushed the apm_codebrowser branch 2 times, most recently from 6d2c46d to ccc0049 Compare October 8, 2019 02:19
@spacedragon spacedragon marked this pull request as ready for review October 8, 2019 02:20
@spacedragon spacedragon requested a review from a team as a code owner October 8, 2019 02:20
@elastic elastic deleted a comment from elasticmachine Oct 8, 2019
@elastic elastic deleted a comment from elasticmachine Oct 8, 2019
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@spacedragon
Copy link
Copy Markdown
Contributor Author

@elasticmachine merge upstream

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Copy link
Copy Markdown
Contributor

@mw-ding mw-ding left a comment

Choose a reason for hiding this comment

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

This is awesome!

Can you move all the core components to this fold https://github.com/elastic/kibana/tree/master/x-pack/legacy/plugins/code/public/components/integrations. The apm_demo folder has been removed.

@rylnd can you take look at this PR in case some of the conventions are not aligned.

@spacedragon spacedragon requested a review from a team as a code owner October 11, 2019 07:08
@spacedragon
Copy link
Copy Markdown
Contributor Author

spacedragon commented Oct 11, 2019

This is awesome!

Can you move all the core components to this fold https://github.com/elastic/kibana/tree/master/x-pack/legacy/plugins/code/public/components/integrations. The apm_demo folder has been removed.

done

@spacedragon
Copy link
Copy Markdown
Contributor Author

retest

@elastic elastic deleted a comment from elasticmachine Oct 11, 2019
@elastic elastic deleted a comment from elasticmachine Oct 11, 2019
@spacedragon
Copy link
Copy Markdown
Contributor Author

retest

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@rylnd
Copy link
Copy Markdown
Contributor

rylnd commented Oct 15, 2019

@spacedragon there's a small conflict due to my data changes in #48230, as we discussed. Let me know if you need help resolving it.

<div className="codeFlyout__header--file">
<EuiIcon type="codeApp" size="m" />
<EuiText size="s">
<EuiLink href={`/app/code#/${props.repo}/blob/${props.revision}/${props.file}`}>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@spacedragon I don't think this is generating the correct route, at least not in dev mode (the three-letter path prefix is lost)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmm, it works on my machine. What url did it give you there?
We can fire an issue after merge this PR if there is a problem.

spacedragon and others added 13 commits October 18, 2019 09:19
* Do not nest classes unless necessary (none here were needed)
* Prefer to give an EUI component a class rather than styling its
internal one
* use underscores to separate blocks from elements
This is a less unexpected way to align our tabs on the right.
The ID was removed when we switched to a ref, and I did not see a need
for the flex-grow declarations.
The subtree is going to be redrawn either way; saving the one outer div
here isn't adding much.
@spacedragon
Copy link
Copy Markdown
Contributor Author

@spacedragon there's a small conflict due to my data changes in #48230, as we discussed. Let me know if you need help resolving it.

No worries, problem solved, thanks .

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@spacedragon spacedragon merged commit e3bce65 into elastic:master Oct 18, 2019
@spacedragon spacedragon deleted the apm_codebrowser branch October 18, 2019 03:27
spacedragon pushed a commit to spacedragon/kibana that referenced this pull request Oct 18, 2019
* [Code] code viewer for APM integration
spacedragon pushed a commit to spacedragon/kibana that referenced this pull request Oct 18, 2019
* [Code] code viewer for APM integration
spacedragon pushed a commit that referenced this pull request Oct 18, 2019
* [Code] code viewer for APM integration
spacedragon pushed a commit that referenced this pull request Oct 18, 2019
* [Code] code viewer for APM integration
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants