AMBARI-11294 Multiple selections possible at Metrics and Expression page of Create Widget Wizard. (atkach)

ambari-web/app/templates/main/service/widgets/create/step2_add_metric.hbs

@@ -23,12 +23,12 @@
     {{#if controller.content.isMetricsLoaded}}
       <!--service level-->
       {{#each service in view.componentMap}}
-        <li class="dropdown-submenu keep-open">
+        <li class="dropdown-submenu">
           <a class="" tabindex="-1" href="javascript:void(null);">{{service.displayName}}</a>
           <ul class="dropdown-menu">
             {{#each component in service.components}}
               <!--component level-->
-              <li class="dropdown-submenu keep-open">
+              <li class="dropdown-submenu">
                 <a href="javascript:void(null);">{{component.displayName}}</a>
                 <ul class="dropdown-menu select-options-dropdown">
                   <!--metrics level-->

ambari-web/app/views/common/widget/graph_widget_view.js

@@ -79,9 +79,10 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, {
       this.get('content.values').forEach(function (value) {
         var expression = this.extractExpressions(value)[0];
         var computedData;
-        var datasetKey = value.value.match(this.get('EXPRESSION_REGEX'))[0];
+        var datasetKey;
 
         if (expression) {
+          datasetKey = value.value.match(this.get('EXPRESSION_REGEX'))[0];
           computedData = this.computeExpression(expression, metrics)[datasetKey];
           //exclude empty datasets
           if (computedData.length > 0) {

ambari-web/app/views/main/service/widgets/create/expression_view.js

@@ -210,9 +210,6 @@ App.AddMetricExpressionView = Em.View.extend({
     $('html').on('click.dropdown', '.dropdown-menu li', function (e) {
       $(this).hasClass('keep-open') && e.stopPropagation();
     });
-    $('html').on('click.dropdown', '.dropdown-menu chosen-drop', function (e) {
-      $(this).hasClass('keep-open') && e.stopPropagation();
-    });
     var self = this;
     Em.run.later(this, function () {
       $(".metrics-select.chosen-select").chosen({