fix(ui): conflict resolution to properly import #13730
Merged
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
Attempting to build the UI on `main` currently fails with the following error: ``` ERROR in ./src/app/workflows/components/retry-workflow-node-panel.tsx 26:0-43 Module not found: Error: Can't resolve '../../shared/utils' in '/home/vscode/go/src/github.com/argoproj/argo-workflows/ui/src/app/workflows/components' ``` This is happening due to a merge conflict between argoproj#13343 and argoproj#13339. The latter was merged first and deleted `ui/src/app/shared/utils.ts`, which the former is importing. The reason the CI build didn't fail for the former PR is that the branch wasn't up-to-date with `main` at the time of merge. Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com>
This was referenced Oct 9, 2024
agilgur5
approved these changes
Oct 9, 2024
There was a problem hiding this comment.
Thanks for fixing this Mason! I didn't have time to fix it yesterday when I noticed it in #13343 (comment), so I appreciate you getting to it in the interim!
agilgur5
changed the title
|
Thanks for fixing this. |
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.
Motivation
Attempting to build the UI on
maincurrently fails with the following error:This is happening due to a merge conflict between #13343 and #13339. The latter was merged first and deleted
ui/src/app/shared/utils.ts, which the former is importing. The reason the CI build didn't fail for the former PR is that the branch wasn't up-to-date withmainat the time of merge.Modifications
Fixed
src/app/workflows/components/retry-workflow-node-panel.tsxto use the new location ofgetValueFromParameter()Verification
Verified http://localhost:8080/workflows?namespace=argo&limit=50 loads locally:
