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

Bug 1798177: Add expand/collapse of operator groups, type icons #4190

Merged

Conversation

jeff-phillips-18
Copy link
Member

Fixes:
https://issues.redhat.com/browse/ODC-2851
https://issues.redhat.com/browse/ODC-2894

Analysis / Root cause:
The expand/collapse groupings never took the Operator Groups into consideration so they were not expanded/collapsed when the filter was toggled.

Solution Description:
Add the necessary handling of the filter for the expand/collapse of operator groups. Allow operator groups to be selected, though there is no side panel for them at this time. To better distinguish the collapsed group types, add the grouping type icon to the upper left corner of collapsed groups.

Browser conformance:

  • Chrome
  • Firefox
  • Safari
  • Edge

Sample Screenshots:
groupings

cc @openshift/team-devconsole-ux

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 4, 2020
@openshift-ci-robot
Copy link
Contributor

@jeff-phillips-18: This pull request references Bugzilla bug 1798177, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1798177: Add expand/collapse of operator groups, type icons

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. component/dev-console Related to dev-console labels Feb 4, 2020
@andrewballantyne
Copy link
Contributor

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Feb 4, 2020
@serenamarie125
Copy link
Contributor

FYI @Veethika

Copy link
Contributor

@serenamarie125 serenamarie125 left a comment

Choose a reason for hiding this comment

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

Knative grouping border should be the same as other groupings (Operator backed groupings & helm groupings). Unsure if that's part of this bug or not, but providing the feedback.

Otherwise, the expand/collapse & associated type icons look good

ref={hoverRef}
onClick={onSelect}
className={classNames('odc-operator-backed-service', {
'is-selected': selected,
Copy link
Contributor

Choose a reason for hiding this comment

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

On selecting expanded group, it is not adding the highlight which is added when the group is collapsed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

Copy link
Contributor

Choose a reason for hiding this comment

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

You actually don't need this line because it is only needed on the __bg node.

@jeff-phillips-18
Copy link
Member Author

@serenamarie125 Updated to use the same styling for Helm, Knative, and Operator groups.

image

image

@abhi-kn
Copy link
Contributor

abhi-kn commented Feb 5, 2020

@serenamarie125
A small observation not directly related to this PR. If an application group has Knative service & on collapsing application group, the collapsed app group is expected to display resource name as 'Knative Services' with count as per design. But since we use resource kind as label to display and Knative resources have kind value as Service, label displayed is 'Service' instead of 'Knative Service'. Is this acceptable or do we need to display the label as 'Knative Service'?

Actual result:
image

Expected result:
image

cc: @jeff-phillips-18

ref={hoverRef}
onClick={onSelect}
className={classNames('odc-operator-backed-service', {
'is-selected': selected,
Copy link
Contributor

Choose a reason for hiding this comment

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

You actually don't need this line because it is only needed on the __bg node.

<SvgBoxedText
className="odc-base-node__label"
x={x + width / 2}
y={y + height + 30}
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we should update this to 24px now because the labels are overlapping the app group border. Or we add more padding to the app groups.

@christianvogt
Copy link
Contributor

@abhi-kn I think it's worth raising an issue for discussion around the naming and not for this PR.
Because Service is the name of the resource. We'd have to make the change console wide or specifically a one off in topology. That being said we also don't name other knative resources Knative Revision or Knative Route.
cc @openshift/team-devconsole-ux

@jeff-phillips-18
Copy link
Member Author

/test analyze

@christianvogt
Copy link
Contributor

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 6, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@serenamarie125
Copy link
Contributor

A small observation not directly related to this PR. If an application group has Knative service & on collapsing application group, the collapsed app group is expected to display resource name as 'Knative Services' with count as per design. But since we use resource kind as label to display and Knative resources have kind value as Service, label displayed is 'Service' instead of 'Knative Service'. Is this acceptable or do we need to display the label as 'Knative Service'?

@abhi-kn I think this is a problem, IMO it should be KSVC if the Application Grouping has a Knative Service inside of it. Interesting, as I found something likely connected which I mentioned on the tmp-odc-topology channel today.

Copy link
Contributor

@serenamarie125 serenamarie125 left a comment

Choose a reason for hiding this comment

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

Jeff this looks great! I see both the operator backed grouping and Knative service groupings here, and noticed that the knative logo has also been removed from the revisions 👍
Approved from a UX perspective ( I know that some additional visual changes will happen based on Veethika's subsequent visual specs.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: christianvogt, jeff-phillips-18, serenamarie125

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 32a85f9 into openshift:master Feb 7, 2020
@openshift-ci-robot
Copy link
Contributor

@jeff-phillips-18: All pull requests linked via external trackers have merged. Bugzilla bug 1798177 has been moved to the MODIFIED state.

In response to this:

Bug 1798177: Add expand/collapse of operator groups, type icons

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@spadgett spadgett added this to the v4.4 milestone Feb 17, 2020
@jeff-phillips-18 jeff-phillips-18 deleted the collapse-groups branch December 2, 2020 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/dev-console Related to dev-console kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants