Updated Sparky to add ECOMP functionality Browse, Specialized Search, BYOQ, and the...

[aai/sparky-fe.git] / src / app / MainScreenWrapper.jsx

diff --git a/src/app/MainScreenWrapper.jsx b/src/app/MainScreenWrapper.jsx
index 730ac93..5a5209d 100644 (file)
--- a/src/app/MainScreenWrapper.jsx
+++ b/src/app/MainScreenWrapper.jsx
@@ -20,7 +20,7 @@
  */
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
-import * as Extensibility from './extensibility/index.js';
+import * as Module from './module/index.js';
 import TierSupport from './tierSupport/TierSupport.jsx';
 import VnfSearch from './vnfSearch/VnfSearch.jsx';
 import MainScreenHeader from './MainScreenHeader.jsx';
@@ -45,7 +45,7 @@ import {
   extensibleViewMessageCallback
 } from './MainScreenWrapperActionHelper.js';
 
-import extensibleViews from 'resources/views/extensibleViews.json';
+import defaultViews from 'resources/views/defaultViews.json';
 import customComponentConfig from 'resources/views/customComponents.json';
 import { newCustomComponentsEvent } from 'app/configurableViews/ConfigurableViewActions.js';
 import {
@@ -140,14 +140,16 @@ class MainScreenWrapper extends Component {
       extensibleViewNetworkCallbackData,
       onExtensibleViewMessageCallback,
       onOverlayNetworkCallback,
+      configurableViewsConfig,
+      customComponents,
       customRoutes
     } = this.props;
 
     let customViewList = [];
-    extensibleViews.forEach(function(view,key) {
+    defaultViews.forEach(function(view,key) {
 
       let path = '', extKey = '';
-      if(isEmpty(extensibleViews[key]['viewParams'])){
+      if(isEmpty(defaultViews[key]['viewParams'])){
         path = '/' + view.viewName + '/:extensibleViewParams?';
         extKey = view.viewName + 'Route';
       } else {
@@ -157,12 +159,12 @@ class MainScreenWrapper extends Component {
 
       var renderComponent = (props) => {
         let viewParams = {};
-        if(isEmpty(extensibleViews[key]['viewParams']) && props.match.params.extensibleViewParams !== undefined) {
+        if(isEmpty(defaultViews[key]['viewParams']) && props.match.params.extensibleViewParams !== undefined) {
           viewParams = decryptParamsForView(props.match.params.extensibleViewParams);
         }
 
-        if (Extensibility.default.hasOwnProperty(view.componentName)) {
-          let Component = Extensibility.default[view.componentName];
+        if (Module.default.hasOwnProperty(view.componentName)) {
+          let Component = Module.default[view.componentName];
           return (
             <Component
               {...props}
@@ -187,7 +189,7 @@ class MainScreenWrapper extends Component {
           );
         }
       };
-      if(isEmpty(extensibleViews[key]['isExact']) && !extensibleViews[key]['isExact']){
+      if(isEmpty(defaultViews[key]['isExact']) && !defaultViews[key]['isExact']){
         customViewList.push(
           <Route key={extKey} path={path} render={renderComponent}/>
         );
@@ -199,9 +201,11 @@ class MainScreenWrapper extends Component {
 
     });
 
+    let configurableViewList = getConfigurableRoutes(configurableViewsConfig, customComponents);
+
     return (
       <Router>
-        <div className='main-app-container'>
+        <div className='main-app-container' id='main-app-container'>
           <Switch>
             <Redirect from='/' exact to='/schema'/>
           </Switch>
@@ -210,6 +214,7 @@ class MainScreenWrapper extends Component {
           <Route key='VnfSearchRoute' path='/vnfSearch/:filters?' component={VnfSearch}/>
           {customViewList}
           {customRoutes}
+          {configurableViewList}
         </div>
       </Router>
     );