Merge pull request #511 from Blazam-App/v1-Dev

Nightly Update
Blazam-App · Aug 22, 2024 · b316f4e · b316f4e
2 parents af9d585 + 68dfd2c
commit b316f4e
Show file tree

Hide file tree

Showing 31 changed files with 226 additions and 140 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -5,8 +5,8 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
-		<AssemblyVersion>1.0.0</AssemblyVersion>
-		<Version>2024.08.17.2047</Version>
+		<AssemblyVersion>1.0.1</AssemblyVersion>
+		<Version>2024.08.22.2343</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
@@ -67,6 +67,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />

diff --git a/BLAZAM/Pages/Groups/ViewGroup.razor b/BLAZAM/Pages/Groups/ViewGroup.razor
@@ -94,12 +94,17 @@
 
                 </Section>
             </MudItem>
-            <MudItem xs="12" md="12">
-                <Section Style="min-height:200px;" Title=@AppLocalization["Members"]>
-                    <GroupMembersDataGrid Group="Group" />
 
-                </Section>
-            </MudItem>
+
+            @if (Group.CanReadField(ActiveDirectoryFields.MemberOf))
+            {
+                <MudItem xs="12" md="12">
+                    <Section Style="min-height:200px;" Title=@AppLocalization["Members"]>
+                        <GroupMembersDataGrid Group="Group" />
+
+                    </Section>
+                </MudItem>
+            }
         </MudGrid>
 
 

diff --git a/BLAZAM/Pages/Users/ViewUser.razor b/BLAZAM/Pages/Users/ViewUser.razor
@@ -77,17 +77,18 @@
                             <LogonHoursModalContent User="User" />
                         }
                     </AppModal>
-
-
+
                     <MudGrid>
                         <MudItem xs="12" md="3">
+
                             <Section FullWidth=false>
-
+                                
                                 <MudCard Elevation="2"
                                          Style="width:fit-content;height:fit-content"
                                          Class="relative mx-auto my-auto d-block p-1"
                                          @onmouseenter=@(()=>{showRemoveThumbnail=true;})
                                          @onmouseleave=@(()=>{showRemoveThumbnail=false;})>
+
                                     @if (User?.ThumbnailPhoto != null)
                                     {
                                         <Base64Image Style="max-height:150px;max-width:150px;" Data="User.ThumbnailPhoto.ReizeRawImage(150)" />
@@ -163,17 +164,25 @@
 
 
 
+
                                 @if (User.CanReadField(ActiveDirectoryFields.MemberOf))
                                 {
                                     <MudStack>
                                         <MudText Typo="Typo.subtitle2">@AppLocalization["Groups"]</MudText>
                                         <MemberOfList AssignToClicked=@(()=>{AssignToModal?.ShowAsync();}) Model="User" />
 
-                                    </MudStack>
-
-
 
+                                    </MudStack>
+                                }
+                                else
+                                {
+                                    <NoAccess />
                                 }
+                                @if (User.Disabled)
+                                {
+                                    <MudAlert Severity="Severity.Error" Class="mud-width-full">@AppLocalization["User is disabled"]</MudAlert>
+                                }
+
 
 
                             </Section>

diff --git a/BLAZAMCommon.Tests/BLAZAMCommon.Tests.csproj b/BLAZAMCommon.Tests/BLAZAMCommon.Tests.csproj
@@ -15,6 +15,7 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
+		<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
 		<PackageReference Include="xunit" Version="2.9.0" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/BLAZAMCommon/BLAZAMCommon.csproj b/BLAZAMCommon/BLAZAMCommon.csproj
@@ -29,6 +29,7 @@
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	  <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
 	  <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />

diff --git a/BLAZAMDatabase/BLAZAMDatabase.csproj b/BLAZAMDatabase/BLAZAMDatabase.csproj
@@ -20,6 +20,7 @@
 	  <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
 	  <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
 	  <PackageReference Include="System.Data.SQLite" Version="1.0.118" />
+	  <PackageReference Include="System.Security.Permissions" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BLAZAMEmailMessage/BLAZAMEmailMessage.csproj b/BLAZAMEmailMessage/BLAZAMEmailMessage.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
 	  <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.8" />
     <PackageReference Include="MudBlazor" Version="7.6.0" />
   </ItemGroup>
 

diff --git a/BLAZAMGui/Navs/Buttons/NavBrowseButton.razor b/BLAZAMGui/Navs/Buttons/NavBrowseButton.razor
@@ -9,7 +9,8 @@
              Title="@AppLocalization["Browse"]"
              Icon="@Icons.Material.Filled.ViewList">
     <ADTreeView AdditionalVisibilityFilters=@((entry)=>{if(entry is IADOrganizationalUnit ou) return (ou.CanReadUsersInSubOus || ou.CanReadNonOUs); return false;})
-                SelectedEntryChanged="@((entry)=>{SelectedEntryChanged.InvokeAsync(entry);})" />
+                SelectedEntryChanged="@((entry)=>{SelectedEntryChanged.InvokeAsync(entry);})"
+                StartRootExpanded=false/>
 </MudNavGroup>
 
 @code {

diff --git a/BLAZAMGui/Navs/NavMenu.razor b/BLAZAMGui/Navs/NavMenu.razor
@@ -11,7 +11,6 @@
 
 <MudNavMenu Color="Color.Success"
             Bordered="true"
-
             Class="py-3 w-100">
     <MudBreakpointProvider>
         <MudHidden Breakpoint="Breakpoint.MdAndUp">
@@ -25,7 +24,8 @@
         </MudHidden>
     </MudBreakpointProvider>
     <NavHomeButton />
-    <NavBrowseButton SelectedEntryChanged=@((entry)=>{SelectedEntryChanged.InvokeAsync(entry);}) BrowseExpandedChanged=@((value)=>{BrowseExpandedChanged.InvokeAsync(value);}) />
+    <NavBrowseButton SelectedEntryChanged=@((entry)=>{SelectedEntryChanged.InvokeAsync(entry);})
+                     BrowseExpandedChanged=@((value)=>{BrowseExpandedChanged.InvokeAsync(value);}) />
     <AuthorizeView Context="createContext" Roles=@createRole>
         <MudNavGroup Icon="@Icons.Material.Filled.Create"
                      Title="@AppLocalization["Create"]"
@@ -88,7 +88,7 @@
 
     public void GotoEntry(IDirectoryEntryAdapter entry)
     {
-        
+
         Nav.NavigateTo(entry.SearchUri);
     }
 

diff --git a/BLAZAMGui/UI/DirectoryEntryViewHeader.razor b/BLAZAMGui/UI/DirectoryEntryViewHeader.razor
@@ -69,7 +69,9 @@
                                      Icon="@Icons.Material.Filled.Edit"
                                      ToggledIcon="@Icons.Material.Filled.EditOff"
                                      ToggledColor="Color.Error"
-                                     Disabled=@(!DirectoryEntry.CanEdit && !CurrentUser.State.CanAssign) />
+                                     Disabled=@(!DirectoryEntry.CanEdit && (accountEntry!=null && (accountEntry.CanAssign||accountEntry.CanUnassign)))
+                                     ToggledTitle="End Edit" />
+
             </MudTooltip>
 
             @if (accountEntry != null && accountEntry.LockedOut)
@@ -87,7 +89,6 @@
                 <MudTooltip Text="@AppLocalization["Assign To"]">
 
                     <MudIconButton OnClick="@Assign"
-                                   Disabled=@(!groupableEntry.CanAssign)
                                    Icon="@Icons.Material.Filled.GroupAdd"
                                    aria-label="assign to" />
                 </MudTooltip>
@@ -172,10 +173,7 @@
             {
                 <MudMenuItem OnClick="@Unlock">Unlock...</MudMenuItem>
             }
-            @if (groupableEntry?.CanAssign == true)
-            {
-                <MudMenuItem OnClick="@Assign">Assign To...</MudMenuItem>
-            }
+            <MudMenuItem OnClick="@Assign">Assign To...</MudMenuItem>
             @if (accountEntry?.CanDisable == true && accountEntry is not IADComputer)
             {
                 <MudMenuItem OnClick="@ResetPassword">Change Password...</MudMenuItem>

diff --git a/BLAZAMGui/UI/Groups/AssignToModalContent.razor b/BLAZAMGui/UI/Groups/AssignToModalContent.razor
@@ -14,11 +14,12 @@
                             Label="Group Name"
                             SearchObjectType="ActiveDirectoryObjectType.Group"
                             @bind-SelectedResult=@Group
-                            CustomResultsFilter=@((result)=>{
-                            if(result is IADGroup){
-                            return !DirectoryModel.MemberOf.Contains(result as IADGroup);
+                            CustomDisableFilter=@((result)=>{
+                            if(result is IADGroup group){
+                            return !DirectoryModel.MemberOf.Contains(group) && group.CanAssign ;
                             }
-                            return true;
+                            return false
+                            ;
                             }) />
             @if (count == 0)
             {

diff --git a/BLAZAMGui/UI/Groups/MemberOfList.razor b/BLAZAMGui/UI/Groups/MemberOfList.razor
@@ -14,7 +14,7 @@
                     <MudListItem>
                         <ChildContent>
                             <MudStack Row=true>
-                                @if (EditMode)
+                                @if (EditMode && g.CanUnassign)
                                 {
                                     <MudText Class="align-middle">@g.CanonicalName</MudText>
 
@@ -25,7 +25,7 @@
 
                                 }
                                 <MudSpacer />
-                                @if (EditMode)
+                                @if (EditMode && g.CanUnassign)
                                 {
                                     <MudIconButton Size="Size.Small" OnClick="@(()=>{Model.UnassignFrom(g);})" Class="align-end align-middle" Color=Color.Error Icon="@Icons.Material.Filled.Close" />
                                 }

diff --git a/BLAZAMGui/UI/Inputs/ADAutoComplete.razor b/BLAZAMGui/UI/Inputs/ADAutoComplete.razor
@@ -1,4 +1,7 @@
 @inherits AutoCompleteComponentBase
+@{
+//TODO Finish custom disable 
+}
 <MudAutocomplete Class="@Class"
                  Style="@Style"
                  Disabled=@Disabled
@@ -63,8 +66,8 @@
         </MoreItemsTemplate>
     </MudAutocomplete>
 
-    @code {
-#nullable disable warnings
+@code {
+    #nullable disable warnings
     [Parameter]
     public Func<object> Validation { get; set; }
     [Parameter]
@@ -83,8 +86,15 @@
     [Parameter]
     public Origin AnchorOrigin { get; set; } = Origin.BottomCenter;
 
+    /// <summary>
+    /// Disables this autocomplete input
+    /// </summary>
     [Parameter]
     public bool Disabled { get; set; }
+
+    /// <summary>
+    /// Automatically bring the text box into focus on load
+    /// </summary>
     [Parameter]
     public bool AutoFocus { get; set; }
 
@@ -97,6 +107,7 @@
     [Parameter]
     public int MaxResults { get; set; } = 10;
 
+
     [Parameter]
     public bool AllowCustomInput { get; set; }
 
@@ -106,6 +117,9 @@
 
     [Parameter]
     public Func<IDirectoryEntryAdapter, bool> CustomResultsFilter { get; set; }
+
+    [Parameter]
+    public Func<IDirectoryEntryAdapter, bool>? CustomDisableFilter { get; set; }
     @*
     [Parameter]
     public IFluentDisplay Display { get; set; }*@
@@ -115,6 +129,10 @@
 
     IEnumerable<IDirectoryEntryAdapter> _searchResults = new List<IDirectoryEntryAdapter>();
     bool _searchDisabled;
+
+    /// <summary>
+    /// Indicates whether to search for disabled Users/Computers
+    /// </summary>
     [Parameter]
     public bool SearchDisabled
     {
@@ -191,10 +209,10 @@
     }
 
 
-    public List<IDirectoryEntryAdapter> _selectedResults;
+    // public List<IDirectoryEntryAdapter> _selectedResults;
 
 
-    List<string> SelectedResultNames = new();
+    // List<string> SelectedResultNames = new();
 
 
 

diff --git a/BLAZAMGui/UI/Inputs/ADAutoCompleteResult.razor b/BLAZAMGui/UI/Inputs/ADAutoCompleteResult.razor
@@ -22,7 +22,7 @@
         <MudIcon Icon="@typeIcon"/>
 
     </MudItem>
-    <MudItem sm="12" md="10">
+    <MudItem  sm="12" md="10">
         <MudStack Row=true Spacing="0">
             <MudStack Spacing="0">
                 <MudText Typo="Typo.subtitle2">
@@ -67,6 +67,9 @@
     [Parameter]
     public IDirectoryEntryAdapter? Entry { get; set; }
 
+    [Parameter]
+    public bool Disabled { get; set; } = false;
+
     private string typeIcon = Icons.Material.Filled.QuestionMark;
 
     protected override async Task OnInitializedAsync()