completed client state invalidation in multi-user environment
This commit is contained in:
		@ -152,7 +152,7 @@
 | 
			
		||||
                }
 | 
			
		||||
                await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
 | 
			
		||||
                await logger.LogInformation("Folder Saved {Folder}", folder);
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
 | 
			
		||||
@ -117,7 +117,7 @@
 | 
			
		||||
            {
 | 
			
		||||
                await logger.LogInformation("Login Successful For Username {Username}", Username);
 | 
			
		||||
                authstateprovider.NotifyAuthenticationChanged();
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(ReturnUrl, Reload.Site));
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(ReturnUrl));
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
 | 
			
		||||
@ -72,7 +72,7 @@
 | 
			
		||||
        try
 | 
			
		||||
        {
 | 
			
		||||
            await ModuleDefinitionService.InstallModuleDefinitionsAsync();
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
@ -71,7 +71,7 @@
 | 
			
		||||
            moduledefinition.Permissions = permissiongrid.GetPermissions();
 | 
			
		||||
            await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
 | 
			
		||||
            await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
@ -78,7 +78,7 @@ else
 | 
			
		||||
            await PackageService.DownloadPackageAsync(moduledefinitionname, version, "Modules");
 | 
			
		||||
            await ModuleDefinitionService.InstallModuleDefinitionsAsync();
 | 
			
		||||
            await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", moduledefinitionname, version);
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
@ -93,7 +93,7 @@ else
 | 
			
		||||
        {
 | 
			
		||||
            await ModuleDefinitionService.DeleteModuleDefinitionAsync(ModuleDefinition.ModuleDefinitionId, ModuleDefinition.SiteId);
 | 
			
		||||
            await logger.LogInformation("Module Deleted {ModuleDefinition}", ModuleDefinition);
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
@ -33,7 +33,8 @@
 | 
			
		||||
            try
 | 
			
		||||
            {
 | 
			
		||||
                await ModuleService.ImportModuleAsync(ModuleState.ModuleId, content);
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(Reload.Page));
 | 
			
		||||
                StateHasChanged();
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
            }
 | 
			
		||||
            catch (Exception ex)
 | 
			
		||||
            {
 | 
			
		||||
 | 
			
		||||
@ -115,7 +115,7 @@
 | 
			
		||||
            moduleType.GetMethod("UpdateSettings").Invoke(settings, null); // method must be public in settings component
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl(Reload.Page));
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -315,7 +315,7 @@
 | 
			
		||||
                await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
 | 
			
		||||
 | 
			
		||||
                await logger.LogInformation("Page Added {Page}", page);
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(page.Path, Reload.Site));
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(page.Path));
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
 | 
			
		||||
@ -400,7 +400,7 @@
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                await logger.LogInformation("Page Saved {Page}", page);
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(page.Path, Reload.Site));
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(page.Path));
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
 | 
			
		||||
@ -31,7 +31,7 @@
 | 
			
		||||
            Page.IsDeleted = true;
 | 
			
		||||
            await PageService.UpdatePageAsync(Page);
 | 
			
		||||
            await logger.LogInformation("Page Deleted {Page}", Page);
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl("admin/pages", Reload.Site));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
@ -117,7 +117,7 @@
 | 
			
		||||
            await logger.LogInformation("Page Restored {Page}", Page);
 | 
			
		||||
            await Load();
 | 
			
		||||
            StateHasChanged();
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
@ -134,7 +134,7 @@
 | 
			
		||||
            await logger.LogInformation("Page Permanently Deleted {Page}", Page);
 | 
			
		||||
            await Load();
 | 
			
		||||
            StateHasChanged();
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
@ -329,7 +329,7 @@
 | 
			
		||||
 | 
			
		||||
                        await logger.LogInformation("Site Saved {Site}", site);
 | 
			
		||||
 | 
			
		||||
                        NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
 | 
			
		||||
                        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                else
 | 
			
		||||
 | 
			
		||||
@ -243,7 +243,7 @@
 | 
			
		||||
 | 
			
		||||
                        await Log(Alias, LogLevel.Information, "Edit", null, "Site Saved {Site}", site);
 | 
			
		||||
 | 
			
		||||
                        NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
 | 
			
		||||
                        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                else
 | 
			
		||||
 | 
			
		||||
@ -61,7 +61,7 @@ else
 | 
			
		||||
                {
 | 
			
		||||
                    await AliasService.DeleteAliasAsync(alias.AliasId);
 | 
			
		||||
                }
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
 | 
			
		||||
                NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
 | 
			
		||||
@ -61,7 +61,7 @@
 | 
			
		||||
    private async Task InstallThemes()
 | 
			
		||||
    {
 | 
			
		||||
        await ThemeService.InstallThemesAsync();
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private async Task DownloadTheme(string packageid, string version)
 | 
			
		||||
 | 
			
		||||
@ -66,13 +66,13 @@ else
 | 
			
		||||
        await PackageService.DownloadPackageAsync(themename, version, "Themes");
 | 
			
		||||
        await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
 | 
			
		||||
        await ThemeService.InstallThemesAsync();
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private async Task DeleteTheme(Theme Theme)
 | 
			
		||||
    {
 | 
			
		||||
        await ThemeService.DeleteThemeAsync(Theme.ThemeName);
 | 
			
		||||
        await logger.LogInformation("Theme Deleted {Theme}", Theme);
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@ -47,13 +47,13 @@
 | 
			
		||||
    private async Task Upgrade()
 | 
			
		||||
    {
 | 
			
		||||
        await InstallationService.Upgrade();
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private async Task Download(string packageid, string version)
 | 
			
		||||
    {
 | 
			
		||||
        await PackageService.DownloadPackageAsync(packageid, version, "Framework");
 | 
			
		||||
        await InstallationService.Upgrade();
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
 | 
			
		||||
        NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@ -189,7 +189,7 @@
 | 
			
		||||
                await htmltextservice.AddHtmlTextAsync(htmltext);
 | 
			
		||||
            }
 | 
			
		||||
            await logger.LogInformation("Html/Text Content Saved {HtmlText}", htmltext);
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl(Reload.Page));
 | 
			
		||||
            NavigationManager.NavigateTo(NavigateUrl());
 | 
			
		||||
        }
 | 
			
		||||
        catch (Exception ex)
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										10
									
								
								Oqtane.Client/Modules/MessageType.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								Oqtane.Client/Modules/MessageType.cs
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,10 @@
 | 
			
		||||
namespace Oqtane.Modules
 | 
			
		||||
{
 | 
			
		||||
    public enum MessageType
 | 
			
		||||
    {
 | 
			
		||||
        Success,
 | 
			
		||||
        Info,
 | 
			
		||||
        Warning,
 | 
			
		||||
        Error
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@ -2,9 +2,9 @@
 | 
			
		||||
using Oqtane.Shared;
 | 
			
		||||
using Oqtane.Models;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using Oqtane.Services;
 | 
			
		||||
using System;
 | 
			
		||||
using Oqtane.UI;
 | 
			
		||||
 | 
			
		||||
namespace Oqtane.Modules
 | 
			
		||||
{
 | 
			
		||||
@ -49,29 +49,14 @@ namespace Oqtane.Modules
 | 
			
		||||
            return NavigateUrl(PageState.Page.Path);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string NavigateUrl(Reload reload)
 | 
			
		||||
        {
 | 
			
		||||
            return NavigateUrl(PageState.Page.Path, reload);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string NavigateUrl(string path)
 | 
			
		||||
        {
 | 
			
		||||
            return NavigateUrl(path, "", Reload.None);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string NavigateUrl(string path, Reload reload)
 | 
			
		||||
        {
 | 
			
		||||
            return NavigateUrl(path, "", reload);
 | 
			
		||||
            return NavigateUrl(path, "");
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string NavigateUrl(string path, string parameters)
 | 
			
		||||
        {
 | 
			
		||||
            return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters, Reload.None);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string NavigateUrl(string path, string parameters, Reload reload)
 | 
			
		||||
        {
 | 
			
		||||
            return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters, reload);
 | 
			
		||||
            return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string EditUrl(string action)
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user