Merge pull request #267 from Blazam-App/Beta-Dev

Nightly Update
Blazam-App · Mar 20, 2024 · fa73422 · fa73422
2 parents 44121e0 + 5559019
commit fa73422
Show file tree

Hide file tree

Showing 83 changed files with 1,697 additions and 1,248 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>0.8.9</AssemblyVersion>
-		<Version>2024.03.15.1259</Version>
+		<Version>2024.03.20.2221</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
@@ -57,17 +57,17 @@
 		<PackageReference Include="Cassia" Version="2.0.0.60" />
 		<PackageReference Include="Core.System.Configuration.Install" Version="1.1.0" />
 		<PackageReference Include="DuoUniversal" Version="1.2.2" />
-		<PackageReference Include="MailKit" Version="4.3.0" />
+		<PackageReference Include="MailKit" Version="4.4.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.27" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.27" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.27" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.27" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.16" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.16" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.17" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.17" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.16" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.16" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/BLAZAM/Pages/Browse/Browse.razor b/BLAZAM/Pages/Browse/Browse.razor
@@ -4,20 +4,31 @@
 <h3>Browse</h3>
 @if (Monitor.DirectoryConnectionStatus == ServiceConnectionState.Up)
 {
+    <MudContainer Style=" position:relative;">
+        <MudDrawerContainer>
+            <MudDrawer Anchor="Anchor.End"
+                       Style="min-height:200px"
+                       Variant=DrawerVariant.Persistent
+                       @bind-Open=_drawerOpen>
 
+                <ADTreeView TextColor="Color.Surface" @bind-SelectedEntry=selectedEntry />
 
-    <ADTreeView @bind-SelectedOU=selectedEntry/>
-    @if (selectedEntry != null && selectedEntry is not IADOrganizationalUnit)
-    {
-        <ViewDirectoryEntry DirectoryEntry="selectedEntry" />
 
-    }
+            </MudDrawer>
+            @if (selectedEntry != null && selectedEntry is not IADOrganizationalUnit)
+            {
+                <ViewDirectoryEntry DirectoryEntry="selectedEntry" />
+
+            }
+        </MudDrawerContainer>
+
+    </MudContainer>
 
 }
 @code {
 
     IDirectoryEntryAdapter? selectedEntry;
-
+    bool _drawerOpen = true;
     protected override void OnInitialized()
     {
         base.OnInitialized();

diff --git a/BLAZAM/Pages/Configure/Templates.razor b/BLAZAM/Pages/Configure/Templates.razor
@@ -40,7 +40,7 @@
 
                 <MudIconButton Color=Color.Tertiary
                                Class="align-middle"
-                               OnClick="@(()=>{SelectedTemplate = new();Nav.NavigateTo("/templates");})"
+                               OnClick="@(NewTemplate)"
                                Icon="@Icons.Material.Filled.AddCard" />
 
             </MudTooltip>
@@ -50,7 +50,7 @@
             <MudTooltip Text="@AppLocalization["New template"]">
                 <MudIconButton Color=Color.Tertiary
                                Class="align-middle"
-                               OnClick="@(()=>{SelectedTemplate = new();Nav.NavigateTo("/templates");})"
+                                 OnClick="@(NewTemplate)"
                                Icon="@Icons.Material.Filled.AddCard" />
 
             </MudTooltip>
@@ -119,7 +119,7 @@
 </SetHeader>
 @if (Templates.Count() > 0)
 {
-    
+
     <MudCard Elevation="2">
         <MudExpansionPanel Text="@AppLocalization["Inheritance Tree"]">
             <TemplateInheritanceTreeView RootTemplate="CreateTemplateHash"
@@ -149,13 +149,13 @@
     protected override async Task OnInitializedAsync()
     {
         await base.OnInitializedAsync();
-        
+
         if (Templates?.Count() < 1)
         {
 
             await Task.Delay(1000);
             createFirstTemplateTooltipVisible = true;
-            
+
 
 
 
@@ -188,6 +188,13 @@
         await RefreshComponents();
 
     }
+    private async void NewTemplate()
+    {
+        SelectedTemplate = new();
+        TemplateIdParameter = null;
+        SelectedTemplate = new();
+        Nav.NavigateTo("/templates/0",true);
+    }
     private HashSet<DirectoryTemplate> CreateTemplateHash
     {
         get

diff --git a/BLAZAM/Pages/Groups/ConfirmNewGroup.razor b/BLAZAM/Pages/Groups/ConfirmNewGroup.razor
@@ -33,7 +33,7 @@
             var result = await Group.CommitChangesAsync(createGroupJob);
 
             disableCreateGroupButton = false;
-            InvokeAsync(StateHasChanged);
+            await InvokeAsync(StateHasChanged);
             if (result.FailedSteps.Count == 0)
             {
 

diff --git a/BLAZAM/Pages/Groups/ViewGroup.razor b/BLAZAM/Pages/Groups/ViewGroup.razor
@@ -46,12 +46,7 @@
         </AppModal>
 
 
-        <AppModal Title=@AppLocalization["Change History"] @ref=@ChangeHistoryModal Options=@(new DialogOptions(){FullWidth=true,MaxWidth=MaxWidth.ExtraExtraLarge})>
-            @if (ChangeHistoryModal?.IsShown == true)
-            {
-                <ChangeHistoryModalContent Model="Group" />
-            }
-        </AppModal>
+
 
 
         <MudGrid>

diff --git a/BLAZAM/Pages/Recycle Bin/RecycleBin.razor b/BLAZAM/Pages/Recycle Bin/RecycleBin.razor
@@ -12,14 +12,15 @@
              @bind-SelectedItems=@selectedEntries
              Square=true
              MultiSelection=true
+             Height="80vh"
              Items="@deletedObjects"
              Filterable="false"
              SortMode="@SortMode.Multiple"
              Groupable="false">
     <ToolBarContent>
         <MudText Typo="Typo.h6">Recycle Bin</MudText>
         <MudSpacer />
-        <MudButton Color="Color.Primary" Variant="@Variant.Outlined" OnClick="@(async()=>{await RestoreSelected();})">Restore Selected</MudButton>
+        <MudButton Color="Color.Primary" Variant="@Variant.Outlined" OnClick="@(()=>{RestoreSelected();})">Restore Selected</MudButton>
 
     </ToolBarContent>
     <Columns>
@@ -73,11 +74,34 @@
 
         await InvokeAsync(StateHasChanged);
     }
+
+    //TODO stop the confimation message on batch restore
+    private async void RestoreSelected()
+    {
+        if (await MessageService.Confirm("Are you sure you want to restore the selected entries", "Restore?"))
+        {
+            IJob batchRestore = new Job(AppLocalization["Restore"]);
+            foreach (var entry in selectedEntries)
+            {
+                IJobStep restoreEntryStep = new JobStep(AppLocalization["Restore: "] + entry.CanonicalName, (step) =>
+                {
+                    if (RestoreEntry(entry))
+                        return true;
+                    return false;
+
+                });
+                batchRestore.Steps.Add(restoreEntryStep);
+            }
+            batchRestore.Run();
+            batchRestore.ShowJobDetailsDialog(MessageService);
+        }
+    }
     async Task Restore(IDirectoryEntryAdapter entryToRestore)
     {
-        if (await MessageService.Confirm("Are you sure you want to restore " + entryToRestore.CanonicalName + " to " + entryToRestore.LastKnownParent.CanonicalName, "Restore?"))
+        if (entryToRestore.LastKnownParent == null) throw new ApplicationException("Tombstone item has no  LastKnownParent");
+        if (await MessageService.Confirm("Are you sure you want to restore " + entryToRestore.CanonicalName + " to " + entryToRestore.LastKnownParent?.CanonicalName, "Restore?"))
         {
-            if (Directory.RestoreTombstone(entryToRestore, entryToRestore.LastKnownParent))
+            if (RestoreEntry(entryToRestore))
             {
                 SnackBarService.Success(entryToRestore.CanonicalName + " restored successfully");
                 await GetDeletedEntries();
@@ -90,21 +114,9 @@
 
         }
     }
-    //TODO stop the confimation message on batch restore
-    async Task RestoreSelected()
+    bool RestoreEntry(IDirectoryEntryAdapter entry)
     {
-        IJob batchRestore = new Job(AppLocalization["Restore"]);
-        foreach (var entry in selectedEntries)
-        {
-            IJobStep restoreEntryStep = new JobStep(AppLocalization["Restore: "] + entry.CanonicalName, async (step) =>
-            {
-                await Restore(entry);
-                return true;
-
-            });
-            batchRestore.Steps.Add(restoreEntryStep);
-        }
-        batchRestore.Run();
-        batchRestore.ShowJobDetailsDialog(MessageService);
+        return (entry.LastKnownParent != null && Directory.RestoreTombstone(entry, entry.LastKnownParent));
     }
+
 }
diff --git a/BLAZAM/Pages/SSO.cshtml.cs b/BLAZAM/Pages/SSO.cshtml.cs
@@ -60,12 +60,12 @@ public async Task<IActionResult> OnPost([FromFormAttribute]LoginRequest req)
                // return new ObjectResult(result.Status);
 
             }
-            catch (Exception ex)
+            catch 
             {
 
                 //return new ObjectResult(ex.Message);
             }
-            if (req.ReturnUrl.IsUrlLocalToHost())
+            if (req.ReturnUrl!=null && req.ReturnUrl.IsUrlLocalToHost())
             {
                 return Redirect(req.ReturnUrl);
             }

diff --git a/BLAZAM/Pages/Search.razor b/BLAZAM/Pages/Search.razor
@@ -147,7 +147,7 @@
        });
         Searcher.ResultsCollected += ((batch) =>
              {
-                 results.AddRange(batch);
+                 results.AddRange(batch.Where(r=>r.CanRead));
              });
     }
     /// <summary>

diff --git a/BLAZAM/Pages/Users/ConfirmNewUser.razor b/BLAZAM/Pages/Users/ConfirmNewUser.razor
@@ -178,7 +178,7 @@ InDirectoryTemplate(ActiveDirectoryFields.PhysicalDeliveryOffice)
     bool InDirectoryTemplate(ActiveDirectoryField field)
     {
         if (DirectoryTemplate == null) return true;
-        return DirectoryTemplate?.FieldValues.Any(f => f.Field.FieldName == field.FieldName) == true;
+        return DirectoryTemplate?.FieldValues.Any(f => f.Field?.FieldName == field.FieldName) == true;
     }
     bool confirmed = false;
     bool disableCreateUserButton=false;
@@ -200,7 +200,7 @@ InDirectoryTemplate(ActiveDirectoryFields.PhysicalDeliveryOffice)
             var result = await User.CommitChangesAsync(createUserJob);
 
             disableCreateUserButton = false;
-            InvokeAsync(StateHasChanged);
+            await InvokeAsync(StateHasChanged);
             if (result.FailedSteps.Count == 0)
             {
                 var newUser = Directory.Users.FindUsersByContainerName(User.CanonicalName, false, true);
@@ -210,7 +210,7 @@ InDirectoryTemplate(ActiveDirectoryFields.PhysicalDeliveryOffice)
                 }
                 SnackBarService.Success("User has been created");
                 confirmed = true;
-                Confirmed.InvokeAsync();
+                await Confirmed.InvokeAsync();
                 //Nav.NavigateTo("/search/" + User.SamAccountName);
 
             }