Mccalluc/user files sorting

refinery/data_set_manager/utils.py

@@ -14,7 +14,6 @@
 from django.utils.http import urlquote, urlunquote
 
 import requests
-from requests.exceptions import HTTPError
 
 import core
 
@@ -826,11 +825,23 @@ def search_solr(encoded_params, core):
     """
     url_portion = '/'.join([core, "select"])
     url = urlparse.urljoin(settings.REFINERY_SOLR_BASE_URL, url_portion)
-    try:
-        full_response = requests.get(url, params=encoded_params)
-        full_response.raise_for_status()
-    except HTTPError as e:
-        logger.error(e)
+    full_response = requests.get(url, params=encoded_params)
+    if not full_response.ok:
+        try:
+            response_obj = json.loads(full_response.content)
+        except ValueError:
+            raise RuntimeError(
+                'Expected Solr JSON, not: {}'.format(full_response.content)
+            )
+        try:
+            raise RuntimeError('Solr error: {}\nin context: {}'.format(
+                response_obj['error']['msg'],
+                response_obj
+            ))
+        except KeyError:
+            raise RuntimeError(
+                'Not expected response structure: {}'.format(response_obj)
+            )
 
     response = full_response.content
 

refinery/ui/source/js/user-file-browser/ctrls/user-file-browser-files-ctrl.js

@@ -9,10 +9,17 @@
     '$log',
     '$q',
     'userFileBrowserFactory',
+    'userFileSortsService',
     'gridOptionsService'
   ];
 
-  function UserFileBrowserFilesCtrl ($log, $q, userFileBrowserFactory, gridOptionsService) {
+  function UserFileBrowserFilesCtrl (
+      $log,
+      $q,
+      userFileBrowserFactory,
+      userFileSortsService,
+      gridOptionsService
+  ) {
     var vm = this;
     var promise = $q.defer();
     var getUserFiles = userFileBrowserFactory.getUserFiles;
@@ -25,8 +32,38 @@
       promise.reject();
     });
 
+    vm.sortChanged = function (grid, sortColumns) {
+      if (typeof sortColumns !== 'undefined') {
+        for (var i = 0; i < sortColumns.length; i++) {
+          var column = sortColumns[i];
+          userFileSortsService.fields[i] = {
+            name: column.field,
+            direction: column.sort.direction
+            // NOTE: UI Grid uiGridConstants.ASC and DESC happen to match
+            // "asc" and "desc" for solr, but if that changed, this breaks.
+            // NOTE: column.sort.priority seems to be redundant with array order,
+            // but I don't think we have this guaranteed.
+          };
+        }
+
+        // TODO: This is copy-and-paste
+        getUserFiles().then(function (solr) {
+          // TODO: Should there be something that wraps up this "then"? It is repeated.
+          // gridOptionsService.columnDefs = userFileBrowserFactory.createColumnDefs();
+          gridOptionsService.data = userFileBrowserFactory.createData(solr.nodes);
+          promise.resolve();
+        }, function () {
+          $log.error('/user/files/ request failed');
+          promise.reject();
+        });
+      }
+    };
+
     gridOptionsService.appScopeProvider = vm;
     vm.gridOptions = gridOptionsService;
+    vm.gridOptions.onRegisterApi = function (api) {
+      api.core.on.sortChanged(null, vm.sortChanged);
+    };
   }
 })();
 

refinery/ui/source/js/user-file-browser/services/user-file-sorts.js

@@ -0,0 +1,15 @@
+(function () {
+  'use strict';
+  angular
+    .module('refineryApp')
+    .factory('userFileSortsService', userFileSortsService);
+
+  userFileSortsService.$inject = [];
+
+  function userFileSortsService () {
+    var userFileSorts = {
+      fields: []
+    };
+    return userFileSorts;
+  }
+})();

refinery/ui/source/js/user-file-browser/services/user-file.js

@@ -5,9 +5,19 @@
     .factory('userFileService', userFileService);
 
   // TODO: userFileBrowserFiltersCtrl.filters is what I need, but maybe I need a new service?
-  userFileService.$inject = ['$resource', 'settings', 'userFileFiltersService'];
+  userFileService.$inject = [
+    '$resource',
+    'settings',
+    'userFileFiltersService',
+    'userFileSortsService'
+  ];
 
-  function userFileService ($resource, settings, userFileFiltersService) {
+  function userFileService (
+      $resource,
+      settings,
+      userFileFiltersService,
+      userFileSortsService
+  ) {
     var userFile = $resource(
       settings.appRoot + settings.refineryApiV2 + '/user/files/',
       {},
@@ -27,6 +37,13 @@
               });
               // TODO: Repeated fq params may be more efficient, but not a big deal
               return filters.join(' AND ');
+            },
+            sort: function () {
+              var sort = userFileSortsService.fields.map(function (field) {
+                return field.name + '_Characteristics_generic_s ' + field.direction
+                    + ', ' + field.name + '_Factor_Value_s ' + field.direction;
+              }).join(', ');
+              return sort;
             }
           }
         }

refinery/ui/source/js/user-file-browser/services/user-file.spec.js

@@ -160,7 +160,7 @@
             .expectGET(
                 settings.appRoot +
                 settings.refineryApiV2 +
-                '/user/files/?fq=&limit=100'
+                '/user/files/?fq=&limit=100&sort='
             ).respond(200, fakeResponse);
       });
     });