Prechádzať zdrojové kódy

Revert "AMBARI-7584. Slider View: Show yarn-site and global configs in app configs page. (Max Shepel via akovalenko)"

This reverts commit ec0034df789179576cd7e2e3e45b41c5b3243c13.
Reverted because, we might want to hide categories in future. We just
dont want to hide global and yarn-site for now
Srimanth Gunturi 11 rokov pred
rodič
commit
34858c8bd5

+ 3 - 0
contrib/views/slider/src/main/resources/ui/app/models/slider_app.js

@@ -111,6 +111,9 @@ App.SliderApp = DS.Model.extend({
 
 
   supportedMetricNames: DS.attr('string'),
   supportedMetricNames: DS.attr('string'),
 
 
+  // Config categories, that should be hidden on app page
+  hiddenCategories: ['yarn-site', 'global'],
+
   /**
   /**
    * @type {boolean}
    * @type {boolean}
    */
    */

+ 17 - 15
contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs

@@ -18,21 +18,23 @@
 
 
 <div class="app_configs">
 <div class="app_configs">
   {{#each configCategory in view.configsByCategories}}
   {{#each configCategory in view.configsByCategories}}
-    {{#bs-panel heading=configCategory.name collapsible=true}}
-      <div class="container-fluid">
-        {{#each configCategory.configs}}
-          <div class="row">
-            <div class="col-md-3 property-name">{{formatWordBreak key devider="."}}</div>
-            <div>
-              {{#if isMultiline}}
-                {{textarea disabled=true value=value classNames="col-md-6"}}
-              {{else}}
-                <input type="text" {{bind-attr value=value}} disabled="disabled" class="col-md-6" />
-              {{/if}}
+    {{#if configCategory.isVisible}}
+      {{#bs-panel heading=configCategory.name collapsible=true}}
+        <div class="container-fluid">
+          {{#each configCategory.configs}}
+            <div class="row">
+              <div class="col-md-3 property-name">{{formatWordBreak key devider="."}}</div>
+              <div>
+                {{#if isMultiline}}
+                  {{textarea disabled=true value=value classNames="col-md-6"}}
+                {{else}}
+                  <input type="text" {{bind-attr value=value}} disabled="disabled" class="col-md-6" />
+                {{/if}}
+              </div>
             </div>
             </div>
-          </div>
-        {{/each}}
-      </div>
-    {{/bs-panel}}
+          {{/each}}
+        </div>
+      {{/bs-panel}}
+    {{/if}}
   {{/each}}
   {{/each}}
 </div>
 </div>

+ 5 - 2
contrib/views/slider/src/main/resources/ui/app/views/slider_app/configs_view.js

@@ -32,16 +32,19 @@ App.SliderAppConfigsView = Ember.View.extend(App.WithPanels, {
   configsObserver: function() {
   configsObserver: function() {
     var model = this.get('controller.content'),
     var model = this.get('controller.content'),
       configs = model.get('.configs'),
       configs = model.get('.configs'),
-      configsByCategories = this.get('configsByCategories');
+      configsByCategories = this.get('configsByCategories'),
+      hiddenCategories = model.get('hiddenCategories');
     Em.keys(configs).forEach(function (site) {
     Em.keys(configs).forEach(function (site) {
       if (configsByCategories.mapBy('name').contains(site)) {
       if (configsByCategories.mapBy('name').contains(site)) {
         var c = configsByCategories.findBy('name', site);
         var c = configsByCategories.findBy('name', site);
         c.set('configs', model.mapObject(configs[site]));
         c.set('configs', model.mapObject(configs[site]));
+        c.set('isVisible', !hiddenCategories.contains(site));
       }
       }
       else {
       else {
         configsByCategories.pushObject(Em.Object.create({
         configsByCategories.pushObject(Em.Object.create({
           name: site,
           name: site,
-          configs: model.mapObject(configs[site])
+          configs: model.mapObject(configs[site]),
+          isVisible: !hiddenCategories.contains(site)
         }));
         }));
       }
       }
     });
     });