2 files changed, 14 insertions, 5 deletions
diff --git a/openecomp-ui/src/sdc-app/features/featureToggle.js b/openecomp-ui/src/sdc-app/features/featureToggle.js
index d33c76e523..861db6ae9c 100644
--- a/openecomp-ui/src/sdc-app/features/featureToggle.js
+++ b/openecomp-ui/src/sdc-app/features/featureToggle.js
@@ -38,12 +38,14 @@ import { connect } from 'react-redux';
 
 export const FeatureComponent = props => {
     const { features = [], featureName, InnerComponent, ...otherProps } = props;
-    const AComp = InnerComponent.AComp ? InnerComponent.AComp : InnerComponent;
+    const OnComp = InnerComponent.OnComp
+        ? InnerComponent.OnComp
+        : InnerComponent;
 
     return !!features.find(el => el.name === featureName && el.active) ? (
-        <AComp {...otherProps} />
-    ) : InnerComponent.BComp ? (
-        <InnerComponent.BComp {...otherProps} />
+        <OnComp {...otherProps} />
+    ) : InnerComponent.OffComp ? (
+        <InnerComponent.OffComp {...otherProps} />
     ) : null;
 };
 
diff --git a/openecomp-ui/src/sdc-app/features/restToggle.js b/openecomp-ui/src/sdc-app/features/featureToggleUtils.js
index 505dace4e7..1263336fd3 100644
--- a/openecomp-ui/src/sdc-app/features/restToggle.js
+++ b/openecomp-ui/src/sdc-app/features/featureToggleUtils.js
@@ -16,9 +16,16 @@
 
 import store from 'sdc-app/AppStore.js';
 
-export default ({ featureName, restFunction, mockResult }) => {
+export const restToggle = ({ featureName, restFunction, mockResult }) => {
     const { features } = store.getState();
     return !!features.find(el => el.name === featureName && el.active)
         ? restFunction()
         : Promise.resolve(mockResult);
 };
+
+export const functionToggle = (featureName, { onFunction, offFunction }) => {
+    const { features } = store.getState();
+    return !!features.find(el => el.name === featureName && el.active)
+        ? onFunction()
+        : offFunction();
+};