ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject ambari git commit: AMBARI-17976. Logsearch UI: When unselected host component is opened in new tab, We get 'no data' (Dharmesh Makwana via oleewere)
Date Tue, 02 Aug 2016 10:37:50 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 d82884c1c -> a1aae27bb


AMBARI-17976. Logsearch UI: When unselected host component is opened in new tab, We get 'no
data' (Dharmesh Makwana via oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1aae27b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1aae27b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1aae27b

Branch: refs/heads/branch-2.4
Commit: a1aae27bbbc55010cdb9c745955657a5315ad1c7
Parents: d82884c
Author: oleewere <oleewere@gmail.com>
Authored: Tue Aug 2 12:19:09 2016 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Tue Aug 2 12:36:55 2016 +0200

----------------------------------------------------------------------
 .../libs/other/timezone/WorldMapGenerator.js    |  2 +-
 .../src/main/webapp/scripts/utils/Tour.js       |  6 +-
 .../dashboard/BubbleGraphTableLayoutView.js     |  4 +-
 .../views/dashboard/ComponentListView.js        |  2 +-
 .../scripts/views/dashboard/HostListView.js     |  6 +-
 .../webapp/scripts/views/tabs/LogFileView.js    |  6 +-
 .../main/webapp/scripts/views/tabs/TreeView.js  |  2 +-
 .../src/main/webapp/styles/style.css            | 63 ++++++++++++++++++++
 8 files changed, 77 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/other/timezone/WorldMapGenerator.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/other/timezone/WorldMapGenerator.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/other/timezone/WorldMapGenerator.js
index e1188e0..3462ce8 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/other/timezone/WorldMapGenerator.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/libs/other/timezone/WorldMapGenerator.js
@@ -151,7 +151,7 @@
             }
             if (options.selectBox) {
                 var select = this.genrateElement('select', {
-                    'class': 'btn btn-default dropdown-toggle',
+                    'class': 'mapDropDown dropdown-toggle',
                 }, option);
                 containerArr.push(select);
             }

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/Tour.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/Tour.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/Tour.js
index 7d99c26..ea9fca0 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/Tour.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/utils/Tour.js
@@ -78,7 +78,7 @@ define(['require', 'tour'], function(require, TourJs) {
                 }, {
                     element: $(document.querySelectorAll('#r_BubbleTable')[1]).find('td.logTime:first').get(0),
                     content: "The Log Time column lists a consolidated view of filtered log
entries for the selected service.",
-                    placement: "right"
+                    placement: "top"
                 }, {
                     element: $('li[data-id="audit"]').get(0),
                     content: "The Access Logs tab displays access information across services
and their components. You can create different views and aggregations and apply filters for
viewing access log details.",
@@ -260,10 +260,10 @@ define(['require', 'tour'], function(require, TourJs) {
             10: {
                 css: {
                     'top': '45px',
-                    'right': '10px'
+                    'right': '80px'
                 },
                 appendIndex: 1,
-                handDirection: 'left',
+                handDirection: 'right',
                 handText: "Components",
                 handClass: "left-right"
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
index 093ed83..a154f5d 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/BubbleGraphTableLayoutView.js
@@ -217,7 +217,7 @@ define(['require',
 						host :  host,
 						component : component,
 						sourceLogId: id
-					},that.graphParams/*,{includeQuery:null,excludeQuery:null}*/),
+					},that.graphParams,{treeParams:null}),
 					globalVent : that.globalVent
 				});
 			}
@@ -717,7 +717,7 @@ define(['require',
 //							iMessage : that.collection.queryParams.iMessage,
 //							eMessage : that.collection.queryParams.eMessage,
 //							query : that.collection.queryParams.query
-						},that.collection.queryParams/*,{includeQuery:null,excludeQuery:null}*/),
+						},that.collection.queryParams,{treeParams:null}),
 						globalVent : that.globalVent
 					}/*)*/);
 				} else {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
index 74bd364..abd3740 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/ComponentListView.js
@@ -191,7 +191,7 @@ define(['require',
 						params:_.extend({},{
 							host :  host,
 							component : component
-						},that.searchParams/*,{includeQuery:null,excludeQuery:null}*/),
+						},that.searchParams,{treeParams:null}),
 						globalVent : that.globalVent
 					});
 				},

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostListView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostListView.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostListView.js
index a441cb0..7f169c1 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostListView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/HostListView.js
@@ -109,7 +109,7 @@ define(['require',
 		},
 		fetchHosts : function(params){
 			var that = this;
-			$.extend(this.collection.queryParams,params);
+			$.extend(this.collection.queryParams,params,{treeParams:null});
 			this.collection.fetch({
 				reset:true,
 				complete : function(){
@@ -126,7 +126,7 @@ define(['require',
 				//appending box for every host
 				//if(i==0 || (i % 5 == 0)){
 					//($ul) ? that.formatTree($ul.parent(".tree")) : "";
-					$el.append("<div class='col-md-3'><div class='box box-dashed'><div class='box-content'><div
class='tree smart-form'><ul></ul></div></div></div></div>");
+					$el.append("<div class='col-md-3'><div class='box box-dashed'><div class='box-contentHost'><div
class='tree smart-form'><ul></ul></div></div></div></div>");
 					$ul = $el.find(".tree.smart-form").last().find("ul");
 				//}
 				if(data.get("isParent")  === "true" || data.get("isParent") == true){
@@ -250,7 +250,7 @@ define(['require',
 						params:_.extend({},{
 							host :  host,
 							component : component
-						},that.searchParams/*,{includeQuery:null,excludeQuery:null}*/),
+						},that.searchParams,{treeParams:null}),
 						globalVent : that.globalVent
 					});
 				}

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
index bc894e3..4b698e7 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js
@@ -279,9 +279,9 @@ define(['require',
                 this.listenTo(this.globalVent, "globalExclusion:component:message", function(value)
{
                     this.fetchCollection(value);
                 }, this);
-                //            this.listenTo(this.vent, "tab:refresh", function(params) {
-                //            	this.reRenderView(params);
-                //            },this);
+                this.listenTo(this.vent, "tab:refresh", function(params) {
+                	this.fetchTableCollection(params);
+                },this);
                 this.listenTo(this.vent, "timer:end", function(value) {
                     //timer should start only after log table fetch is complete.
                     ViewUtils.setLatestTimeParams(this.params);

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
index 2918606..cf33e68 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/TreeView.js
@@ -313,7 +313,7 @@ define(['require',
 					params:_.extend({},{
 						host :  host,
 						component : component
-					},that.searchParams),
+					},that.searchParams,{treeParams:null}),
 					globalVent : that.globalVent
 				}/*)*/);
 			}

http://git-wip-us.apache.org/repos/asf/ambari/blob/a1aae27b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
index 519aa1a..68f7de1 100644
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css
@@ -2846,3 +2846,66 @@ td.filterName {
   word-break: break-all;
   white-space: normal;
 }
+/*World Map Drop Down Css*/
+.mapDropDown {
+  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15)
+    rgba(0, 0, 0, 0.25);
+  color: #333;
+  border-color: #ccc;
+  background-color: #fff;
+  display: inline-block;
+  margin-bottom: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 1.42857143;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  background-image: none;
+  border: 1px solid #CCC;
+  border-radius: 4px;
+}
+
+.mapDropDown:focus,.mapDropDown:active:focus,.mapDropDown.active:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.mapDropDown:active {
+  position: relative;
+  top: 2px;
+  left: 2px;
+}
+
+.mapDropDown:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+}
+
+.box-contentHost{
+    padding: 5px 10px;
+    overflow: hidden;
+    background: #fff;
+    position: relative;
+}
+
+.box-contentHost:after {
+  clear: both; 
+}
+
+.box-contentHost:before, .box-contentHost:after {
+  content: "";
+  display: table;
+}
\ No newline at end of file


Mime
View raw message