Fix folder color in OU tree views

Blazam-App · Dec 19, 2024 · 431a24f · 431a24f
1 parent c9d2f2e
commit 431a24f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>1.2.3</AssemblyVersion>
-		<Version>2024.12.19.0417</Version>
+		<Version>2024.12.19.2303</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>

diff --git a/BLAZAMGui/UI/Inputs/TreeViews/OUTreeView.razor b/BLAZAMGui/UI/Inputs/TreeViews/OUTreeView.razor
@@ -5,7 +5,9 @@
 <MudTreeView T="IDirectoryEntryAdapter"
              ServerData="GetOUChildrenAsync"
              Items="RootOU"
+             @ref=treeView
              Dense="true"
+             SelectionMode="SelectionMode.SingleSelection"
              Hover="true"
              MaxHeight="400px"
              Color="Color.Primary"
@@ -18,7 +20,7 @@
                          @bind-Activated=context.Selected
                          Text="@context.Value?.CanonicalName"
                          Icon="@Icons.Material.Filled.Folder"
-                         IconColor="@(context.Selected==true?Color.Primary:Color.Default)"
+                         IconColor=@(GetIconColor(context))
                          Class="minw-max w-100"
                          CanExpand=@(context.Value is IADOrganizationalUnit)
                          Context="treeContext"

diff --git a/BLAZAMGui/UI/Inputs/TreeViews/OUTreeViewBase.cs b/BLAZAMGui/UI/Inputs/TreeViews/OUTreeViewBase.cs
@@ -17,7 +17,7 @@ public class OUTreeViewBase : AppComponentBase
         protected ADOrganizationalUnit TopLevel;
         private IADOrganizationalUnit? _startingSelectedNode;
         private IDirectoryEntryAdapter? _selectedEntry;
-
+        protected MudTreeView<IDirectoryEntryAdapter>? treeView;
         [Parameter]
         public bool StartRootExpanded { get; set; } = true;
 
@@ -60,26 +60,31 @@ public IDirectoryEntryAdapter? SelectedEntry
                 if (value == _selectedEntry) return;
                 if (value != null)
                 {
+                    var firstSet = true;
+                    if (_selectedEntry != null)
+                        firstSet = false;
+
                     var cache = _selectedEntry;
 
                     _selectedEntry = value;
                     if (cache == null && RootOU.Count > 0 && value == RootOU.First()) return;
 
-
+                    
                     InvokeAsync(() => { SelectedEntryChanged.InvokeAsync(value); });
+
 
-
-                    //if (TopLevel == null)
-                    //    OnInitializedAsync();
-
-                    if (RootOU.Count > 0)
-                        OpenToSelected();
+
+                    //if (RootOU.Count > 0 && firstSet)
+                    //    OpenToSelected();
 
                 }
             }
 
         }
-
+        protected Color GetIconColor(TreeItemData<IDirectoryEntryAdapter>context)
+        {
+            return context.Selected == true ? Color.Primary : Color.Default;
+        }
         [Parameter]
         public EventCallback<IDirectoryEntryAdapter> SelectedEntryChanged { get; set; }
         /// <summary>
@@ -124,24 +129,14 @@ protected async Task InitializeTreeView()
         {
             await Task.Run(() =>
             {
-
-                //ApplicationBaseOUs = Directory.OUs.FindSubOusByDN(null);
-
-
                 if (RootOU is null || RootOU.Count < 1)
                 {
                     TopLevel = new ADOrganizationalUnit();
                     TopLevel.Parse(directory: Directory, directoryEntry: Directory.GetDirectoryEntry());
                     _ = TopLevel.SubOUs;
                     var TopLevelList = new List<IDirectoryEntryAdapter>() { TopLevel };
-                    // RootOU = new HashSet<IDirectoryEntryAdapter>() { TopLevel as IDirectoryEntryAdapter };
                     RootOU = TopLevelList.ToTreeItemData();
                 }
-                if (StartingSelectedOU == null)
-                {
-                    //StartingSelectedOU = TopLevel;
-
-                }
 
                 OpenToSelected();
                 LoadingData = false;
@@ -186,14 +181,15 @@ protected void OpenToSelected()
 
                         while (openThis != null)
                         {
+
                             openThis.Children = GetChildren(openThis);
                             var child = openThis.Children.Where(
                                 c => SelectedEntry.DN.Contains(c.Value.DN)
                                                             && !SelectedEntry.DN.Equals(c.Value.DN)
                                                             ).FirstOrDefault();
                             if (child != null)
                             {
-
+                                
                                 child.Expanded = true;
 
                                 openThis = child;