Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00
Code Issues Projects Releases Wiki Activity

fix(feature): toggle correctly display for list and update feature

Browse Source
This commit is contained in:
Corinne Krych 2018-04-17 11:23:15 +02:00
parent 4b64762671
commit 38d6494683
6 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/component/feature/__tests__/__snapshots__/feature-list-item-component-test.jsx.snap
View File

@ -22,7 +22,7 @@ exports[`renders correctly with one feature 1`] = `
>
<react-mdl-Switch
checked={false}
disabled={true}
disabled={false}
onChange={[Function]}
title="Toggle Another"
/>

2
frontend/src/component/feature/feature-list-item-component.jsx
View File

@ -42,7 +42,7 @@ const Feature = ({
</span>
<span className={styles.listItemToggle}>
<Switch
disabled={toggleFeature !== undefined}
disabled={toggleFeature === undefined}
title={`Toggle ${name}`}
key="left-actions"
onChange={() => toggleFeature(name)}

1
frontend/src/component/feature/form/__tests__/__snapshots__/form-update-feature-component-test.jsx.snap
View File

@ -27,6 +27,7 @@ ShallowWrapper {
"name": "feature",
"nameError": Object {},
},
undefined,
],
],
}

15
frontend/src/component/feature/form/form-update-feature-component.jsx
View File

@ -14,15 +14,23 @@ class UpdateFeatureComponent extends Component {
}
render() {
const { input, addStrategy, removeStrategy, updateStrategy, moveStrategy, onSubmit, onCancel } = this.props;
const {
input,
features,
addStrategy,
removeStrategy,
updateStrategy,
moveStrategy,
onSubmit,
onCancel,
} = this.props;
const {
name, // eslint-disable-line
} = input;
const configuredStrategies = input.strategies || [];
return (
<form onSubmit={onSubmit(input)}>
<form onSubmit={onSubmit(input, features)}>
<section style={{ padding: '16px' }}>
<StrategiesSection
configuredStrategies={configuredStrategies}
@ -42,6 +50,7 @@ class UpdateFeatureComponent extends Component {
UpdateFeatureComponent.propTypes = {
input: PropTypes.object,
features: PropTypes.array,
setValue: PropTypes.func.isRequired,
addStrategy: PropTypes.func.isRequired,
removeStrategy: PropTypes.func.isRequired,

5
frontend/src/component/feature/form/form-update-feature-container.jsx
View File

@ -26,7 +26,7 @@ const mapStateToProps = createMapper({
});
const prepare = (methods, dispatch) => {
methods.onSubmit = input => e => {
methods.onSubmit = (input, features) => e => {
e.preventDefault();
if (Array.isArray(input.strategies)) {
@ -35,6 +35,9 @@ const prepare = (methods, dispatch) => {
});
}
delete input.description;
// take the status of the feature toggles from the central store in case `toggleFeature` function was called
const feat = features.find(f => f.name === input.name);
input.enabled = feat.enabled;
// TODO: should add error handling
requestUpdateFeatureToggle(input)(dispatch)

6
frontend/src/component/feature/view-component.jsx
View File

@ -46,13 +46,13 @@ export default class ViewFeatureToggleComponent extends React.Component {
}
getTabContent(activeTab) {
const { featureToggle, featureToggleName } = this.props;
const { features, featureToggle, featureToggleName } = this.props;
if (TABS[activeTab] === TABS.history) {
return <HistoryComponent toggleName={featureToggleName} />;
} else if (TABS[activeTab] === TABS.strategies) {
if (this.isFeatureView) {
return <EditFeatureToggle featureToggle={featureToggle} />;
return <EditFeatureToggle featureToggle={featureToggle} features={features} />;
}
return <ViewFeatureToggle featureToggle={featureToggle} />;
} else {
@ -165,7 +165,7 @@ export default class ViewFeatureToggleComponent extends React.Component {
>
<span style={{ paddingRight: '24px' }}>
<Switch
disabled={this.isFeatureView}
disabled={!this.isFeatureView}
ripple
checked={featureToggle.enabled}
onChange={() => toggleFeature(featureToggle.name)}