Skip to content

Conversation

ciiay
Copy link
Contributor

@ciiay ciiay commented Aug 20, 2021

Fixes: #5200

Signed-off-by: ciiay yicai@redhat.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).

@codecov
Copy link

codecov bot commented Aug 20, 2021

Codecov Report

Merging #7042 (b4702a1) into master (b271d6a) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #7042   +/-   ##
=======================================
  Coverage   41.12%   41.12%           
=======================================
  Files         158      158           
  Lines       21364    21364           
=======================================
  Hits         8785     8785           
  Misses      11313    11313           
  Partials     1266     1266           
Impacted Files Coverage Δ
util/settings/settings.go 47.15% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b271d6a...b4702a1. Read the comment docs.

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.

I really like the new purple color. However, currently the Applications List displays the Health Status color for each app on the left:

(Consistent Health Status colors:)
Screen Shot 2021-08-20 at 12 50 50 PM

(Inconsistent Health Status colors:)
Screen Shot 2021-08-20 at 12 50 39 PM

With this change, the colors no longer match. I'm in favor of changing the Suspended color to purple, but if we do it I think we should do it everywhere consistently.

@ciiay
Copy link
Contributor Author

ciiay commented Aug 20, 2021

@rbreeze Good catch! I searched with "Suspended" in code and thought I covered everywhere but missed this one. I will make a PR against argo-ui repo to add this new suspended color.

I looked into the application-table component code, and I see we are applying both health status color and comparison status color for the left border color. In the style sheet it's missing style definition of applications-list__entry--health-Suspended {}, so the health status color is not applied. As you mentioned, the health status color is preferred to be used for the left border color, can I safely remove the applications-list__entry--comparison-${app.status.sync.status} class name? So that only health status color will matter for the left border.

Code reference:

@rbreeze
Copy link
Member

rbreeze commented Aug 26, 2021

can I safely remove the applications-list__entry--comparison-${app.status.sync.status} class name?

Yeah, this should be okay.

I will make a PR against argo-ui repo to add this new suspended color.

I think this should be merged into argo-ui before this PR is merged, so that we can bump the argo-ui commit SHA in this PR.

@alexmt
Copy link
Collaborator

alexmt commented Aug 26, 2021

Just merged argoproj/argo-ui#135. You can bump the argo-ui commit SHA using yarn add git+https://github.com/argoproj/argo-ui.git

@ciiay
Copy link
Contributor Author

ciiay commented Aug 26, 2021

@rbreeze Thanks for the confirmation. I see Alex has merged my argo-ui PR for this PR. I'm going to update this PR soon.

@ciiay
Copy link
Contributor Author

ciiay commented Aug 26, 2021

yarn add git+https://github.com/argoproj/argo-ui.git

Thanks for merging my PR and thanks for the tips. Making a push soon.

ciiay added 2 commits August 26, 2021 17:22
Signed-off-by: ciiay <yicai@redhat.com>
@rbreeze
Copy link
Member

rbreeze commented Aug 26, 2021

It looks like you have a reference to $argo-suspended-color leftover:

ERROR in ./src/app/applications/components/applications-list/applications-list.scss (./node_modules/raw-loader!./node_modules/sass-loader/lib/loader.js!./src/app/applications/components/applications-list/applications-list.scss)
159
Module build failed (from ./node_modules/sass-loader/lib/loader.js):
160

161
            border-left-color: $argo-suspended-color;
162
                              ^
163
      Undefined variable: "$argo-suspended-color".
164
      in /home/runner/work/argo-cd/argo-cd/ui/src/app/applications/components/applications-list/applications-list.scss (line 45, column 32)

Signed-off-by: ciiay <yicai@redhat.com>
@ciiay ciiay force-pushed the ui-5200-pie-chart-display-improvement branch from 0081dc9 to f6b5b01 Compare August 27, 2021 13:25
@ciiay
Copy link
Contributor Author

ciiay commented Aug 27, 2021

$argo-suspended-color is the one I added in argo-ui repo. It's showing in my local 'node_modules/argo-ui/src/styles/config' and tested that app runs on my local with no errors regarding this variable. I included yarn.lock which has the argo-ui update in this PR as well. Is there anything wrong with my process that makes it not picking up my argo-ui node_module update?

@alexmt
Copy link
Collaborator

alexmt commented Aug 27, 2021

@ciiay I forgot to clarify. The yarn add git+https://github.com/argoproj/argo-ui.git should be executed in ui directory. I think you run it in repo root directory.

Please don't forgot to added yarn.lock - it was created by yarn add command.

ciiay added 2 commits August 27, 2021 13:52
Signed-off-by: ciiay <yicai@redhat.com>
@ciiay
Copy link
Contributor Author

ciiay commented Aug 27, 2021

@alexmt Thanks for the information. It looks like this directory information is missing from this page. https://argoproj.github.io/argo-cd/developer-guide/dependencies/#argo-ui-components . How could I or anyone update this documentation?

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

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

LGTM

@alexmt
Copy link
Collaborator

alexmt commented Aug 27, 2021

How could I or anyone update this documentation?

You can make changes in https://github.com/argoproj/argo-cd/blob/master/docs/developer-guide/dependencies.md#argo-ui-components

@ciiay ciiay requested a review from rbreeze August 27, 2021 18:42
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 4290304 into argoproj:master Aug 27, 2021
plakyda-codefresh pushed a commit to plakyda-codefresh/argo-cd that referenced this pull request Sep 28, 2021
…goproj#5200 (argoproj#7042)

Signed-off-by: ciiay <yicai@redhat.com>
Signed-off-by: viktorplakida <plakyda1@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Summary Colors don't match key and numbers don't match colors
3 participants