summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorSteve Thomas <steve.thomas@amdocs.com>2018-02-05 11:54:23 -0500
committerSteve Thomas <steve.thomas@amdocs.com>2018-02-05 13:29:46 -0500
commitc89060158fab7394c3bddc5eacb0411dbb13785c (patch)
tree5fa03163e71167f44ed761b2772b6653f0d656c3 /src/app
parentf42261a2cd0582e0209018c23816681e146ea97d (diff)
Correcting spinner
Change-Id: I0531805d63a9d5b8ac6a161281845a6b8cc1f4af Issue-ID: AAI-732 Signed-off-by: Steve Thomas <steve.thomas@amdocs.com>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/tierSupport/TierSupport.jsx15
-rw-r--r--src/app/vnfSearch/VnfSearchNfRoleVisualization.jsx14
-rw-r--r--src/app/vnfSearch/VnfSearchNfTypeVisualization.jsx14
-rw-r--r--src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx14
-rw-r--r--src/app/vnfSearch/VnfSearchProvStatusVisualization.jsx35
-rw-r--r--src/app/vnfSearch/VnfSearchTotalCountVisualization.jsx15
6 files changed, 33 insertions, 74 deletions
diff --git a/src/app/tierSupport/TierSupport.jsx b/src/app/tierSupport/TierSupport.jsx
index 943943f..e51dde8 100644
--- a/src/app/tierSupport/TierSupport.jsx
+++ b/src/app/tierSupport/TierSupport.jsx
@@ -24,8 +24,7 @@
import React, {Component} from 'react';
import {connect} from 'react-redux';
import SplitPane from 'react-split-pane';
-import { ClipLoader } from 'react-spinners';
-import {COLOR_BLUE} from 'utils/GlobalConstants.js';
+import Spinner from 'utils/SpinnerContainer.jsx';
import {setSecondaryTitle} from 'app/MainScreenWrapperActionHelper.js';
import ForceDirectedGraph from 'generic-components/graph/ForceDirectedGraph.jsx';
@@ -177,11 +176,6 @@ class TierSupport extends Component {
onNodeMenuSelect,
enableBusyFeedback
} = this.props;
-
- let componentVisibitliyClassName = 'showContainer';
- if(enableBusyFeedback){
- componentVisibitliyClassName = 'hideContainer';
- }
let availableOverlay;
let overlayComponent;
// Currently only ONE overlay can be added to each view.
@@ -209,10 +203,7 @@ class TierSupport extends Component {
let currentSelectedMenu = this.getCurrentSelectedMenu(overlayComponent);
return (
<div className='tier-support-ui'>
- <div className='spinner'>
- <ClipLoader color={COLOR_BLUE} loading={enableBusyFeedback} />
- </div>
- <div className={componentVisibitliyClassName}>
+ <Spinner loading={enableBusyFeedback}>
<SplitPane
split='vertical'
enableResizing='true'
@@ -242,7 +233,7 @@ class TierSupport extends Component {
{currentSelectedMenu}
</div>
</SplitPane>
- </div>
+ </Spinner>
</div>
);
}
diff --git a/src/app/vnfSearch/VnfSearchNfRoleVisualization.jsx b/src/app/vnfSearch/VnfSearchNfRoleVisualization.jsx
index 806ab3a..19b37cd 100644
--- a/src/app/vnfSearch/VnfSearchNfRoleVisualization.jsx
+++ b/src/app/vnfSearch/VnfSearchNfRoleVisualization.jsx
@@ -36,7 +36,7 @@ import i18n from 'utils/i18n/i18n';
import {CHART_NF_ROLE} from 'app/vnfSearch/VnfSearchConstants.js';
import {COLOR_BLUE} from 'utils/GlobalConstants.js';
-import { ClipLoader } from 'react-spinners';
+import Spinner from 'utils/SpinnerContainer.jsx';
let mapStateToProps = ({vnfSearch}) => {
let {
@@ -61,10 +61,7 @@ class VnfSearchNfRoleVisualization extends Component {
processedNfRoleCountChartData,
enableBusyFeedback
} = this.props;
- let componentVisibitliyClassName = 'showContainer';
- if(enableBusyFeedback){
- componentVisibitliyClassName = 'hideContainer';
- }
+
let visualizationClass = 'visualizations';
if (processedNfRoleCountChartData.values ===
@@ -82,10 +79,7 @@ class VnfSearchNfRoleVisualization extends Component {
<div className='visualization-charts'>
<div>
<h3>{i18n(CHART_NF_ROLE.title)}</h3>
- <div className='spinner'>
- <ClipLoader color={COLOR_BLUE} loading={enableBusyFeedback} />
- </div>
- <div className={componentVisibitliyClassName}>
+ <Spinner loading={enableBusyFeedback}>
<ResponsiveContainer width='100%' height={300}>
<BarChart data={processedNfRoleCountChartData.values}>
<XAxis dataKey={xAxisAttrName}/>
@@ -96,7 +90,7 @@ class VnfSearchNfRoleVisualization extends Component {
dataKey={yAxisAttrName} fill={COLOR_BLUE}/>
</BarChart>
</ResponsiveContainer>
- </div>
+ </Spinner>
</div>
</div>
</div>
diff --git a/src/app/vnfSearch/VnfSearchNfTypeVisualization.jsx b/src/app/vnfSearch/VnfSearchNfTypeVisualization.jsx
index 3f4acf0..3c862d7 100644
--- a/src/app/vnfSearch/VnfSearchNfTypeVisualization.jsx
+++ b/src/app/vnfSearch/VnfSearchNfTypeVisualization.jsx
@@ -36,7 +36,7 @@ import i18n from 'utils/i18n/i18n';
import {CHART_NF_TYPE} from 'app/vnfSearch/VnfSearchConstants.js';
import {COLOR_BLUE} from 'utils/GlobalConstants.js';
-import { ClipLoader } from 'react-spinners';
+import Spinner from 'utils/SpinnerContainer.jsx';
let mapStateToProps = ({vnfSearch}) => {
let {
@@ -61,10 +61,7 @@ class VnfSearchNfTypeVisualization extends Component {
processedNfTypeCountChartData,
enableBusyFeedback
} = this.props;
- let componentVisibitliyClassName = 'showContainer';
- if(enableBusyFeedback){
- componentVisibitliyClassName = 'hideContainer';
- }
+
let visualizationClass = 'visualizations';
if (processedNfTypeCountChartData.values ===
null ||
@@ -80,10 +77,7 @@ class VnfSearchNfTypeVisualization extends Component {
<div className='visualization-charts'>
<div >
<h3>{i18n(CHART_NF_TYPE.title)}</h3>
- <div className='spinner'>
- <ClipLoader color={COLOR_BLUE} loading={enableBusyFeedback} />
- </div>
- <div className={componentVisibitliyClassName}>
+ <Spinner loading={enableBusyFeedback}>
<ResponsiveContainer width='100%' height={300}>
<BarChart data={processedNfTypeCountChartData.values}>
<XAxis dataKey={xAxisAttrName}/>
@@ -94,7 +88,7 @@ class VnfSearchNfTypeVisualization extends Component {
dataKey={yAxisAttrName} fill={COLOR_BLUE}/>
</BarChart>
</ResponsiveContainer>
- </div>
+ </Spinner>
</div>
</div>
</div>
diff --git a/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx b/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx
index 7cc29d8..834e179 100644
--- a/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx
+++ b/src/app/vnfSearch/VnfSearchOrchestratedStatusVisualization.jsx
@@ -36,7 +36,7 @@ import i18n from 'utils/i18n/i18n';
import {CHART_ORCH_STATUS} from 'app/vnfSearch/VnfSearchConstants.js';
import {COLOR_BLUE} from 'utils/GlobalConstants.js';
-import { ClipLoader } from 'react-spinners';
+import Spinner from 'utils/SpinnerContainer.jsx';
let mapStateToProps = ({vnfSearch}) => {
let {
@@ -61,10 +61,7 @@ class VnfSearchOrchStatusVisualizations extends Component {
processedOrchStatusCountChartData,
enableBusyFeedback
} = this.props;
- let componentVisibitliyClassName = 'showContainer';
- if(enableBusyFeedback){
- componentVisibitliyClassName = 'hideContainer';
- }
+
let visualizationClass = 'visualizations';
if (processedOrchStatusCountChartData.values ===
null ||
@@ -80,10 +77,7 @@ class VnfSearchOrchStatusVisualizations extends Component {
<div className='visualization-charts'>
<div >
<h3>{i18n(CHART_ORCH_STATUS.title)}</h3>
- <div className='spinner'>
- <ClipLoader color={COLOR_BLUE} loading={enableBusyFeedback} />
- </div>
- <div className={componentVisibitliyClassName}>
+ <Spinner loading={enableBusyFeedback}>
<ResponsiveContainer width='100%' height={300}>
<BarChart data={processedOrchStatusCountChartData.values}>
<XAxis dataKey={xAxisAttrName}/>
@@ -94,7 +88,7 @@ class VnfSearchOrchStatusVisualizations extends Component {
dataKey={yAxisAttrName} fill={COLOR_BLUE}/>
</BarChart>
</ResponsiveContainer>
- </div>
+ </Spinner>
</div>
</div>
</div>
diff --git a/src/app/vnfSearch/VnfSearchProvStatusVisualization.jsx b/src/app/vnfSearch/VnfSearchProvStatusVisualization.jsx
index 7ef6e9e..fe985c9 100644
--- a/src/app/vnfSearch/VnfSearchProvStatusVisualization.jsx
+++ b/src/app/vnfSearch/VnfSearchProvStatusVisualization.jsx
@@ -36,7 +36,7 @@ import i18n from 'utils/i18n/i18n';
import {CHART_PROV_STATUS} from 'app/vnfSearch/VnfSearchConstants.js';
import {COLOR_BLUE} from 'utils/GlobalConstants.js';
-import { ClipLoader } from 'react-spinners';
+import Spinner from 'utils/SpinnerContainer.jsx';
let mapStateToProps = ({vnfSearch}) => {
let {
@@ -62,10 +62,6 @@ class VnfSearchProvStatusVisualization extends Component {
enableBusyFeedback
} = this.props;
- let componentVisibitliyClassName = 'showContainer';
- if(enableBusyFeedback){
- componentVisibitliyClassName = 'hideContainer';
- }
let visualizationClass = 'visualizations';
if (processedProvStatusCountChartData.values ===
null ||
@@ -81,22 +77,19 @@ class VnfSearchProvStatusVisualization extends Component {
<div className='visualization-charts'>
<div className='visualization-side-by-side-70'>
<h3>{i18n(CHART_PROV_STATUS.title)}</h3>
- <div className='spinner'>
- <ClipLoader color={COLOR_BLUE} loading={enableBusyFeedback} />
- </div>
- <div className={componentVisibitliyClassName}>
+ <Spinner loading={enableBusyFeedback}>
<ResponsiveContainer width='100%' height={345} >
- <BarChart
- data={processedProvStatusCountChartData.values}>
- <XAxis dataKey={xAxisAttrName}/>
- <YAxis />
- <CartesianGrid strokeDasharray='3 3'/>
- <Tooltip/>
- <Bar name={i18n(CHART_PROV_STATUS.xAxisLabel)}
- dataKey={yAxisAttrName} fill={COLOR_BLUE}/>
- </BarChart>
- </ResponsiveContainer>
- </div>
+ <BarChart
+ data={processedProvStatusCountChartData.values}>
+ <XAxis dataKey={xAxisAttrName}/>
+ <YAxis />
+ <CartesianGrid strokeDasharray='3 3'/>
+ <Tooltip/>
+ <Bar name={i18n(CHART_PROV_STATUS.xAxisLabel)}
+ dataKey={yAxisAttrName} fill={COLOR_BLUE}/>
+ </BarChart>
+ </ResponsiveContainer>
+ </Spinner>
</div>
</div>
</div>
@@ -104,4 +97,4 @@ class VnfSearchProvStatusVisualization extends Component {
}
}
-export default connect(mapStateToProps)(VnfSearchProvStatusVisualization); \ No newline at end of file
+export default connect(mapStateToProps)(VnfSearchProvStatusVisualization);
diff --git a/src/app/vnfSearch/VnfSearchTotalCountVisualization.jsx b/src/app/vnfSearch/VnfSearchTotalCountVisualization.jsx
index 553de42..0335da3 100644
--- a/src/app/vnfSearch/VnfSearchTotalCountVisualization.jsx
+++ b/src/app/vnfSearch/VnfSearchTotalCountVisualization.jsx
@@ -26,8 +26,7 @@ import {connect} from 'react-redux';
import i18n from 'utils/i18n/i18n';
import {TOTAL_VNF_COUNT} from 'app/vnfSearch/VnfSearchConstants.js';
-import {COLOR_BLUE} from 'utils/GlobalConstants.js';
-import { ClipLoader } from 'react-spinners';
+import Spinner from 'utils/SpinnerContainer.jsx';
let mapStateToProps = ({vnfSearch}) => {
let {
@@ -55,10 +54,7 @@ class VnfSearchTotalCountVisualization extends Component {
count,
enableBusyFeedback
} = this.props;
- let componentVisibitliyClassName = 'showContainer';
- if(enableBusyFeedback){
- componentVisibitliyClassName = 'hideContainer';
- }
+
let visualizationClass = 'visualizations';
if (count === null) {
visualizationClass = 'visualizations hidden';
@@ -70,14 +66,11 @@ class VnfSearchTotalCountVisualization extends Component {
<div className='visualization-side-by-side-30'>
<span>&nbsp;</span>
<h3>{i18n(TOTAL_VNF_COUNT.title)}</h3>
- <div className='spinner'>
- <ClipLoader color={COLOR_BLUE} loading={enableBusyFeedback} />
- </div>
- <div className={componentVisibitliyClassName}>
+ <Spinner loading={enableBusyFeedback}>
<div className='total-box-entity-count'>
<span>{count}</span>
</div>
- </div>
+ </Spinner>
</div>
</div>
</div>