improve performance of alias handling and allow aliases to be an unlimited number of subfolders in depth

This commit is contained in:
Shaun Walker
2020-05-05 09:15:36 -04:00
parent bf84f12471
commit a02cfea6c9
54 changed files with 320 additions and 586 deletions

View File

@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Oqtane.Shared;
namespace Oqtane.Services
@ -11,28 +10,22 @@ namespace Oqtane.Services
{
private readonly SiteState _siteState;
private readonly NavigationManager _navigationManager;
public UserRoleService(HttpClient http, SiteState siteState, NavigationManager navigationManager) : base(http)
{
public UserRoleService(HttpClient http, SiteState siteState) : base(http)
{
_siteState = siteState;
_navigationManager = navigationManager;
}
private string Apiurl
{
get { return CreateApiUrl(_siteState.Alias, _navigationManager.Uri, "UserRole"); }
}
private string Apiurl => CreateApiUrl(_siteState.Alias, "UserRole");
public async Task<List<UserRole>> GetUserRolesAsync(int siteId)
{
return await GetJsonAsync<List<UserRole>>($"{Apiurl}?siteid={siteId.ToString()}");
return await GetJsonAsync<List<UserRole>>($"{Apiurl}?siteid={siteId}");
}
public async Task<UserRole> GetUserRoleAsync(int userRoleId)
{
return await GetJsonAsync<UserRole>($"{Apiurl}/{userRoleId.ToString()}");
return await GetJsonAsync<UserRole>($"{Apiurl}/{userRoleId}");
}
public async Task<UserRole> AddUserRoleAsync(UserRole userRole)
@ -42,12 +35,12 @@ namespace Oqtane.Services
public async Task<UserRole> UpdateUserRoleAsync(UserRole userRole)
{
return await PutJsonAsync<UserRole>($"{Apiurl}/{userRole.UserRoleId.ToString()}", userRole);
return await PutJsonAsync<UserRole>($"{Apiurl}/{userRole.UserRoleId}", userRole);
}
public async Task DeleteUserRoleAsync(int userRoleId)
{
await DeleteAsync($"{Apiurl}/{userRoleId.ToString()}");
await DeleteAsync($"{Apiurl}/{userRoleId}");
}
}
}