Skip to content

Migrate <Switch> to PF4 #2708

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

Merged
openshift-merge-robot merged 1 commit into from
Sep 17, 2019
Merged

Migrate <Switch> to PF4 #2708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/integration-tests/tests/olm/descriptors.scenario.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const inputValueFor = (capability: SpecCapability) => async(el: ElementFinder) =
limits: {cpu: await el.$$('input').get(0).getAttribute('value'), memory: await el.$$('input').get(1).getAttribute('value')},
requests: {cpu: await el.$$('input').get(2).getAttribute('value'), memory: await el.$$('input').get(3).getAttribute('value')},
};
case SpecCapability.booleanSwitch: return (await el.$('.bootstrap-switch').getAttribute('class')).includes('bootstrap-switch-on');
case SpecCapability.booleanSwitch: return (await el.$('.pf-c-switch__input').getAttribute('checked')) !== 'false';
case SpecCapability.password: return el.$('input').getAttribute('value');
case SpecCapability.checkbox: return (await el.$('input').getAttribute('checked')) !== 'false';
case SpecCapability.imagePullPolicy: return el.$('input[type=\'radio\']:checked').getAttribute('value');
Expand Down
13 changes: 6 additions & 7 deletions frontend/public/components/operator-lifecycle-manager/create-operand.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import { safeDump } from 'js-yaml';
import * as _ from 'lodash-es';
import { PropertyPath } from 'lodash';
import * as classNames from 'classnames';
import { Switch } from 'patternfly-react';
import { Alert, ActionGroup, Button } from '@patternfly/react-core';
import { Alert, ActionGroup, Button, Switch } from '@patternfly/react-core';
import { JSONSchema6TypeName } from 'json-schema';

import {
Expand Down Expand Up @@ -346,11 +345,11 @@ export const CreateOperandForm: React.FC<CreateOperandFormProps> = (props) => {
}
if (field.capabilities.includes(SpecCapability.booleanSwitch)) {
return <Switch
value={formValues[field.path]}
onChange={(el, val) => setFormValues(values => ({...values, [field.path]: val}))}
onText="True"
offText="False"
bsSize="mini" />;
id={field.path}
isChecked={formValues[field.path]}
onChange={(val) => setFormValues(values => ({...values, [field.path]: val}))}
label="True"
labelOff="False" />;
}
if (field.capabilities.includes(SpecCapability.imagePullPolicy)) {
return <RadioGroup
Expand Down
12 changes: 5 additions & 7 deletions frontend/public/components/operator-lifecycle-manager/descriptors/spec/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import * as React from 'react';
import * as _ from 'lodash-es';
import { Map as ImmutableMap } from 'immutable';
import { Tooltip } from '@patternfly/react-core';
import { Switch, Tooltip } from '@patternfly/react-core';
import { EyeIcon, EyeSlashIcon } from '@patternfly/react-icons';
import { Switch } from 'patternfly-react';

import { SpecCapability, DescriptorProps, CapabilityProps } from '../types';
import { ResourceRequirementsModalLink } from './resource-requirements';
Expand Down Expand Up @@ -59,14 +58,13 @@ const BooleanSwitch: React.FC<SpecCapabilityProps> = (props) => {

return <div className="co-spec-descriptor--switch">
<Switch
value={value}
onChange={(el, val) => {
isChecked={value}
onChange={(val) => {
setValue(val);
setConfirmed(false);
}}
onText="True"
offText="False"
bsSize="mini" />
label="True"
labelOff="False" />
&nbsp;&nbsp;
{value !== props.value && confirmed && <LoadingInline />}
{value !== props.value && !confirmed && <React.Fragment>
Expand Down
2 changes: 0 additions & 2 deletions frontend/public/vendor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
@import '~patternfly/dist/sass/patternfly/list-view';
@import '~patternfly/dist/sass/patternfly/popovers';
@import '~patternfly/dist/sass/patternfly/forms';
@import '~patternfly/dist/sass/patternfly/dependencies/bootstrap-switch/bootstrap-switch';
@import '~patternfly/dist/sass/patternfly/bootstrap-switch';
Copy link
Member

@spadgett spadgett Sep 12, 2019

Choose a reason for hiding this comment

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

👍

I confirmed kubevirt-web-ui-components doesn't reference Switch so this should be safe

@import "~xterm/dist/addons/fullscreen/fullscreen";
@import "~patternfly-react/dist/sass/field-level-help";
@import "~patternfly-react/dist/sass/modeless-overlay";
Expand Down