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: Add namespace to sub-application link URLs (#11945) #11946

Merged
merged 2 commits into from Jan 24, 2023

Conversation

iandelahorne
Copy link
Contributor

@iandelahorne iandelahorne commented Jan 11, 2023

Fixes #11518 and #11945

  • ui: Add namespace to sub-application links in list and tree view
  • Add Patreon to USERS.md

Screenshots:

Tree view with sub-applications in other namespaces Screenshot 2023-01-11 at 14 15 03
List view with sub-applications in other namespaces Screenshot 2023-01-11 at 14 16 59

With "apps in other namespaces" disabled, and using argocd-example-apps/apps from HEAD, this is the behavior - the links work as before, but now the namespace (argocd) is included before the application name.

Tree view with sub-applications, "Apps in other namespaces" disabled Screenshot 2023-01-11 at 14 30 12

Signed-off-by: Ian Delahorne ian@patreon.com

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

fixes argoproj#11945

- ui: Add namespace to sub-application links in list and tree view
- Add Patreon to USERS.md

Signed-off-by: Ian Delahorne <ian@patreon.com>
@iandelahorne
Copy link
Contributor Author

👋 I'm new to submitting PRs to ArgoCD, and also not a frontend expert. This will add the namespace to the external link for all sub-applications, not just those in non-argocd namespaces.

@codecov
Copy link

codecov bot commented Jan 11, 2023

Codecov Report

Base: 47.38% // Head: 47.38% // No change to project coverage 👍

Coverage data is based on head (117f117) compared to base (4a50114).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #11946   +/-   ##
=======================================
  Coverage   47.38%   47.38%           
=======================================
  Files         245      245           
  Lines       41670    41670           
=======================================
  Hits        19745    19745           
  Misses      19937    19937           
  Partials     1988     1988           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ashutosh16
Copy link
Contributor

@iandelahorne Thanks for submitting the PR, would you be able to provide the screenshot of the UI changes?

@crenshaw-dev
Copy link
Collaborator

Thanks for the PR @iandelahorne! Have you confirmed that the change works fine for apps-of-apps when apps-in-any-namespace is disabled?

@iandelahorne
Copy link
Contributor Author

@ashutosh16 Sure, I added screenshots to the description

@crenshaw-dev It does indeed work well for app-of-apps when apps-in-any-namespace is disabled, I verified this on my test cluster and added a screenshot.

@alexef
Copy link
Member

alexef commented Jan 17, 2023

This fixes #11518

Copy link
Member

@alexef alexef left a comment

Choose a reason for hiding this comment

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

I see we also have appQualifiedName in utils.tsx, but that function seems to be for display purpose.

I cannot find other place where we generate the applications/ url.

I confirm the url WITH namespace also works when multiple namespaces are not enabled.

@iandelahorne
Copy link
Contributor Author

Thanks for the review @alexef! I'm not familiar with the devleopment flow - do I need to ping someone on slack or attend a contributor's meeting for this to get reviewed and merged?

@crenshaw-dev
Copy link
Collaborator

@iandelahorne no need, we're just a little behind on reviews. Folks keep contributing things. 🙂

Copy link
Member

@rbreeze rbreeze left a comment

Choose a reason for hiding this comment

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

LGTM

@rbreeze rbreeze merged commit bd8777a into argoproj:master Jan 24, 2023
@mikeeq
Copy link

mikeeq commented Jan 25, 2023

Why it wasn't cherry-pick'ed to v2.5.8 but #12115 was? :(

@crenshaw-dev
Copy link
Collaborator

@mikeeq I think the other cherry-pick was actually in error. We had a code freeze for the CVE patch. I'll cherry-pick this so it goes out with 2.5.9.

crenshaw-dev pushed a commit that referenced this pull request Jan 27, 2023
Signed-off-by: Ian Delahorne <ian@patreon.com>
Co-authored-by: Remington Breeze <remington@breeze.software>
crenshaw-dev pushed a commit that referenced this pull request Jan 27, 2023
Signed-off-by: Ian Delahorne <ian@patreon.com>
Co-authored-by: Remington Breeze <remington@breeze.software>
@crenshaw-dev
Copy link
Collaborator

Cherry-picked onto release-2.5 for 2.5.9 and release-2.6 for 2.6.0-rc6.

emirot pushed a commit to emirot/argo-cd that referenced this pull request Jan 27, 2023
Signed-off-by: Ian Delahorne <ian@patreon.com>
Co-authored-by: Remington Breeze <remington@breeze.software>
Signed-off-by: emirot <emirot.nolan@gmail.com>
schakrad pushed a commit to schakrad/argo-cd that referenced this pull request Mar 14, 2023
Signed-off-by: Ian Delahorne <ian@patreon.com>
Co-authored-by: Remington Breeze <remington@breeze.software>
Signed-off-by: schakrad <chakradari.sindhu@gmail.com>
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.

UI redirect issue from mother app to child app view
6 participants