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

Merge pull request #235 from Unleash/deprecate-strategies

Browse Source 
Basic implementation of deprecation/reactivation of strategies
This commit is contained in:
Christopher Kolstad 2021-01-22 10:19:33 +01:00 committed by GitHub
commit 56ce9b2084
11 changed files with 186 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/component/feature/strategy/strategies-add.jsx
View File

@ -61,11 +61,13 @@ class AddStrategy extends React.Component {
/>
<Menu target="strategies-add" valign="bottom" align="right" ripple style={menuStyle}>
<MenuItem disabled>Add Strategy:</MenuItem>
{this.props.strategies.map(s => (
<MenuItem key={s.name} title={s.description} onClick={() => this.addStrategy(s.name)}>
{s.name}
</MenuItem>
))}
{this.props.strategies
.filter(s => !s.deprecated)
.map(s => (
<MenuItem key={s.name} title={s.description} onClick={() => this.addStrategy(s.name)}>
{s.name}
</MenuItem>
))}
</Menu>
</div>
);

38
frontend/src/component/strategies/__tests__/__snapshots__/list-component-test.jsx.snap
View File

@ -55,6 +55,7 @@ exports[`renders correctly with one strategy 1`] = `
</div>
<react-mdl-List>
<react-mdl-ListItem
className=""
twoLine={true}
>
<react-mdl-ListItemContent
@ -64,16 +65,27 @@ exports[`renders correctly with one strategy 1`] = `
<a
href="/strategies/view/Another"
onClick={[Function]}
title=""
>
<strong>
Another
</strong>
</a>
</react-mdl-ListItemContent>
<react-mdl-IconButton
name="delete"
onClick={[Function]}
/>
<span>
<react-mdl-IconButton
color="#"
disabled={false}
name="visibility_off"
onClick={[Function]}
title="Deprecate acitvation strategy"
/>
<react-mdl-IconButton
name="delete"
onClick={[Function]}
title="Delete acitvation strategy"
/>
</span>
</react-mdl-ListItem>
</react-mdl-List>
</react-mdl-Card>
@ -120,6 +132,7 @@ exports[`renders correctly with one strategy without permissions 1`] = `
</div>
<react-mdl-List>
<react-mdl-ListItem
className=""
twoLine={true}
>
<react-mdl-ListItemContent
@ -129,13 +142,28 @@ exports[`renders correctly with one strategy without permissions 1`] = `
<a
href="/strategies/view/Another"
onClick={[Function]}
title=""
>
<strong>
Another
</strong>
</a>
</react-mdl-ListItemContent>
<span>
<react-mdl-IconButton
color="#"
disabled={false}
name="visibility_off"
onClick={[Function]}
title="Deprecate acitvation strategy"
/>
<react-mdl-IconButton
disabled={true}
name="delete"
onClick={[Function]}
title="You can not delete a built-in strategy"
/>
</span>
</react-mdl-ListItem>
</react-mdl-List>
</react-mdl-Card>

1
frontend/src/component/strategies/__tests__/__snapshots__/strategy-details-component-test.jsx.snap
View File

@ -58,6 +58,7 @@ exports[`renders correctly with one strategy 1`] = `
>
<div>
<react-mdl-Grid>
<react-mdl-Cell
col={12}
>

4
frontend/src/component/strategies/__tests__/list-component-test.jsx
View File

@ -18,6 +18,8 @@ test('renders correctly with one strategy', () => {
strategies={[strategy]}
fetchStrategies={jest.fn()}
removeStrategy={jest.fn()}
deprecateStrategy={jest.fn()}
reactivateStrategy={jest.fn()}
history={{}}
hasPermission={permission => [CREATE_STRATEGY, DELETE_STRATEGY].indexOf(permission) !== -1}
/>
@ -38,6 +40,8 @@ test('renders correctly with one strategy without permissions', () => {
strategies={[strategy]}
fetchStrategies={jest.fn()}
removeStrategy={jest.fn()}
deprecateStrategy={jest.fn()}
reactivateStrategy={jest.fn()}
history={{}}
hasPermission={() => false}
/>

50
frontend/src/component/strategies/list-component.jsx
View File

@ -6,11 +6,15 @@ import { List, ListItem, ListItemContent, IconButton, Card } from 'react-mdl';
import { HeaderTitle, styles as commonStyles } from '../common';
import { CREATE_STRATEGY, DELETE_STRATEGY } from '../../permissions';
import styles from './strategies.module.scss';
class StrategiesListComponent extends Component {
static propTypes = {
strategies: PropTypes.array.isRequired,
fetchStrategies: PropTypes.func.isRequired,
removeStrategy: PropTypes.func.isRequired,
deprecateStrategy: PropTypes.func.isRequired,
reactivateStrategy: PropTypes.func.isRequired,
history: PropTypes.object.isRequired,
hasPermission: PropTypes.func.isRequired,
};
@ -20,7 +24,7 @@ class StrategiesListComponent extends Component {
}
render() {
const { strategies, removeStrategy, hasPermission } = this.props;
const { strategies, removeStrategy, hasPermission, reactivateStrategy, deprecateStrategy } = this.props;
return (
<Card shadow={0} className={commonStyles.fullwidth} style={{ overflow: 'visible' }}>
@ -42,17 +46,47 @@ class StrategiesListComponent extends Component {
<List>
{strategies.length > 0 ? (
strategies.map((strategy, i) => (
<ListItem key={i} twoLine>
<ListItem key={i} twoLine className={strategy.deprecated ? styles.deprecated : ''}>
<ListItemContent icon="extension" subtitle={strategy.description}>
<Link to={`/strategies/view/${strategy.name}`}>
<Link
to={`/strategies/view/${strategy.name}`}
title={strategy.deprecated ? 'Deprecated' : ''}
>
<strong>{strategy.name}</strong>
{strategy.deprecated ? <small> (Deprecated)</small> : null}
</Link>
</ListItemContent>
{strategy.editable === false || !hasPermission(DELETE_STRATEGY) ? (
''
) : (
<IconButton name="delete" onClick={() => removeStrategy(strategy)} />
)}
<span>
{strategy.deprecated ? (
<IconButton
name="visibility"
title="Reactivate acitvation strategy"
onClick={() => reactivateStrategy(strategy)}
/>
) : (
<IconButton
name="visibility_off"
title="Deprecate acitvation strategy"
disabled={strategy.name === 'default'}
color="#"
onClick={() => deprecateStrategy(strategy)}
/>
)}
{strategy.editable === false || !hasPermission(DELETE_STRATEGY) ? (
<IconButton
name="delete"
title="You can not delete a built-in strategy"
disabled
onClick={() => {}}
/>
) : (
<IconButton
name="delete"
title="Delete acitvation strategy"
onClick={() => removeStrategy(strategy)}
/>
)}
</span>
</ListItem>
))
) : (

14
frontend/src/component/strategies/list-container.jsx
View File

@ -1,6 +1,6 @@
import { connect } from 'react-redux';
import StrategiesListComponent from './list-component.jsx';
import { fetchStrategies, removeStrategy } from './../../store/strategy/actions';
import { fetchStrategies, removeStrategy, deprecateStrategy, reactivateStrategy } from './../../store/strategy/actions';
import { hasPermission } from '../../permissions';
const mapStateToProps = state => {
@ -19,6 +19,18 @@ const mapDispatchToProps = dispatch => ({
removeStrategy(strategy)(dispatch);
}
},
deprecateStrategy: strategy => {
// eslint-disable-next-line no-alert
if (window.confirm('Are you sure you want to deprecate this strategy?')) {
deprecateStrategy(strategy)(dispatch);
}
},
reactivateStrategy: strategy => {
// eslint-disable-next-line no-alert
if (window.confirm('Are you sure you want to reactivate this strategy?')) {
reactivateStrategy(strategy)(dispatch);
}
},
fetchStrategies: () => fetchStrategies()(dispatch),
});

7
frontend/src/component/strategies/show-strategy-component.js
View File

@ -32,6 +32,13 @@ class ShowStrategyComponent extends PureComponent {
return (
<div>
<Grid>
{strategy.deprecated ? (
<Cell>
<h5 style={{ color: '#ff0000' }}>Deprecated</h5>
</Cell>
) : (
''
)}
<Cell col={12}>
<h6>Parameters</h6>
<hr />

7
frontend/src/component/strategies/strategies.module.scss
View File

@ -6,3 +6,10 @@
padding: 0;
margin: 0;
}
.deprecated {
a {
color: #1d1818;
}
}

29
frontend/src/store/strategy/actions.js
View File

@ -5,14 +5,20 @@ import { dispatchAndThrow } from '../util';
export const ADD_STRATEGY = 'ADD_STRATEGY';
export const UPDATE_STRATEGY = 'UPDATE_STRATEGY';
export const REMOVE_STRATEGY = 'REMOVE_STRATEGY';
export const DEPRECATE_STRATEGY = 'DEPRECATE_STRATEGY';
export const REACTIVATE_STRATEGY = 'REACTIVATE_STRATEGY';
export const REQUEST_STRATEGIES = 'REQUEST_STRATEGIES';
export const START_CREATE_STRATEGY = 'START_CREATE_STRATEGY';
export const START_UPDATE_STRATEGY = 'START_UPDATE_STRATEGY';
export const START_DEPRECATE_STRATEGY = 'START_DEPRECATE_STRATEGY';
export const START_REACTIVATE_STRATEGY = 'START_REACTIVATE_STRATEGY';
export const RECEIVE_STRATEGIES = 'RECEIVE_STRATEGIES';
export const ERROR_RECEIVE_STRATEGIES = 'ERROR_RECEIVE_STRATEGIES';
export const ERROR_CREATING_STRATEGY = 'ERROR_CREATING_STRATEGY';
export const ERROR_UPDATING_STRATEGY = 'ERROR_UPDATING_STRATEGY';
export const ERROR_REMOVING_STRATEGY = 'ERROR_REMOVING_STRATEGY';
export const ERROR_DEPRECATING_STRATEGY = 'ERROR_DEPRECATING_STRATEGY';
export const ERROR_REACTIVATING_STRATEGY = 'ERROR_REACTIVATING_STRATEGY';
const addStrategy = strategy => ({ type: ADD_STRATEGY, strategy });
const createRemoveStrategy = strategy => ({ type: REMOVE_STRATEGY, strategy });
@ -26,6 +32,11 @@ const startCreate = () => ({ type: START_CREATE_STRATEGY });
const startUpdate = () => ({ type: START_UPDATE_STRATEGY });
const startDeprecate = () => ({ type: START_DEPRECATE_STRATEGY });
const deprecateStrategyEvent = strategy => ({ type: DEPRECATE_STRATEGY, strategy });
const startReactivate = () => ({ type: START_REACTIVATE_STRATEGY });
const reactivateStrategyEvent = strategy => ({ type: REACTIVATE_STRATEGY, strategy });
export function fetchStrategies() {
return dispatch => {
dispatch(startRequest());
@ -70,3 +81,21 @@ export function removeStrategy(strategy) {
export function getApplicationsWithStrategy(strategyName) {
return applicationApi.fetchApplicationsWithStrategyName(strategyName);
}
export function deprecateStrategy(strategy) {
return dispatch => {
dispatch(startDeprecate());
api.deprecate(strategy)
.then(() => dispatch(deprecateStrategyEvent(strategy)))
.catch(dispatchAndThrow(dispatch, ERROR_DEPRECATING_STRATEGY));
};
}
export function reactivateStrategy(strategy) {
return dispatch => {
dispatch(startReactivate());
api.reactivate(strategy)
.then(() => dispatch(reactivateStrategyEvent(strategy)))
.catch(dispatchAndThrow(dispatch, ERROR_REACTIVATING_STRATEGY));
};
}

18
frontend/src/store/strategy/api.js
View File

@ -34,9 +34,27 @@ function remove(strategy) {
}).then(throwIfNotSuccess);
}
function deprecate(strategy) {
return fetch(`${URI}/${strategy.name}/deprecate`, {
method: 'POST',
headers,
credentials: 'include',
}).then(throwIfNotSuccess);
}
function reactivate(strategy) {
return fetch(`${URI}/${strategy.name}/reactivate`, {
method: 'POST',
headers,
credentials: 'include',
}).then(throwIfNotSuccess);
}
export default {
fetchAll,
create,
update,
remove,
deprecate,
reactivate,
};

26
frontend/src/store/strategy/index.js
View File

@ -1,5 +1,12 @@
import { List, Map as $Map } from 'immutable';
import { RECEIVE_STRATEGIES, REMOVE_STRATEGY, ADD_STRATEGY, UPDATE_STRATEGY } from './actions';
import {
RECEIVE_STRATEGIES,
REMOVE_STRATEGY,
ADD_STRATEGY,
UPDATE_STRATEGY,
DEPRECATE_STRATEGY,
REACTIVATE_STRATEGY,
} from './actions';
function getInitState() {
return new $Map({ list: new List() });
@ -25,6 +32,19 @@ function updateStrategy(state, action) {
);
}
function setDeprecationStatus(state, action, status) {
return state.update('list', list =>
list.map(strategy => {
if (strategy.name === action.strategy.name) {
action.strategy.deprecated = status;
return action.strategy;
} else {
return strategy;
}
})
);
}
const strategies = (state = getInitState(), action) => {
switch (action.type) {
case RECEIVE_STRATEGIES:
@ -35,6 +55,10 @@ const strategies = (state = getInitState(), action) => {
return state.update('list', list => list.push(action.strategy));
case UPDATE_STRATEGY:
return updateStrategy(state, action);
case DEPRECATE_STRATEGY:
return setDeprecationStatus(state, action, true);
case REACTIVATE_STRATEGY:
return setDeprecationStatus(state, action, false);
default:
return state;
}