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

Migrate icons to PF4 components and upgrade Font Awesome #2076

Merged
merged 1 commit into from Jul 23, 2019
Merged

Migrate icons to PF4 components and upgrade Font Awesome #2076

merged 1 commit into from Jul 23, 2019

Conversation

rhamilto
Copy link
Member

@rhamilto rhamilto commented Jul 17, 2019 •
edited

Supports https://jira.coreos.com/browse/CONSOLE-1606

Note we still need to carry Font Awesome as a dependency for the cases where we use an icon as content in a pseudo element.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 17, 2019
@openshift-ci-robot openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 17, 2019
@rhamilto rhamilto force-pushed the migrate-icons-to-components branch 3 times, most recently from ae1e943 to 6b61f07 Compare July 17, 2019 21:41
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2019
@rhamilto rhamilto force-pushed the migrate-icons-to-components branch from 6b61f07 to 6ca8423 Compare July 18, 2019 13:21
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2019
@rhamilto rhamilto force-pushed the migrate-icons-to-components branch from 6ca8423 to 5b16791 Compare July 18, 2019 19:42
@rhamilto rhamilto changed the title [WIP] Migrate icons to PF4 components and upgrade Font Awesome Migrate icons to PF4 components and upgrade Font Awesome Jul 18, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 18, 2019
@rhamilto rhamilto force-pushed the migrate-icons-to-components branch from 5b16791 to 6eec9d0 Compare July 18, 2019 19:57
@rhamilto
Copy link
Member Author

Sorry @spadgett, this one is big. But is relatively easy to review.

spadgett
spadgett approved these changes Jul 19, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

frontend/public/components/operator-lifecycle-manager/descriptors/status/phase.tsx

export const Phase: React.SFC<PhaseProps> = ({status}) => <span className={status === 'Failed' ? 'co-error' : ''}>
{ status === 'Failed' && <i className="fa fa-ban" /> } {status}
{ status === 'Failed' && <BanIcon data-test-id="ban-icon" /> } {status}
Copy link
Member

Choose a reason for hiding this comment

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

Nice solution to the test problem 👍

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 19, 2019
@spadgett spadgett added this to the v4.2 milestone Jul 19, 2019
@spadgett
Copy link
Member

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

@rhamilto
Copy link
Member Author

/retest

2 similar comments
@rhamilto
Copy link
Member Author

/retest

@rhamilto
Copy link
Member Author

/retest

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

@rhamilto rhamilto force-pushed the migrate-icons-to-components branch from 6eec9d0 to 678ad50 Compare July 19, 2019 17:10
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 19, 2019
@rhamilto
Copy link
Member Author

Rebased. @spadgett, please tag.

spadgett
spadgett approved these changes Jul 22, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

This was approved before feature freeze and only needed a rebase.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2019
@rhamilto rhamilto force-pushed the migrate-icons-to-components branch from 92ebe16 to 1e6e3d7 Compare July 22, 2019 18:38
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2019
@rhamilto
Copy link
Member Author

Rebased due to conflict in package.json. @spadgett, please re-tag.

spadgett
spadgett approved these changes Jul 22, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2019
@rhamilto rhamilto force-pushed the migrate-icons-to-components branch from 1e6e3d7 to 4b5b59c Compare July 22, 2019 20:38
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2019
@rhamilto
Copy link
Member Author

Rebased due to conflict in resource-sidebar.jsx. @spadgett, please re-tag.

@spadgett
Copy link
Member

infrastructure error

/retest

spadgett
spadgett approved these changes Jul 22, 2019
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, spadgett

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.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@spadgett
Copy link
Member

/retest

@openshift-bot
Copy link
Contributor

/retest

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

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

@rhamilto
Copy link
Member Author

/retest

@rhamilto rhamilto mentioned this pull request Jul 23, 2019
Merged
@rhamilto
Copy link
Member Author

/retest

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

@rhamilto
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit ecaf818 into openshift:master Jul 23, 2019
@rhamilto rhamilto deleted the migrate-icons-to-components branch July 24, 2019 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spadgett spadgett spadgett approved these changes

@jeff-phillips-18 jeff-phillips-18 Awaiting requested review from jeff-phillips-18

@josephschorr josephschorr Awaiting requested review from josephschorr

Assignees

@spadgett spadgett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. queue/multiple-rebases size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v4.2
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rhamilto @spadgett @openshift-bot @openshift-ci-robot @openshift-merge-robot