Removed use of crud helper. Refactored user and api key response. Removed unused request/response models

This commit is contained in:
2025-04-05 14:56:26 +02:00
parent e1c0722fce
commit 7fa46ef245
11 changed files with 231 additions and 87 deletions

View File

@@ -53,18 +53,18 @@
</a>
</div>
<DataTable @ref="Table" TItem="ApiKeyDetailResponse">
<DataTable @ref="Table" TItem="ApiKeyResponse">
<Configuration>
<Pagination TItem="ApiKeyDetailResponse" ItemSource="LoadData" />
<Pagination TItem="ApiKeyResponse" ItemSource="LoadData" />
<DataTableColumn TItem="ApiKeyDetailResponse" Field="@(x => x.Id)" Name="Id"/>
<DataTableColumn TItem="ApiKeyDetailResponse" Field="@(x => x.Description)" Name="Description"/>
<DataTableColumn TItem="ApiKeyDetailResponse" Field="@(x => x.ExpiresAt)" Name="Expires at">
<DataTableColumn TItem="ApiKeyResponse" Field="@(x => x.Id)" Name="Id"/>
<DataTableColumn TItem="ApiKeyResponse" Field="@(x => x.Description)" Name="Description"/>
<DataTableColumn TItem="ApiKeyResponse" Field="@(x => x.ExpiresAt)" Name="Expires at">
<ColumnTemplate>
@(Formatter.FormatDate(context.ExpiresAt))
</ColumnTemplate>
</DataTableColumn>
<DataTableColumn TItem="ApiKeyDetailResponse">
<DataTableColumn TItem="ApiKeyResponse">
<ColumnTemplate>
<div class="flex justify-end">
<a href="/admin/api/@(context.Id)" class="text-primary-500 mr-2 sm:mr-3">
@@ -83,19 +83,19 @@
@code
{
private DataTable<ApiKeyDetailResponse> Table;
private DataTable<ApiKeyResponse> Table;
private async Task<IPagedData<ApiKeyDetailResponse>> LoadData(PaginationOptions options)
=> await ApiClient.GetJson<PagedData<ApiKeyDetailResponse>>($"api/admin/apikeys?page={options.Page}&pageSize={options.PerPage}");
private async Task<IPagedData<ApiKeyResponse>> LoadData(PaginationOptions options)
=> await ApiClient.GetJson<PagedData<ApiKeyResponse>>($"api/admin/apikeys?page={options.Page}&pageSize={options.PerPage}");
private async Task Delete(ApiKeyDetailResponse apiKeyDetailResponse)
private async Task Delete(ApiKeyResponse apiKeyResponse)
{
await AlertService.ConfirmDanger(
"API Key deletion",
$"Do you really want to delete the api key '{apiKeyDetailResponse.Description}'",
$"Do you really want to delete the api key '{apiKeyResponse.Description}'",
async () =>
{
await ApiClient.Delete($"api/admin/apikeys/{apiKeyDetailResponse.Id}");
await ApiClient.Delete($"api/admin/apikeys/{apiKeyResponse.Id}");
await ToastService.Success("Successfully deleted api key");
await Table.Refresh();

View File

@@ -55,7 +55,7 @@
private async Task Load(LazyLoader _)
{
var detail = await ApiClient.GetJson<ApiKeyDetailResponse>($"api/admin/apikeys/{Id}");
var detail = await ApiClient.GetJson<ApiKeyResponse>($"api/admin/apikeys/{Id}");
Request = Mapper.Map<UpdateApiKeyRequest>(detail);
}

View File

@@ -17,14 +17,14 @@
</PageHeader>
</div>
<DataTable @ref="Table" TItem="UserDetailResponse">
<DataTable @ref="Table" TItem="UserResponse">
<Configuration>
<Pagination TItem="UserDetailResponse" ItemSource="LoadData" />
<Pagination TItem="UserResponse" ItemSource="LoadData" />
<DataTableColumn TItem="UserDetailResponse" Field="@(x => x.Id)" Name="Id"/>
<DataTableColumn TItem="UserDetailResponse" Field="@(x => x.Username)" Name="Username"/>
<DataTableColumn TItem="UserDetailResponse" Field="@(x => x.Email)" Name="Email"/>
<DataTableColumn TItem="UserDetailResponse">
<DataTableColumn TItem="UserResponse" Field="@(x => x.Id)" Name="Id"/>
<DataTableColumn TItem="UserResponse" Field="@(x => x.Username)" Name="Username"/>
<DataTableColumn TItem="UserResponse" Field="@(x => x.Email)" Name="Email"/>
<DataTableColumn TItem="UserResponse">
<ColumnTemplate>
<div class="flex justify-end">
<a href="/admin/users/@(context.Id)" class="text-primary-500 mr-2 sm:mr-3">
@@ -43,19 +43,19 @@
@code
{
private DataTable<UserDetailResponse> Table;
private DataTable<UserResponse> Table;
private async Task<IPagedData<UserDetailResponse>> LoadData(PaginationOptions options)
=> await ApiClient.GetJson<PagedData<UserDetailResponse>>($"api/admin/users?page={options.Page}&pageSize={options.PerPage}");
private async Task<IPagedData<UserResponse>> LoadData(PaginationOptions options)
=> await ApiClient.GetJson<PagedData<UserResponse>>($"api/admin/users?page={options.Page}&pageSize={options.PerPage}");
private async Task Delete(UserDetailResponse detailResponse)
private async Task Delete(UserResponse response)
{
await AlertService.ConfirmDanger(
"User deletion",
$"Do you really want to delete the user '{detailResponse.Username}'",
$"Do you really want to delete the user '{response.Username}'",
async () =>
{
await ApiClient.Delete($"api/admin/users/{detailResponse.Id}");
await ApiClient.Delete($"api/admin/users/{response.Id}");
await ToastService.Success("Successfully deleted user");
await Table.Refresh();

View File

@@ -55,7 +55,7 @@
private async Task Load(LazyLoader _)
{
var detail = await ApiClient.GetJson<UserDetailResponse>($"api/admin/users/{Id}");
var detail = await ApiClient.GetJson<UserResponse>($"api/admin/users/{Id}");
Request = Mapper.Map<UpdateUserRequest>(detail);
}