Merge pull request #2254 from sbwalker/dev

Fix #2249 Fix #2250 - issues with site deletion
oqtane · Jun 27, 2022 · c8c5a05 · c8c5a05
2 parents c4f04ed + 2771f03
commit c8c5a05
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -546,19 +546,19 @@
 	{
 		try
 		{
-			var sites = await SiteService.GetSitesAsync();
-			if (sites.Count > 1)
+			var aliases = await AliasService.GetAliasesAsync();
+			if (aliases.Any(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId))
 			{
 				await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
 				await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
 
-				var aliases = await AliasService.GetAliasesAsync();
-				foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
+				foreach (Alias alias in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
 				{
-					await AliasService.DeleteAliasAsync(a.AliasId);
+					await AliasService.DeleteAliasAsync(alias.AliasId);
 				}
 
-				NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+				aliases = await AliasService.GetAliasesAsync();
+				NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliases.First().Name, true);
 			}
 			else
 			{