UI support for Togglz flow 91/27591/3
authorsvishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
Mon, 8 Jan 2018 13:21:46 +0000 (15:21 +0200)
committerVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>
Tue, 9 Jan 2018 13:47:00 +0000 (13:47 +0000)
Issue-ID: SDC-881
Change-Id: I4423d1ee115003aff0bd9d988b25a8260811928b
Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
12 files changed:
openecomp-ui/.babelrc
openecomp-ui/.eslintrc
openecomp-ui/package.json
openecomp-ui/src/sdc-app/Application.jsx
openecomp-ui/src/sdc-app/features/FeaturesActionHelper.js [new file with mode: 0644]
openecomp-ui/src/sdc-app/features/FeaturesConstants.js [new file with mode: 0644]
openecomp-ui/src/sdc-app/features/FeaturesReducer.js [new file with mode: 0644]
openecomp-ui/src/sdc-app/features/featureToggle.js [new file with mode: 0644]
openecomp-ui/src/sdc-app/onboarding/OnboardingReducersMap.js
openecomp-ui/test-utils/factories/features/FeaturesFactory.js [new file with mode: 0644]
openecomp-ui/test/features/featureToggle.test.js [new file with mode: 0644]
openecomp-ui/test/features/featuresActions.test.js [new file with mode: 0644]

index 76f4b82..a902be2 100644 (file)
@@ -6,7 +6,8 @@
                "transform-es2015-spread",
                "transform-object-rest-spread",
                "transform-class-properties",
-               "transform-runtime"
+               "transform-runtime",
+               "transform-decorators-legacy"
        ],
        "sourceMap": "inline"
 }
index baa1391..2ebd851 100644 (file)
@@ -13,7 +13,8 @@
   "ecmaFeatures": {
     "jsx": true,
     "classes": true,
-    "modules": true
+    "modules": true,
+    "experimentalDecorators": true
   },
   "globals": {
     "Event": true,
index 55ee16a..556431d 100644 (file)
@@ -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",
index 4915d26..aa81eb3 100644 (file)
@@ -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 (file)
index 0000000..5ae1820
--- /dev/null
@@ -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 (file)
index 0000000..fe3d4a4
--- /dev/null
@@ -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 (file)
index 0000000..d7c8624
--- /dev/null
@@ -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 (file)
index 0000000..ffdd19a
--- /dev/null
@@ -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);
+       };
+}
+
index f69bc0d..12304fc 100644 (file)
@@ -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 (file)
index 0000000..30241c8
--- /dev/null
@@ -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 (file)
index 0000000..707180b
--- /dev/null
@@ -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 (file)
index 0000000..aa3e265
--- /dev/null
@@ -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