Closed #54 Sorting relationships in the UI

rappen · Feb 3, 2020 · d634f94 · d634f94
1 parent ac64e6e
commit d634f94
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/LCG-UDG/LCG.cs b/LCG-UDG/LCG.cs
@@ -497,7 +497,10 @@ private void DisplayFilteredRelationships()
             if (selectedEntity?.Relationships != null && selectedEntity.Relationships.Count > 0)
             {
                 GetSettingsFromUI();
-                var filteredRelationships = GetFilteredRelationships(selectedEntity, txtRelSearch.Text);
+                var filteredRelationships = GetFilteredRelationships(selectedEntity, txtRelSearch.Text)
+                    .OrderBy(r => r.LookupName)
+                    .OrderBy(r => r.OtherEntity?.DisplayName)
+                    .OrderBy(r => r.Type);
                 gridRelationships.DataSource = new SortableBindingList<RelationshipMetadataProxy>(filteredRelationships);
                 if (gridRelationships.Columns.Count > 0)
                 {
@@ -620,7 +623,7 @@ bool GetInternalFilter(AttributeMetadataProxy a)
                            && GetManagedFilter(a)
                            && GetSearchFilter(a)
                            && GetLogicalFilter(a)
-                           &&GetInternalFilter(a));
+                           && GetInternalFilter(a));
         }
 
         private IEnumerable<EntityMetadataProxy> GetFilteredEntities()
@@ -661,18 +664,18 @@ private IEnumerable<RelationshipMetadataProxy> GetFilteredRelationships(EntityMe
         {
             bool GetTypeFilter(RelationshipMetadataProxy r)
             {   // Exclude relationships where selected entity is just child of the relationship
-                if (settings.RelationshipFilter.Type1N && 
+                if (settings.RelationshipFilter.Type1N &&
                     r.OneToManyRelationshipMetadata?.ReferencedEntity == entity?.LogicalName)
                 {
                     return true;
                 }
-                if (settings.RelationshipFilter.TypeN1 && 
-                    r.OneToManyRelationshipMetadata?.ReferencingEntity == entity?.LogicalName && 
+                if (settings.RelationshipFilter.TypeN1 &&
+                    r.OneToManyRelationshipMetadata?.ReferencingEntity == entity?.LogicalName &&
                     r.OneToManyRelationshipMetadata?.ReferencedEntity != entity?.LogicalName)   // Exclude self-referencing relationships, they are included as 1:N
                 {
                     return true;
                 }
-                if (settings.RelationshipFilter.TypeNN && 
+                if (settings.RelationshipFilter.TypeNN &&
                     r.Metadata.RelationshipType == RelationshipType.ManyToManyRelationship)
                 {
                     return true;