From b0af00aa47d35039d44db2de014c48c18ac30b57 Mon Sep 17 00:00:00 2001 From: Jim Spillane Date: Wed, 27 May 2020 16:58:50 -0400 Subject: [PATCH 01/11] Fix Alias route Added wildcard route catchall. --- Oqtane.Server/Controllers/AliasController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs index 0bbdde97..c4422587 100644 --- a/Oqtane.Server/Controllers/AliasController.cs +++ b/Oqtane.Server/Controllers/AliasController.cs @@ -47,7 +47,7 @@ namespace Oqtane.Controllers } // GET api//name/xxx?sync=yyyyMMddHHmmssfff - [HttpGet("name/{name}")] + [HttpGet("name/{**name}")] public Alias Get(string name, string sync) { List aliases = _aliases.GetAliases().ToList(); // cached From e935451d934ceaabf13e1b2d716e6bd145ac734b Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Thu, 28 May 2020 11:32:24 +0200 Subject: [PATCH 02/11] Search in User management --- Oqtane.Client/Modules/Admin/Users/Index.razor | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index a9d4366f..cf180d73 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -9,7 +9,11 @@ } else { - + + +
+ +
@@ -28,16 +32,32 @@ else } @code { + private List allroles; private List userroles; + private string search; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override async Task OnInitializedAsync() { - userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId); - userroles = userroles.Where(item => item.Role.Name == Constants.RegisteredRole).ToList(); + allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId); + userroles = allroles.Where(item => item.Role.Name == Constants.RegisteredRole).ToList(); } + private void OnSearch() + { + userroles = allroles + .Where(item => item.Role.Name == Constants.RegisteredRole && + ( + item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) || + item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) || + item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase) + ) + ) + .ToList(); + } + + private async Task DeleteUser(UserRole UserRole) { try @@ -56,4 +76,4 @@ else AddModuleMessage(ex.Message, MessageType.Error); } } -} \ No newline at end of file +} From 151e37c4702bfbd3c056bedb3ba6aa643fe7f9ca Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Thu, 28 May 2020 12:26:23 +0200 Subject: [PATCH 03/11] Uri extensions for read query values - safe way to check if key is presented - safe parsing int values in query - should replace int.Parse() _jobId = Int32.Parse(PageState.QueryString["id"]); can throw unhandled exception when "id" is not int correct way if (PageState.Uri.TryGetQueryValueInt("id",out _jobId)) .... --- Oqtane.Shared/Shared/Utilities.cs | 89 +++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs index de81561b..04f3ea1e 100644 --- a/Oqtane.Shared/Shared/Utilities.cs +++ b/Oqtane.Shared/Shared/Utilities.cs @@ -1,5 +1,6 @@ using Oqtane.Models; using System; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; @@ -15,7 +16,7 @@ namespace Oqtane.Shared { if (type == null) return null; var assemblyFullName = type.Assembly.FullName; - var assemblyName = assemblyFullName.Substring(0, assemblyFullName.IndexOf(",", StringComparison.Ordinal)); + var assemblyName = assemblyFullName.Substring(0, assemblyFullName.IndexOf(",", StringComparison.Ordinal)); return $"{type.Namespace}, {assemblyName}"; } @@ -24,10 +25,10 @@ namespace Oqtane.Shared var uriBuilder = new UriBuilder { Path = !string.IsNullOrEmpty(alias) - ? (!string.IsNullOrEmpty(path)) - ? $"{alias}/{path}" - : $"{alias}" - : $"{path}", + ? (!string.IsNullOrEmpty(path)) + ? $"{alias}/{path}" + : $"{alias}" + : $"{path}", Query = parameters }; @@ -44,6 +45,7 @@ namespace Oqtane.Shared path += $"/{action}"; } } + return NavigateUrl(alias, path, parameters); } @@ -98,6 +100,7 @@ namespace Oqtane.Shared // remove assembly if fully qualified type typename = typename.Substring(0, typename.IndexOf(",")); } + // segment 0 is the last segment, segment 1 is the second to last segment, etc... string[] segments = typename.Split('.'); string name = ""; @@ -105,6 +108,7 @@ namespace Oqtane.Shared { name = segments[segments.Length - (segment + 1)]; } + return name; } @@ -142,11 +146,14 @@ namespace Oqtane.Shared stringBuilder.Append('-'); prevdash = true; } + break; } } + result = stringBuilder.ToString().Trim('-'); } + return result; } @@ -236,25 +243,28 @@ namespace Oqtane.Shared if (string.IsNullOrEmpty(email)) return false; return Regex.IsMatch(email, - @"^(?("")("".+?(? ParseQueryString(string query) + { + Dictionary dictionary = new Dictionary(); + if (!string.IsNullOrEmpty(query)) + { + query = query.Substring(1); + string str = query; + char[] separator = new char[1] {'&'}; + foreach (string key in str.Split(separator, StringSplitOptions.RemoveEmptyEntries)) + { + if (key != "") + { + if (key.Contains("=")) + { + string[] strArray = key.Split('=', StringSplitOptions.None); + dictionary.Add(strArray[0], strArray[1]); + } + else + dictionary.Add(key, "true"); + } + } + } + + return dictionary; + } } } From 612a820dacc6d9eefd2dd14215ff9aff14bbb251 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Thu, 28 May 2020 09:44:41 -0400 Subject: [PATCH 04/11] fixed stylesheet and script removal logic --- Oqtane.Client/UI/ThemeBuilder.razor | 9 +++++---- Oqtane.Server/wwwroot/js/interop.js | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor index 2b40e59e..792572b8 100644 --- a/Oqtane.Client/UI/ThemeBuilder.razor +++ b/Oqtane.Client/UI/ThemeBuilder.razor @@ -24,6 +24,7 @@ } // include page resources + string batch = DateTime.Now.ToString("yyyyMMddHHmmssfff"); var links = new List(); var scripts = new List(); foreach (Resource resource in PageState.Page.Resources) @@ -31,18 +32,18 @@ switch (resource.ResourceType) { case ResourceType.Stylesheet: - links.Add(new { id = "app-stylesheet" + links.Count.ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" }); + links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" }); break; case ResourceType.Script: - scripts.Add(new { id = "app-script" + scripts.Count.ToString("00"), src = resource.Url, integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", content = "", location = "body", key = "" }); + scripts.Add(new { id = "app-script-" + batch + "-" + (scripts.Count + 1).ToString("00"), src = resource.Url, integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", content = "", location = "body", key = "" }); break; } } await interop.IncludeLinks(links.ToArray()); await interop.IncludeScripts(scripts.ToArray()); // remove any page resource references which are no longer required for this page - await interop.RemoveElementsById("app-stylesheet", "app-stylesheet" + links.Count.ToString("00"), ""); - await interop.RemoveElementsById("app-script", "app-script" + scripts.Count.ToString("00"), ""); + await interop.RemoveElementsById("app-stylesheet", "", "app-stylesheet-" + batch + "-00"); + await interop.RemoveElementsById("app-script", "", "app-script-" + batch + "-00"); // add favicon if (PageState.Site.FaviconFileId != null) diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js index f94c3472..90668589 100644 --- a/Oqtane.Server/wwwroot/js/interop.js +++ b/Oqtane.Server/wwwroot/js/interop.js @@ -45,6 +45,9 @@ Oqtane.Interop = { document.head.appendChild(meta); } else { + if (id !== "") { + meta.setAttribute("id", id); + } if (meta.content !== content) { meta.setAttribute("content", content); } @@ -77,6 +80,9 @@ Oqtane.Interop = { document.head.appendChild(link); } else { + if (link.id !== id) { + link.setAttribute('id', id); + } if (link.rel !== rel) { link.setAttribute('rel', rel); } @@ -148,6 +154,9 @@ Oqtane.Interop = { }); } else { + if (script.id !== id) { + script.setAttribute('id', id); + } if (src !== "") { if (script.src !== this.getAbsoluteUrl(src)) { script.removeAttribute('integrity'); From f7470e3c5b30922db676ebee7bbdc4301e6c6fc4 Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Thu, 28 May 2020 20:00:28 +0200 Subject: [PATCH 05/11] Horizontal menu fix --- Oqtane.Client/Themes/Controls/MenuHorizontal.Razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor b/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor index 8924054f..58159b13 100644 --- a/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor +++ b/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor @@ -16,7 +16,7 @@ if (p.PageId == PageState.Page.PageId) {
  • - + @if (p.Icon != string.Empty) { @@ -28,7 +28,7 @@ else {
  • - + @if (p.Icon != string.Empty) { From 0f09df13b54b2b8789e4680a1dcfba164de484fa Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Thu, 28 May 2020 14:48:00 -0400 Subject: [PATCH 06/11] page redirect support and added missing unique indexes on database tables --- Oqtane.Client/UI/ThemeBuilder.razor | 7 ++++++ Oqtane.Server/Oqtane.Server.csproj | 6 +++++ Oqtane.Server/Scripts/Master.1.0.1.sql | 29 ++++++++++++++++++++++ Oqtane.Server/Scripts/Tenant.1.0.1.sql | 33 ++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 Oqtane.Server/Scripts/Master.1.0.1.sql create mode 100644 Oqtane.Server/Scripts/Tenant.1.0.1.sql diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor index 792572b8..8857bad9 100644 --- a/Oqtane.Client/UI/ThemeBuilder.razor +++ b/Oqtane.Client/UI/ThemeBuilder.razor @@ -13,6 +13,13 @@ { var interop = new Interop(JsRuntime); + // handle page redirection + if (!string.IsNullOrEmpty(PageState.Page.Url)) + { + NavigationManager.NavigateTo(PageState.Page.Url); + return; + } + // set page title if (!string.IsNullOrEmpty(PageState.Page.Title)) { diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index ccc27cd2..dae3eed2 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -23,7 +23,13 @@ + + + + + + diff --git a/Oqtane.Server/Scripts/Master.1.0.1.sql b/Oqtane.Server/Scripts/Master.1.0.1.sql new file mode 100644 index 00000000..e742869d --- /dev/null +++ b/Oqtane.Server/Scripts/Master.1.0.1.sql @@ -0,0 +1,29 @@ +/* + +Version 1.0.1 Master migration script + +*/ + +CREATE UNIQUE NONCLUSTERED INDEX IX_Tenant ON [dbo].[Tenant] + ( + [Name] + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_Alias ON [dbo].[Alias] + ( + [Name] + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_ModuleDefinition ON [dbo].[ModuleDefinition] + ( + [ModuleDefinitionName] + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_Job ON [dbo].[Job] + ( + [JobType] + ) ON [PRIMARY] +GO diff --git a/Oqtane.Server/Scripts/Tenant.1.0.1.sql b/Oqtane.Server/Scripts/Tenant.1.0.1.sql new file mode 100644 index 00000000..83904a29 --- /dev/null +++ b/Oqtane.Server/Scripts/Tenant.1.0.1.sql @@ -0,0 +1,33 @@ +/* + +Version 1.0.1 Tenant migration script + +*/ + +CREATE UNIQUE NONCLUSTERED INDEX IX_Site ON [dbo].[Site] + ( + [TenantId], + [Name] + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_Role ON [dbo].[Role] + ( + [SiteId], + [Name] + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_Profile ON [dbo].[Profile] + ( + [SiteId], + [Name] + ) ON [PRIMARY] +GO + +CREATE UNIQUE NONCLUSTERED INDEX IX_File ON [dbo].[File] + ( + [FolderId], + [Name] + ) ON [PRIMARY] +GO From 7d251b20ccfa78aa619b8aa5bcd6522775abf0cf Mon Sep 17 00:00:00 2001 From: ijungleboy Date: Thu, 28 May 2020 21:07:30 +0200 Subject: [PATCH 07/11] Fix collection of theme information because of improper namespace checks https://github.com/oqtane/oqtane.framework/issues/554 --- Oqtane.Server/Repository/ThemeRepository.cs | 28 +++++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs index 1ea0c697..33012004 100644 --- a/Oqtane.Server/Repository/ThemeRepository.cs +++ b/Oqtane.Server/Repository/ThemeRepository.cs @@ -54,16 +54,26 @@ namespace Oqtane.Repository ) continue; string themeNamespace = themeControlType.Namespace; - string qualifiedModuleType = themeNamespace + ", " + themeControlType.Assembly.GetName().Name; + // 2dm disabled - not used anywhere in code + //string qualifiedModuleType = themeNamespace + ", " + themeControlType.Assembly.GetName().Name; int index = themes.FindIndex(item => item.ThemeName == themeNamespace); + + // Find all types in the assembly which have the same namespace-root as the theme file + // Check with "." in the end to + List typesInTheme = assembly.GetTypes() + .Where(item => item.Namespace != null) + // Namespace must be the same or start with "xxx." to ensure that + // similar namespaces like "MyTheme" and "MyTheme2" don't match in StartsWith(...) + .Where(item => item.Namespace == themeNamespace + || item.Namespace.StartsWith(themeNamespace + ".")) + .ToList(); + if (index == -1) { // determine if this theme implements ITheme - Type themetype = assembly.GetTypes() - .Where(item => item.Namespace != null) - .Where(item => item.Namespace.StartsWith(themeNamespace)) - .Where(item => item.GetInterfaces().Contains(typeof(ITheme))).FirstOrDefault(); + Type themetype = typesInTheme + .FirstOrDefault(item => item.GetInterfaces().Contains(typeof(ITheme))); if (themetype != null) { var themeobject = Activator.CreateInstance(themetype) as ITheme; @@ -90,9 +100,7 @@ namespace Oqtane.Repository theme.ThemeControls += (themeControlType.FullName + ", " + themeControlType.Assembly.GetName().Name + ";"); // layouts - Type[] layouttypes = assembly.GetTypes() - .Where(item => item.Namespace != null) - .Where(item => item.Namespace.StartsWith(themeNamespace)) + Type[] layouttypes = typesInTheme .Where(item => item.GetInterfaces().Contains(typeof(ILayoutControl))).ToArray(); foreach (Type layouttype in layouttypes) { @@ -104,9 +112,7 @@ namespace Oqtane.Repository } // containers - Type[] containertypes = assembly.GetTypes() - .Where(item => item.Namespace != null) - .Where(item => item.Namespace.StartsWith(themeNamespace)) + Type[] containertypes = typesInTheme .Where(item => item.GetInterfaces().Contains(typeof(IContainerControl))).ToArray(); foreach (Type containertype in containertypes) { From 3a5b6954e346c29a62cb6f11bc58ae63405072b0 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Thu, 28 May 2020 16:24:22 -0400 Subject: [PATCH 08/11] fix for #525 when running locally without a network connection --- .../Admin/ModuleDefinitions/Index.razor | 20 +++--- .../Modules/Admin/Themes/Index.razor | 63 ++++++++++++++----- .../Modules/Admin/Upgrade/Index.razor | 48 ++++++++++---- 3 files changed, 96 insertions(+), 35 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index d348ddb4..acd19670 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -55,20 +55,26 @@ else } catch (Exception ex) { - await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message); - AddModuleMessage("Error Loading Modules", MessageType.Error); + if (_moduleDefinitions == null) + { + await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message); + AddModuleMessage("Error Loading Modules", MessageType.Error); + } } } private bool UpgradeAvailable(string moduledefinitionname, string version) { var upgradeavailable = false; - var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault(); - if (package != null) + if (_packages != null) { - upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); + var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault(); + if (package != null) + { + upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); + } + } - return upgradeavailable; } @@ -86,7 +92,7 @@ else await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", moduledefinitionname, version, ex.Message); AddModuleMessage("Error Downloading Module", MessageType.Error); } - } + } private async Task DeleteModule(ModuleDefinition moduleDefinition) { diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index 4a3113b6..61076ca2 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -4,7 +4,7 @@ @inject IThemeService ThemeService @inject IPackageService PackageService -@if (themes == null) +@if (_themes == null) {

    Loading...

    } @@ -12,7 +12,7 @@ else { - +
      Name @@ -39,41 +39,70 @@ else } @code { - private List themes; - private List packages; + private List _themes; + private List _packages; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; protected override async Task OnInitializedAsync() { - themes = await ThemeService.GetThemesAsync(); - packages = await PackageService.GetPackagesAsync("module"); + try + { + _themes = await ThemeService.GetThemesAsync(); + _packages = await PackageService.GetPackagesAsync("theme"); + } + catch (Exception ex) + { + if (_themes == null) + { + await logger.LogError(ex, "Error Loading Themes {Error}", ex.Message); + AddModuleMessage("Error Loading Themes", MessageType.Error); + } + } } private bool UpgradeAvailable(string themename, string version) { var upgradeavailable = false; - var package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault(); - if (package != null) + if (_packages != null) { - upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); + var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault(); + if (package != null) + { + upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0); + } } - return upgradeavailable; } private async Task DownloadTheme(string themename, string version) { - await PackageService.DownloadPackageAsync(themename, version, "Themes"); - await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version); - await ThemeService.InstallThemesAsync(); - NavigationManager.NavigateTo(NavigateUrl()); + try + { + await PackageService.DownloadPackageAsync(themename, version, "Themes"); + await ThemeService.InstallThemesAsync(); + await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version); + NavigationManager.NavigateTo(NavigateUrl()); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Theme {ThemeName} {Version} {Error}", themename, version, ex.Message); + AddModuleMessage("Error Downloading Theme", MessageType.Error); + } } private async Task DeleteTheme(Theme Theme) { - await ThemeService.DeleteThemeAsync(Theme.ThemeName); - await logger.LogInformation("Theme Deleted {Theme}", Theme); - NavigationManager.NavigateTo(NavigateUrl()); + try + { + await ThemeService.DeleteThemeAsync(Theme.ThemeName); + await logger.LogInformation("Theme Deleted {Theme}", Theme); + NavigationManager.NavigateTo(NavigateUrl()); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Deleting Theme {Theme} {Error}", Theme, ex.Message); + AddModuleMessage("Error Deleting Theme", MessageType.Error); + } } } \ No newline at end of file diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index 7ee95e30..cf446d82 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -43,28 +43,54 @@ protected override async Task OnInitializedAsync() { - List packages = await PackageService.GetPackagesAsync("framework"); - _package = packages.FirstOrDefault(); - if (_package != null) + try { - _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0); + List packages = await PackageService.GetPackagesAsync("framework"); + if (packages != null) + { + _package = packages.FirstOrDefault(); + if (_package != null) + { + _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0); + } + else + { + _package = new Package { Name = Constants.PackageId, Version = Constants.Version }; + } + } } - else + catch { - _package = new Package { Name = Constants.PackageId, Version = Constants.Version }; + // can be caused by no network connection } } private async Task Upgrade() { - await InstallationService.Upgrade(); - NavigationManager.NavigateTo(NavigateUrl()); + try + { + await InstallationService.Upgrade(); + NavigationManager.NavigateTo(NavigateUrl()); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Executing Upgrade {Error}", ex.Message); + AddModuleMessage("Error Executing Upgrade", MessageType.Error); + } } private async Task Download(string packageid, string version) { - await PackageService.DownloadPackageAsync(packageid, version, "Framework"); - await InstallationService.Upgrade(); - NavigationManager.NavigateTo(NavigateUrl()); + try + { + await PackageService.DownloadPackageAsync(packageid, version, "Framework"); + await InstallationService.Upgrade(); + NavigationManager.NavigateTo(NavigateUrl()); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message); + AddModuleMessage("Error Downloading Framework", MessageType.Error); + } } } From f9035f8fdfe3e1c0d49ccdec012973fb3d26a0e0 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Thu, 28 May 2020 17:32:06 -0400 Subject: [PATCH 09/11] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 29bbbb1f..d80d120a 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,11 @@ V1.0.0 (MVP) # Background Oqtane was created by [Shaun Walker](https://www.linkedin.com/in/shaunbrucewalker/) and is inspired by the DotNetNuke web application framework. Initially created as a proof of concept, Oqtane is a native Blazor application written from the ground up using modern .NET Core technology. It is a modular application framework offering a fully dynamic page compositing model, multi-site support, designer friendly templates (skins), and extensibility via third party modules. -# Release Announcement +# Release Announcements -[Announcing Oqtane... a Modular Application Framework for Blazor!](https://www.oqtane.org/Resources/Blog/PostId/520/announcing-oqtane-a-modular-application-framework-for-blazor) +[Oqtane 1.0](https://www.oqtane.org/Resources/Blog/PostId/540/announcing-oqtane-10-a-modular-application-framework-for-blazor) + +[Oqtane POC](https://www.oqtane.org/Resources/Blog/PostId/520/announcing-oqtane-a-modular-application-framework-for-blazor) # Example Screenshots From 58d97dd73194061f985ec5e1ace6dea4135f519d Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Fri, 29 May 2020 16:09:27 +0200 Subject: [PATCH 10/11] OqtaneIgnore implementation to theme elements --- Oqtane.Server/Repository/ModuleDefinitionRepository.cs | 2 +- Oqtane.Server/Repository/ThemeRepository.cs | 3 ++- Oqtane.Shared/Extensions/AssemblyExtensions.cs | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index 9cf698a5..4a600a62 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -195,7 +195,7 @@ namespace Oqtane.Repository if (modulecontroltype.Name == "ModuleBase" || modulecontroltype.IsGenericType || modulecontroltype.IsAbstract - || Attribute.IsDefined(modulecontroltype, typeof(OqtaneIgnoreAttribute)) + || modulecontroltype.IsOqtaneIgnore() ) continue; string moduleNamespace = modulecontroltype.Namespace; diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs index 33012004..13fe85dc 100644 --- a/Oqtane.Server/Repository/ThemeRepository.cs +++ b/Oqtane.Server/Repository/ThemeRepository.cs @@ -50,7 +50,7 @@ namespace Oqtane.Repository // Check if type should be ignored if (themeControlType.Name == "ThemeBase" || themeControlType.IsGenericType - || Attribute.IsDefined(themeControlType, typeof(OqtaneIgnoreAttribute)) + || themeControlType.IsOqtaneIgnore() ) continue; string themeNamespace = themeControlType.Namespace; @@ -62,6 +62,7 @@ namespace Oqtane.Repository // Find all types in the assembly which have the same namespace-root as the theme file // Check with "." in the end to List typesInTheme = assembly.GetTypes() + .Where(item=>!item.IsOqtaneIgnore()) .Where(item => item.Namespace != null) // Namespace must be the same or start with "xxx." to ensure that // similar namespaces like "MyTheme" and "MyTheme2" don't match in StartsWith(...) diff --git a/Oqtane.Shared/Extensions/AssemblyExtensions.cs b/Oqtane.Shared/Extensions/AssemblyExtensions.cs index fc873fe2..d02053f4 100644 --- a/Oqtane.Shared/Extensions/AssemblyExtensions.cs +++ b/Oqtane.Shared/Extensions/AssemblyExtensions.cs @@ -79,5 +79,10 @@ namespace System.Reflection .Where(a => a.GetTypes().Any() || a.GetTypes().Any() || a.GetTypes().Any()) .Where(a => Utilities.GetFullTypeName(a.GetName().Name) != "Oqtane.Client"); } + + public static bool IsOqtaneIgnore(this Type type) + { + return Attribute.IsDefined(type, typeof(OqtaneIgnoreAttribute)); + } } } From 6402723d2a2862af4799e005eabe58cf333c64ce Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 29 May 2020 16:27:02 -0400 Subject: [PATCH 11/11] addressed consistency between theme loading and moduledefinition loading, added theme detailed UI view --- .../Modules/Admin/Themes/Index.razor | 11 +- Oqtane.Client/Modules/Admin/Themes/View.razor | 101 ++++++++++++++++++ .../Repository/ModuleDefinitionRepository.cs | 13 +-- Oqtane.Server/Repository/ThemeRepository.cs | 39 ++++--- 4 files changed, 133 insertions(+), 31 deletions(-) create mode 100644 Oqtane.Client/Modules/Admin/Themes/View.razor diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index 61076ca2..9f5a76e2 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -1,4 +1,5 @@ @namespace Oqtane.Modules.Admin.Themes +@using System.Net @inherits ModuleBase @inject NavigationManager NavigationManager @inject IThemeService ThemeService @@ -14,25 +15,27 @@ else
    +     Name Version  
    + @if (context.AssemblyName != "Oqtane.Client") - { + { - } + } @context.Name @context.Version @if (UpgradeAvailable(context.ThemeName, context.Version)) - { + { - } + }     diff --git a/Oqtane.Client/Modules/Admin/Themes/View.razor b/Oqtane.Client/Modules/Admin/Themes/View.razor new file mode 100644 index 00000000..eb655799 --- /dev/null +++ b/Oqtane.Client/Modules/Admin/Themes/View.razor @@ -0,0 +1,101 @@ +@namespace Oqtane.Modules.Admin.Themes +@using System.Net +@inherits ModuleBase +@inject IThemeService ThemeService +@inject NavigationManager NavigationManager + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + +
    + + + +
    + + + +
    + + + +
    + + + +
    + + + +
    +Cancel + +@code { + private string _themeName = ""; + private string _name; + private string _version; + private string _owner = ""; + private string _url = ""; + private string _contact = ""; + private string _license = ""; + + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; + + protected override async Task OnInitializedAsync() + { + try + { + _themeName = WebUtility.UrlDecode(PageState.QueryString["name"]); + var themes = await ThemeService.GetThemesAsync(); + var theme = themes.FirstOrDefault(item => item.ThemeName == _themeName); + if (theme != null) + { + _name = theme.Name; + _version = theme.Version; + _owner = theme.Owner; + _url = theme.Url; + _contact = theme.Contact; + _license = theme.License; + } + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message); + AddModuleMessage("Error Loading Theme", MessageType.Error); + } + } +} diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index 4a600a62..7521b9f3 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -188,6 +188,7 @@ namespace Oqtane.Repository private List LoadModuleDefinitionsFromAssembly(List moduledefinitions, Assembly assembly) { ModuleDefinition moduledefinition; + Type[] modulecontroltypes = assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IModuleControl))).ToArray(); foreach (Type modulecontroltype in modulecontroltypes) { @@ -198,8 +199,8 @@ namespace Oqtane.Repository || modulecontroltype.IsOqtaneIgnore() ) continue; - string moduleNamespace = modulecontroltype.Namespace; - string qualifiedModuleType = moduleNamespace + ", " + modulecontroltype.Assembly.GetName().Name; + // create namespace root typename + string qualifiedModuleType = modulecontroltype.Namespace + ", " + modulecontroltype.Assembly.GetName().Name; int index = moduledefinitions.FindIndex(item => item.ModuleDefinitionName == qualifiedModuleType); if (index == -1) @@ -208,7 +209,7 @@ namespace Oqtane.Repository Type moduletype = assembly .GetTypes() .Where(item => item.Namespace != null) - .Where(item => item.Namespace.StartsWith(moduleNamespace)) + .Where(item => item.Namespace == modulecontroltype.Namespace || item.Namespace.StartsWith(modulecontroltype.Namespace + ".")) .FirstOrDefault(item => item.GetInterfaces().Contains(typeof(IModule))); if (moduletype != null) { @@ -221,8 +222,8 @@ namespace Oqtane.Repository // set default property values moduledefinition = new ModuleDefinition { - Name = moduleNamespace.Substring(moduleNamespace.LastIndexOf(".") + 1), - Description = "Manage " + moduleNamespace.Substring(moduleNamespace.LastIndexOf(".") + 1), + Name = Utilities.GetTypeNameLastSegment(modulecontroltype.Namespace, 0), + Description = "Manage " + Utilities.GetTypeNameLastSegment(modulecontroltype.Namespace, 0), Categories = ((qualifiedModuleType.StartsWith("Oqtane.Modules.Admin.")) ? "Admin" : "") }; } @@ -230,7 +231,7 @@ namespace Oqtane.Repository // set internal properties moduledefinition.ModuleDefinitionName = qualifiedModuleType; moduledefinition.Version = ""; // will be populated from database - moduledefinition.ControlTypeTemplate = moduleNamespace + "." + Constants.ActionToken + ", " + modulecontroltype.Assembly.GetName().Name; + moduledefinition.ControlTypeTemplate = modulecontroltype.Namespace + "." + Constants.ActionToken + ", " + modulecontroltype.Assembly.GetName().Name; moduledefinition.AssemblyName = assembly.GetName().Name; if (string.IsNullOrEmpty(moduledefinition.Categories)) diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs index 13fe85dc..bc14de74 100644 --- a/Oqtane.Server/Repository/ThemeRepository.cs +++ b/Oqtane.Server/Repository/ThemeRepository.cs @@ -44,36 +44,33 @@ namespace Oqtane.Repository private List LoadThemesFromAssembly(List themes, Assembly assembly) { Theme theme; + List themeTypes = new List(); + Type[] themeControlTypes = assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IThemeControl))).ToArray(); foreach (Type themeControlType in themeControlTypes) { // Check if type should be ignored if (themeControlType.Name == "ThemeBase" || themeControlType.IsGenericType + || themeControlType.IsAbstract || themeControlType.IsOqtaneIgnore() ) continue; - string themeNamespace = themeControlType.Namespace; - // 2dm disabled - not used anywhere in code - //string qualifiedModuleType = themeNamespace + ", " + themeControlType.Assembly.GetName().Name; - - int index = themes.FindIndex(item => item.ThemeName == themeNamespace); - - // Find all types in the assembly which have the same namespace-root as the theme file - // Check with "." in the end to - List typesInTheme = assembly.GetTypes() - .Where(item=>!item.IsOqtaneIgnore()) - .Where(item => item.Namespace != null) - // Namespace must be the same or start with "xxx." to ensure that - // similar namespaces like "MyTheme" and "MyTheme2" don't match in StartsWith(...) - .Where(item => item.Namespace == themeNamespace - || item.Namespace.StartsWith(themeNamespace + ".")) - .ToList(); + // create namespace root typename + string qualifiedThemeType = themeControlType.Namespace + ", " + themeControlType.Assembly.GetName().Name; + int index = themes.FindIndex(item => item.ThemeName == qualifiedThemeType); if (index == -1) { + // Find all types in the assembly with the same namespace root + themeTypes = assembly.GetTypes() + .Where(item => !item.IsOqtaneIgnore()) + .Where(item => item.Namespace != null) + .Where(item => item.Namespace == themeControlType.Namespace || item.Namespace.StartsWith(themeControlType.Namespace + ".")) + .ToList(); + // determine if this theme implements ITheme - Type themetype = typesInTheme + Type themetype = themeTypes .FirstOrDefault(item => item.GetInterfaces().Contains(typeof(ITheme))); if (themetype != null) { @@ -89,19 +86,19 @@ namespace Oqtane.Repository }; } // set internal properties - theme.ThemeName = themeNamespace; + theme.ThemeName = qualifiedThemeType; theme.ThemeControls = ""; theme.PaneLayouts = ""; theme.ContainerControls = ""; theme.AssemblyName = assembly.FullName.Split(",")[0]; themes.Add(theme); - index = themes.FindIndex(item => item.ThemeName == themeNamespace); + index = themes.FindIndex(item => item.ThemeName == qualifiedThemeType); } theme = themes[index]; theme.ThemeControls += (themeControlType.FullName + ", " + themeControlType.Assembly.GetName().Name + ";"); // layouts - Type[] layouttypes = typesInTheme + Type[] layouttypes = themeTypes .Where(item => item.GetInterfaces().Contains(typeof(ILayoutControl))).ToArray(); foreach (Type layouttype in layouttypes) { @@ -113,7 +110,7 @@ namespace Oqtane.Repository } // containers - Type[] containertypes = typesInTheme + Type[] containertypes = themeTypes .Where(item => item.GetInterfaces().Contains(typeof(IContainerControl))).ToArray(); foreach (Type containertype in containertypes) {