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

Merge branch 'master' into update∕not_change_route

Browse Source
This commit is contained in:
Ivar Conradi Østhus 2018-08-15 19:15:13 +02:00 committed by GitHub
commit 365e0ef464
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/component/feature/form/form-add-feature-container.jsx
View File

@ -3,6 +3,8 @@ import { createFeatureToggles, validateName } from './../../../store/feature-act
import { createMapper, createActions } from './../../input-helpers';
import AddFeatureComponent from './form-add-feature-component';
const defaultStrategy = { name: 'default' };
const ID = 'add-feature-toggle';
const mapStateToProps = createMapper({
id: ID,
@ -26,6 +28,8 @@ const prepare = (methods, dispatch, ownProps) => {
input.strategies.forEach(s => {
delete s.id;
});
} else {
input.strategies = [defaultStrategy];
}
createFeatureToggles(input)(dispatch)

6
frontend/src/component/feature/form/strategies-list.jsx
View File

@ -18,7 +18,11 @@ class StrategiesList extends React.Component {
const { strategies, configuredStrategies, moveStrategy, removeStrategy, updateStrategy } = this.props;
if (!configuredStrategies || configuredStrategies.length === 0) {
return <i style={{ color: 'red' }}>No strategies added</i>;
return (
<p style={{ padding: '0 16px' }}>
<i>No activation strategies selected.</i>
</p>
);
}
const blocks = configuredStrategies.map((strategy, i) => (

8
frontend/src/component/feature/form/strategies-section.jsx
View File

@ -8,9 +8,9 @@ import { HeaderTitle } from '../../common';
class StrategiesSectionComponent extends React.Component {
static propTypes = {
strategies: PropTypes.array.isRequired,
addStrategy: PropTypes.func,
removeStrategy: PropTypes.func,
updateStrategy: PropTypes.func,
addStrategy: PropTypes.func.isRequired,
removeStrategy: PropTypes.func.isRequired,
updateStrategy: PropTypes.func.isRequired,
fetchStrategies: PropTypes.func.isRequired,
};
@ -24,7 +24,7 @@ class StrategiesSectionComponent extends React.Component {
}
return (
<div>
<div style={{ padding: '10px 0' }}>
{this.props.addStrategy ? (
<HeaderTitle title="Activation strategies" actions={<AddStrategy {...this.props} />} />
) : (