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.

Sign up for GitHub

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

Jump to bottom

Conditional link #2399

Merged
merged 1 commit into from
Aug 29, 2019
Merged

Conditional link #2399

merged 1 commit into from
Aug 29, 2019

Conversation

bipuladh
Copy link
Contributor

Changes made to make it possible to generate inventory resources without the links.

@openshift-ci-robot
Copy link
Contributor

Hi @bipuladh. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. component/ceph Related to ceph-storage-plugin component/core Related to console core functionality labels Aug 19, 2019
@cloudbehl
Copy link
Contributor

@rawagner please review.

@spadgett
Copy link
Member

/assign @rawagner

@spadgett spadgett added this to the v4.2 milestone Aug 19, 2019
@spadgett
Copy link
Member

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 19, 2019
rawagner
rawagner suggested changes Aug 20, 2019
View reviewed changes
frontend/public/components/dashboard/inventory-card/inventory-item.tsx Outdated
@@ -110,6 +121,7 @@ export const ResourceInventoryItem: React.FC<ResourceInventoryItemProps> = React
count={groups[key].count}
statusIDs={groups[key].statusIDs}
filterType={groups[key].filterType}
showLink={showLink}
Copy link
Contributor

Choose a reason for hiding this comment

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

if you dont want to show link, then you should use Status component instead of StatusLink

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well in that case I think I should just make use of that component than making changes to StatusLink. Sorry for the trouble.

frontend/public/components/dashboard/inventory-card/inventory-item.tsx Outdated
});

export const ResourceInventoryItem: React.FC<ResourceInventoryItemProps> = React.memo(
({ kind, useAbbr, resources, additionalResources, isLoading, mapper, namespace, error }) => {
({ kind, useAbbr, resources, additionalResources, isLoading, mapper, namespace, error,showLink=true }) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
({ kind, useAbbr, resources, additionalResources, isLoading, mapper, namespace, error,showLink=true }) => {
({ kind, useAbbr, resources, additionalResources, isLoading, mapper, namespace, error, showLink = true }) => {

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 20, 2019
@cloudbehl
Copy link
Contributor

/test e2e-aws
/test e2e-aws-console

1 similar comment
@cloudbehl
Copy link
Contributor

/test e2e-aws
/test e2e-aws-console

@gnehapk
Copy link
Contributor

gnehapk commented Aug 21, 2019

/retest

@cloudbehl
Copy link
Contributor

/approve
@rawagner please have look once again

rawagner
rawagner reviewed Aug 21, 2019
View reviewed changes
frontend/public/components/dashboard/inventory-card/inventory-item.tsx Outdated
statusIDs={groups[key].statusIDs}
filterType={groups[key].filterType}
/>
{ Object.keys(groups).filter(key => groups[key].count > 0).map(key => (
Copy link
Contributor

Choose a reason for hiding this comment

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

just a nit but i'd prefer slightly different formatting such as

{Object.keys(groups).filter(key => groups[key].count > 0).map(key => showLink ?
  (
    <StatusLink
      key={key}
      kind={kind}
      namespace={namespace}
      groupID={key}
      count={groups[key].count}
      statusIDs={groups[key].statusIDs}
      filterType={groups[key].filterType}
    />
  ) : (
    <Status groupID={key} count={groups[key].count} />
  )
)}

@bipuladh
Copy link
Contributor Author

/retest

@bipuladh
Copy link
Contributor Author

/test images

@bipuladh bipuladh force-pushed the conditional_link branch 2 times, most recently from aad6991 to f80dd99 Compare August 21, 2019 08:22
@cloudbehl
Copy link
Contributor

/test images

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2019
@cloudbehl
Copy link
Contributor

/test e2e-aws-console

@cloudbehl
Copy link
Contributor

/test e2e-aws-console
/test e2e-aws-console-olm
/test e2e-aws

@bipuladh
Copy link
Contributor Author

/test e2e-aws-console
/test e2e-aws-console-olm

@cloudbehl
Copy link
Contributor

/test e2e-aws-console-olm

@cloudbehl
Copy link
Contributor

@rawagner lgtm got removed after the rebase. Have a look.

@rawagner
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2019
@cloudbehl
Copy link
Contributor

/approve

1 similar comment
@rawagner
Copy link
Contributor

/approve

@bipuladh
Conditional renering added to ResourceInventoryItem based on showLink
ef64728 
Co-Authored-By: Rastislav Wagner <rawagner@redhat.com>
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Aug 28, 2019
@vojtechszocs
Copy link
Contributor

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2019
@cloudbehl
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 28, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bipuladh, cloudbehl, rawagner, vojtechszocs

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-bot
Copy link
Contributor

/retest

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

3 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@bipuladh
Copy link
Contributor Author

/test e2e-aws-console-olm

@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.

@cloudbehl
Copy link
Contributor

cloudbehl commented Aug 29, 2019 •
edited
Loading

/test e2e-aws

@openshift-merge-robot openshift-merge-robot merged commit 18f435e into openshift:master Aug 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rawagner rawagner rawagner requested changes

@cloudbehl cloudbehl Awaiting requested review from cloudbehl

@jcaianirh jcaianirh Awaiting requested review from jcaianirh

Assignees

@rawagner rawagner

@cloudbehl cloudbehl

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/ceph Related to ceph-storage-plugin component/core Related to console core functionality lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v4.2
Development

Successfully merging this pull request may close these issues.
9 participants
@bipuladh @openshift-ci-robot @cloudbehl @spadgett @gnehapk @rawagner @vojtechszocs @openshift-bot @openshift-merge-robot