From 1fc83f4b1d0c2eb7cf18ecf049335571eb320575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Jim=C3=A9nez?= <juanji0503@gmail.com>
Date: Mon, 18 Jun 2018 10:00:10 +0200
Subject: [PATCH] Refactored nodes list and many other Monitoring files

---
 .../templates/manager/monitoring/config.html  | 48 ----------------
 .../manager/monitoring/configuration.html     | 55 +++++++++++++++++++
 ...monitoring-disabled.html => disabled.html} |  0
 ...ain-timelions.html => main-timelions.html} |  0
 .../{monitoring-main.html => main.html}       |  0
 .../manager/monitoring/monitoring.jade        | 20 ++-----
 .../{node-detail.html => nodes-detail.html}   |  0
 .../{node-list.html => nodes-list.html}       | 40 +++++++++++++-
 .../ruleset/decoders/decoders-detail.html     |  2 +-
 .../ruleset/decoders/decoders-list.html       |  2 +-
 .../manager/ruleset/rules/rules-detail.html   |  2 +-
 .../manager/ruleset/rules/rules-list.html     |  2 +-
 12 files changed, 104 insertions(+), 67 deletions(-)
 delete mode 100644 public/templates/manager/monitoring/config.html
 create mode 100644 public/templates/manager/monitoring/configuration.html
 rename public/templates/manager/monitoring/{monitoring-disabled.html => disabled.html} (100%)
 rename public/templates/manager/monitoring/{monitoring-main-timelions.html => main-timelions.html} (100%)
 rename public/templates/manager/monitoring/{monitoring-main.html => main.html} (100%)
 rename public/templates/manager/monitoring/{node-detail.html => nodes-detail.html} (100%)
 rename public/templates/manager/monitoring/{node-list.html => nodes-list.html} (54%)

diff --git a/public/templates/manager/monitoring/config.html b/public/templates/manager/monitoring/config.html
deleted file mode 100644
index 63e00eeda..000000000
--- a/public/templates/manager/monitoring/config.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<div layout="row" ng-show="showConfig" class="wz-timelions">
-    <md-card flex="30" class="wz-md-card">
-        <md-card-content class="wazuh-column">
-            <span class="wz-headline-title">Top 5 nodes</span>
-            <md-divider class="wz-margin-top-10"></md-divider>
-            <kbn-vis ng-show="rendered" vis-id="'Wazuh-App-Cluster-Overview-Node-Pie'" id="Wazuh-App-Cluster-Overview-Node-Pie"></kbn-vis>
-            <span class="wz-padding-top-10" ng-show="!rendered">No results for selected time interval</span>
-        </md-card-content>
-    </md-card>
-    <md-card flex class="wz-md-card">
-        <md-card-content>
-            <span class="wz-headline-title">Overview</span>
-            <md-divider class="wz-margin-top-10"></md-divider>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">Disabled</span>
-                <span flex class="color-grey">{{configuration.disabled}}</span>
-            </div>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">Hidden</span>
-                <span flex class="color-grey">{{configuration.hidden}}</span>
-            </div>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">Name</span>
-                <span flex class="color-grey">{{configuration.name}}</span>
-            </div>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">Node name</span>
-                <span flex class="color-grey">{{configuration.node_name}}</span>
-            </div>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">Node type</span>
-                <span flex class="color-grey">{{configuration.node_type}}</span>
-            </div>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">Bind address</span>
-                <span flex class="color-grey">{{configuration.bind_addr}}</span>
-            </div>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">IP</span>
-                <span flex class="color-grey">{{configuration.nodes[0] || 'Unknown'}}</span>
-            </div>
-            <div layout="row" class="wz-padding-top-10">
-                <span flex="15">Port</span>
-                <span flex class="color-grey">{{configuration.port}}</span>
-            </div>
-        </md-card-content>
-    </md-card>
-</div>
\ No newline at end of file
diff --git a/public/templates/manager/monitoring/configuration.html b/public/templates/manager/monitoring/configuration.html
new file mode 100644
index 000000000..268e68086
--- /dev/null
+++ b/public/templates/manager/monitoring/configuration.html
@@ -0,0 +1,55 @@
+<!-- Cards for overview monitoring section -->
+<div layout="row" layout-align="start stretch" class="wz-timelions" ng-show="showConfig">
+
+    <!-- Overview visualization card -->
+    <md-card flex="30" class="wz-md-card">
+        <md-card-content class="wazuh-column">
+            <span class="wz-headline-title">Top 5 nodes</span>
+            <md-divider class="wz-margin-top-10"></md-divider>
+            <kbn-vis ng-show="rendered" vis-id="'Wazuh-App-Cluster-Overview-Node-Pie'" id="Wazuh-App-Cluster-Overview-Node-Pie"></kbn-vis>
+            <span class="wz-padding-top-10 wz-text-center" ng-show="!rendered">There are no results for selected time range. Try another one.</span>
+        </md-card-content>
+    </md-card>
+
+    <!-- Cluster configuration card -->
+    <md-card flex class="wz-md-card">
+        <md-card-content>
+            <i class="fa fa-fw fa-server" aria-hidden="true"></i> <span class="wz-headline-title">Cluster configuration</span>
+            <md-divider class="wz-margin-top-10"></md-divider>
+            <!-- Configuration options -->
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">Disabled</span>
+                <span class="color-grey">{{configuration.disabled}}</span>
+            </div>
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">Hidden</span>
+                <span class="color-grey">{{configuration.hidden}}</span>
+            </div>
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">Name</span>
+                <span class="color-grey">{{configuration.name}}</span>
+            </div>
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">Node name</span>
+                <span class="color-grey">{{configuration.node_name}}</span>
+            </div>
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">Node type</span>
+                <span class="color-grey">{{configuration.node_type}}</span>
+            </div>
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">Bind address</span>
+                <span class="color-grey">{{configuration.bind_addr}}</span>
+            </div>
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">IP</span>
+                <span class="color-grey">{{configuration.nodes[0] || 'Unknown'}}</span>
+            </div>
+            <div layout="row" class="wz-padding-top-10">
+                <span flex="25">Port</span>
+                <span class="color-grey">{{configuration.port}}</span>
+            </div>
+        </md-card-content>
+    </md-card>
+</div>
+<!-- End cards for overview monitoring section -->
diff --git a/public/templates/manager/monitoring/monitoring-disabled.html b/public/templates/manager/monitoring/disabled.html
similarity index 100%
rename from public/templates/manager/monitoring/monitoring-disabled.html
rename to public/templates/manager/monitoring/disabled.html
diff --git a/public/templates/manager/monitoring/monitoring-main-timelions.html b/public/templates/manager/monitoring/main-timelions.html
similarity index 100%
rename from public/templates/manager/monitoring/monitoring-main-timelions.html
rename to public/templates/manager/monitoring/main-timelions.html
diff --git a/public/templates/manager/monitoring/monitoring-main.html b/public/templates/manager/monitoring/main.html
similarity index 100%
rename from public/templates/manager/monitoring/monitoring-main.html
rename to public/templates/manager/monitoring/main.html
diff --git a/public/templates/manager/monitoring/monitoring.jade b/public/templates/manager/monitoring/monitoring.jade
index e2ec6aa85..33d6d4b0a 100644
--- a/public/templates/manager/monitoring/monitoring.jade
+++ b/public/templates/manager/monitoring/monitoring.jade
@@ -1,16 +1,8 @@
-include ./monitoring-disabled.html
+include ./disabled.html
 include ./monitoring.head
-include ./monitoring-main.html
-include ./monitoring-main-timelions.html
-
-<!-- Config -->
-include ./config.html
-
-<!-- Node list -->
-include ./node-list.html
-
-<!-- Node detail -->
-include ./node-detail.html
-
-<!-- Footer -->
+include ./main.html
+include ./main-timelions.html
+include ./configuration.html
+include ./nodes-list.html
+include ./nodes-detail.html
 include ../../footer.foot
diff --git a/public/templates/manager/monitoring/node-detail.html b/public/templates/manager/monitoring/nodes-detail.html
similarity index 100%
rename from public/templates/manager/monitoring/node-detail.html
rename to public/templates/manager/monitoring/nodes-detail.html
diff --git a/public/templates/manager/monitoring/node-list.html b/public/templates/manager/monitoring/nodes-list.html
similarity index 54%
rename from public/templates/manager/monitoring/node-list.html
rename to public/templates/manager/monitoring/nodes-list.html
index 00497f046..8ffe5e10e 100644
--- a/public/templates/manager/monitoring/node-list.html
+++ b/public/templates/manager/monitoring/nodes-list.html
@@ -1,3 +1,41 @@
+<div layout="column" layout-align="start stretch" class="md-padding" ng-if="showNodes && !currentNode">
+
+    <!-- Monitoring nodes searchbar -->
+    <wz-search-bar data="nodes" term="nodeSearchTerm" placetext="'Search nodes...'"></wz-search-bar>
+    <!-- End monitoring nodes searchbar -->
+
+    <!-- Monitoring nodes table -->
+    <wz-table-header layout="row" data="nodes" keys="[
+            {name:'Name',size:25},
+            {name:'Version',size:25},
+            {name:'IP',size:25},
+            {name:'Type',size:25}
+        ]">
+    </wz-table-header>
+    <wz-table layout="column" flex data="nodes" func="showNode(index)" keys="[
+            {col:'name',size:25},
+            {col:'version',size:25},
+            {col:'ip',size:25},
+            {col:'type',size:25}
+        ]" class="no-lateral-padding">
+    </wz-table>
+    <!-- End monitoring nodes table -->
+</div>
+
+
+
+
+
+
+
+
+
+
+<!--
+
+
+
+
 <div layout="column" flex ng-if="showNodes && !currentNode">
     <md-card flex class="wz-md-card" ng-show="!currentNode">
         <md-card-content>
@@ -21,4 +59,4 @@
             </wz-table>
         </md-card-content>
     </md-card>
-</div>
+</div> -->
diff --git a/public/templates/manager/ruleset/decoders/decoders-detail.html b/public/templates/manager/ruleset/decoders/decoders-detail.html
index 39334950a..0c98a94dc 100644
--- a/public/templates/manager/ruleset/decoders/decoders-detail.html
+++ b/public/templates/manager/ruleset/decoders/decoders-detail.html
@@ -160,7 +160,7 @@
         </div>
 
         <!-- Related decoders section -->
-        <div ng-show="(decodersRelated.items && decodersRelated.items.length > 0)" layout-padding>
+        <div ng-show="(decodersRelated.items && decodersRelated.items.length > 0)" class="md-padding">
             <h1 class="md-headline wz-headline"><i class="fa fa-fw fa-link" aria-hidden="true"></i> Related decoders</h1>
             <wz-table-header
                 class="wz-side-margin-8"
diff --git a/public/templates/manager/ruleset/decoders/decoders-list.html b/public/templates/manager/ruleset/decoders/decoders-list.html
index 0da5e196a..2847a6ba1 100644
--- a/public/templates/manager/ruleset/decoders/decoders-list.html
+++ b/public/templates/manager/ruleset/decoders/decoders-list.html
@@ -1,4 +1,4 @@
-<div ng-show="!loading && !viewingDetail" flex layout="column" layout-padding>
+<div ng-show="!loading && !viewingDetail" flex layout="column" class="md-padding">
     <div id="content" layout="row" layout-align="start start">
         <span flex layout="row" layout-align="space-between center">
             <md-autocomplete flex id="Auto" class="wz-autocomplete wz-select-input wz-margin-right-16" md-input-id="autocomplete" md-select-on-match="true" md-no-cache="noCache" md-selected-item="filter"
diff --git a/public/templates/manager/ruleset/rules/rules-detail.html b/public/templates/manager/ruleset/rules/rules-detail.html
index 63263819d..e71806e6b 100644
--- a/public/templates/manager/ruleset/rules/rules-detail.html
+++ b/public/templates/manager/ruleset/rules/rules-detail.html
@@ -201,7 +201,7 @@
         </div>
 
         <!-- Related rules section -->
-        <div ng-show="(rulesRelated.items && rulesRelated.items.length > 0)" layout-padding>
+        <div ng-show="(rulesRelated.items && rulesRelated.items.length > 0)" class="md-padding">
             <h1 class="md-headline wz-headline"><i class="fa fa-fw fa-link" aria-hidden="true"></i> Related rules</h1>
             <wz-table-header
                 class="wz-side-margin-8"
diff --git a/public/templates/manager/ruleset/rules/rules-list.html b/public/templates/manager/ruleset/rules/rules-list.html
index 4e622af33..d22a5e33a 100644
--- a/public/templates/manager/ruleset/rules/rules-list.html
+++ b/public/templates/manager/ruleset/rules/rules-list.html
@@ -1,4 +1,4 @@
-<div ng-show="!loading && !viewingDetail" flex layout="column" layout-padding>
+<div ng-show="!loading && !viewingDetail" flex layout="column" class="md-padding">
     <div id="content" layout="row" layout-align="start start">
         <span layout="row" flex layout-align="space-between center">
             <md-autocomplete flex class="wz-autocomplete wz-select-input wz-margin-right-8"