diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/environments/environment.prod.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/environments/environment.prod.ts index 0f8d432..591410b9 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/environments/environment.prod.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/environments/environment.prod.ts @@ -89,7 +89,7 @@ export const env = { field: "name" } ], - complete: [ + detailed: [ { header: "Gruppe", field: "name" @@ -97,34 +97,6 @@ export const env = { { header: "Kommentar", field: "comment" - }, - { - header: "Active", - field: (group: any) => group.active ? "✓" : "" - }, - { - header: "AD Sync", - field: (group: any) => group.adSync ? "✓" : "" - }, - { - header: "Internal", - field: (group: any) => group.internal ? "✓" : "" - }, - { - header: 'Hinzugefügt
wer', - field: (g: any) => g.addedWho - }, - { - header: 'Hinzugefügt
wann', - field: (g: any) => new Date(g.addedWhen).toLocaleString('de-DE', { day: '2-digit', month: '2-digit', year: '2-digit', hour: '2-digit', minute: '2-digit' }).replace(',', '') - }, - { - header: 'Geändert
wer', - field: 'changedWho' - }, - { - header: 'Geändert
wann', - field: (g: any) => new Date(g.changedWhen).toLocaleString('de-DE', { day: '2-digit', month: '2-digit', year: '2-digit', hour: '2-digit', minute: '2-digit' }).replace(',', '') } ], representative: [ @@ -189,10 +161,6 @@ export const env = { header: "Repr. Gruppen", field: (ur: any) => ur.repGroup?.name }, - { - header: "Rechte Gruppen", - field: (ur: any) => ur.rightGroup?.name - }, { header: "Repr. Benutzer", field: (ur: any) => ur.repUser?.username @@ -220,4 +188,4 @@ export const env = { { value: "en-US", name: "en-US" } ] } -}; +}; \ No newline at end of file diff --git a/DigitalData.UserManager.API/Program.cs b/DigitalData.UserManager.API/Program.cs index 61ead86..eef8e0b 100644 --- a/DigitalData.UserManager.API/Program.cs +++ b/DigitalData.UserManager.API/Program.cs @@ -54,7 +54,7 @@ try { // Once the app is built, the password will be decrypted with Encryptor. lazy loading also acts as a call back method. Lazy? cnn_str = null; - builder.Services.AddDbContext(options => options.UseSqlServer(cnn_str!.Value).EnableDetailedErrors()); + builder.Services.AddDbContext(options => options.UseSqlServer(cnn_str!.Value).EnableSensitiveDataLogging()); var allowedOrigins = builder.Configuration.GetSection("AllowedOrigins").Get() ?? throw new InvalidOperationException("In appsettings there is no allowed origin."); diff --git a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs index 6cf8e71..f93ffe6 100644 --- a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepCreateDto.cs @@ -6,6 +6,6 @@ namespace DigitalData.UserManager.Application.DTOs.UserRep int? UserId, int? RepGroupId, int? GroupId, - int RepUserId + int? RepUserId ) : BaseCreateDto(); } \ No newline at end of file diff --git a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs index d4228a4..f81bf8b 100644 --- a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs +++ b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepReadDto.cs @@ -11,7 +11,7 @@ namespace DigitalData.UserManager.Application.DTOs.UserRep int? RepUserId, int? RepGroupId, string AddedWho, - string ChangedWho, + string? ChangedWho, UserReadDto? User, GroupReadDto? RepGroup, GroupReadDto? Group, diff --git a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs index 366fa20..59165f0 100644 --- a/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs +++ b/DigitalData.UserManager.Application/DTOs/UserRep/UserRepUpdateDto.cs @@ -6,6 +6,6 @@ namespace DigitalData.UserManager.Application.DTOs.UserRep int? UserId, int? RepGroupId, int? GroupId, - int RepUserId + int? RepUserId ) : BaseUpdateDto(); } \ No newline at end of file diff --git a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs index f6609b1..cd53a72 100644 --- a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs +++ b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs @@ -20,6 +20,7 @@ namespace DigitalData.UserManager.Domain.Entities [Column("CHANGED_WHO")] public string? ChangedWho { get; set; } + //TODO: assign it to default value in create dto, not here! [Column("ADDED_WHEN", TypeName = "datetime")] [DefaultValue("GETDATE()")] public DateTime AddedWhen { get; set; } = DateTime.Now; diff --git a/DigitalData.UserManager.Domain/Entities/UserRep.cs b/DigitalData.UserManager.Domain/Entities/UserRep.cs index a59679b..1b40d1f 100644 --- a/DigitalData.UserManager.Domain/Entities/UserRep.cs +++ b/DigitalData.UserManager.Domain/Entities/UserRep.cs @@ -6,7 +6,6 @@ namespace DigitalData.UserManager.Domain.Entities [Table("TBDD_USER_REPRESENTATION", Schema = "dbo")] public class UserRep : BaseEntity { - [Required] [Column("USER_ID")] public int? UserId { get; set; }