Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

optimized cross tenant logic and fixed bug related to reordering modules in panes

Browse Source
This commit is contained in:
Shaun Walker
2020-03-04 09:28:02 -05:00
parent 06257943ca
commit 061043bd15
8 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Oqtane.Client/Services/LogService.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Text.Json;
using System.Threading.Tasks;
@ -69,14 +68,7 @@ namespace Oqtane.Services
log.Message = message;
log.MessageTemplate = "";
log.Properties = JsonSerializer.Serialize(args);
if (Alias == null)
{
await http.PostJsonAsync(apiurl, log);
}
else
{
await http.PostJsonAsync(apiurl + "?alias=" + WebUtility.UrlEncode(Alias.Name), log);
}
await http.PostJsonAsync(CreateCrossTenantUrl(apiurl, Alias), log);
}
}
}

12
Oqtane.Client/Services/ServiceBase.cs
View File

@ -1,7 +1,5 @@
using System;
using Microsoft.AspNetCore.Components;
using Oqtane.Models;
using Oqtane.Shared;
namespace Oqtane.Services
{
@ -30,5 +28,15 @@ namespace Oqtane.Services
apiurl += "api/" + serviceName;
return apiurl;
}
public static string CreateCrossTenantUrl(string url, Alias alias)
{
if (alias != null)
{
url += (url.Contains("?")) ? "&" : "?";
url += "aliasid=" + alias.AliasId.ToString();
}
return url;
}
}
}

21
Oqtane.Client/Services/SiteService.cs
View File

@ -5,7 +5,6 @@ using System.Linq;
using Microsoft.AspNetCore.Components;
using System.Collections.Generic;
using Oqtane.Shared;
using System.Net;
namespace Oqtane.Services
{
@ -27,40 +26,30 @@ namespace Oqtane.Services
get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Site"); }
}
private string urlsuffix(Alias Alias)
{
string querystring = "";
if (Alias != null)
{
querystring = "?alias=" + WebUtility.UrlEncode(Alias.Name);
}
return querystring;
}
public async Task<List<Site>> GetSitesAsync(Alias Alias)
{
List<Site> sites = await http.GetJsonAsync<List<Site>>(apiurl + urlsuffix(Alias));
List<Site> sites = await http.GetJsonAsync<List<Site>>(CreateCrossTenantUrl(apiurl, Alias));
return sites.OrderBy(item => item.Name).ToList();
}
public async Task<Site> GetSiteAsync(int SiteId, Alias Alias)
{
return await http.GetJsonAsync<Site>(apiurl + "/" + SiteId.ToString() + urlsuffix(Alias));
return await http.GetJsonAsync<Site>(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
}
public async Task<Site> AddSiteAsync(Site Site, Alias Alias)
{
return await http.PostJsonAsync<Site>(apiurl + urlsuffix(Alias), Site);
return await http.PostJsonAsync<Site>(CreateCrossTenantUrl(apiurl, Alias), Site);
}
public async Task<Site> UpdateSiteAsync(Site Site, Alias Alias)
{
return await http.PutJsonAsync<Site>(apiurl + "/" + Site.SiteId.ToString() + urlsuffix(Alias), Site);
return await http.PutJsonAsync<Site>(CreateCrossTenantUrl(apiurl + "/" + Site.SiteId.ToString(), Alias), Site);
}
public async Task DeleteSiteAsync(int SiteId, Alias Alias)
{
await http.DeleteAsync(apiurl + "/" + SiteId.ToString() + urlsuffix(Alias));
await http.DeleteAsync(CreateCrossTenantUrl(apiurl + "/" + SiteId.ToString(), Alias));
}
}
}

6
Oqtane.Client/Services/UserService.cs
View File

@ -1,12 +1,8 @@
using Oqtane.Shared;
using Oqtane.Models;
using System;
using System.Linq;
using System.Net.Http;
using Microsoft.AspNetCore.Components;
using System.Threading.Tasks;
using System.Collections.Generic;
using System.Net;
namespace Oqtane.Services
{
@ -54,7 +50,7 @@ namespace Oqtane.Services
{
try
{
return await http.PostJsonAsync<User>(apiurl + "?alias=" + WebUtility.UrlEncode(Alias.Name), User);
return await http.PostJsonAsync<User>(CreateCrossTenantUrl(apiurl, Alias), User);
}
catch
{