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

Fixes inconsistent fonts on step 1 and step 2 of baremetal wizard #8103

Merged
merged 1 commit into from Feb 11, 2021

Conversation

Jayashree-panda
Copy link
Contributor

@openshift-ci-robot openshift-ci-robot added the component/lso Related to local-storage-operator-plugin label Feb 9, 2021
@openshift-ci-robot
Copy link
Contributor

Hi @Jayashree-panda. 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 the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 9, 2021
@@ -312,7 +313,11 @@ export const LocalVolumeSetHeader = () => {

return (
<>
<h1 className="co-create-operand__header-text">{t('lso-plugin~Local Volume Set')}</h1>
<TextContent>
<Text component={TextVariants.h3} className="ocs-install-wizard__h3">
Copy link
Contributor

Choose a reason for hiding this comment

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

We dont want to use ocs class in lso page. I would suggest to make it a prop.

Suggested change
<Text component={TextVariants.h3} className="ocs-install-wizard__h3">
<Text component={TextVariants.h3} className={className}>

Also, this will do the change in lso page form as well and for lso page, we still want to use h1, perhaps a prop component would be good to pass from ocs to this component.

Copy link
Contributor

@afreen23 afreen23 Feb 9, 2021

Choose a reason for hiding this comment

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

This is a generic component, hence we must add props to it , rather than making a direct change. And keep the defaults.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@afreen23 I will make the changes. Thanks 👍

<Text component={TextVariants.h3} className="ocs-install-wizard__h3">
{t('lso-plugin~Auto Detect Volume')}
</Text>
</TextContent>
Copy link
Contributor

@afreen23 afreen23 Feb 9, 2021

Choose a reason for hiding this comment

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

same as above.

Copy link
Contributor

Choose a reason for hiding this comment

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

Same as LocalVolumeHeader

@@ -307,12 +308,16 @@ type LocalVolumeSetInnerProps = {
taintsFilter?: (node: NodeKind) => boolean;
};

export const LocalVolumeSetHeader = () => {
export const LocalVolumeSetHeader = ({ className, variant }) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Add types and make className optional

Suggested change
export const LocalVolumeSetHeader = ({ className, variant }) => {
export const LocalVolumeSetHeader: React.FC<LocalVolumeSetHeaderprops> = ({ className, variant }) => {
...
type LocalVolumeSetHeader = {
variant: string
className?: string
}

@@ -79,7 +79,7 @@ const CreateLocalVolumeSet: React.FC = withHandlePromise<
]}
/>
</div>
<LocalVolumeSetHeader />
<LocalVolumeSetHeader className={null} variant={TextVariants.h1} />
Copy link
Contributor

Choose a reason for hiding this comment

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

Make className optional prop

Suggested change
<LocalVolumeSetHeader className={null} variant={TextVariants.h1} />
<LocalVolumeSetHeader variant={TextVariants.h1} />

@@ -105,7 +105,7 @@ const AutoDetectVolume: React.FC = withHandlePromise<AutoDetectVolumeProps & Han
/>
</div>

<AutoDetectVolumeHeader />
<AutoDetectVolumeHeader className={null} variant={TextVariants.h1} />
Copy link
Contributor

Choose a reason for hiding this comment

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

Make className optional

Suggested change
<AutoDetectVolumeHeader className={null} variant={TextVariants.h1} />
<AutoDetectVolumeHeader variant={TextVariants.h1} />

<Text component={TextVariants.h3} className="ocs-install-wizard__h3">
{t('lso-plugin~Auto Detect Volume')}
</Text>
</TextContent>
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as LocalVolumeHeader

@@ -64,7 +64,7 @@ export const CreateLocalVolumeSet: React.FC<CreateLocalVolumeSetProps> = ({

return (
<>
<LocalVolumeSetHeader />
<LocalVolumeSetHeader className={'ocs-install-wizard__h3'} variant={TextVariants.h3} />
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
<LocalVolumeSetHeader className={'ocs-install-wizard__h3'} variant={TextVariants.h3} />
<LocalVolumeSetHeader className="ocs-install-wizard__h3"' variant={TextVariants.h3} />

@@ -11,7 +11,7 @@ import '../../attached-devices.scss';

export const AutoDetectVolume: React.FC<AutoDetectVolumeProps> = ({ state, dispatch }) => (
<>
<AutoDetectVolumeHeader />
<AutoDetectVolumeHeader className={'ocs-install-wizard__h3'} variant={TextVariants.h3} />
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
<AutoDetectVolumeHeader className={'ocs-install-wizard__h3'} variant={TextVariants.h3} />
<AutoDetectVolumeHeader className="ocs-install-wizard__h3" variant={TextVariants.h3} />

Signed-off-by: Jayashree-panda <jayashreepanda12345@gmail.com>
@afreen23
Copy link
Contributor

/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 Feb 10, 2021
@afreen23
Copy link
Contributor

/test e2e-gcp-console
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 10, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afreen23, Jayashree-panda

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 Feb 10, 2021
@cloudbehl
Copy link
Contributor

/test e2e-gcp-console

@openshift-merge-robot openshift-merge-robot merged commit 1860d41 into openshift:master Feb 11, 2021
@spadgett spadgett added this to the v4.8 milestone Feb 15, 2021
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. component/ceph Related to ceph-storage-plugin component/lso Related to local-storage-operator-plugin 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants