3 files changed, 37 insertions, 3 deletions
diff --git a/openecomp-ui/src/sdc-app/features/FeaturesConstants.js b/openecomp-ui/src/sdc-app/features/FeaturesConstants.js
index fe3d4a474e..f962d243d5 100644
--- a/openecomp-ui/src/sdc-app/features/FeaturesConstants.js
+++ b/openecomp-ui/src/sdc-app/features/FeaturesConstants.js
@@ -17,4 +17,9 @@ import keyMirror from 'nfvo-utils/KeyMirror.js';
 
 export const actionTypes = keyMirror({
 	FEATURES_LIST_LOADED: null
-});
-\ No newline at end of file
+});
+
+export const featureToggleNames = {
+	ARCHIVE_ITEM: 'ARCHIVE_ITEM',
+	FILTER: 'FILTER'
+};
+\ 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
index ffdd19aabf..5e0df1448f 100644
--- a/openecomp-ui/src/sdc-app/features/featureToggle.js
+++ b/openecomp-ui/src/sdc-app/features/featureToggle.js
@@ -37,8 +37,13 @@ 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;
+export const FeatureComponent = (props) => {
+	const {features = [], featureName, InnerComponent, ...otherProps} = props;
+	const AComp = InnerComponent.AComp ? InnerComponent.AComp : InnerComponent;
+	
+	return !!features.find(el => el.name === featureName && el.active) ?
+		 <AComp {...otherProps}/> 
+		 : InnerComponent.BComp ? <InnerComponent.BComp {...otherProps}/> : null;
 };
 
 FeatureComponent.propTypes = {
diff --git a/openecomp-ui/src/sdc-app/features/restToggle.js b/openecomp-ui/src/sdc-app/features/restToggle.js
new file mode 100644
index 0000000000..c90521dd7e
--- /dev/null
+++ b/openecomp-ui/src/sdc-app/features/restToggle.js
@@ -0,0 +1,24 @@
+/*!
+ * Copyright © 2016-2018 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 store from 'sdc-app/AppStore.js';
+
+
+export default ({featureName, restFunction, mockResult}) => {
+	const {features} = store.getState();
+	return !!features.find(el => el.name === featureName && el.active) ? 
+		restFunction() : Promise.resolve(mockResult);
+};
+\ No newline at end of file