Resolves #1697 - Bug Fix of popover not closing #1698
Closed
Conversation
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
Signed-off-by: Riya Jain <[email protected]>
yurishkuro
reviewed
Aug 18, 2023
packages/jaeger-ui/src/components/TraceDiff/TraceDiffGraph/TraceDiffGraph.css
Show resolved
Hide resolved
|
ok let's go with your change. Please make sure the commits are signed |
## Which problem is this PR solving? - This PR Migrates `SpanBar.test.js` from Enzyme to RTL - part of: #1668 ## How was this change tested? - using `yarn test-ci` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Ansh Goyal <[email protected]>
## Which problem is this PR solving? Resolves #1258 ## Short description of the changes made the root eslintrc also extend the recommended config from @typescript-eslint. --------- Signed-off-by: Anik Dhabal Babu <[email protected]>
## Which problem is this PR solving? - Part of #1636 ## Description of the changes - Changing icons from v3 to v4 ## How was this change tested? - Tested locally everything seems good ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: bupd <[email protected]>
## Which problem is this PR solving? - This PR migrates the test `NewWindowIcon.test.js` from Enzyme to RTL - part of: #1668 ## How was this change tested? - using `yarn test-ci` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Ansh Goyal <[email protected]>
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 6.0.0 to 6.0.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/testing-library/jest-dom/releases"><code>@testing-library/jest-dom</code>'s releases</a>.</em></p> <blockquote> <h2>v6.0.1</h2> <h2><a href="https://github.com/testing-library/jest-dom/compare/v6.0.0...v6.0.1">6.0.1</a> (2023-08-18)</h2> <h3>Bug Fixes</h3> <ul> <li>matchers type is making the global expect unsafe (<a href="https://github.com/testing-library/jest-dom/issues/513">#513</a>) (<a href="https://github.com/testing-library/jest-dom/commit/bdb34f12959578c77b18b0c0910d512768b20ab0">bdb34f1</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/testing-library/jest-dom/commit/bdb34f12959578c77b18b0c0910d512768b20ab0"><code>bdb34f1</code></a> fix: matchers type is making the global expect unsafe (<a href="https://github.com/testing-library/jest-dom/issues/513">#513</a>)</li> <li>See full diff in <a href="https://github.com/testing-library/jest-dom/compare/v6.0.0...v6.0.1">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore <dependency name> dependency` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore <dependency name> dependency` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
## Which problem is this PR solving? - Resolves Icons part of #1636 ## Description of the changes - Completely upgraded the antd Icons to V4 - Modified tests to suit the V4 ## How was this change tested? - All the changes were tested with all the required tests - Ran the tests locally and passed ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: bupd <[email protected]>
|
when you click on DCO check, it shows which commit it's unhappy about. Merge commits via github normally are already signed. Given the small change, it may be easier to redo it, or squash & push. We have some instructions in the CONTRIBUTING. |
|
Hmm, I did sign my commit, but did not sign the merge commits. I checkout out DCO, and followed the instruction which were provided, which happen to create something unusual here. |
|
This pull request got a little messy with a small change, So closing this and creating a new one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Riya Jain [email protected]
Which problem is this PR solving?
Resolves #1697
Description of the changes
Added a z-index in TraceDiffGraph so that now when the user click outside the popup it will get closed.
Checklist
jaeger:make lint testjaeger-ui:yarn lintandyarn test