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

Converted EuiToolTipPopover to TS #1800

Merged
merged 10 commits into from
Apr 8, 2019
Merged

Converted EuiToolTipPopover to TS #1800

merged 10 commits into from
Apr 8, 2019

Conversation

theodesp
Copy link
Contributor

@theodesp theodesp commented Apr 5, 2019

Summary

As per #1557

Checklist

  • This was checked in mobile
  • This was checked in IE11
  • This was checked in dark mode
  • Any props added have proper autodocs
  • Documentation examples were added
  • A changelog entry exists and is marked appropriately
  • This was checked for breaking changes and labeled appropriately
  • Jest tests were updated or added to match the most common scenarios
  • This was checked against keyboard-only and screenreader scenarios
  • This required updates to Framer X components

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

src/components/tool_tip/tool_tip_popover.tsx Outdated Show resolved Hide resolved
src/components/tool_tip/tool_tip_popover.tsx Outdated Show resolved Hide resolved
@theodesp
Copy link
Contributor Author

theodesp commented Apr 8, 2019

@chandlerprall PR updated. Thanx

Copy link
Contributor

@chandlerprall chandlerprall left a comment

Choose a reason for hiding this comment

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

Changes LGTM; Built eui.d.ts locally and verified EuiToolTip is exported as expected.

@chandlerprall
Copy link
Contributor

jenkins test this

@chandlerprall chandlerprall merged commit 68594fb into elastic:master Apr 8, 2019
@chandlerprall
Copy link
Contributor

@theodesp merged, and thanks again!

One suggestion - it looks like you're reusing your master branch for each of these, which creates an ever-increasing history on each of these PRs

commits

EUI enforces merge by squashing, which creates a single new commit for each PR and ignores the history of the commits during development. This means that the individual commits you make on your master branch are not part of the repo's history, only the single squash per PR, so when a new PR is created from your master branch git sees the whole history is different and flags all affected files, even though the majority of them have no differences between EUI master and your branch.

Seeing a clean and focused commit history in a PR helps us correctly review; if you could pull your master to the latest eui/master that would help a lot; I'm not sure the "best" way to do this given the existing history on your fork's master, but personally I would delete your master branch and re-create it based on eui's master. I believe you could also merge eui/master into your master, or rebase yours against eui/master, which will end up in a few empty conflicts. Going forward, creating a new branch for each change set will help keep the history cleaner.

@theodesp
Copy link
Contributor Author

theodesp commented Apr 8, 2019

I think If i delete my master and pull from eui will fix it. Then I will use feature branches that merge into eui master and when they are merged just sync my master with only from eui master without conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants