Configuration - empty results (#683)

wazuh · Apr 29, 2019 · 936b9f5 · 936b9f5
1 parent 25e14ad
commit 936b9f5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/agents/agents/agents.html b/SplunkAppForWazuh/appserver/static/js/controllers/agents/agents/agents.html
@@ -1,7 +1,7 @@
 <!-- End loading ring -->
 <div flex ng-if="!loading" class="md-padding" layout="column" layout-align="start space-around">
 
-  <div layout="row" layout-align="space-between stretch">
+  <div layout="row" layout-align="space-between stretch" ng-if="!wazuhNotReadyYet">
 
     <div class="md-padding euiFlexGroup--wrap layout-row wz-margin-top--20">
       <div class="layout-column md-padding">

diff --git a/...nkAppForWazuh/appserver/static/js/controllers/management/configuration/alerts/alerts.html b/...nkAppForWazuh/appserver/static/js/controllers/management/configuration/alerts/alerts.html
@@ -34,7 +34,7 @@
 
     <!-- No configuration section -->
     <wz-no-config flex error="currentConfig['mail-alerts']" ng-if="currentConfig['mail-alerts'] && isString(currentConfig['mail-alerts'])"></wz-no-config>
-    <wz-no-config flex error="'not-present'" ng-if="currentConfig['mail-alerts'] && !isString(currentConfig['mail-alerts']) || (!currentConfig['mail-alerts'].email_alerts || !currentConfig['mail-alerts'].email_alerts.length)"></wz-no-config>
+    <wz-no-config flex error="'not-present'" ng-if="currentConfig['mail-alerts'] && !isString(currentConfig['mail-alerts']) && (!currentConfig['mail-alerts'].email_alerts || !currentConfig['mail-alerts'].email_alerts.length)">  </wz-no-config>
     <!-- End no configuration section -->
 
     <!-- This section is the main content -->
@@ -375,7 +375,7 @@
 
     <!-- No configuration section -->
     <wz-no-config flex error="currentConfig['csyslog-csyslog']" ng-if="currentConfig['csyslog-csyslog'] && isString(currentConfig['csyslog-csyslog'])"></wz-no-config>
-    <wz-no-config flex error="'not-present'" ng-if="currentConfig['csyslog-csyslog'] && !isString(currentConfig['csyslog-csyslog']) || (!currentConfig['csyslog-csyslog'].syslog_output || !currentConfig['csyslog-csyslog'].syslog_output.length)"></wz-no-config>
+    <wz-no-config flex error="'not-present'" ng-if="currentConfig['csyslog-csyslog'] && !isString(currentConfig['csyslog-csyslog']) && (!currentConfig['csyslog-csyslog'].syslog_output || !currentConfig['csyslog-csyslog'].syslog_output.length)"></wz-no-config>
     <!-- End no configuration section -->
 
     <!-- This section is the main content -->

diff --git a/...ic/js/controllers/management/configuration/integrity-monitoring/integrity-monitoring.html b/...ic/js/controllers/management/configuration/integrity-monitoring/integrity-monitoring.html
@@ -41,13 +41,8 @@
   <!-- This section contains the main content and the right sidenav -->
   <div flex="auto" layout="row" ng-if="!load">
 
-    <!-- No configuration section -->
-    <wz-no-config flex error="currentConfig['syscheck-syscheck']" ng-if="currentConfig['syscheck-syscheck'] && isString(currentConfig['syscheck-syscheck'])"></wz-no-config>
-    <wz-no-config flex error="'not-present'" ng-if="currentConfig['syscheck-syscheck'] && !isString(currentConfig['syscheck-syscheck']) && !currentConfig['syscheck-syscheck'].syscheck"></wz-no-config>
-    <!-- End no configuration section -->
-
     <!-- This section is the main content -->
-    <div class="configuration-margin-top" flex layout="column" ng-if="currentConfig['syscheck-syscheck'] && !isString(currentConfig['syscheck-syscheck']) && currentConfig['syscheck-syscheck'].syscheck">
+    <div class="configuration-margin-top" flex layout="column">
 
 
 
@@ -105,11 +100,12 @@
 
       <!-- No configuration section -->
       <wz-no-config flex error="'not-present'" 
-      ng-if="((agent || {}).os || {}).platform !== 'windows' && configurationSubTab === 'fim-ignored' && currentConfig && currentConfig['syscheck-syscheck'] && currentConfig['syscheck-syscheck'].syscheck && !currentConfig['syscheck-syscheck'].syscheck.ignore"></wz-no-config>
+        ng-if="((agent || {}).os || {}).platform !== 'windows' && configurationSubTab === 'fim-ignored' && currentConfig && currentConfig['syscheck-syscheck']
+        && currentConfig['syscheck-syscheck'].syscheck && !currentConfig['syscheck-syscheck'].syscheck.ignore.length">
+      </wz-no-config>
       <!-- End no configuration section -->
-
       <!-- Ignored card -->
-      <md-card class="wz-md-card" ng-if="((agent || {}).os || {}).platform !== 'windows' && !JSONContent && !XMLContent && configurationSubTab === 'fim-ignored' && currentConfig && currentConfig['syscheck-syscheck'] && currentConfig['syscheck-syscheck'].syscheck && currentConfig['syscheck-syscheck'].syscheck.ignore">
+      <md-card class="wz-md-card" ng-if="((agent || {}).os || {}).platform !== 'windows' && !JSONContent && !XMLContent && configurationSubTab === 'fim-ignored' && currentConfig && currentConfig['syscheck-syscheck'] && currentConfig['syscheck-syscheck'].syscheck && currentConfig['syscheck-syscheck'].syscheck.ignore.length">
         <md-card-content class="overflow-auto">
           <div layout="row" layout-align="start center">
             <div>

diff --git a/...pserver/static/js/controllers/management/configuration/log-collection/log-collection.html b/...pserver/static/js/controllers/management/configuration/log-collection/log-collection.html
@@ -29,10 +29,8 @@
 
   <!-- No configuration section -->
   <wz-no-config flex error="currentConfig['logcollector-localfile']"
-    ng-if="currentConfig['logcollector-localfile'] && isString(currentConfig['logcollector-localfile'])"></wz-no-config>
-  <wz-no-config flex error="'not-present'"
-    ng-if="currentConfig['logcollector-localfile'] && !isString(currentConfig['logcollector-localfile']) && !currentConfig['logcollector-localfile'].localfile">
-  </wz-no-config>
+    ng-if="currentConfig['logcollector-localfile'].length && !isString(currentConfig['logcollector-localfile'])"></wz-no-config>
+  <wz-no-config flex error="'not-present'" ng-if="!currentConfig['logcollector-localfile'].localfile.length"></wz-no-config>
   <!-- End no configuration section -->
 
   <!-- This section is the main content -->

diff --git a/...orWazuh/appserver/static/js/controllers/management/configuration/open-scap/open-scap.html b/...orWazuh/appserver/static/js/controllers/management/configuration/open-scap/open-scap.html
@@ -71,7 +71,7 @@
                 <tr ng-repeat="item in currentConfig['open-scap'].content">
                   <td>{{item.path}}</td>
                   <td>
-                    <ul>
+                    <ul class="noDot">
                       <li ng-repeat="profile in item.profile">{{profile}}</li>
                     </ul>
                     <span ng-if="!item.profile">-</span>

diff --git a/...r/static/js/controllers/management/configuration/policy-monitoring/policy-monitoring.html b/...r/static/js/controllers/management/configuration/policy-monitoring/policy-monitoring.html
@@ -49,11 +49,11 @@
     <!-- End no configuration section -->
 
     <!-- This section is the main content -->
-    <div class="configuration-margin-top" flex layout="column" ng-if="(currentConfig['syscheck-rootcheck'] && !isString(currentConfig['syscheck-rootcheck']) && currentConfig['syscheck-rootcheck'].rootcheck) || (currentConfig['sca'] && !isString(currentConfig['sca']))">
+    <div class="configuration-margin-top" flex layout="column">
 
 
       <!-- No configuration section -->
-      <wz-no-config flex error="'not-present'" ng-if="(configurationSubTab === 'pm-unix' && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && !currentConfig['syscheck-rootcheck'].rootcheck.system_audit) || (configurationSubTab === 'pm-ca' && !currentConfig['sca'])"></wz-no-config>
+      <wz-no-config flex error="'not-present'" ng-if="(configurationSubTab === 'pm-unix' && currentConfig && currentConfig['syscheck-rootcheck'] && currentConfig['syscheck-rootcheck'].rootcheck && !currentConfig['syscheck-rootcheck'].rootcheck.system_audit)"></wz-no-config>
       <!-- End no configuration section -->
 
       <!-- The main card will all the settings -->
@@ -164,7 +164,12 @@
       <!-- End main card with all the settings -->
 
       <!-- The configuration assessment -->
-      <md-card class="wz-md-card" ng-if="!JSONContent && !XMLContent && configurationSubTab === 'pm-ca'">
+
+      <!-- No configuration section -->
+      <wz-no-config flex error="'not-present'" ng-if="(configurationSubTab === 'pm-ca' && !currentConfig['sca'])"></wz-no-config>
+      <!-- End no configuration section -->
+
+      <md-card class="wz-md-card" ng-if="!JSONContent && !XMLContent && configurationSubTab === 'pm-ca' && currentConfig['sca']">
         <md-card-content>
           <!-- Configuration block -->
           <div layout="row" layout-align="start center">
@@ -176,7 +181,7 @@
           </div>
           <md-divider class="wz-margin-top-10"></md-divider>
 
-          <div layout="row" style="padding-left: 20%; margin-bottom:30px;">
+          <div ng-if="currentConfig['sca']" layout="row" style="padding-left: 20%; margin-bottom:30px;">
             <div class="wz-padding-top-10" style="width:100%">
               <!-- content -->
               <wz-config-item label="Configuration assessment status" value="currentConfig['sca'].enabled === 'yes' ? 'enabled' : 'disabled'">