aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openecomp-ui/.babelrc3
-rw-r--r--openecomp-ui/.eslintrc3
-rw-r--r--openecomp-ui/package.json3
-rw-r--r--openecomp-ui/src/sdc-app/Application.jsx5
-rw-r--r--openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js40
-rw-r--r--openecomp-ui/src/sdc-app/features/FeaturesConstants.js20
-rw-r--r--openecomp-ui/src/sdc-app/features/FeaturesReducer.js26
-rw-r--r--openecomp-ui/src/sdc-app/features/featureToggle.js55
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/OnboardingReducersMap.js6
-rw-r--r--openecomp-ui/test-utils/factories/features/FeaturesFactory.js26
-rw-r--r--openecomp-ui/test/features/featureToggle.test.js37
-rw-r--r--openecomp-ui/test/features/featuresActions.test.js45
12 files changed, 262 insertions, 7 deletions
diff --git a/openecomp-ui/.babelrc b/openecomp-ui/.babelrc
index 76f4b82867..a902be2cfc 100644
--- a/openecomp-ui/.babelrc
+++ b/openecomp-ui/.babelrc
@@ -6,7 +6,8 @@
"transform-es2015-spread",
"transform-object-rest-spread",
"transform-class-properties",
- "transform-runtime"
+ "transform-runtime",
+ "transform-decorators-legacy"
],
"sourceMap": "inline"
}
diff --git a/openecomp-ui/.eslintrc b/openecomp-ui/.eslintrc
index baa1391245..2ebd851b87 100644
--- a/openecomp-ui/.eslintrc
+++ b/openecomp-ui/.eslintrc
@@ -13,7 +13,8 @@
"ecmaFeatures": {
"jsx": true,
"classes": true,
- "modules": true
+ "modules": true,
+ "experimentalDecorators": true
},
"globals": {
"Event": true,
diff --git a/openecomp-ui/package.json b/openecomp-ui/package.json
index 55ee16aef9..556431d7a6 100644
--- a/openecomp-ui/package.json
+++ b/openecomp-ui/package.json
@@ -56,7 +56,8 @@
"babel-eslint": "^7.2.1",
"babel-jest": "^19.0.0",
"babel-loader": "^7.0.0-beta.1",
- "babel-plugin-transform-class-properties": "^6.10.2",
+ "babel-plugin-transform-class-properties": "^6.10.2",
+ "babel-plugin-transform-decorators-legacy": "^1.3.4",
"babel-plugin-transform-es2015-destructuring": "^6.9.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.10.3",
"babel-plugin-transform-es2015-spread": "^6.8.0",
diff --git a/openecomp-ui/src/sdc-app/Application.jsx b/openecomp-ui/src/sdc-app/Application.jsx
index 4915d26044..aa81eb384c 100644
--- a/openecomp-ui/src/sdc-app/Application.jsx
+++ b/openecomp-ui/src/sdc-app/Application.jsx
@@ -1,5 +1,5 @@
/*!
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2016-2017 European Support Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import Loader from 'nfvo-components/loader/Loader.jsx';
import WebSocketUtil from 'nfvo-utils/WebSocketUtil.js';
import UserNotificationsActionHelper from 'sdc-app/onboarding/userNotifications/UserNotificationsActionHelper.js';
import store from './AppStore.js';
-
+import FeaturesActionHelper from 'sdc-app/features/FeaturesActionHelper.js';
class Application extends React.Component {
static propTypes = {
@@ -32,6 +32,7 @@ class Application extends React.Component {
if(openSocket) {
UserNotificationsActionHelper.notificationsFirstHandling(store.dispatch);
}
+ FeaturesActionHelper.getFeaturesList(store.dispatch);
}
componentWillUnmount() {
WebSocketUtil.close();
diff --git a/openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js b/openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js
new file mode 100644
index 0000000000..5ae182018a
--- /dev/null
+++ b/openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js
@@ -0,0 +1,40 @@
+/*!
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+import RestAPIUtil from 'nfvo-utils/RestAPIUtil.js';
+import Configuration from 'sdc-app/config/Configuration.js';
+import {actionTypes} from './FeaturesConstants.js';
+
+
+function baseUrl() {
+ const restPrefix = Configuration.get('restPrefix');
+ return `${restPrefix}/v1.0/togglz`;
+}
+
+function fetchList() {
+ return RestAPIUtil.fetch(baseUrl());
+}
+
+export default {
+ getFeaturesList(dispatch) {
+ return fetchList().then(response => {
+ dispatch({
+ type: actionTypes.FEATURES_LIST_LOADED,
+ features: response.features
+ });
+ });
+ }
+};
+
diff --git a/openecomp-ui/src/sdc-app/features/FeaturesConstants.js b/openecomp-ui/src/sdc-app/features/FeaturesConstants.js
new file mode 100644
index 0000000000..fe3d4a474e
--- /dev/null
+++ b/openecomp-ui/src/sdc-app/features/FeaturesConstants.js
@@ -0,0 +1,20 @@
+/*!
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+import keyMirror from 'nfvo-utils/KeyMirror.js';
+
+export const actionTypes = keyMirror({
+ FEATURES_LIST_LOADED: null
+}); \ No newline at end of file
diff --git a/openecomp-ui/src/sdc-app/features/FeaturesReducer.js b/openecomp-ui/src/sdc-app/features/FeaturesReducer.js
new file mode 100644
index 0000000000..d7c8624d54
--- /dev/null
+++ b/openecomp-ui/src/sdc-app/features/FeaturesReducer.js
@@ -0,0 +1,26 @@
+/*!
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+ import {actionTypes} from './FeaturesConstants.js';
+
+ export default (state = [], action) => {
+ switch (action.type) {
+ case actionTypes.FEATURES_LIST_LOADED:
+ return [...action.features];
+ default:
+ return state;
+ }
+ }; \ No newline at end of file
diff --git a/openecomp-ui/src/sdc-app/features/featureToggle.js b/openecomp-ui/src/sdc-app/features/featureToggle.js
new file mode 100644
index 0000000000..ffdd19aabf
--- /dev/null
+++ b/openecomp-ui/src/sdc-app/features/featureToggle.js
@@ -0,0 +1,55 @@
+/*!
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+
+ /**
+ * Feature toggling decorator
+ * usage:
+ *
+ * @featureToggle('FeatureName')
+ * class Example extends React.Component {
+ * render() {
+ * return (<div>test feature</div>);
+ * }
+ * }
+ *
+ * OR
+ *
+ * const TestFeature = () => (<div>test feature</div>)
+ * export default featureToggle('FeatureName')(TestFeature)
+ *
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {connect} from 'react-redux';
+
+export const FeatureComponent = ({features = [], featureName, InnerComponent}) => {
+ return !!features.find(el => el.name === featureName && el.active) ? <InnerComponent/> : null;
+};
+
+FeatureComponent.propTypes = {
+ features: PropTypes.array,
+ featureName: PropTypes.string.isRequired
+};
+
+
+export default function featureToggle(featureName) {
+ return (InnerComponent) => {
+ return connect(({features}) => {return {features, featureName, InnerComponent};})(FeatureComponent);
+ };
+}
+
diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingReducersMap.js b/openecomp-ui/src/sdc-app/onboarding/OnboardingReducersMap.js
index f69bc0da5e..12304fcbce 100644
--- a/openecomp-ui/src/sdc-app/onboarding/OnboardingReducersMap.js
+++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingReducersMap.js
@@ -1,5 +1,5 @@
/*!
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2016-2017 European Support Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import versionsPageReducer from './versionsPage/VersionsPageReducer.js';
import usersReducer from './users/UsersReducers.js';
import mergeEditorReducer from 'sdc-app/common/merge/MergeEditorReducer.js';
import revisionsReducer from './revisions/RevisionsReducer.js';
+import featuresReducer from 'sdc-app/features/FeaturesReducer.js';
export default {
currentScreen: currentScreenReducer,
@@ -38,5 +39,6 @@ export default {
softwareProductList: softwareProductListReducer,
users: usersReducer,
versionsPage: versionsPageReducer,
- revisions: revisionsReducer
+ revisions: revisionsReducer,
+ features: featuresReducer
};
diff --git a/openecomp-ui/test-utils/factories/features/FeaturesFactory.js b/openecomp-ui/test-utils/factories/features/FeaturesFactory.js
new file mode 100644
index 0000000000..30241c88a6
--- /dev/null
+++ b/openecomp-ui/test-utils/factories/features/FeaturesFactory.js
@@ -0,0 +1,26 @@
+/*!
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+import {Factory} from 'rosie';
+import RandomNameMixin from 'test-utils/factories/mixins/RandomNameMixin';
+
+export default new Factory()
+ .extend(RandomNameMixin)
+ .attrs({
+ active: () => {return (Math.random() >= 0.5);}
+ });
+
+
diff --git a/openecomp-ui/test/features/featureToggle.test.js b/openecomp-ui/test/features/featureToggle.test.js
new file mode 100644
index 0000000000..707180bc9b
--- /dev/null
+++ b/openecomp-ui/test/features/featureToggle.test.js
@@ -0,0 +1,37 @@
+/*!
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+import React from 'react';
+import {mount} from 'enzyme';
+import deepFreeze from 'deep-freeze';
+import FeatureFactory from 'test-utils/factories/features/FeaturesFactory.js';
+import {FeatureComponent} from 'sdc-app/features/featureToggle.js';
+
+describe('feature toggle decorator test', () => {
+ it('feature on toggle test', () => {
+ const featuresList = [FeatureFactory.build({name: 'TEST', active: true})];
+ deepFreeze(featuresList);
+ const wrapper = mount(<FeatureComponent features={featuresList} featureName='TEST' InnerComponent={() => (<div className='feature'></div>)}/>);
+ expect(wrapper.find('.feature').length).toBe(1);
+ });
+
+ it('feature off toggle test', () => {
+ const featuresList = [FeatureFactory.build({name: 'TEST', active: false})];
+ deepFreeze(featuresList);
+ const wrapper = mount(<FeatureComponent features={featuresList} featureName='TEST' InnerComponent={() => (<div className='feature'></div>)}/>);
+ expect(wrapper.find('.feature').length).toBe(0);
+ });
+}); \ No newline at end of file
diff --git a/openecomp-ui/test/features/featuresActions.test.js b/openecomp-ui/test/features/featuresActions.test.js
new file mode 100644
index 0000000000..aa3e265136
--- /dev/null
+++ b/openecomp-ui/test/features/featuresActions.test.js
@@ -0,0 +1,45 @@
+/*!
+ * Copyright © 2016-2017 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+import deepFreeze from 'deep-freeze';
+import {cloneAndSet} from 'test-utils/Util.js';
+import {storeCreator} from 'sdc-app/AppStore.js';
+import mockRest from 'test-utils/MockRest.js';
+import FeatureFactory from 'test-utils/factories/features/FeaturesFactory.js';
+import FeaturesActionHelper from 'sdc-app/features/FeaturesActionHelper.js';
+
+describe('Feature Toggle data flow Tests', function () {
+ it('Fetch features list test', () => {
+ const featuresList = FeatureFactory.buildList(3);
+ deepFreeze(featuresList);
+ const store = storeCreator();
+ deepFreeze(store.getState());
+ const expectedStore = cloneAndSet(store.getState(), 'features', featuresList);
+
+
+ mockRest.addHandler('fetch', ({data, options, baseUrl}) => {
+ expect(baseUrl).toEqual('/onboarding-api/v1.0/togglz');
+ expect(data).toEqual(undefined);
+ expect(options).toEqual(undefined);
+ return {features: featuresList};
+ });
+
+ return FeaturesActionHelper.getFeaturesList(store.dispatch).then(() => {
+ expect(store.getState().features).toEqual(expectedStore.features);
+ });
+
+ });
+}); \ No newline at end of file