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

Bug 1812076: Create custom sort for operand status column #4708

Merged
merged 2 commits into from Mar 18, 2020
Merged

Bug 1812076: Create custom sort for operand status column #4708

merged 2 commits into from Mar 18, 2020

Conversation

jcaianirh
Copy link
Member

@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 Mar 10, 2020
@openshift-ci-robot
Copy link
Contributor

@jcaianirh: This pull request references Bugzilla bug 1812076, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1812076: Create custom sort for operand status column

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 the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 10, 2020
@openshift-ci-robot openshift-ci-robot added component/core Related to console core functionality component/olm Related to OLM labels Mar 10, 2020
benjaminapetersen
benjaminapetersen reviewed Mar 11, 2020
View reviewed changes
frontend/public/components/factory/table.tsx Outdated
@@ -3,6 +3,7 @@ import * as PropTypes from 'prop-types';
import * as React from 'react';
import { connect } from 'react-redux';
import { getNodeRoles, getMachinePhase } from '@console/shared';
import { getSortableOperandStatus } from '@console/operator-lifecycle-manager/src/components/operand';
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we don't want frontend/public/components to import from a frontend/packages/... dir.
This could create some circular dependency issues/leaky abstractions.

Copy link
Member

Choose a reason for hiding this comment

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

+1 core console shouldn't import from static plugins

Copy link
Member

Choose a reason for hiding this comment

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

The right fix would be to add an extension point that allows plugins to contribute a table sort function.

@christianvogt I vaguely recall we had to do something like this before. Do you remember?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ya this looks like a bad code dependency.

Sorting sounds like something we should be able to pass in as a prop to the table.
Otherwise an extension works too.

Copy link
Contributor

Choose a reason for hiding this comment

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

I was expecting a prop to the table as well.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 13, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 13, 2020
@jcaianirh
Copy link
Member Author

/retest

@openshift-ci-robot
Copy link
Contributor

@jcaianirh: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/frontend d89cacf link /test frontend

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@jcaianirh
Copy link
Member Author

/retest

benjaminapetersen
benjaminapetersen approved these changes Mar 17, 2020
View reviewed changes
Copy link
Contributor

@benjaminapetersen benjaminapetersen left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 17, 2020
@benjaminapetersen
Copy link
Contributor

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@benjaminapetersen: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.4

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminapetersen, jcaianirh

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2020
@openshift-merge-robot openshift-merge-robot merged commit 41f89d6 into openshift:master Mar 18, 2020
@openshift-ci-robot
Copy link
Contributor

@jcaianirh: All pull requests linked via external trackers have merged. Bugzilla bug 1812076 has been moved to the MODIFIED state.

In response to this:

Bug 1812076: Create custom sort for operand status column

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-cherrypick-robot
Copy link

@benjaminapetersen: #4708 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	frontend/packages/operator-lifecycle-manager/src/components/operand.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/operand.tsx
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/operand.tsx
Patch failed at 0001 Bug 1812076: Create custom sort for operand status column

In response to this:

/cherry-pick release-4.4

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.5 milestone Mar 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christianvogt christianvogt christianvogt left review comments

@benjaminapetersen benjaminapetersen benjaminapetersen approved these changes

@jhadvig jhadvig Awaiting requested review from jhadvig

@spadgett spadgett Awaiting requested review from spadgett

Assignees

@benjaminapetersen benjaminapetersen

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/core Related to console core functionality component/olm Related to OLM lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v4.5
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jcaianirh @openshift-ci-robot @benjaminapetersen @openshift-cherrypick-robot @spadgett @christianvogt @openshift-merge-robot