Skip to content

Conversation

almoelda
Copy link
Contributor

@almoelda almoelda commented Jan 19, 2025

Closes #21454

  • Adding a util function for cluster query parameter since this will introduce 1 function which is used by several components
  • Applications link in cluster summary page
  • Applications link in project summary page

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).
  • The title of the PR conforms to the Toolchain Guide
  • 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.
  • 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).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@almoelda almoelda requested a review from a team as a code owner January 19, 2025 14:15
Copy link

bunnyshell bot commented Jan 19, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@almoelda almoelda force-pushed the applications-link-in-settings branch from 2f911b5 to e35b614 Compare January 19, 2025 14:19
…r summary page and applications link in project summary page

Signed-off-by: Almo Elda <almogldbh@gmail.com>
Signed-off-by: Almo Elda <almogldbh@gmail.com>
Copy link
Member

@reggie-k reggie-k left a comment

Choose a reason for hiding this comment

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

Thanks for the PR!
Could you attach a screenshot?

@almoelda
Copy link
Contributor Author

almoelda commented Jan 20, 2025

Thanks for the PR! Could you attach a screenshot?

Sure. @reggie-k
I have tested locally applications for different projects and clusters

Screenshot 2025-01-20 at 10 45 25 Screenshot 2025-01-20 at 10 45 11

Comment on lines +98 to +99
apps.items.filter(app => app.spec.destination.name === cluster.name || app.spec.destination.server === cluster.server)
.length
Copy link
Member

@reggie-k reggie-k Jan 20, 2025

Choose a reason for hiding this comment

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

Thanks for the PR! It looks great in the UI!
Why do we have to filter the results here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Please correct me if I am wrong, I believe that the query options does not provide any way to filter by cluster, by taking a look at this https://github.com/argoproj/argo-cd/blob/master/pkg/apiclient/application/application.pb.go#L44-L64 I learned from this file which is filtering apps with the filter function as well https://github.com/argoproj/argo-cd/blob/master/ui/src/app/applications/components/application-details/application-details-app-dropdown.tsx#L38-L43

Copy link
Member

Choose a reason for hiding this comment

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

I see, I wonder whether we can filter inside list in ApplicationService instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean altering the QueryOptions or adding another callback to filter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hey @reggie-k
How you suggest we proceed here?
Thanks :)

Copy link
Member

Choose a reason for hiding this comment

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

It is an option to introduce a new field to ApplicationQuery, and then have it filtered on the backend side.
Actually, the CLI today does have an option to filter by cluster for argocd app list.

But I wanna hear more maintainers' opinions on whether we should do this API change or just have the filtering frontend-side.

Copy link
Member

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

This PR doesn't entirely close the issue. You're still required to add a new panel and embed the Applications list view in a new Tab panel.

@github-project-automation github-project-automation bot moved this from Ready for final review to Changes Requested in Argo CD Review Mar 17, 2025
@keithchong
Copy link
Contributor

keithchong commented Mar 20, 2025

@nitishfy , @agaudreault did you want either option 1 or option 2, or both?

Here's my two cents worth:

For option 1, I suggest to have the "list of applications" (eg. in a table format, and to clarify, not the view itself). Possibly, for each application row, there is a link that brings you to the Application's details graphical view. That way, we don't have to add filters.

You could add additional features to this new panel by also including a link (not part of the table that I described above) to the Application List view (graphical) and have the filter enabled for project or cluster. (Just like this PR here)

For option 2, I think it is the simplest solution and likely still resolves the same usability concerns. It will use the existing graphical view to give you the same information that you want, just like in this new tab.

So, I'd pick option 2 for its simplicity.

Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

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

LGTM. The proposal 2. in the issue is implemented here and it is simpler (less pretty, but much simpler). It does solve the need to go from project to applications and is a good solution in my opinion.

@agaudreault agaudreault merged commit 6d7e75d into argoproj:master Mar 20, 2025
27 checks passed
PaulSonOfLars pushed a commit to PaulSonOfLars/argo-cd that referenced this pull request Mar 22, 2025
Hapshanko pushed a commit to Hapshanko/argo-cd that referenced this pull request Apr 29, 2025
…rgoproj#21561)

Signed-off-by: Almo Elda <almogldbh@gmail.com>
Signed-off-by: Hapshanko <adamgaming391100@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Add link to get the list of applications of a cluster/project
6 participants