Blazam-App · jacobsen9026 · Nov 13, 2024 · Nov 13, 2024
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>1.1.0</AssemblyVersion>
-		<Version>2024.11.13.1850</Version>
+		<Version>2024.11.13.2234</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>

diff --git a/BLAZAM/Pages/Computers/ViewComputer.razor b/BLAZAM/Pages/Computers/ViewComputer.razor
@@ -288,7 +288,7 @@
                 Computer.Delete();
                 SnackBarService.Success(Computer.CanonicalName + " has been deleted.");
                 await AuditLogger.Computer.Deleted(Computer);
-                _ = OUNotificationService.PostAsync(Computer, NotificationType.Delete, CurrentUser.State);
+                _ = NotificationGenerationService.PostAsync(Computer, NotificationType.Delete, CurrentUser.State);
 
                 Nav.NavigateTo("/users/search");
 
@@ -328,7 +328,7 @@
                     }
                     if (changes.Any(c => c.Field != ActiveDirectoryFields.MemberOf.FieldName))
                     {
-                        _ = OUNotificationService.PostAsync(Computer, NotificationType.Modify, CurrentUser.State);
+                        _ = NotificationGenerationService.PostAsync(Computer, NotificationType.Modify, CurrentUser.State);
                         await AuditLogger.User.Changed(Computer, changes.Where(c => c.Field != ActiveDirectoryFields.MemberOf.FieldName).ToList());
                     }
 

diff --git a/BLAZAM/Pages/Configure/Audit.razor b/BLAZAM/Pages/Configure/Audit.razor
@@ -11,8 +11,8 @@
 
 
 
-<AppPageTitle>Audit</AppPageTitle>
-<h3>Audit</h3>
+<AppPageTitle>@AppLocalization["Audit"]</AppPageTitle>
+<MudText Typo="Typo.h4">@AppLocalization["Audit"]</MudText>
 
 
 

diff --git a/BLAZAM/Pages/Configure/Fields.razor b/BLAZAM/Pages/Configure/Fields.razor
@@ -3,6 +3,9 @@
 @inherits DatabaseComponentBase
 @attribute [Authorize(Roles = UserRoles.SuperAdmin)]
 
+<AppPageTitle>@AppLocalization["Fields"]</AppPageTitle>
+
+<MudText Typo="Typo.h4">@AppLocalization["Fields"] <AppDocumentationButton Page="/admin/fields" /></MudText>
 <MudDataGrid @ref=fieldGrid
              T="CustomActiveDirectoryField"
              ServerData="RefreshData"
@@ -11,10 +14,8 @@
              FixedHeader=true
              EditTrigger="DataGridEditTrigger.Manual">
     <ToolBarContent>
-        <MudText Typo="Typo.h6">@AppLocalization["Fields"]</MudText>
         <MudSpacer />
-        <MudIconButton Icon="@Icons.Material.Filled.Add" OnClick="@(()=>{addFieldModal?.ShowAsync();})" />
-        <AppDocumentationButton Page="/admin/fields" />
+        <MudIconButton Icon="@Icons.Material.Filled.Add" [email protected] OnClick="@(()=>{addFieldModal?.ShowAsync();})" />
 
     </ToolBarContent>
 

diff --git a/BLAZAM/Pages/Configure/Permissions.razor b/BLAZAM/Pages/Configure/Permissions.razor
@@ -3,8 +3,8 @@
 @attribute [Authorize(Roles = UserRoles.SuperAdmin)]
 
 @inherits TabbedAppComponentBase
+<AppPageTitle>@AppLocalization["Permissions"]</AppPageTitle>
 
-<AppPageTitle>Permissions</AppPageTitle>
 <AuthorizeView [email protected]>
 
     <SetHeader>
@@ -48,7 +48,7 @@
 
                 @if (Monitor.DirectoryConnectionStatus == ServiceConnectionState.Up)
                 {
-                    <ImpersonateUser />
+
                     <PermissionMapper />
 
                 }

diff --git a/BLAZAM/Pages/Configure/Settings.razor b/BLAZAM/Pages/Configure/Settings.razor
@@ -4,8 +4,8 @@
 @attribute [Authorize(Roles = UserRoles.SuperAdmin)]
 
 @inherits TabbedAppComponentBase
+<AppPageTitle>@AppLocalization["Settings"]</AppPageTitle>
 
-<AppPageTitle>Settings</AppPageTitle>
 <SetHeader>
 </SetHeader>
 <AuthorizeView>

diff --git a/BLAZAM/Pages/Configure/Templates.razor b/BLAZAM/Pages/Configure/Templates.razor
@@ -127,6 +127,8 @@
 
     </AppModal>
 </SetHeader>
+
+<MudText Typo="Typo.h4">@AppLocalization["Templates"] <AppDocumentationButton Page="/admin/templates" /></MudText>
 @if (Templates.Count() > 0)
 {
 

diff --git a/BLAZAM/Pages/Groups/ViewGroup.razor b/BLAZAM/Pages/Groups/ViewGroup.razor
@@ -161,20 +161,20 @@
                 {
                     await AuditLogger.User.Assigned(assignment.Member, assignment.Group);
                     await AuditLogger.Group.MemberAdded(assignment.Group, assignment.Member);
-                    _ = OUNotificationService.PostAsync(assignment.Member, NotificationType.GroupAssignment, CurrentUser.State, Group);
+                    _ = NotificationGenerationService.PostAsync(assignment.Member, NotificationType.GroupAssignment, CurrentUser.State, Group);
 
                 }
 
                 foreach (var assignment in unassignFrom)
                 {
                     await AuditLogger.User.Unassigned(assignment.Member, assignment.Group);
                     await AuditLogger.Group.MemberRemoved(assignment.Group, assignment.Member);
-                    _ = OUNotificationService.PostAsync(assignment.Member, NotificationType.GroupAssignment, CurrentUser.State, Group);
+                    _ = NotificationGenerationService.PostAsync(assignment.Member, NotificationType.GroupAssignment, CurrentUser.State, Group);
 
                 }
                 if (changes.Any(c => c.Field != "member"))
                 {
-                    _ = OUNotificationService.PostAsync(Group, NotificationType.Modify, CurrentUser.State);
+                    _ = NotificationGenerationService.PostAsync(Group, NotificationType.Modify, CurrentUser.State);
                     await AuditLogger.Group.Changed(Group, changes.Where(c => c.Field != ActiveDirectoryFields.MemberOf.FieldName).ToList());
                 }
                 //await AuditLogger.Group.Changed(Group, Group.Changes);
@@ -205,7 +205,7 @@
                 Group.Delete();
                 SnackBarService.Success(Group.CanonicalName + " has been deleted.");
                 await AuditLogger.Group.Deleted(Group);
-                _ = OUNotificationService.PostAsync(Group, NotificationType.Delete, CurrentUser.State);
+                _ = NotificationGenerationService.PostAsync(Group, NotificationType.Delete, CurrentUser.State);
 
                 //Group = null;
                 Nav.NavigateTo("/groups/search");

diff --git a/BLAZAM/Pages/OU/CreateOU.razor b/BLAZAM/Pages/OU/CreateOU.razor
@@ -1,49 +1,37 @@
 @page "/ou/create"
 @inherits TabbedAppComponentBase
 @attribute [Authorize]
+<AppPageTitle>@AppLocalization["Create OU"]</AppPageTitle>
 
-<AppPageTitle>Create OU</AppPageTitle>
 
-    <MudTabs Elevation="0" Outlined="true" @bind-ActivePanelIndex="selectedStep">
-        <MudTabPanel>
-            <ChildContent>
-                <MudText>
-
+<MudTabs Elevation="0" Outlined="true" @bind-ActivePanelIndex="selectedStep">
+    <MudTabPanel>
+        <ChildContent>
+            <MudText>
+                <OUTreeView Label="Parent Organizational Unit"
+                            SelectedEntryChanged="OUSelected"/>
 
-                        <OUTreeView Label="Parent Organizational Unit"
-                                SelectedEntryChanged="OUSelected">
-                           @* <NodeContent>
-                                @context.Name
-                            </NodeContent>*@
-                        </OUTreeView>
+                <MudTextField Immediate=true Label="Organizational Unit Name" @bind-Value=@newOUName />
 
-
+                <MudButton Disabled=@(parentOU==null || newOUName.IsNullOrEmpty()) Color="Color.Primary" OnClick="CreateNewOU">Next</MudButton>
+            </MudText>
+        </ChildContent>
+        <TabContent>
+            Create
+        </TabContent>
+    </MudTabPanel>
+    <MudTabPanel Disabled=@(newOU==null || newOUName.IsNullOrEmpty())>
+        <ChildContent>
+            <MudText>
+                <ConfirmNewOU OU="@newOU" />
+            </MudText>
+        </ChildContent>
+        <TabContent>
+            Confirm
+        </TabContent>
+    </MudTabPanel>
+</MudTabs>
 
-
-
-                        <MudTextField Immediate=true Label="Organizational Unit Name" @bind-Value=@newOUName />
-
-
-
-                    <MudButton Disabled=@(parentOU==null || newOUName.IsNullOrEmpty()) Color="Color.Primary" OnClick="CreateNewOU">Next</MudButton>
-                </MudText>
-            </ChildContent>
-            <TabContent>
-                Create
-            </TabContent>
-        </MudTabPanel>
-        <MudTabPanel Disabled=@(newOU==null || newOUName.IsNullOrEmpty())>
-            <ChildContent>
-                <MudText>
-                    <ConfirmNewOU OU="@newOU"  />
-                </MudText>
-            </ChildContent>
-            <TabContent>
-                Confirm
-            </TabContent>
-        </MudTabPanel>
-    </MudTabs>
-
 
 
 
@@ -53,11 +41,6 @@
 
     int selectedStep;
 
-
-
-
-
-
     string newOUName;
     IADOrganizationalUnit? parentOU;
     IADOrganizationalUnit? newOU;
@@ -101,7 +84,7 @@
     async void CreateNewOU()
     {
         LoadingData = true;
-       
+
         newOU = parentOU?.CreateOU(newOUName);
 
 

diff --git a/BLAZAM/Pages/OU/ViewOU.razor b/BLAZAM/Pages/OU/ViewOU.razor
@@ -1,5 +1,4 @@
 @inherits DirectoryEntryViewBase
-@inject NotificationGenerationService OUNotificationService
 
 <AppPageTitle>@OU?.CanonicalName</AppPageTitle>
 
@@ -87,21 +86,27 @@
     }
     async void SaveChanges()
     {
-        if (await MessageService.Confirm("Are you sure you want to save the changes?", "Save Changes"))
+        if (OU != null)
         {
-            var changes = OU?.Changes;
-            await OU.CommitChangesAsync();
-            EditMode = false;
-            //Nav.WarnOnNavigation = false;
-            await AuditLogger.OU.Changed(OU, changes);
-            _ = OUNotificationService.PostAsync(OU, NotificationType.Modify, CurrentUser.State);
+            if (await MessageService.Confirm("Are you sure you want to save the changes?", "Save Changes"))
+            {
+                var changes = OU?.Changes;
+                await OU.CommitChangesAsync();
+                EditMode = false;
+                //Nav.WarnOnNavigation = false;
+                await AuditLogger.OU.Changed(OU, changes);
+                _ = NotificationGenerationService.PostAsync(OU, NotificationType.Modify, CurrentUser.State);
 
-            SnackBarService.Success("The changes made to this ou have been saved.");
-            await RefreshEntryComponents();
+                SnackBarService.Success(AppLocalization["The changes made to this ou have been saved."]);
+                await RefreshEntryComponents();
 
 
+            }
+        }
+        else
+        {
+            SnackBarService.Error("OU is null");
         }
-
     }
     void ChildClicked(DataGridRowClickEventArgs<IDirectoryEntryAdapter> args)
     {
@@ -116,7 +121,7 @@
                 OU.Delete();
                 SnackBarService.Success(OU.CanonicalName + " has been deleted.");
                 await AuditLogger.OU.Deleted(OU);
-                _ = OUNotificationService.PostAsync(OU, NotificationType.Delete, CurrentUser.State);
+                _ = NotificationGenerationService.PostAsync(OU, NotificationType.Delete, CurrentUser.State);
 
 
                 Nav.NavigateTo("/ou/search");

diff --git a/BLAZAM/Pages/Recycle Bin/RecycleBin.razor b/BLAZAM/Pages/Recycle Bin/RecycleBin.razor
@@ -1,8 +1,8 @@
 @page "/recyclebin"
 @inherits AppComponentBase
 @attribute [Authorize(Roles = UserRoles.SuperAdmin)]
+<AppPageTitle>@AppLocalization["Recycle Bin"]</AppPageTitle>
 
-<AppPageTitle>Recycle Bin</AppPageTitle>
 
 <MudDataGrid T="IDirectoryEntryAdapter"
              Virtualize=true

diff --git a/BLAZAM/Pages/Users/CreateUser.razor b/BLAZAM/Pages/Users/CreateUser.razor
@@ -6,7 +6,8 @@
 {
     <AppNavLock />
 }
-<AppPageTitle>Create User</AppPageTitle>
+<AppPageTitle>@AppLocalization["Create User"]</AppPageTitle>
+
 <MudContainer MaxWidth="MaxWidth.ExtraExtraLarge">
     <MudTabs PanelClass="mx-auto w-100"
              @ref=Tabs

diff --git a/BLAZAM/Pages/Users/ViewUser.razor b/BLAZAM/Pages/Users/ViewUser.razor
@@ -666,20 +666,20 @@
                     {
                         await AuditLogger.User.Assigned(assignment.Member, assignment.Group);
                         await AuditLogger.Group.MemberAdded(assignment.Group, assignment.Member);
-                        _ = OUNotificationService.PostAsync(User, NotificationType.GroupAssignment, CurrentUser.State, assignment.Group);
+                        _ = NotificationGenerationService.PostAsync(User, NotificationType.GroupAssignment, CurrentUser.State, assignment.Group);
 
                     }
 
                     foreach (var assignment in unassignFrom)
                     {
                         await AuditLogger.User.Unassigned(assignment.Member, assignment.Group);
                         await AuditLogger.Group.MemberRemoved(assignment.Group, assignment.Member);
-                        _ = OUNotificationService.PostAsync(User, NotificationType.GroupAssignment, CurrentUser.State, assignment.Group);
+                        _ = NotificationGenerationService.PostAsync(User, NotificationType.GroupAssignment, CurrentUser.State, assignment.Group);
 
                     }
                     if (changes.Any(c => c.Field != ActiveDirectoryFields.MemberOf.FieldName))
                     {
-                        _ = OUNotificationService.PostAsync(User, NotificationType.Modify, CurrentUser.State);
+                        _ = NotificationGenerationService.PostAsync(User, NotificationType.Modify, CurrentUser.State);
                         await AuditLogger.User.Changed(User, changes.Where(c => c.Field != ActiveDirectoryFields.MemberOf.FieldName).ToList());
                     }
 
@@ -729,7 +729,7 @@
 
                 SnackBarService.Success(User.DisplayName + " has been deleted.");
                 await AuditLogger.User.Deleted(User);
-                _ = OUNotificationService.PostAsync(User, NotificationType.Delete, CurrentUser.State);
+                _ = NotificationGenerationService.PostAsync(User, NotificationType.Delete, CurrentUser.State);
 
             }
             catch (ApplicationException ex)

diff --git a/BLAZAMActiveDirectory/Adapters/ADOrganizationalUnit.cs b/BLAZAMActiveDirectory/Adapters/ADOrganizationalUnit.cs
@@ -267,7 +267,7 @@ public IADUser CreateUser(string containerName)
         /// Directory.
         /// </summary>
         /// <param name="containerName">The container name of the new group</param>
-        /// <returns>An uncommited group</returns>
+        /// <returns>An uncommitted group</returns>
         public IADGroup CreateGroup(string containerName)
         {
             EnsureDirectoryEntry();

diff --git a/BLAZAMGui/UI/DirectoryEntryViewBase.razor.cs b/BLAZAMGui/UI/DirectoryEntryViewBase.razor.cs
@@ -12,7 +12,7 @@ namespace BLAZAM.Gui.UI
     public class DirectoryEntryViewBase : DatabaseComponentBase
     {
         [Inject]
-        public NotificationGenerationService OUNotificationService { get; set; }
+        public NotificationGenerationService NotificationGenerationService { get; set; }
         [Parameter]
         public IDirectoryEntryAdapter DirectoryEntry { get; set; }
 

diff --git a/BLAZAMGui/UI/Outputs/RequestNotificationMessageListItem.razor b/BLAZAMGui/UI/Outputs/RequestNotificationMessageListItem.razor
@@ -82,7 +82,7 @@ else
                     <MudButton Size="Size.Small"
                                Variant="Variant.Filled"
                                StartIcon="@Icons.Material.Filled.ThumbUpAlt"
-                               OnClick="@(()=>{_approvalModal.ShowAsync();})"
+                               OnClick="@(()=>{_=_approvalModal.ShowAsync();})"
                                Color="Color.Success">@AppLocalization["Approve"]</MudButton>
                 </MudStack>
 

diff --git a/BLAZAMGui/UI/Search/SearchControls.razor b/BLAZAMGui/UI/Search/SearchControls.razor
@@ -54,33 +54,13 @@
 
 @if (IsAdmin == true || CurrentUser.State?.CanSearchDisabled(ActiveDirectoryObjectType.User) == true)
 {
-    var buttonColor = Color.Error;
-    if (!SearchService.IncludeDisabled)
-
-    {
-        buttonColor = Color.Success;
-    }
-    @*    <MudButton Size=Size.Small
-               Class="d-flex"
-               Variant="Variant.Filled"
-               ButtonType="ButtonType.Button"
-               OnClick=@(async()=>{
-           SearchService.IncludeDisabled= !SearchService.IncludeDisabled;
-           await InvokeAsync(StateHasChanged);
-           }) Color=buttonColor>
-        @AppLocalization["Enabled Only"]
-    </MudButton> *@
-
-
     <MudSwitch Class="d-flex align-middle"
         Size=Size.Small
                @bind-Value=SearchService.IncludeDisabled
                UncheckedColor="Color.Error"
                Color=Color.Success>
         @AppLocalization["Include Disabled"]
     </MudSwitch>
-
-
 }
 @{
     var adornmentIcon = Icons.Material.Filled.AccountTree;