Fix condition for showing progress status

This commit is contained in:
Jesús Ángel 2019-08-29 12:56:18 +02:00
parent d463f7e996
commit ff2a15fe66
2 changed files with 5 additions and 13 deletions

View File

@ -100,8 +100,7 @@
<!-- Loading status section -->
<div layout="column" layout-align="center center"
ng-if="tab !== 'welcome' && tab !== 'sca' && tab !== 'configuration' && tab !== 'syscollector'"
ng-show="resultState === 'ready' && tabView === 'panels' && !rendered">
ng-if="tab !== 'welcome' && tab !== 'sca' && tab !== 'configuration' && tab !== 'syscollector' && tabView === 'panels' && !rendered">
<div class="percentage"><i class="fa fa-fw fa-spin fa-spinner" aria-hidden="true"></i></div>
<div class="percentage">{{loadingStatus}}</div>
</div>
@ -131,13 +130,7 @@
<div layout="row" class="wz-margin-top-10 wz-margin-right-8 wz-margin-left-8"
ng-if="!showSyscheckFiles && !showScaScan && tab !== 'welcome' && tab !== 'configuration' && tab !== 'syscollector' && tab !== 'sca'"
ng-show="resultState === 'none' && tabView === 'panels'">
<div flex class="euiCallOut euiCallOut--warning">
<div class="euiCallOutHeader">
<react-component name="EuiIcon" props="{type:'help',className:'euiCallOutHeader__title'}" />
<span class="euiCallOutHeader__title">There are no results for selected time range. Try another
one.</span>
</div>
</div>
<react-component flex name="EuiCallOut" props="{color:'warning',iconType:'help', title:'There are no results for selected time range. Try another one.'}" />
</div>
<!-- No results section -->

View File

@ -56,8 +56,8 @@
<!-- End Discover search bar section -->
<!-- Loading status section -->
<div layout="column" layout-align="center center" ng-if="octrl.tab !== 'welcome'"
ng-show="resultState === 'ready' && octrl.tabView === 'panels' && !rendered">
<div layout="column" layout-align="center center"
ng-if="octrl.tab !== 'welcome' && octrl.tabView === 'panels' && !rendered">
<div class="percentage"><i class="fa fa-fw fa-spin fa-spinner" aria-hidden="true"></i></div>
<div class="percentage">{{loadingStatus}}</div>
</div>
@ -74,8 +74,7 @@
<!-- No results section -->
<div layout="row" class="wz-margin-top-10 wz-margin-right-8 wz-margin-left-8" ng-if="octrl.tab !== 'welcome'"
ng-show="resultState === 'none' && octrl.tabView === 'panels'">
<react-component flex name="EuiCallOut"
props="{color:'warning',iconType:'help', title:'There are no results for selected time range. Try another
<react-component flex name="EuiCallOut" props="{color:'warning',iconType:'help', title:'There are no results for selected time range. Try another
one.'}" />
</div>
<!-- No results section -->