Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored response and request models to dto naming. Adjusted mapper naming

Browse Source
This commit is contained in:
ChiaraBm
2026-01-14 19:19:45 +01:00
parent 1d1dfc2c1c
commit 7f482fd6c3
37 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moonlight.Frontend/UI/Admin/Modals/CreateRoleDialog.razor
View File

@@ -56,9 +56,9 @@
@code
{
[Parameter] public Func<CreateRoleRequest, Task> OnSubmit { get; set; }
[Parameter] public Func<CreateRoleDto, Task> OnSubmit { get; set; }
private CreateRoleRequest Request;
private CreateRoleDto Request;
private List<string> Permissions;
private FormHandler FormHandler;

8
Moonlight.Frontend/UI/Admin/Modals/UpdateRoleDialog.razor
View File

@@ -58,16 +58,16 @@
@code
{
[Parameter] public Func<UpdateRoleRequest, Task> OnSubmit { get; set; }
[Parameter] public RoleResponse Role { get; set; }
[Parameter] public Func<UpdateRoleDto, Task> OnSubmit { get; set; }
[Parameter] public RoleDto Role { get; set; }
private UpdateRoleRequest Request;
private UpdateRoleDto Request;
private List<string> Permissions;
private FormHandler FormHandler;
protected override void OnInitialized()
{
Request = RoleMapper.MapToUpdate(Role);
Request = RoleMapper.ToUpdate(Role);
Permissions = Role.Permissions.ToList();
}

4
Moonlight.Frontend/UI/Admin/Views/Overview.razor
View File

@@ -144,14 +144,14 @@
@code
{
private bool IsInfoLoading = true;
private SystemInfoResponse? InfoResponse;
private SystemInfoDto? InfoResponse;
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if(!firstRender)
return;
InfoResponse = await HttpClient.GetFromJsonAsync<SystemInfoResponse>("api/admin/system/info", Constants.SerializerOptions);
InfoResponse = await HttpClient.GetFromJsonAsync<SystemInfoDto>("api/admin/system/info", Constants.SerializerOptions);
IsInfoLoading = false;
await InvokeAsync(StateHasChanged);

4
Moonlight.Frontend/UI/Admin/Views/Sys/Diagnose.razor
View File

@@ -218,7 +218,7 @@
{
private bool IsLoading = false;
private bool HasDiagnosed = false;
private DiagnoseResultResponse[] Entries;
private DiagnoseResultDto[] Entries;
private async Task DiagnoseAsync()
{
@@ -226,7 +226,7 @@
HasDiagnosed = false;
await InvokeAsync(StateHasChanged);
var results = await HttpClient.GetFromJsonAsync<DiagnoseResultResponse[]>("api/admin/system/diagnose");
var results = await HttpClient.GetFromJsonAsync<DiagnoseResultDto[]>("api/admin/system/diagnose");
Entries = results ?? [];
IsLoading = false;

20
Moonlight.Frontend/UI/Admin/Views/Sys/Roles.razor
View File

@@ -27,9 +27,9 @@
</div>
<div class="mt-3">
<DataGrid @ref="Grid" TGridItem="RoleResponse" Loader="LoadAsync" PageSize="10" ClassName="bg-card">
<DataGrid @ref="Grid" TGridItem="RoleDto" Loader="LoadAsync" PageSize="10" ClassName="bg-card">
<PropertyColumn Field="u => u.Id"/>
<PropertyColumn IsFilterable="true" Identifier="@nameof(RoleResponse.Name)" Field="r => r.Name"/>
<PropertyColumn IsFilterable="true" Identifier="@nameof(RoleDto.Name)" Field="r => r.Name"/>
<PropertyColumn Title="Description" Field="r => r.Description"/>
<PropertyColumn Title="Members" Field="r => r.MemberCount"/>
<TemplateColumn>
@@ -68,26 +68,26 @@
@code
{
private DataGrid<RoleResponse> Grid;
private DataGrid<RoleDto> Grid;
private async Task<DataGridResponse<RoleResponse>> LoadAsync(DataGridRequest<RoleResponse> request)
private async Task<DataGridResponse<RoleDto>> LoadAsync(DataGridRequest<RoleDto> request)
{
var query = $"?startIndex={request.StartIndex}&length={request.Length}";
var filterOptions = request.Filters.Count > 0 ? new FilterOptions(request.Filters) : null;
var response = await HttpClient.GetFromJsonAsync<PagedData<RoleResponse>>(
var response = await HttpClient.GetFromJsonAsync<PagedData<RoleDto>>(
$"api/admin/roles{query}&filterOptions={filterOptions}",
Constants.SerializerOptions
);
return new DataGridResponse<RoleResponse>(response!.Data, response.TotalLength);
return new DataGridResponse<RoleDto>(response!.Data, response.TotalLength);
}
private async Task CreateAsync()
{
await DialogService.LaunchAsync<CreateRoleDialog>(parameters =>
{
parameters[nameof(CreateRoleDialog.OnSubmit)] = async Task (CreateRoleRequest request) =>
parameters[nameof(CreateRoleDialog.OnSubmit)] = async Task (CreateRoleDto request) =>
{
await HttpClient.PostAsJsonAsync(
"api/admin/roles",
@@ -101,12 +101,12 @@
});
}
private async Task EditAsync(RoleResponse role)
private async Task EditAsync(RoleDto role)
{
await DialogService.LaunchAsync<UpdateRoleDialog>(parameters =>
{
parameters[nameof(UpdateRoleDialog.Role)] = role;
parameters[nameof(UpdateRoleDialog.OnSubmit)] = async Task (UpdateRoleRequest request) =>
parameters[nameof(UpdateRoleDialog.OnSubmit)] = async Task (UpdateRoleDto request) =>
{
await HttpClient.PatchAsJsonAsync(
$"api/admin/roles/{role.Id}",
@@ -120,7 +120,7 @@
});
}
private async Task DeleteAsync(RoleResponse role)
private async Task DeleteAsync(RoleDto role)
{
await AlertDialogService.ConfirmDangerAsync(
$"Deletion of role {role.Name}",

2
Moonlight.Frontend/UI/Admin/Views/Users/Create.razor
View File

@@ -69,7 +69,7 @@
@code
{
private CreateUserRequest Request = new();
private CreateUserDto Request = new();
private FormHandler Form;

8
Moonlight.Frontend/UI/Admin/Views/Users/Edit.razor
View File

@@ -77,15 +77,15 @@
[Parameter] public int Id { get; set; }
private FormHandler Form;
private UpdateUserRequest Request;
private UserResponse User;
private UpdateUserDto Request;
private UserDto User;
private async Task LoadAsync(LazyLoader _)
{
var user = await HttpClient.GetFromJsonAsync<UserResponse>($"api/users/{Id}", Constants.SerializerOptions);
var user = await HttpClient.GetFromJsonAsync<UserDto>($"api/users/{Id}", Constants.SerializerOptions);
User = user!;
Request = UserMapper.MapToUpdate(User);
Request = UserMapper.ToUpdate(User);
}
private async Task OnSubmitAsync()

18
Moonlight.Frontend/UI/Admin/Views/Users/Index.razor
View File

@@ -36,12 +36,12 @@
</div>
<div class="mt-8">
<DataGrid @ref="Grid" TGridItem="UserResponse" Loader="LoadAsync" PageSize="10" ClassName="bg-card">
<DataGrid @ref="Grid" TGridItem="UserDto" Loader="LoadAsync" PageSize="10" ClassName="bg-card">
<PropertyColumn HeadClassName="text-left" CellClassName="text-left" Field="u => u.Id"/>
<PropertyColumn HeadClassName="text-left" CellClassName="text-left" IsFilterable="true"
Identifier="@nameof(UserResponse.Username)" Field="u => u.Username"/>
Identifier="@nameof(UserDto.Username)" Field="u => u.Username"/>
<PropertyColumn HeadClassName="text-left" CellClassName="text-left" IsFilterable="true"
Identifier="@nameof(UserResponse.Email)" Field="u => u.Email"/>
Identifier="@nameof(UserDto.Email)" Field="u => u.Email"/>
<TemplateColumn>
<CellTemplate>
<TableCell>
@@ -78,24 +78,24 @@
@code
{
private DataGrid<UserResponse> Grid;
private DataGrid<UserDto> Grid;
private async Task<DataGridResponse<UserResponse>> LoadAsync(DataGridRequest<UserResponse> request)
private async Task<DataGridResponse<UserDto>> LoadAsync(DataGridRequest<UserDto> request)
{
var query = $"?startIndex={request.StartIndex}&length={request.Length}";
var filterOptions = request.Filters.Count > 0 ? new FilterOptions(request.Filters) : null;
var response = await HttpClient.GetFromJsonAsync<PagedData<UserResponse>>(
var response = await HttpClient.GetFromJsonAsync<PagedData<UserDto>>(
$"api/users{query}&filterOptions={filterOptions}",
Constants.SerializerOptions
);
return new DataGridResponse<UserResponse>(response!.Data, response.TotalLength);
return new DataGridResponse<UserDto>(response!.Data, response.TotalLength);
}
private void Edit(UserResponse response) => Navigation.NavigateTo($"/users/{response.Id}");
private void Edit(UserDto dto) => Navigation.NavigateTo($"/users/{dto.Id}");
private async Task DeleteAsync(UserResponse user)
private async Task DeleteAsync(UserDto user)
{
await AlertDialogService.ConfirmDangerAsync(
$"Deletion of user {user.Username}",