Tree View Optimizations

BLAZAM/BLAZAM.csproj

@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>0.8.9</AssemblyVersion>
-		<Version>2024.03.20.2221</Version>
+		<Version>2024.03.23.1303</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>

BLAZAM/Pages/Browse/ViewDirectoryEntry.razor

@@ -1,6 +1,6 @@
 @inject IStringLocalizer<AppLocalization> AppLocalization
 <CascadingValue Value="ChangeHistoryModal">
-@switch (DirectoryEntry.ObjectType)
+@switch (DirectoryEntry?.ObjectType)
 {
     case ActiveDirectoryObjectType.User:
         <ViewUser DirectoryEntry="DirectoryEntry" />
@@ -31,5 +31,5 @@
     [Parameter]
     public IDirectoryEntryAdapter? DirectoryEntry { get; set; }
 
-    protected AppModal ChangeHistoryModal{ get; set; }
+    protected AppModal? ChangeHistoryModal{ get; set; }
 }

BLAZAM/Pages/Computers/ViewComputer.razor

@@ -22,7 +22,7 @@
                                       OnResetPassword="@(()=>{ChangePasswordModal?.Show();})"
                                       OnToggleEditMode="ToggleEditMode"
                                       OnUnlock="@Unlock"
-                                      OnShowHistory="@(()=>{ChangeHistoryModal.Show();})"/>
+                                      OnShowHistory="@(()=>{ChangeHistoryModal?.Show();})"/>
             <MudOverlay Visible="SavingChanges" DarkBackground="false" Absolute="true">
 
             </MudOverlay>
@@ -252,15 +252,15 @@
 
     async Task Unlock()
     {
-        if (await MessageService.Confirm("Are you sure you want to unlock " + Computer?.CanonicalName + "?", "Unlock Computer"))
+        if (Computer!=null && await MessageService.Confirm("Are you sure you want to unlock " + Computer?.CanonicalName + "?", "Unlock Computer"))
         {
             Computer.LockedOut = false;
         }
 
     }
     protected override async void DiscardChanges()
     {
-        if (await MessageService.Confirm("Are you sure you want to discard your changes?", "Discard Changes"))
+        if (Computer != null && await MessageService.Confirm("Are you sure you want to discard your changes?", "Discard Changes"))
         {
             Computer.DiscardChanges();
             EditMode = false;
@@ -271,7 +271,7 @@
     }
     async Task DeleteComputer()
     {
-        if (await MessageService.Confirm("Are you sure you want to delete " + Computer?.CanonicalName + "?", "Delete Computer"))
+        if (Computer != null && await MessageService.Confirm("Are you sure you want to delete " + Computer?.CanonicalName + "?", "Delete Computer"))
         {
             try
             {
@@ -290,7 +290,7 @@
     }
     async void SaveChanges()
     {
-        if (await MessageService.Confirm("Are you sure you want to save the changes?"))
+        if (Computer != null && await MessageService.Confirm("Are you sure you want to save the changes?"))
         {
             var jobResults = await Computer.CommitChangesAsync();
             if (jobResults.Result == JobResult.Passed)
@@ -305,7 +305,7 @@
             }
             else
             {
-                jobResults.ShowJobDetailsDialog(MessageService);
+                await jobResults.ShowJobDetailsDialogAsync(MessageService);
             }
 
 

BLAZAM/Pages/Configure/AddFieldModalContent.razor

@@ -20,8 +20,8 @@
     protected override void OnInitialized()
     {
         base.OnInitialized();
-        Modal.OnYes = Add;
-        Modal.YesText = AppLocalization["Add"];
+        Modal.SetOnYes(Add);
+        Modal.SetYesText(AppLocalization["Add"]);
         foreach(var objectType in Enum.GetValues<ActiveDirectoryObjectType>().Where(ot=>ot!=ActiveDirectoryObjectType.All))
         {
             assignedObjectTypes.Add(objectType.ToString(), false);

BLAZAM/Pages/Configure/Fields.razor

@@ -86,7 +86,10 @@
     {
         LoadingData = true;
         await InvokeAsync(StateHasChanged);
-        ADFields = await Context.CustomActiveDirectoryFields.Where(x => x.DeletedAt == null).ToListAsync();
+        if (Context != null)
+        {
+            ADFields = await Context.CustomActiveDirectoryFields.Where(x => x.DeletedAt == null).ToListAsync();
+        }
         LoadingData = false;
         var data = new GridData<CustomActiveDirectoryField>();
         data.Items = ADFields;
@@ -104,7 +107,7 @@
         if (await MessageService.Confirm("Are you sure you want to delete " + field.DisplayName + "?", "Delete " + field.DisplayName + "?"))
         {
             field.DeletedAt = DateTime.UtcNow;
-            if (await Context.SaveChangesAsync() > 0)
+            if (Context != null && await Context.SaveChangesAsync() > 0)
             {
                 await fieldGrid?.ReloadServerData();
 

BLAZAM/Pages/Configure/Templates.razor

@@ -3,14 +3,14 @@
 @inherits TemplateComponent
 @attribute [Authorize(Roles = UserRoles.SuperAdmin)]
 
-<AppPageTitle>Templates</AppPageTitle>
+<AppPageTitle>@AppLocalization["Templates"]</AppPageTitle>
 
 <SetHeader @ref=Header>
 
 
     <MudStack Row=true>
         <MudText Align="Align.Center">
-            Templates
+            @AppLocalization["Templates"]
 
         </MudText>
 
@@ -86,7 +86,7 @@
         {
             <MudTooltip Text="@AppLocalization["Restore templates"]">
 
-                <MudIconButton OnClick=@(async()=>{RestoreModal.Show();})
+                <MudIconButton OnClick=@(async()=>{RestoreModal?.Show();})
                                Color="Color.Warning"
                                Icon="@Icons.Material.Filled.RestoreFromTrash" />
             </MudTooltip>
@@ -173,22 +173,27 @@
     async Task RenameSelectedCategory()
     {
         var temp = Context?.DirectoryTemplates.Where(t => t.Category == SelectedCategory).ToList();
-        foreach (var template in temp)
+        if (temp != null)
         {
-            template.Category = newCategoryName;
+            foreach (var template in temp)
+            {
+                template.Category = newCategoryName;
+            }
         }
-        if (SelectedTemplate.Category == SelectedCategory)
+        if (SelectedTemplate!=null && SelectedTemplate.Category == SelectedCategory)
             SelectedTemplate.Category = newCategoryName;
-        Context?.SaveChanges();
+        if (Context != null && await Context.SaveChangesAsync() > 0)
+        {
 
-        SnackBarService.Success("Renamed category " + SelectedCategory + " to " + newCategoryName);
-        SelectedCategory = newCategoryName;
-        await FetchTemplates();
-        RenameModal?.Hide();
+            SnackBarService.Success(AppLocalization["Renamed category"] + ": " + SelectedCategory + " to " + newCategoryName);
+            SelectedCategory = newCategoryName;
+            await FetchTemplates();
+            RenameModal?.Hide();
+        }
         await RefreshComponents();
 
     }
-    private async void NewTemplate()
+    private void NewTemplate()
     {
         SelectedTemplate = new();
         TemplateIdParameter = null;

BLAZAM/Pages/Error/Oops.razor

@@ -20,9 +20,9 @@
     else
     {
         <h4>@Exception.GetType().Name</h4>
-        <p>@Exception.Message</p>
-        <p>@Exception.InnerException?.Message</p>
-        <p>@Exception.HelpLink</p>
+        <p>@Exception?.Message</p>
+        <p>@Exception?.InnerException?.Message</p>
+        <p>@Exception?.HelpLink</p>
     }
 
     <p>@Loc["Please report to"] your system administrator</p>
@@ -35,7 +35,7 @@
     public static string? ErrorMessage { get; set; }
     public static string? DetailsMessage { get; set; }
     public static string? HelpMessage { get; set; }
-    public static Exception Exception { get; set; }
+    public static Exception? Exception { get; set; }
     protected override void OnInitialized()
     {
         base.OnInitialized();

BLAZAM/Pages/Error/UnhandledExceptionPage.razor

@@ -35,7 +35,7 @@
                 <MudPaper        
             Square
                     >
-                        Error Message: @Error.Message
+                        Error Message: @Error?.Message
                     </MudPaper Square>
                     <MudPaper Class="overflow-auto mud-typography-nowrap">
                         Stack Trace: <br>

BLAZAM/Pages/Groups/CreateGroup.razor

@@ -78,7 +78,7 @@
 
 
 
-    string newGroupName;
+    string newGroupName="";
     List<DirectoryTemplate> templates;
     IADOrganizationalUnit? parentOU;
     IADGroup? newGroup;

BLAZAM/Pages/Groups/ViewGroup.razor

@@ -112,7 +112,7 @@
 
 
 
-            @if (Group.HasUnsavedChanges)
+            @if (Group.CanEdit && Group.HasUnsavedChanges)
         {
             <UnsavedChangesPrompt SaveChanges="SaveChanges" DiscardChanges="DiscardChanges" />
         }
@@ -154,7 +154,7 @@
             }
             else
             {
-                jobResults.ShowJobDetailsDialog(MessageService);
+                await jobResults.ShowJobDetailsDialogAsync(MessageService);
             }
 
 

BLAZAM/Pages/Home.razor

@@ -44,7 +44,7 @@
     {
         try
         {
-            MOTD = (MarkupString)Context.AppSettings.FirstOrDefault().MOTD;
+            MOTD = (MarkupString)Context?.AppSettings.FirstOrDefault().MOTD;
         }
         catch
         {

BLAZAM/Pages/Login.razor

@@ -16,24 +16,50 @@
 
 
 <MudContainer Class="py-5">
-       <FullAppName/>
+    <FullAppName />
 
 
-
-    <form onsubmit="@(()=>{AttemptSignIn();})" class="login-form" method="post" action="/signin" id="login-form">
-        <MudContainer Style="max-width:300px;" Class="py-4">
+
+    <form onsubmit="@(()=>{AttemptSignIn();})"
+          class="login-form"
+          method="post"
+          action="/signin"
+          id="login-form">
+        <MudContainer Style="max-width:300px;"
+                      Class="py-4">
             @if (!ApplicationInfo.InDemoMode || DemoCustomLogin)
             {
 
 
 
-                <MudTextField @ref=_usernameTextField Disabled=@attemptingSignIn Class="justify-center" AutoFocus Label="Username" name="Username" @bind-Value=LoginRequest.Username />
+                <MudTextField @ref=_usernameTextField
+                              Disabled=@attemptingSignIn
+                              Class="justify-center"
+                              AutoFocus=true
+                              Label=@AppLocalization["Username"]
+                              name="Username"
+                              @bind-Value=LoginRequest.Username />
+
+                <MudTextField @ref=_passwordTextField
+                              Disabled=@attemptingSignIn
+                              Class="justify-center"
+                              Label=@AppLocalization["Password"]
+                              name="Password"
+                              InputType="InputType.Password"
+                              @bind-Value=LoginRequest.Password />
+
+                <MudTextField Class="d-none"
+                              name="ReturnUrl"
+                              Value="@redirectUrl" />
+
+                <MudButton OnClick=@(()=>{attemptingSignIn=true;})
+                           Class="my-5"
+                           ButtonType=ButtonType.Submit
+                           Color="Color.Primary">
+                    @AppLocalization["Log In"]
+                </MudButton>
 
-                <MudTextField @ref=_passwordTextField Disabled=@attemptingSignIn Class="justify-center" Label="Password" name="Password" InputType="InputType.Password" @bind-Value=LoginRequest.Password />
-                <MudTextField Class="d-none" name="ReturnUrl" Value="@redirectUrl" />
-                <MudButton OnClick=@(()=>{attemptingSignIn=true;}) Class="my-5" ButtonType=ButtonType.Submit Color="Color.Primary">@AppLocalization["Log In"]</MudButton>
 
-
 
             }
             else if (ApplicationInfo.InDemoMode)
@@ -59,12 +85,14 @@
 
         </MudContainer>
 
-        <MudOverlay Visible="attemptingSignIn" DarkBackground="true" Absolute="true">
+        <MudOverlay Visible="attemptingSignIn"
+                    DarkBackground="true"
+                    Absolute="true">
             @*<MudProgressCircular Color="Color.Secondary" Indeterminate="true" />*@
         </MudOverlay>
     </form>
-    <MudElement Class="d-flex mud-width-full justify-end">  
-        <Copyright Style="font-size:0.8em;"/>
+    <MudElement Class="d-flex mud-width-full justify-end">
+        <Copyright Style="font-size:0.8em;" />
 
     </MudElement>
 </MudContainer>

BLAZAM/Pages/OU/ViewOU.razor

@@ -64,7 +64,7 @@
         </MudDataGrid>
 }
 
-@if (OU.HasUnsavedChanges)
+@if (OU!=null && OU.CanEdit && OU.HasUnsavedChanges)
 {
     <UnsavedChangesPrompt SaveChanges="SaveChanges" DiscardChanges="DiscardChanges" />
 }

BLAZAM/Pages/SignIn.cshtml.cs

@@ -63,7 +63,7 @@ public async Task<IActionResult> OnPost([FromFormAttribute]LoginRequest req)
                     await HttpContext.SignInAsync(result.AuthenticationState.User);
                     await AuditLogger.Logon.Login(result.AuthenticationState.User,req.IPAddress);
                 }
-                return new ObjectResult(result.Status);
+                return new ObjectResult(result?.Status);
 
             }
             catch (Exception ex)

BLAZAM/Pages/Users/ViewUser.razor

@@ -418,7 +418,7 @@
         </CascadingValue>
 
     </EditForm>
-    @if (User.HasUnsavedChanges && !User.NewEntry)
+    @if (User.CanEdit && User.HasUnsavedChanges && !User.NewEntry)
     {
         <UnsavedChangesPrompt SaveChanges="SaveChanges" DiscardChanges="DiscardChanges" />
     }

BLAZAMActiveDirectory/Adapters/DirectoryEntryAdapter.cs

@@ -323,15 +323,30 @@ public virtual bool IsDeleted
             private set { _isDeleted = value; }
 
         }
+        private bool? _cachedHasChildren;
         public virtual bool HasChildren
         {
             get
             {
                 if (CachedChildren == null)
                 {
-                    EnsureDirectoryEntry();
-                    var children = DirectoryEntry.Children;
-                    CachedChildren = children.Encapsulate();
+                    if (_cachedHasChildren == null)
+                    {
+                        EnsureDirectoryEntry();
+                        _cachedHasChildren = DirectoryEntry?.Children.GetEnumerator().MoveNext();
+                    }
+
+
+                    return _cachedHasChildren==true;
+                    //try{
+                    //    return cursor.Current != null;
+
+                    //}
+                    //catch (InvalidOperationException)
+                    //{
+                    //    return false;
+                    //}
+                    //CachedChildren = children.Encapsulate();
                 }
                 var hasChildren = CachedChildren.Count() > 0;
                 return hasChildren;

BLAZAMCommon/Data/LoginRequest.cs

@@ -54,6 +54,6 @@ public bool Valid
         /// <summary>
         /// The remote IP of the login attempt
         /// </summary>
-        public IPAddress IPAddress { get; set; }
+        public IPAddress? IPAddress { get; set; }
     }
 }