You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/06/01 22:52:45 UTC
ambari git commit: AMBARI-11593. Create/Edit widget: Add metric
dropdown should show the contextual service first in the list. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk fd1baecfd -> 70ec7ecad
AMBARI-11593. Create/Edit widget: Add metric dropdown should show the contextual service first in the list. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70ec7eca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70ec7eca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70ec7eca
Branch: refs/heads/trunk
Commit: 70ec7ecad1f8a0bfb20910bb0b5afe07d9e7fe48
Parents: fd1baec
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Mon Jun 1 13:51:57 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Mon Jun 1 13:52:04 2015 -0700
----------------------------------------------------------------------
.../main/service/widgets/edit_controller.js | 1 +
.../main/service/widgets/create/expression_view.js | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ec7eca/ambari-web/app/controllers/main/service/widgets/edit_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/widgets/edit_controller.js b/ambari-web/app/controllers/main/service/widgets/edit_controller.js
index 4a3beda..66f6aeb 100644
--- a/ambari-web/app/controllers/main/service/widgets/edit_controller.js
+++ b/ambari-web/app/controllers/main/service/widgets/edit_controller.js
@@ -89,6 +89,7 @@ App.WidgetEditController = App.WidgetWizardController.extend({
type: 'sync',
callback: function () {
this.load('widgetType');
+ this.load('widgetService');
this.load('widgetProperties', true);
this.load('widgetValues', true);
this.load('widgetMetrics', true);
http://git-wip-us.apache.org/repos/asf/ambari/blob/70ec7eca/ambari-web/app/views/main/service/widgets/create/expression_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index bb6171d..eb41656 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -393,8 +393,20 @@ App.AddMetricExpressionView = Em.View.extend({
}));
}
- return result;
- }.property('controller.filteredMetrics')
+ return this.putContextServiceOnTop(result);
+ }.property('controller.filteredMetrics'),
+
+ /**
+ * returns the input array with the context service (service from which widget browser is launched) as the first element of the array
+ * @param serviceComponentMap {Array}
+ * @return {Array}
+ */
+ putContextServiceOnTop: function(serviceComponentMap) {
+ var contextService = this.get('controller.content.widgetService');
+ var serviceIndex = serviceComponentMap.indexOf(serviceComponentMap.findProperty('serviceName', contextService));
+ return serviceComponentMap.slice(serviceIndex, serviceComponentMap.length).concat(serviceComponentMap.slice(0, serviceIndex));
+ }
+
});
App.InputCursorTextfieldView = Ember.TextField.extend({