CactuseSecurity#2867: corrected timing of initial reordering and emancipated logic from Dropdown component's properties

Author: Robin-Smets

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRole.razor

@@ -318,9 +318,13 @@
     /// <summary>
     /// Updates the app server's visual elements after reordering the collection.
     /// </summary>
-    private void OnCollectionReordered()
+    private void OnCollectionReordered(List<ModellingAppServer> orderedCollection)
     {
-        AppRoleHandler.AppServerToAdd = orderByDropdown.Collection;
+        if (AppRoleHandler != null && orderedCollection != null)
+        {
+            AppRoleHandler.AppServerToAdd = orderedCollection;
+        }
+        
         InvokeAsync(StateHasChanged);
     }
 }

roles/ui/files/FWO.UI/Pages/NetworkModelling/EditAppRoleLeftSide.razor

@@ -85,9 +85,13 @@
     /// <summary>
     /// Updates the app server's visual elements after reordering the collection.
     /// </summary>
-    private void OnCollectionReordered()
+    private void OnCollectionReordered(List<ModellingAppServer> orderedCollection)
     {
-        AppRoleHandler.AppServersInArea = orderByDropdown.Collection;
+        if (AppRoleHandler != null && orderedCollection != null)
+        {
+            AppRoleHandler.AppServersInArea = orderedCollection;
+        }
+        
         InvokeAsync(StateHasChanged);
     }
 }

roles/ui/files/FWO.UI/Shared/OrderByDropdown.razor

@@ -43,7 +43,7 @@
     /// Callback to communicate that the reordering process has been completed.
     /// </summary>
     [Parameter, EditorRequired]
-    public EventCallback CollectionReordered { get; set; }
+    public EventCallback<List<TCollectionItem>> CollectionReordered { get; set; }
 
     /// <summary>
     /// Backing field of property 'SelectedProperty'.
@@ -93,18 +93,15 @@
     /// The visual elements for the implemented order modes.
     /// </summary>
     private List<OrderMode> orderModes = new List<OrderMode> {OrderMode.Asc, OrderMode.Desc};
+    
+    private bool initialized = false;
 
-
-    protected override void OnAfterRender(bool firstRender)
+    protected override void OnParametersSet()
     {
-        if (firstRender)
+        if (!initialized && ElementProperties != null && ElementProperties.Any())
         {
-            if(propertyDropdown != null && propertyDropdown.Elements != null && propertyDropdown.Elements.Any())
-            {
-                SelectedProperty = propertyDropdown.Elements.First();
-            }
-            
-            StateHasChanged();
+            SelectedProperty = ElementProperties.First();
+            initialized = true;
         }
     }
 
@@ -113,16 +110,15 @@
     /// </summary>
     private void ReorderCollection()
     {
-        if(propertyDropdown != null && Collection != null && !string.IsNullOrEmpty(propertyDropdown.SelectedElement))
+        if(Collection != null && !string.IsNullOrEmpty(SelectedProperty))
         {
             if(SelectedProperty.Equals("Ip") && typeof(TCollectionItem) == typeof(ModellingAppServer))
             {
                 Collection = Collection.OrderBy(GetIPAddressRange, new IPAddressRangeComparer()).ToList<TCollectionItem>();  
             }
             else
             {
-                string keySelectorProperty = propertyDropdown.SelectedElement;
-                Func<TCollectionItem, object> keySelector = GetGenericOrderByExpression<TCollectionItem>(keySelectorProperty);
+                Func<TCollectionItem, object> keySelector = GetGenericOrderByExpression<TCollectionItem>(SelectedProperty);
                 Collection = Collection.OrderBy(keySelector).ToList();  
             }
 
@@ -131,8 +127,13 @@
                 Collection.Reverse();   
             }
 
-            InvokeAsync(StateHasChanged);
-            CollectionReordered.InvokeAsync();
+            if (initialized)
+            {
+                InvokeAsync(StateHasChanged);
+                              
+            }
+
+            CollectionReordered.InvokeAsync(Collection);  
         }
         else
         {