Correcting spinner

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

diff --git a/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx b/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx
index e72f3f6..834e179 100644 (file)
--- a/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx
+++ b/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx
@@ -1,29 +1,25 @@
-/* eslint-disable max-len,max-len,max-len,max-len,max-len,max-len */
 /*
- * ============LICENSE_START===================================================
- * SPARKY (AAI UI service)
- * ============================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright © 2017 Amdocs
- * 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
+ *       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.
- * ============LICENSE_END=====================================================
+ * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import {
@@ -40,29 +36,36 @@ import i18n from 'utils/i18n/i18n';
 
 import {CHART_ORCH_STATUS} from 'app/vnfSearch/VnfSearchConstants.js';
 import {COLOR_BLUE} from 'utils/GlobalConstants.js';
-
+import Spinner from 'utils/SpinnerContainer.jsx';
 
 let mapStateToProps = ({vnfSearch}) => {
   let {
-        processedOrchStatusCountChartData = CHART_ORCH_STATUS.emptyData
+        processedOrchStatusCountChartData = CHART_ORCH_STATUS.emptyData,
+        enableBusyFeedback = false
       } = vnfSearch;
 
   return {
-    processedOrchStatusCountChartData
+    processedOrchStatusCountChartData,
+    enableBusyFeedback
   };
 };
 
 class VnfSearchOrchStatusVisualizations extends Component {
+  static propTypes = {
+    processedOrchStatusCountChartData: React.PropTypes.object,
+    enableBusyFeedback: React.PropTypes.bool
+  };
 
   render() {
     let {
-                                               processedOrchStatusCountChartData
+                                               processedOrchStatusCountChartData,
+            enableBusyFeedback
                                } = this.props;
 
     let visualizationClass = 'visualizations';
-    if (processedOrchStatusCountChartData[0].values ===
+    if (processedOrchStatusCountChartData.values ===
       null ||
-                                               processedOrchStatusCountChartData[0].values.size <=
+                                               processedOrchStatusCountChartData.values.size <=
       0) {
       visualizationClass = 'visualizations hidden';
     }
@@ -74,16 +77,18 @@ class VnfSearchOrchStatusVisualizations extends Component {
         <div className='visualization-charts'>
           <div >
             <h3>{i18n(CHART_ORCH_STATUS.title)}</h3>
-            <ResponsiveContainer width='100%' height={300}>
-              <BarChart data={processedOrchStatusCountChartData[0].values}>
-                <XAxis dataKey={xAxisAttrName}/>
-                <YAxis   />
-                <CartesianGrid strokeDasharray='3 3'/>
-                <Tooltip/>
-                <Bar name={i18n(CHART_ORCH_STATUS.yAxisLabel)}
-                     dataKey={yAxisAttrName} fill={COLOR_BLUE}/>
-              </BarChart>
-            </ResponsiveContainer>
+            <Spinner loading={enableBusyFeedback}>
+              <ResponsiveContainer width='100%' height={300}>
+                <BarChart data={processedOrchStatusCountChartData.values}>
+                  <XAxis dataKey={xAxisAttrName}/>
+                  <YAxis   />
+                  <CartesianGrid strokeDasharray='3 3'/>
+                  <Tooltip/>
+                  <Bar name={i18n(CHART_ORCH_STATUS.yAxisLabel)}
+                       dataKey={yAxisAttrName} fill={COLOR_BLUE}/>
+                </BarChart>
+              </ResponsiveContainer>
+            </Spinner>
           </div>
         </div>
       </div>