Forráskód Böngészése

HUE-3873 [core] Sort configuration and properties by name

Johan Ahlen 9 éve
szülő
commit
906bdd6

+ 3 - 1
apps/useradmin/src/useradmin/templates/list_configurations.mako

@@ -262,7 +262,6 @@ ${ configKoComponents.config() }
       });
 
       $.each(data.configuration, function (appName, app) {
-
         app.name = appName;
         var defaultIndex = {};
         if (typeof app.default === 'undefined') {
@@ -298,6 +297,9 @@ ${ configKoComponents.config() }
         }
         apps.push(new AppConfiguration(app, self.allGroups));
       });
+      apps.sort(function (a, b) {
+        return a.name().localeCompare(b.name());
+      })
       self.apps(apps);
     };
 

+ 13 - 0
desktop/core/src/desktop/templates/config_ko_components.mako

@@ -260,6 +260,7 @@ from desktop.views import _ko
                 self.availableProperties.push(property);
               }
             });
+            self.sort();
           };
 
           setInitialProperties();
@@ -272,12 +273,23 @@ from desktop.views import _ko
           });
         }
 
+        var niceNameSort = function (a, b) {
+          return a.nice_name().localeCompare(b.nice_name());
+        }
+
+        PropertySelectorViewModel.prototype.sort = function () {
+          var self = this;
+          self.availableProperties.sort(niceNameSort);
+          self.selectedProperties.sort(niceNameSort);
+        }
+
         PropertySelectorViewModel.prototype.addProperty = function () {
           var self = this;
           if (self.propertyToAdd()) {
             self.selectedProperties.push(self.propertyToAdd());
             self.availableProperties.remove(self.propertyToAdd());
             self.propertyToAdd(null);
+            self.sort();
           }
         };
 
@@ -286,6 +298,7 @@ from desktop.views import _ko
           property.value(property.defaultValue());
           self.selectedProperties.remove(property);
           self.availableProperties.push(property);
+          self.sort();
         }
 
         ko.components.register('property-selector', {