Sort group items on load.

This only affects groups that are populated by loading, such as the CKAN, WMS, and WFS groups.

Author: kring

LICENSE.md

@@ -213,6 +213,33 @@ https://github.com/humangeo/leaflet-tilefilter
 > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+### javascript-natural-sort
+
+https://www.npmjs.org/package/javascript-natural-sort
+
+> The MIT License (MIT)
+
+> Copyright (c) Jim Palmer, Kyle Housley
+
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
+
+
 Tests
 =====
 

package.json

@@ -7,6 +7,7 @@
     "cors": "~2.5.0",
     "express": "^4.4.3",
     "formidable": "~1.0.15",
+    "javascript-natural-sort": "^0.7.1",
     "mongoose": "^3.8.18",
     "ogr2ogr": "~0.4.1",
     "proj4": "~2.2.1",

src/ViewModels/CatalogGroupViewModel.js

@@ -18,6 +18,8 @@ var inherit = require('../Core/inherit');
 var raiseErrorOnRejectedPromise = require('./raiseErrorOnRejectedPromise');
 var runLater = require('../Core/runLater');
 
+var naturalSort = require('javascript-natural-sort');
+
 /**
  * A group of data items and other groups in the {@link CatalogViewModel}.  A group can contain
  * {@link CatalogMemberViewModel|CatalogMemberViewModels} or other
@@ -265,6 +267,7 @@ CatalogGroupViewModel.prototype.load = function() {
 
         return that._load();
     }).then(function() {
+        that.sortItems();
         that._loadingPromise = undefined;
         that.isLoading = false;
     }).otherwise(function(e) {
@@ -343,4 +346,25 @@ CatalogGroupViewModel.prototype.findFirstItemByName = function(name) {
     return undefined;
 };
 
+/**
+ * Sorts the items in this group.
+ *
+ * @param {Boolean} [sortRecursively=false] true to sort the items in sub-groups as well; false to sort only the items in this group.
+ */
+CatalogGroupViewModel.prototype.sortItems = function(sortRecursively) {
+    naturalSort.insensitive = true;
+    this.items.sort(function(a, b) {
+        return naturalSort(a.name, b.name);
+    });
+
+    if (defaultValue(sortRecursively, false)) {
+        for (var i = 0; i < this.items.length; ++i) {
+            var item = this.items[i];
+            if (defined(item.sortItems)) {
+                item.sortItems(sortRecursively);
+            }
+        }
+    }
+};
+
 module.exports = CatalogGroupViewModel;

src/ViewModels/raiseErrorOnRejectedPromise.js

@@ -19,9 +19,9 @@ var raiseErrorOnRejectedPromise = function(application, promise) {
             } else {
                 application.error.raiseEvent(new ViewModelError({
                     sender: undefined,
-                    title: 'An unknown error occurred',
+                    title: 'An error occurred',
                     message: '\
-<p>National Map experienced an unknown error.  Please report this by emailing <a href="mailto:nationalmap@lists.nicta.com.au">nationalmap@lists.nicta.com.au</a>.  \
+<p>National Map experienced an error.  Please report this by emailing <a href="mailto:nationalmap@lists.nicta.com.au">nationalmap@lists.nicta.com.au</a>.  \
 Details of the error are below.</p>\
 <p><pre>' + e.toString() + '</pre></p>'
                 }));