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

fix: upgrade argo-ui components to latest -- 3.4 backport #12998

Merged
merged 1 commit into from
May 4, 2024

Conversation

Joibel
Copy link
Member

@Joibel Joibel commented Apr 30, 2024

A cherry pick of #11585 to release/3.4

Changes from #11585:

  • archived-workflow-details.tsx changes to className
  • yarn.lock updated, react-toastify still pinned to 9.0.3

Specifically fixes #11448 on 3.4
Fixes #11585 missing from #11648 (comment)

Testing

make start UI=true runs up cleanly.
Built argo-cli image and installed it as the UI in a 3.4.16 install. Ran a workflow and clicked around a lot. I didn't observe anything wrong.
The resolution #11448 has been checked.

A cherry pick of argoproj#11585 to release/3.4

Changes from argoproj#11585:
* `archived-workflow-details.tsx` changes to `className`
* `yarn.lock` updated, `react-toastify` still pinned to 9.0.3

Co-authored-by: Anton Gilgur <agilgur5@gmail.com>
Co-authored-by: Yuan Tang <terrytangyuan@gmail.com>
Signed-off-by: Alan Clucas <alan@clucas.org>
Copy link
Member

@terrytangyuan terrytangyuan left a comment

Choose a reason for hiding this comment

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

@agilgur5 Could you take a look?

@agilgur5 agilgur5 changed the title fix: upgrade argo-ui components to latest fix: upgrade argo-ui components to latest (3.4 cherry pick) Apr 30, 2024
@agilgur5 agilgur5 added type/dependencies PRs and issues specific to updating dependencies area/ui javascript Pull requests that update Javascript dependencies type/backport Backport of an existing PR to an older release branch labels May 1, 2024
@agilgur5 agilgur5 changed the title fix: upgrade argo-ui components to latest (3.4 cherry pick) fix: upgrade argo-ui components to latest (3.4 backport) May 1, 2024
@agilgur5 agilgur5 self-assigned this May 1, 2024
Copy link
Member

@agilgur5 agilgur5 left a comment

Choose a reason for hiding this comment

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

It looks like there was a merge conflict resolution mistake here (see below in-line comment) that updated some devDeps unnecessarily, but it doesn't actually impact anything meaningful. Otherwise changes LGTM.

Checked locally that I produced the same yarn.lock as is here as well and ran yarn test and yarn lint since CI isn't running on the release-3.4 base branch. All made no changes. Generated files LGTM.

"babel-loader": "^8.3.0",
"copy-webpack-plugin": "^5.1.2",
"copyfiles": "^2.4.1",
"file-loader": "^6.2.0",
"glob": "^9.3.2",
"glob": "^10.3.3",
Copy link
Member

Choose a reason for hiding this comment

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

Hmm glob and babel-jest weren't changed in #11585 and you didn't mention them in your PR description -- possible incorrect merge conflict resolution?

I do see that #11585 already had them at these versions though, not sure if you intentionally bumped them?

Copy link
Member

Choose a reason for hiding this comment

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

babel-jest looks like all dependabot updates and only patches and minors: #11307 and #11478

Copy link
Member

Choose a reason for hiding this comment

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

Looks like glob was also all dependabot updates, including dependabot doing a breaking change (i.e. one of the reasons I disabled it for non-security in #12487). #10862, #10915, and several more until #11328

Copy link
Member

Choose a reason for hiding this comment

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

Oh right, and then I removed glob in #11630 anyway as it was unused

@agilgur5 agilgur5 merged commit 5fe8b37 into argoproj:release-3.4 May 4, 2024
4 checks passed
@agilgur5 agilgur5 added this to the v3.4.x patches milestone May 4, 2024
@agilgur5 agilgur5 changed the title fix: upgrade argo-ui components to latest (3.4 backport) fix: upgrade argo-ui components to latest -- 3.4 backport) Oct 23, 2024
@agilgur5 agilgur5 changed the title fix: upgrade argo-ui components to latest -- 3.4 backport) fix: upgrade argo-ui components to latest -- 3.4 backport Oct 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ui javascript Pull requests that update Javascript dependencies type/backport Backport of an existing PR to an older release branch type/dependencies PRs and issues specific to updating dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants