Merge pull request #517 from TAMULib/475-alphabetically_sort

Issue 475: Alternate approach to sorting, using backend.
TAMULib · Jan 30, 2023 · 75d2ec4 · 75d2ec4
2 parents 8f2dea8 + df527ef
commit 75d2ec4
Show file tree

Hide file tree

Showing 34 changed files with 61 additions and 45 deletions.
diff --git a/src/main/java/edu/tamu/sage/controller/DiscoveryViewController.java b/src/main/java/edu/tamu/sage/controller/DiscoveryViewController.java
@@ -55,7 +55,7 @@ public class DiscoveryViewController {
     @RequestMapping(method = RequestMethod.GET)
     @PreAuthorize("hasRole('ANONYMOUS')")
     public ApiResponse getAll() {
-        return new ApiResponse(SUCCESS, discoveryViewRepo.findAll());
+        return new ApiResponse(SUCCESS, discoveryViewRepo.findAllByOrderByNameAsc());
     }
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)

diff --git a/src/main/java/edu/tamu/sage/controller/IternalMetadataController.java b/src/main/java/edu/tamu/sage/controller/IternalMetadataController.java
@@ -33,7 +33,7 @@ public class IternalMetadataController {
     @GetMapping
     @PreAuthorize("hasRole('ADMIN')")
     public ApiResponse getAll() {
-        return new ApiResponse(SUCCESS, internalMetadataRepo.findAllByOrderByFieldAsc());
+        return new ApiResponse(SUCCESS, internalMetadataRepo.findAllByOrderByGlossAsc());
     }
 
     @PostMapping

diff --git a/src/main/java/edu/tamu/sage/controller/JobController.java b/src/main/java/edu/tamu/sage/controller/JobController.java
@@ -41,7 +41,7 @@ public class JobController {
     @GetMapping
     @PreAuthorize("hasRole('USER')")
     public ApiResponse getAll() {
-        return new ApiResponse(SUCCESS, jobRepo.findAll());
+        return new ApiResponse(SUCCESS, jobRepo.findAllByOrderByNameAsc());
     }
 
     @PostMapping

diff --git a/src/main/java/edu/tamu/sage/controller/OperatorController.java b/src/main/java/edu/tamu/sage/controller/OperatorController.java
@@ -42,7 +42,7 @@ public class OperatorController {
     @GetMapping
     @PreAuthorize("hasRole('ADMIN')")
     public ApiResponse getAll() {
-        return new ApiResponse(SUCCESS, operatorRepo.findAll());
+        return new ApiResponse(SUCCESS, operatorRepo.findAllByOrderByNameAsc());
     }
 
     @GetMapping("/types")

diff --git a/src/main/java/edu/tamu/sage/controller/ReaderController.java b/src/main/java/edu/tamu/sage/controller/ReaderController.java
@@ -31,7 +31,7 @@ public class ReaderController {
     @RequestMapping(method = RequestMethod.GET)
     @PreAuthorize("hasRole('ANONYMOUS')")
     public ApiResponse getAll() {
-        return new ApiResponse(SUCCESS, solrReaderRepo.findAll());
+        return new ApiResponse(SUCCESS, solrReaderRepo.findAllByOrderByNameAsc());
     }
 
     @RequestMapping(method = RequestMethod.POST)

diff --git a/src/main/java/edu/tamu/sage/controller/SourceController.java b/src/main/java/edu/tamu/sage/controller/SourceController.java
@@ -138,19 +138,19 @@ public ApiResponse testSolrCoreAuthorization(@WeaverValidatedModel Source source
     @RequestMapping(method = RequestMethod.GET)
     @PreAuthorize("hasRole('ANONYMOUS')")
     public ApiResponse getAll(@WeaverUser User user) {
-        return new ApiResponse(SUCCESS, sourceRepo.findAll());
+        return new ApiResponse(SUCCESS, sourceRepo.findAllByOrderByNameAsc());
     }
 
     @RequestMapping("/writeable")
     @PreAuthorize("hasRole('USER')")
     public ApiResponse getWriteable(@WeaverUser User user) {
-        return new ApiResponse(SUCCESS, sourceRepo.findByReadOnly(false));
+        return new ApiResponse(SUCCESS, sourceRepo.findByReadOnlyOrderByNameAsc(false));
     }
 
     @RequestMapping("/readable")
     @PreAuthorize("hasRole('USER')")
     public ApiResponse getReadable(@WeaverUser User user) {
-        return new ApiResponse(SUCCESS, sourceRepo.findByReadOnly(true));
+        return new ApiResponse(SUCCESS, sourceRepo.findByReadOnlyOrderByNameAsc(true));
     }
 
     @RequestMapping(method = RequestMethod.POST)

diff --git a/src/main/java/edu/tamu/sage/controller/WriterController.java b/src/main/java/edu/tamu/sage/controller/WriterController.java
@@ -31,7 +31,7 @@ public class WriterController {
     @RequestMapping(method = RequestMethod.GET)
     @PreAuthorize("hasRole('ANONYMOUS')")
     public ApiResponse getAll() {
-        return new ApiResponse(SUCCESS, solrWriterRepo.findAll());
+        return new ApiResponse(SUCCESS, solrWriterRepo.findAllByOrderByNameAsc());
     }
 
     @RequestMapping(method = RequestMethod.POST)

diff --git a/src/main/java/edu/tamu/sage/job/JobRunner.java b/src/main/java/edu/tamu/sage/job/JobRunner.java
@@ -38,7 +38,7 @@ public class JobRunner {
 
     @Scheduled(cron = "0 0/30 * * * ?")
     private void runJobs() {
-        List<Job> activeJobs = jobRepo.findByScheduleActiveTrue();
+        List<Job> activeJobs = jobRepo.findByScheduleActiveTrueOrderByNameAsc();
         logger.debug("Checking " + activeJobs.size() + " Active Jobs");
         LocalDateTime schedulerStarted = java.time.LocalDateTime.now(ZoneId.of("UTC"));
         activeJobs.forEach(j -> {

diff --git a/src/main/java/edu/tamu/sage/model/repo/DiscoveryViewRepo.java b/src/main/java/edu/tamu/sage/model/repo/DiscoveryViewRepo.java
@@ -3,9 +3,11 @@
 import edu.tamu.sage.model.DiscoveryView;
 import edu.tamu.sage.model.repo.custom.DiscoveryViewRepoCustom;
 import edu.tamu.weaver.data.model.repo.WeaverRepo;
+import java.util.List;
 
 public interface DiscoveryViewRepo extends WeaverRepo<DiscoveryView>, DiscoveryViewRepoCustom {
 
+    public List<DiscoveryView> findAllByOrderByNameAsc();
+
     public DiscoveryView findOneBySlug(String slug);
-
 }
diff --git a/src/main/java/edu/tamu/sage/model/repo/InternalMetadataRepo.java b/src/main/java/edu/tamu/sage/model/repo/InternalMetadataRepo.java
@@ -7,5 +7,5 @@
 
 public interface InternalMetadataRepo extends WeaverRepo<InternalMetadata>, InternalMetadataRepoCustom {
 
-  public List<InternalMetadata> findAllByOrderByFieldAsc();
+  public List<InternalMetadata> findAllByOrderByGlossAsc();
 }
diff --git a/src/main/java/edu/tamu/sage/model/repo/JobRepo.java b/src/main/java/edu/tamu/sage/model/repo/JobRepo.java
@@ -7,5 +7,8 @@
 import edu.tamu.weaver.data.model.repo.WeaverRepo;
 
 public interface JobRepo extends WeaverRepo<Job>, JobRepoCustom {
-    public List<Job> findByScheduleActiveTrue();
+
+    public List<Job> findAllByOrderByNameAsc();
+
+    public List<Job> findByScheduleActiveTrueOrderByNameAsc();
 }
diff --git a/src/main/java/edu/tamu/sage/model/repo/OperatorRepo.java b/src/main/java/edu/tamu/sage/model/repo/OperatorRepo.java
@@ -3,7 +3,9 @@
 import edu.tamu.sage.model.BaseOp;
 import edu.tamu.sage.model.repo.custom.JobRepoCustom;
 import edu.tamu.weaver.data.model.repo.WeaverRepo;
+import java.util.List;
 
 public interface OperatorRepo extends WeaverRepo<BaseOp>, JobRepoCustom {
 
+    public List<BaseOp> findAllByOrderByNameAsc();
 }
diff --git a/src/main/java/edu/tamu/sage/model/repo/ReaderRepo.java b/src/main/java/edu/tamu/sage/model/repo/ReaderRepo.java
@@ -4,6 +4,9 @@
 import edu.tamu.sage.model.Reader;
 import edu.tamu.sage.model.repo.custom.ReaderRepoCustom;
 import edu.tamu.weaver.data.model.repo.WeaverRepo;
+import java.util.List;
 
 public interface ReaderRepo extends WeaverRepo<Reader>, ReaderRepoCustom {
+
+    public List<Reader> findAllByOrderByNameAsc();
 }
diff --git a/src/main/java/edu/tamu/sage/model/repo/SourceRepo.java b/src/main/java/edu/tamu/sage/model/repo/SourceRepo.java
@@ -7,5 +7,8 @@
 import edu.tamu.weaver.data.model.repo.WeaverRepo;
 
 public interface SourceRepo extends WeaverRepo<Source>, SourceRepoCustom    {
-    List<Source> findByReadOnly(Boolean readOnly);
+
+    public List<Source> findAllByOrderByNameAsc();
+
+    public List<Source> findByReadOnlyOrderByNameAsc(Boolean readOnly);
 }
diff --git a/src/main/java/edu/tamu/sage/model/repo/UserRepo.java b/src/main/java/edu/tamu/sage/model/repo/UserRepo.java
@@ -9,11 +9,10 @@
  */
 package edu.tamu.sage.model.repo;
 
-import org.springframework.stereotype.Repository;
-
 import edu.tamu.sage.model.User;
 import edu.tamu.sage.model.repo.custom.UserRepoCustom;
 import edu.tamu.weaver.auth.model.repo.AbstractWeaverUserRepo;
+import org.springframework.stereotype.Repository;
 
 /**
  * User repository.
@@ -23,5 +22,6 @@
  */
 @Repository
 public interface UserRepo extends AbstractWeaverUserRepo<User>, UserRepoCustom {
+
     public User findByEmail(String email);
 }
diff --git a/src/main/java/edu/tamu/sage/model/repo/WriterRepo.java b/src/main/java/edu/tamu/sage/model/repo/WriterRepo.java
@@ -3,7 +3,9 @@
 import edu.tamu.sage.model.Writer;
 import edu.tamu.sage.model.repo.custom.WriterRepoCustom;
 import edu.tamu.weaver.data.model.repo.WeaverRepo;
+import java.util.List;
 
 public interface WriterRepo extends WeaverRepo<Writer>, WriterRepoCustom {
 
+    public List<Writer> findAllByOrderByNameAsc();
 }
diff --git a/src/main/java/edu/tamu/sage/service/SolrSourceService.java b/src/main/java/edu/tamu/sage/service/SolrSourceService.java
@@ -51,14 +51,18 @@ public List<SolrField> getAvailableFields(String uri, String filter) throws Sour
 
         fields.add(defaultField);
 
-        getFields(uri, filter).filter(field -> field.isStored()).forEach(field -> fields.add(field));
+        getFields(uri, filter).filter(field -> field.isStored()).sorted((left, right) -> {
+          return left.getName().compareTo(right.getName());
+        }).forEach(field -> fields.add(field));
 
         return fields;
     }
 
     @Override
     public List<SolrField> getIndexedFields(String uri, String filter) throws SourceServiceException {
-        return getFields(uri, filter).filter(field -> field.isIndexed()).collect(Collectors.toList());
+        return getFields(uri, filter).filter(field -> field.isIndexed()).sorted((left, right) -> {
+          return left.getName().compareTo(right.getName());
+        }).collect(Collectors.toList());
     }
 
     @Override

diff --git a/src/main/webapp/app/views/components/multiSuggestionInput.html b/src/main/webapp/app/views/components/multiSuggestionInput.html
@@ -12,7 +12,7 @@
   />
   <div class="btn-group" uib-dropdown is-open="open">
     <ul class="dropdown-menu" uib-dropdown-menu role="menu">
-      <li role="menuitem" ng-repeat="suggestion in filteredSuggestion = ($ctrl.suggestions | filter:curentValue) | orderBy:'name'" ng-click="addSelection(suggestion[$ctrl.optionproperty])" ng-class="{'active': selectedIndex===$index}"><a href="#" ng-bind-html="suggestion[$ctrl.displayproperty] || suggestion[$ctrl.optionproperty] | boldMatch:curentValue"></a></li>
+      <li role="menuitem" ng-repeat="suggestion in filteredSuggestion = ($ctrl.suggestions | filter:curentValue)" ng-click="addSelection(suggestion[$ctrl.optionproperty])" ng-class="{'active': selectedIndex===$index}"><a href="#" ng-bind-html="suggestion[$ctrl.displayproperty] || suggestion[$ctrl.optionproperty] | boldMatch:curentValue"></a></li>
     </ul>
   </div>
 </div>
diff --git a/src/main/webapp/app/views/discovery.html b/src/main/webapp/app/views/discovery.html
@@ -7,7 +7,7 @@ <h1>Discovery Views</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover discovery-view-table">
         <tbody>
-          <tr ng-repeat="discoveryView in $data" ng-if="discoveryView.published || isAdmin() || isManager()">
+          <tr ng-repeat="discoveryView in $data | orderBy:'name'" ng-if="discoveryView.published || isAdmin() || isManager()">
             <td data-title="'Name'" sortable="'name'">
               <a href="discovery-context/{{discoveryView.slug}}">{{discoveryView.name}}</a>
             </td>

diff --git a/src/main/webapp/app/views/management/discovery-view.html b/src/main/webapp/app/views/management/discovery-view.html
@@ -9,7 +9,7 @@ <h1>Discovery View Management</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover discovery-view-table">
         <tbody>
-          <tr ng-repeat="discoveryView in $data">
+          <tr ng-repeat="discoveryView in $data | orderBy:'name'">
             <td data-title="'Name'" sortable="'name'">
               <a href="discovery-context/{{discoveryView.slug}}">{{discoveryView.name}}</a>
             </td>

diff --git a/src/main/webapp/app/views/management/internal-metadata.html b/src/main/webapp/app/views/management/internal-metadata.html
@@ -9,7 +9,7 @@ <h1>Internal Metadata Management</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover internal-metadata-table">
         <tbody>
-          <tr ng-repeat="internalMetadatum in $data | orderBy: 'id'">
+          <tr ng-repeat="internalMetadatum in $data | orderBy:'gloss'">
             <td data-title="'Gloss'" sortable="'gloss'">
               {{internalMetadatum.gloss}}
             </td>

diff --git a/src/main/webapp/app/views/management/job.html b/src/main/webapp/app/views/management/job.html
@@ -13,23 +13,23 @@ <h1>Job Management</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover jobs-table">
         <tbody>
-          <tr ng-repeat="job in $data">
+          <tr ng-repeat="job in $data | orderBy:'name'">
             <td data-title="'Name'" sortable="'name'">
               {{job.name}}
             </td>
             <td data-title="'Readers'" class="jobs-table-row-reader">
               <ul ng-if="job.readers && job.readers.length">
-                <li ng-repeat="reader in job.readers">{{reader.name}}</li>
+                <li ng-repeat="reader in job.readers | orderBy:'name'">{{reader.name}}</li>
               </ul>
             </td>
             <td data-title="'Operators'" class="jobs-table-row-operator">
               <ul ng-if="job.operators && job.operators.length">
-                <li ng-repeat="operator in job.operators">{{operator.name}}</li>
+                <li ng-repeat="operator in job.operators | orderBy:'name'">{{operator.name}}</li>
               </ul>
             </td>
             <td data-title="'Writers'" class="jobs-table-row-writer">
               <ul ng-if="job.writers && job.writers.length">
-                <li ng-repeat="writer in job.writers">{{writer.name}}</li>
+                <li ng-repeat="writer in job.writers | orderBy:'name'">{{writer.name}}</li>
               </ul>
             </td>
             <td data-title="'Actions'">

diff --git a/src/main/webapp/app/views/management/operator.html b/src/main/webapp/app/views/management/operator.html
@@ -9,7 +9,7 @@ <h1>Operator Management</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover operator-table">
         <tbody>
-          <tr ng-repeat="operator in $data">
+          <tr ng-repeat="operator in $data | orderBy:'name'">
             <td data-title="'Name'" sortable="'name'">
               {{operator.name}}
             </td>

diff --git a/src/main/webapp/app/views/management/reader.html b/src/main/webapp/app/views/management/reader.html
@@ -9,7 +9,7 @@ <h1>Reader Management</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover solr-source-table">
         <tbody>
-          <tr ng-repeat="reader in $data">
+          <tr ng-repeat="reader in $data | orderBy:'name'">
             <td data-title="'Name'" sortable="'name'">
               {{reader.name}}
             </td>

diff --git a/src/main/webapp/app/views/management/source.html b/src/main/webapp/app/views/management/source.html
@@ -9,7 +9,7 @@ <h1>Core Management</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover solr-source-table">
         <tbody>
-          <tr ng-repeat="source in $data">
+          <tr ng-repeat="source in $data | orderBy:'name'">
             <td data-title="'Name'" sortable="'name'">
               {{source.name}}
             </td>

diff --git a/src/main/webapp/app/views/management/writer.html b/src/main/webapp/app/views/management/writer.html
@@ -9,7 +9,7 @@ <h1>Writer Management</h1>
     <div class="panel-body">
       <table ng-table="tableParams" class="table table-hover solr-source-table">
         <tbody>
-          <tr ng-repeat="writer in $data">
+          <tr ng-repeat="writer in $data | orderBy:'name'">
             <td data-title="'Name'" sortable="'name'">
               {{writer.name}}
             </td>

diff --git a/src/main/webapp/app/views/modals/cloneDiscoveryViewModal.html b/src/main/webapp/app/views/modals/cloneDiscoveryViewModal.html
@@ -398,4 +398,3 @@ <h4>Result Metadata</h4>
       <button ng-disabled="isDiscoveryViewResultsInvalid('clone') || discoveryViewForms.clone.$invalid" type="submit" class="btn btn-success">Clone</button>
     </div>
   </form>
-
diff --git a/src/main/webapp/app/views/modals/cloneReaderModal.html b/src/main/webapp/app/views/modals/cloneReaderModal.html
@@ -47,9 +47,9 @@ <h4 class="modal-title">Clone Reader</h4>
 
           <label>Field Mappings</label>
           <ul class="list-group">
-            <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy: 'id'">
+            <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy:'gloss'">
               <label>{{metadatum.gloss}}</label>
-              <input class="form-control" type="text" name="fieldMapping" ng-model="readerFields[metadatum.field].value" uib-typeahead="f.name for f in fields | orderBy:'name' | filter:$viewValue" />
+              <input class="form-control" type="text" name="fieldMapping" ng-model="readerFields[metadatum.field].value" uib-typeahead="f.name for f in fields | filter:$viewValue" />
               <small ng-if="metadatum.required" class="form-text text-muted">This field is required.</small>
             </li>
           </ul>
@@ -62,4 +62,3 @@ <h4 class="modal-title">Clone Reader</h4>
       <button ng-disabled="disableSubmit(readerForms.clone)" type="submit" class="btn btn-success">Clone</button>
     </div>
   </form>
-
diff --git a/src/main/webapp/app/views/modals/cloneWriterModal.html b/src/main/webapp/app/views/modals/cloneWriterModal.html
@@ -36,7 +36,7 @@ <h4 class="modal-title">Clone Writer</h4>
 
           <label>Field Mappings</label>
           <ul class="list-group">
-            <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy: 'id'">
+            <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy:'gloss'">
               <label>{{metadatum.gloss}}</label>
               <input class="form-control" type="text" name="writerMappings" ng-model="writerMappings[metadatum.field]" uib-typeahead="f.name for f in fields | filter:$viewValue" />
               <small ng-if="metadatum.required" class="form-text text-muted">This field is required.</small>
@@ -51,4 +51,3 @@ <h4 class="modal-title">Clone Writer</h4>
       <button ng-disabled="disableSubmit(writerForms.clone)" type="submit" class="btn btn-success">Clone</button>
     </div>
   </form>
-
diff --git a/src/main/webapp/app/views/modals/createReaderModal.html b/src/main/webapp/app/views/modals/createReaderModal.html
@@ -50,9 +50,9 @@ <h4 class="modal-title">Create Reader</h4>
 
         <label>Field Mappings</label>
         <ul class="list-group">
-          <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy: 'id'">
+          <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy:'gloss'">
             <label>{{metadatum.gloss}}</label>
-            <input class="form-control" type="text" name="fieldMapping" ng-model="readerFields[metadatum.field].value" uib-typeahead="f.name for f in fields | orderBy:'name' | filter:$viewValue" />
+            <input class="form-control" type="text" name="fieldMapping" ng-model="readerFields[metadatum.field].value" uib-typeahead="f.name for f in fields | filter:$viewValue" />
             <small ng-if="metadatum.required" class="form-text text-muted">This field is required.</small>
           </li>
         </ul>

diff --git a/src/main/webapp/app/views/modals/createWriterModal.html b/src/main/webapp/app/views/modals/createWriterModal.html
@@ -38,7 +38,7 @@ <h4 class="modal-title">Create Writer</h4>
 
         <label>Field Mappings</label>
         <ul class="list-group">
-          <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy: 'id'">
+          <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy:'gloss'">
             <label>{{metadatum.gloss}}</label>
             <input class="form-control" type="text" name="writerMappings" ng-model="writerMappings[metadatum.field]" uib-typeahead="f.name for f in fields | filter:$viewValue" />
             <small ng-if="metadatum.required" class="form-text text-muted">This field is required.</small>

diff --git a/src/main/webapp/app/views/modals/updateDiscoveryViewModal.html b/src/main/webapp/app/views/modals/updateDiscoveryViewModal.html
@@ -169,7 +169,7 @@ <h4>Facet Fields</h4>
             <div class="col-xs-2 col-sm-offset-1">
               <div class="form-group">
                 <label for="key">Key</label>
-                <select name="key" class="form-control" ng-model="discoveryView.facetFields[$index].key" ng-options="option['name'] as option['name'] for option in fields | orderBy:'name'" ></select>
+                <select name="key" class="form-control" ng-model="discoveryView.facetFields[$index].key" ng-options="option['name'] as option['name'] for option in fields" ></select>
               </div>
             </div>
             <div class="col-xs-4">
@@ -217,7 +217,7 @@ <h4>Search Fields</h4>
             <div class="col-xs-2 col-sm-offset-1">
               <div class="form-group">
                 <label for="key">Key</label>
-                <select name="key" class="form-control" ng-model="discoveryView.searchFields[$index].key" ng-options="option['name'] as option['name'] for option in fields | orderBy:'name'" ></select>
+                <select name="key" class="form-control" ng-model="discoveryView.searchFields[$index].key" ng-options="option['name'] as option['name'] for option in fields" ></select>
               </div>
             </div>
             <div class="col-xs-6">
@@ -362,7 +362,7 @@ <h4>Result Metadata</h4>
             <div class="col-xs-3 col-sm-offset-1">
               <div class="form-group">
                 <label for="key">Key</label>
-                <select name="key" class="form-control" ng-model="discoveryView.resultMetadataFields[$index].key" ng-options="option['name'] as option['name'] for option in fields | orderBy:'name'" ng-change="discoveryView.resultMetadataFields[$index].sortable=!findFieldByKey(discoveryView.resultMetadataFields[$index].key).multiValued"></select>
+                <select name="key" class="form-control" ng-model="discoveryView.resultMetadataFields[$index].key" ng-options="option['name'] as option['name'] for option in fields" ng-change="discoveryView.resultMetadataFields[$index].sortable=!findFieldByKey(discoveryView.resultMetadataFields[$index].key).multiValued"></select>
               </div>
             </div>
             <div class="col-xs-2">

diff --git a/src/main/webapp/app/views/modals/updateReaderModal.html b/src/main/webapp/app/views/modals/updateReaderModal.html
@@ -48,9 +48,9 @@ <h4 class="modal-title">Update Reader</h4>
 
         <label>Field Mappings</label>
         <ul class="list-group">
-          <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy: 'id'">
+          <li class="list-group-item" ng-repeat="metadatum in internalMetadata | orderBy:'gloss'">
             <label>{{metadatum.gloss}}</label>
-            <input class="form-control" type="text" name="fieldMapping" ng-model="readerFields[metadatum.field].value" uib-typeahead="f.name for f in fields | orderBy:'name' | filter:$viewValue" />
+            <input class="form-control" type="text" name="fieldMapping" ng-model="readerFields[metadatum.field].value" uib-typeahead="f.name for f in fields | filter:$viewValue" />
             <small ng-if="metadatum.required" class="form-text text-muted">This field is required.</small>
           </li>
         </ul>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -398,4 +398,3 @@ <h4>Result Metadata</h4>
		<button ng-disabled="isDiscoveryViewResultsInvalid('clone') \|\| discoveryViewForms.clone.$invalid" type="submit" class="btn btn-success">Clone</button>
		</div>
		</form>