Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix stratgy rendering inside create feature form

Browse Source
This commit is contained in:
Ivar Conradi Østhus 2015-03-23 23:44:31 +01:00
parent 9a6d1eb996
commit ddec1d664a
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/UnleashApp.jsx
View File

@ -15,22 +15,22 @@ var tabPanes = [
{ {
name: 'Feature Toggles', name: 'Feature Toggles',
slug: 'feature-toggles', slug: 'feature-toggles',
content: new FeatureTogglesComponent({}) content: FeatureTogglesComponent
}, },
{ {
name: 'Strategies', name: 'Strategies',
slug: 'strategies', slug: 'strategies',
content: new StrategiesComponent({}) content: StrategiesComponent
}, },
{ {
name: "Log", name: "Log",
slug: 'log', slug: 'log',
content: new LogEntriesComponent({}) content: LogEntriesComponent
}, },
{ {
name: "Archive", name: "Archive",
slug: 'archive', slug: 'archive',
content: new ArchiveFeatureComponent({}) content: ArchiveFeatureComponent
} }
]; ];

4
public/js/__tests__/components/feature/FeatureForm-test.js
View File

@ -24,11 +24,11 @@ describe("FeatureForm", function () {
describe("edit", function () { describe("edit", function () {
var feature = {name: "Test", strategy: "unknown"}; var feature = {name: "Test", strategy: "unknown"};
it("should show unknown strategy as deleted", function () { it("should show unknown strategy as default", function () {
Component = TestUtils .renderIntoDocument(<FeatureForm feature={feature} strategies={strategies} />); Component = TestUtils .renderIntoDocument(<FeatureForm feature={feature} strategies={strategies} />);
var strategySelect = Component.getDOMNode().querySelector("select"); var strategySelect = Component.getDOMNode().querySelector("select");
expect(strategySelect.value).toEqual("unknown (deleted)"); expect(strategySelect.value).toEqual("default");
}); });
}); });

2
public/js/components/TabView.jsx
View File

@ -48,7 +48,7 @@ var TabView = React.createClass({
<div className="mod shadow mrn pan"> <div className="mod shadow mrn pan">
<div className="inner pan"> <div className="inner pan">
<div className="bd"> <div className="bd">
{this.state.activeTab.content} {new this.state.activeTab.content()}
</div> </div>
</div> </div>
</div> </div>

9
public/js/components/feature/FeatureForm.jsx
View File

@ -30,17 +30,16 @@ var FeatureForm = React.createClass({
}, },
setSelectedStrategy: function(name) { setSelectedStrategy: function(name) {
var selectedStrategy = this.state.strategyOptions.filter(function(strategy) { var selectedStrategy = this.props.strategies.filter(function(strategy) {
return strategy.name === name; return strategy.name === name;
})[0]; })[0];
if(selectedStrategy) { if(selectedStrategy) {
this.setStrategyParams(selectedStrategy); this.setStrategyParams(selectedStrategy);
} else { } else {
var updatedStrategyName = name + " (deleted)";
this.setState({ this.setState({
currentStrategy: updatedStrategyName, currentStrategy: 'default',
strategyOptions: this.state.strategyOptions.concat([{name: updatedStrategyName}]) requiredParams: []
}); });
} }
}, },
@ -129,7 +128,7 @@ var FeatureForm = React.createClass({
}, },
renderStrategyOptions: function() { renderStrategyOptions: function() {
return this.state.strategyOptions.map(function(strategy) { return this.props.strategies.map(function(strategy) {
return ( return (
<option key={strategy.name} value={strategy.name}> <option key={strategy.name} value={strategy.name}>
{strategy.name} {strategy.name}