You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/04/18 02:41:33 UTC
[1/2] ambari git commit: AMBARI-10584. Widget Browser: need to update
api call because of api change.(XIWANG)
Repository: ambari
Updated Branches:
refs/heads/trunk fc5b29f43 -> f69d157c8
AMBARI-10584. Widget Browser: need to update api call because of api change.(XIWANG)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f69d157c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f69d157c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f69d157c
Branch: refs/heads/trunk
Commit: f69d157c8d428f31a206ec9e92a66e43c3e4e980
Parents: 8719812
Author: Xi Wang <xi...@apache.org>
Authored: Fri Apr 17 17:36:22 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Apr 17 17:36:30 2015 -0700
----------------------------------------------------------------------
.../controllers/main/service/info/summary.js | 28 ++++++++++----------
ambari-web/app/utils/ajax/ajax.js | 4 +--
.../app/views/main/service/info/summary.js | 1 -
3 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f69d157c/ambari-web/app/controllers/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js
index 054ab31..9acf5ee 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -442,18 +442,18 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
if (data.items[0] && data.items.length) {
this.set("allSharedWidgets",
data.items.filter(function (widget) {
- return widget.Widgets.widget_type != "HEATMAP";
+ return widget.WidgetInfo.widget_type != "HEATMAP";
}).map(function (widget) {
- var widgetType = widget.Widgets.widget_type;
- var widgetName = widget.Widgets.widget_name;
+ var widgetType = widget.WidgetInfo.widget_type;
+ var widgetName = widget.WidgetInfo.widget_name;
return Em.Object.create({
- id: widget.Widgets.id,
+ id: widget.WidgetInfo.id,
widgetName: widgetName,
- displayName: widget.Widgets.display_name,
- description: widget.Widgets.description,
+ displayName: widget.WidgetInfo.display_name,
+ description: widget.WidgetInfo.description,
widgetType: widgetType,
iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png",
- serviceName: JSON.parse(widget.Widgets.metrics).mapProperty('service_name').uniq().join('-'),
+ serviceName: JSON.parse(widget.WidgetInfo.metrics).mapProperty('service_name').uniq().join('-'),
added: addedWidgetsNames.contains(widgetName),
isShared: true
});
@@ -491,18 +491,18 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
if (data.items[0] && data.items.length) {
this.set("mineWidgets",
data.items.filter(function (widget) {
- return widget.Widgets.widget_type != "HEATMAP";
+ return widget.WidgetInfo.widget_type != "HEATMAP";
}).map(function (widget) {
- var widgetType = widget.Widgets.widget_type;
- var widgetName = widget.Widgets.widget_name;
+ var widgetType = widget.WidgetInfo.widget_type;
+ var widgetName = widget.WidgetInfo.widget_name;
return Em.Object.create({
- id: widget.Widgets.id,
+ id: widget.WidgetInfo.id,
widgetName: widgetName,
- displayName: widget.Widgets.display_name,
- description: widget.Widgets.description,
+ displayName: widget.WidgetInfo.display_name,
+ description: widget.WidgetInfo.description,
widgetType: widgetType,
iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png",
- serviceName: JSON.parse(widget.Widgets.metrics).mapProperty('service_name').uniq().join('-'),
+ serviceName: JSON.parse(widget.WidgetInfo.metrics).mapProperty('service_name').uniq().join('-'),
added: addedWidgetsNames.contains(widgetName),
isShared: false
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/f69d157c/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 1657196..ff3253b 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2407,12 +2407,12 @@ var urls = {
},
'widgets.all.shared.get': {
- real: '/clusters/{clusterName}/widgets?Widgets/scope=CLUSTER&fields=*',
+ real: '/clusters/{clusterName}/widgets?WidgetInfo/scope=CLUSTER&fields=*',
mock: '/data/widget_layouts/all_shared_widgets.json'
},
'widgets.all.mine.get': {
- real: '/clusters/{clusterName}/widgets?Widgets/author={loginName}&fields=*',
+ real: '/clusters/{clusterName}/widgets?WidgetInfo/author={loginName}&fields=*',
mock: '/data/widget_layouts/all_mine_widgets.json'
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/f69d157c/ambari-web/app/views/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js
index d8df50e..41bfd31 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -600,7 +600,6 @@ App.MainServiceInfoSummaryView = Em.View.extend(App.UserPref, {
}), self.get('controller.widgets'));
//TODO bind to actual layout instance
var layout = self.get('controller.widgetLayouts').objectAt(0);
-
self.get('controller').saveLayout(widgets, layout);
},
activate: function (event, ui) {
[2/2] ambari git commit: AMBARI-10582. Clicking on cancel icon on the
widget should hide it(XIWANG)
Posted by xi...@apache.org.
AMBARI-10582. Clicking on cancel icon on the widget should hide it(XIWANG)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87198125
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87198125
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87198125
Branch: refs/heads/trunk
Commit: 871981252da501cecb33290a4e191be0b66c595a
Parents: fc5b29f
Author: Xi Wang <xi...@apache.org>
Authored: Fri Apr 17 15:49:51 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Apr 17 17:36:30 2015 -0700
----------------------------------------------------------------------
.../app/controllers/main/service/info/summary.js | 4 ++++
ambari-web/app/mixins/common/widget_mixin.js | 14 ++++++++++----
.../app/templates/common/widget/gauge_widget.hbs | 2 +-
.../app/templates/common/widget/graph_widget.hbs | 2 +-
.../app/templates/common/widget/number_widget.hbs | 2 +-
.../app/templates/common/widget/template_widget.hbs | 2 +-
.../app/templates/main/service/info/summary.hbs | 2 +-
7 files changed, 19 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/87198125/ambari-web/app/controllers/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js
index 696d2c9..054ab31 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -331,6 +331,10 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
* @type {boolean}
*/
isAllSharedWidgetsLoaded: false,
+
+ /**
+ * @type {boolean}
+ */
isMineWidgetsLoaded: false,
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/87198125/ambari-web/app/mixins/common/widget_mixin.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/widget_mixin.js b/ambari-web/app/mixins/common/widget_mixin.js
index 35b11b1..33d81fc 100644
--- a/ambari-web/app/mixins/common/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widget_mixin.js
@@ -316,20 +316,26 @@ App.WidgetMixin = Ember.Mixin.create({
/*
* make call when clicking on "remove icon" on widget
*/
- hideWidget: function () {
-
+ hideWidget: function (event) {
+ this.get('controller').hideWidget(
+ {
+ context: Em.Object.create({
+ id: event.context
+ })
+ }
+ );
},
/*
* make call when clicking on "clone icon" on widget
*/
- cloneWidget: function () {
+ cloneWidget: function (event) {
},
/*
* make call when clicking on "edit icon" on widget
*/
- editWidget: function () {
+ editWidget: function (event) {
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/87198125/ambari-web/app/templates/common/widget/gauge_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs b/ambari-web/app/templates/common/widget/gauge_widget.hbs
index 1846670..3dd54c1 100644
--- a/ambari-web/app/templates/common/widget/gauge_widget.hbs
+++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs
@@ -18,7 +18,7 @@
<div class="gauge-widget thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
<i class="icon-remove-sign icon-large"></i>
</a>
<div class="caption title span9">{{view.content.displayName}}</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/87198125/ambari-web/app/templates/common/widget/graph_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs b/ambari-web/app/templates/common/widget/graph_widget.hbs
index ede376f..9c1560f 100644
--- a/ambari-web/app/templates/common/widget/graph_widget.hbs
+++ b/ambari-web/app/templates/common/widget/graph_widget.hbs
@@ -18,7 +18,7 @@
<div class="graph-widget thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
<i class="icon-remove-sign icon-large"></i>
</a>
<div class="caption title span9">{{view.content.displayName}}</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/87198125/ambari-web/app/templates/common/widget/number_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/number_widget.hbs b/ambari-web/app/templates/common/widget/number_widget.hbs
index be32201..d1bdc97 100644
--- a/ambari-web/app/templates/common/widget/number_widget.hbs
+++ b/ambari-web/app/templates/common/widget/number_widget.hbs
@@ -18,7 +18,7 @@
<div class="number-widget thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
<i class="icon-remove-sign icon-large"></i>
</a>
<div class="caption title span9">{{view.content.displayName}}</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/87198125/ambari-web/app/templates/common/widget/template_widget.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/widget/template_widget.hbs b/ambari-web/app/templates/common/widget/template_widget.hbs
index 4e2ea0b..c4f9597 100644
--- a/ambari-web/app/templates/common/widget/template_widget.hbs
+++ b/ambari-web/app/templates/common/widget/template_widget.hbs
@@ -18,7 +18,7 @@
<div class="template-widget thumbnail">
{{#if view.isLoaded}}
- <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget target="view"}}>
+ <a {{bindAttr class=":corner-icon :span1 view.parentView.isMoving:hidden"}} href="#" {{action hideWidget view.id target="view"}}>
<i class="icon-remove-sign icon-large"></i>
</a>
<div class="caption title span9">{{view.content.displayName}}</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/87198125/ambari-web/app/templates/main/service/info/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs
index 2c2668c..8567b76 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -126,7 +126,7 @@
<div id="widget_layout" class="row-fluid">
{{#each widget in controller.widgets}}
<div class="widget span2p4" {{bindAttr id="widget.id"}}>
- {{view widget.viewClass contentBinding="widget"}}
+ {{view widget.viewClass contentBinding="widget" idBinding="widget.id"}}
</div>
{{/each}}
<div class="span2p4">