From 468f186511409844d924b0877a4dd66957a76185 Mon Sep 17 00:00:00 2001 From: Pavel Vesely Date: Mon, 19 Apr 2021 20:03:18 +0200 Subject: [PATCH 01/27] Default Alias When alias is not found in alias table, Oqtane fails with exception. This solution allows define default alias (*) for default site with unknown alias. --- Oqtane.Server/Repository/AliasRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs index f25c4c03..cbec2452 100644 --- a/Oqtane.Server/Repository/AliasRepository.cs +++ b/Oqtane.Server/Repository/AliasRepository.cs @@ -65,8 +65,8 @@ namespace Oqtane.Repository break; // found a matching alias } } - - return alias; + // return fallback alias + return alias ?? aliases.Find(item => item.Name.Equals("*")); } public void DeleteAlias(int aliasId) From 9d9a5a027553450a16f492f170475ef94d90bb8b Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 20 Apr 2021 16:20:24 +0300 Subject: [PATCH 02/27] Localize modules title --- Oqtane.Server/Repository/SiteRepository.cs | 49 +++++++++++----------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index b376b470..3e0dfa5a 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -5,6 +5,7 @@ using System.Linq; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; using Oqtane.Extensions; using Oqtane.Infrastructure; using Oqtane.Models; @@ -24,14 +25,13 @@ namespace Oqtane.Repository private readonly IModuleRepository _moduleRepository; private readonly IPageModuleRepository _pageModuleRepository; private readonly IModuleDefinitionRepository _moduleDefinitionRepository; - private readonly IServiceProvider _serviceProvider; - private readonly IConfigurationRoot _config; + private readonly IStringLocalizer _localizer; public SiteRepository(TenantDBContext context, IRoleRepository roleRepository, IProfileRepository profileRepository, IFolderRepository folderRepository, IPageRepository pageRepository, IModuleRepository moduleRepository, IPageModuleRepository pageModuleRepository, IModuleDefinitionRepository moduleDefinitionRepository, IServiceProvider serviceProvider, - IConfigurationRoot config) + IConfigurationRoot config, IStringLocalizer localizer) { _db = context; _roleRepository = roleRepository; @@ -43,6 +43,7 @@ namespace Oqtane.Repository _moduleDefinitionRepository = moduleDefinitionRepository; _serviceProvider = serviceProvider; _config = config; + _localizer = localizer; } private List CreateAdminPages(List pageTemplates = null) @@ -68,7 +69,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = _localizer["User Login"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -97,7 +98,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = _localizer["User Registration"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -127,7 +128,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = _localizer["Password Reset"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -156,7 +157,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = _localizer["User Profile"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -181,7 +182,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = _localizer["Admin Dashboard"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -208,7 +209,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = _localizer["Site Settings"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -235,7 +236,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = _localizer["Page Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -262,7 +263,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = _localizer["User Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -289,7 +290,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = _localizer["Profile Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -316,7 +317,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = _localizer["Role Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -343,7 +344,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = _localizer["File Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -370,7 +371,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = _localizer["Recycle Bin"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -399,7 +400,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = _localizer["Event Log"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -421,7 +422,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = _localizer["Site Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -443,7 +444,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = _localizer["Module Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -465,7 +466,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = _localizer["Theme Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -494,7 +495,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = "Language Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = _localizer["Language Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -518,7 +519,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = _localizer["Scheduled Jobs"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -540,7 +541,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = _localizer["Sql Management"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -562,7 +563,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = _localizer["System Info"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -584,7 +585,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = _localizer["System Update"], Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), From e33c9e417dca3daf12f7a22596b6daa098f1871f Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 20 Apr 2021 16:26:17 +0300 Subject: [PATCH 03/27] Remove SupportedCultures entry from appsettings.json --- Oqtane.Server/appsettings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index 1af87b4c..338092ad 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -13,7 +13,6 @@ "DefaultContainer": "" }, "Localization": { - "DefaultCulture": "", - "SupportedCultures": [] + "DefaultCulture": "" } } \ No newline at end of file From 0b32dcf9b3e613cddebfb41eed13567fca9f63b6 Mon Sep 17 00:00:00 2001 From: hishamco Date: Tue, 20 Apr 2021 16:27:18 +0300 Subject: [PATCH 04/27] Make English default culture instead of current installed culture --- Oqtane.Server/appsettings.json | 2 +- Oqtane.Shared/Shared/Constants.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json index 338092ad..01d5161a 100644 --- a/Oqtane.Server/appsettings.json +++ b/Oqtane.Server/appsettings.json @@ -13,6 +13,6 @@ "DefaultContainer": "" }, "Localization": { - "DefaultCulture": "" + "DefaultCulture": "en" } } \ No newline at end of file diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 9fde30d5..6b07827e 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -71,6 +71,6 @@ namespace Oqtane.Shared { public static readonly string SatelliteAssemblyExtension = ".resources.dll"; - public static readonly string DefaultCulture = CultureInfo.InstalledUICulture.Name; + public static readonly string DefaultCulture = "en"; } } From 8f5beaf3fe7beb81d2aae7268c151922299dcaf4 Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Tue, 20 Apr 2021 10:58:26 -0700 Subject: [PATCH 05/27] Fix bug with installs due to missing Migrations --- .../Migrations/01000000_InitializeTenant.cs | 9 +- ...02_UpdateDefaultContainerTypeInSitePage.cs | 40 ++ .../02000203_DropDefaultLayoutInSite.cs | 53 ++ .../02010000_AddAppVersionsTableInTenant.cs | 1 - .../EntityBuilders/PageEntityBuilder.cs | 3 - .../EntityBuilders/SettingEntityBuilder.cs | 2 +- .../EntityBuilders/SiteEntityBuilder.cs | 3 - .../HtmlText/Scripts/HtmlText.1.0.0.sql | 19 - .../HtmlText/Scripts/HtmlText.Uninstall.sql | 2 - Oqtane.Server/Oqtane.Server.csproj | 19 - Oqtane.Server/Scripts/Master.00.00.00.00.sql | 10 - Oqtane.Server/Scripts/Master.00.09.00.00.sql | 110 ---- Oqtane.Server/Scripts/Master.01.00.01.00.sql | 29 - Oqtane.Server/Scripts/Tenant.00.00.00.00.sql | 14 - Oqtane.Server/Scripts/Tenant.00.09.00.00.sql | 528 ------------------ Oqtane.Server/Scripts/Tenant.00.09.01.00.sql | 14 - Oqtane.Server/Scripts/Tenant.00.09.02.00.sql | 18 - Oqtane.Server/Scripts/Tenant.01.00.01.00.sql | 39 -- Oqtane.Server/Scripts/Tenant.01.00.01.01.sql | 12 - Oqtane.Server/Scripts/Tenant.01.00.02.01.sql | 9 - Oqtane.Server/Scripts/Tenant.02.00.00.01.sql | 16 - Oqtane.Server/Scripts/Tenant.02.00.01.01.sql | 9 - Oqtane.Server/Scripts/Tenant.02.00.01.02.sql | 27 - Oqtane.Server/Scripts/Tenant.02.00.01.03.sql | 17 - Oqtane.Server/Scripts/Tenant.02.00.02.01.sql | 10 - Oqtane.Server/Scripts/Tenant.02.00.02.02.sql | 20 - Oqtane.Server/Scripts/Tenant.02.00.02.03.sql | 31 - Oqtane.Shared/Shared/Constants.cs | 4 +- 28 files changed, 104 insertions(+), 964 deletions(-) create mode 100644 Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs create mode 100644 Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs delete mode 100644 Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql delete mode 100644 Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql delete mode 100644 Oqtane.Server/Scripts/Master.00.00.00.00.sql delete mode 100644 Oqtane.Server/Scripts/Master.00.09.00.00.sql delete mode 100644 Oqtane.Server/Scripts/Master.01.00.01.00.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.00.00.00.00.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.00.09.00.00.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.00.09.01.00.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.00.09.02.00.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.01.00.01.00.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.01.00.01.01.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.01.00.02.01.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.02.00.00.01.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.02.00.01.01.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.02.00.01.02.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.02.00.01.03.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.02.00.02.01.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.02.00.02.02.sql delete mode 100644 Oqtane.Server/Scripts/Tenant.02.00.02.03.sql diff --git a/Oqtane.Server/Migrations/01000000_InitializeTenant.cs b/Oqtane.Server/Migrations/01000000_InitializeTenant.cs index 4d8817fa..79a41163 100644 --- a/Oqtane.Server/Migrations/01000000_InitializeTenant.cs +++ b/Oqtane.Server/Migrations/01000000_InitializeTenant.cs @@ -22,15 +22,22 @@ namespace Oqtane.Migrations var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase); siteEntityBuilder.Create(); + //Add Column to Site table (for Sql Server only) we will drop it later for Sql Server only + if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB") + { + siteEntityBuilder.AddStringColumn("DefaultLayoutType", 200, true); + } + //Create Page table var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase); pageEntityBuilder.Create(); pageEntityBuilder.AddIndex("IX_Page", new [] {"SiteId", "Path", "UserId"}, true); - //Add Column to Page table (for Sql Server only) we will drop it later for Sql Server only + //Add Columns to Page table (for Sql Server only) we will drop them later for Sql Server only if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB") { pageEntityBuilder.AddBooleanColumn("EditMode"); + pageEntityBuilder.AddStringColumn("LayoutType", 200, true); } //Create Module table diff --git a/Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs b/Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs new file mode 100644 index 00000000..88d63706 --- /dev/null +++ b/Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs @@ -0,0 +1,40 @@ +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Oqtane.Interfaces; +using Oqtane.Migrations.EntityBuilders; +using Oqtane.Repository; + +namespace Oqtane.Migrations +{ + [DbContext(typeof(TenantDBContext))] + [Migration("Tenant.02.00.02.02")] + public class UpdateDefaultContainerTypeInSitePage : MultiDatabaseMigration + { + public UpdateDefaultContainerTypeInSitePage(IEnumerable databases) : base(databases) + { + } + + protected override void Up(MigrationBuilder migrationBuilder) + { + if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB") + { + //Update DefaultContainerType In Site + var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase); + siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'"); + siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'"); + + //Update DefaultContainerType in Page + var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase); + pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'"); + pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'"); + + //Update ContainerType in PageModule + var pageModuleEntityBuilder = new PageModuleEntityBuilder(migrationBuilder, ActiveDatabase); + pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'"); + pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'"); + } + + } + } +} diff --git a/Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs b/Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs new file mode 100644 index 00000000..679b0bac --- /dev/null +++ b/Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs @@ -0,0 +1,53 @@ +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Oqtane.Interfaces; +using Oqtane.Migrations.EntityBuilders; +using Oqtane.Repository; + +namespace Oqtane.Migrations +{ + [DbContext(typeof(TenantDBContext))] + [Migration("Tenant.02.00.02.03")] + public class DropDefaultLayoutInSite : MultiDatabaseMigration + { + public DropDefaultLayoutInSite(IEnumerable databases) : base(databases) + { + } + + protected override void Up(MigrationBuilder migrationBuilder) + { + if (ActiveDatabase.Name == "SqlServer" || ActiveDatabase.Name == "LocalDB") + { + //Alter Column in Setting table for Sql Server + var settingEntityBuilder = new SettingEntityBuilder(migrationBuilder, ActiveDatabase); + settingEntityBuilder.DropIndex("IX_Setting"); + settingEntityBuilder.AlterStringColumn("SettingName", 200); + settingEntityBuilder.AddIndex("IX_Setting", new [] {"EntityName", "EntityId", "SettingName"}, true); + + //Drop Column from Site Table + var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase); + siteEntityBuilder.DropColumn("DefaultLayoutType"); + + //Update DefaultContainerType In Site + siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'"); + siteEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'"); + + //Drop Column from Page Table + var pageEntityBuilder = new PageEntityBuilder(migrationBuilder, ActiveDatabase); + pageEntityBuilder.DropColumn("LayoutType"); + + //Update DefaultContainerType in Page + pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'"); + pageEntityBuilder.UpdateColumn("DefaultContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'"); + + + //Update ContainerType in PageModule + var pageModuleEntityBuilder = new PageModuleEntityBuilder(migrationBuilder, ActiveDatabase); + pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'"); + pageModuleEntityBuilder.UpdateColumn("ContainerType", "'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'", "ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'"); + + } + } + } +} diff --git a/Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs b/Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs index 73a15750..dfaeea21 100644 --- a/Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs +++ b/Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs @@ -10,7 +10,6 @@ namespace Oqtane.Migrations { [DbContext(typeof(TenantDBContext))] [Migration("Tenant.02.01.00.00")] - public class AddAppVersionsTable : MultiDatabaseMigration { public AddAppVersionsTable(IEnumerable databases) : base(databases) diff --git a/Oqtane.Server/Migrations/EntityBuilders/PageEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/PageEntityBuilder.cs index b1cee2e9..e9cf491e 100644 --- a/Oqtane.Server/Migrations/EntityBuilders/PageEntityBuilder.cs +++ b/Oqtane.Server/Migrations/EntityBuilders/PageEntityBuilder.cs @@ -41,7 +41,6 @@ namespace Oqtane.Migrations.EntityBuilders Order = AddIntegerColumn(table,"Order"); IsNavigation = AddBooleanColumn(table,"IsNavigation"); Url = AddStringColumn(table,"Url", 500, true); - LayoutType = AddStringColumn(table,"LayoutType", 200); UserId = AddIntegerColumn(table,"UserId", true); IsPersonalizable = AddBooleanColumn(table,"IsPersonalizable"); DefaultContainerType = AddStringColumn(table,"DefaultContainerType", 200, true); @@ -73,8 +72,6 @@ namespace Oqtane.Migrations.EntityBuilders public OperationBuilder Url { get; private set; } - public OperationBuilder LayoutType { get; private set; } - public OperationBuilder UserId { get; private set; } public OperationBuilder IsPersonalizable { get; private set; } diff --git a/Oqtane.Server/Migrations/EntityBuilders/SettingEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/SettingEntityBuilder.cs index 4956203f..81414985 100644 --- a/Oqtane.Server/Migrations/EntityBuilders/SettingEntityBuilder.cs +++ b/Oqtane.Server/Migrations/EntityBuilders/SettingEntityBuilder.cs @@ -24,7 +24,7 @@ namespace Oqtane.Migrations.EntityBuilders SettingId = AddAutoIncrementColumn(table,"SettingId"); EntityName = AddStringColumn(table,"EntityName", 50); EntityId = AddIntegerColumn(table,"EntityId"); - SettingName = AddStringColumn(table,"SettingName", 50); + SettingName = AddStringColumn(table,"SettingName", 200); SettingValue = AddMaxStringColumn(table,"SettingValue"); AddAuditableColumns(table); diff --git a/Oqtane.Server/Migrations/EntityBuilders/SiteEntityBuilder.cs b/Oqtane.Server/Migrations/EntityBuilders/SiteEntityBuilder.cs index cce461e7..a78f20db 100644 --- a/Oqtane.Server/Migrations/EntityBuilders/SiteEntityBuilder.cs +++ b/Oqtane.Server/Migrations/EntityBuilders/SiteEntityBuilder.cs @@ -27,7 +27,6 @@ namespace Oqtane.Migrations.EntityBuilders LogoFileId = AddIntegerColumn(table,"LogoFileId", true); FaviconFileId = AddIntegerColumn(table,"FaviconFileId", true); DefaultThemeType = AddStringColumn(table,"DefaultThemeType", 200); - DefaultLayoutType = AddStringColumn(table,"DefaultLayoutType", 200); DefaultContainerType = AddStringColumn(table,"DefaultContainerType", 200); PwaIsEnabled = AddBooleanColumn(table,"PwaIsEnabled"); PwaAppIconFileId = AddIntegerColumn(table,"PwaAppIconFileId", true); @@ -52,8 +51,6 @@ namespace Oqtane.Migrations.EntityBuilders public OperationBuilder DefaultThemeType { get; private set; } - public OperationBuilder DefaultLayoutType { get; private set; } - public OperationBuilder DefaultContainerType { get; private set; } public OperationBuilder PwaIsEnabled { get; private set; } diff --git a/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql b/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql deleted file mode 100644 index fa3b0fd2..00000000 --- a/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.1.0.0.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE [dbo].[HtmlText]( - [HtmlTextId] [int] IDENTITY(1,1) NOT NULL, - [ModuleId] [int] NOT NULL, - [Content] [nvarchar](max) NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_HtmlText] PRIMARY KEY CLUSTERED - ( - [HtmlTextId] ASC - ) -) -GO - -ALTER TABLE [dbo].[HtmlText] WITH CHECK ADD CONSTRAINT [FK_HtmlText_Module] FOREIGN KEY([ModuleId]) -REFERENCES [dbo].[Module] ([ModuleId]) -ON DELETE CASCADE -GO diff --git a/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql b/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql deleted file mode 100644 index 34011c03..00000000 --- a/Oqtane.Server/Modules/HtmlText/Scripts/HtmlText.Uninstall.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE [dbo].[HtmlText] -GO diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 5f937608..37f69666 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -25,25 +25,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Oqtane.Server/Scripts/Master.00.00.00.00.sql b/Oqtane.Server/Scripts/Master.00.00.00.00.sql deleted file mode 100644 index e94cd112..00000000 --- a/Oqtane.Server/Scripts/Master.00.00.00.00.sql +++ /dev/null @@ -1,10 +0,0 @@ -/* - -migrate to new naming convention for scripts - -*/ - -UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Master.00.09.00.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Master.0.9.0.sql' -GO -UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Master.01.00.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Master.1.0.1.sql' -GO \ No newline at end of file diff --git a/Oqtane.Server/Scripts/Master.00.09.00.00.sql b/Oqtane.Server/Scripts/Master.00.09.00.00.sql deleted file mode 100644 index 8f569dbb..00000000 --- a/Oqtane.Server/Scripts/Master.00.09.00.00.sql +++ /dev/null @@ -1,110 +0,0 @@ -/* - -Create tables - -*/ -CREATE TABLE [dbo].[Tenant]( - [TenantId] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](100) NOT NULL, - [DBConnectionString] [nvarchar](1024) NOT NULL, - [Version] [nvarchar](50) NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Tenant] PRIMARY KEY CLUSTERED - ( - [TenantId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Alias]( - [AliasId] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](200) NOT NULL, - [TenantId] [int] NOT NULL, - [SiteId] [int] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Alias] PRIMARY KEY CLUSTERED - ( - [AliasId] ASC - ) -) -GO - - -CREATE TABLE [dbo].[ModuleDefinition]( - [ModuleDefinitionId] [int] IDENTITY(1,1) NOT NULL, - [ModuleDefinitionName] [nvarchar](200) NOT NULL, - [Name] [nvarchar](200) NULL, - [Description] [nvarchar](2000) NULL, - [Categories] [nvarchar](200) NULL, - [Version] [nvarchar](50) NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_ModuleDefinition] PRIMARY KEY CLUSTERED - ( - [ModuleDefinitionId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Job] ( - [JobId] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](200) NOT NULL, - [JobType] [nvarchar](200) NOT NULL, - [Frequency] [char](1) NOT NULL, - [Interval] [int] NOT NULL, - [StartDate] [datetime] NULL, - [EndDate] [datetime] NULL, - [IsEnabled] [bit] NOT NULL, - [IsStarted] [bit] NOT NULL, - [IsExecuting] [bit] NOT NULL, - [NextExecution] [datetime] NULL, - [RetentionHistory] [int] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Job] PRIMARY KEY CLUSTERED - ( - [JobId] ASC - ) -) -GO - -CREATE TABLE [dbo].[JobLog] ( - [JobLogId] [int] IDENTITY(1,1) NOT NULL, - [JobId] [int] NOT NULL, - [StartDate] [datetime] NOT NULL, - [FinishDate] [datetime] NULL, - [Succeeded] [bit] NULL, - [Notes] [nvarchar](max) NULL, - CONSTRAINT [PK_JobLog] PRIMARY KEY CLUSTERED - ( - [JobLogId] ASC - ) -) -GO - -/* - -Create foreign key relationships - -*/ -ALTER TABLE [dbo].[Alias] WITH CHECK ADD CONSTRAINT [FK_Alias_Tenant] FOREIGN KEY([TenantId]) -REFERENCES [dbo].[Tenant] ([TenantId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[JobLog] WITH NOCHECK ADD CONSTRAINT [FK_JobLog_Job] FOREIGN KEY([JobId]) -REFERENCES [dbo].[Job] ([JobId]) -ON DELETE CASCADE -GO - - diff --git a/Oqtane.Server/Scripts/Master.01.00.01.00.sql b/Oqtane.Server/Scripts/Master.01.00.01.00.sql deleted file mode 100644 index e742869d..00000000 --- a/Oqtane.Server/Scripts/Master.01.00.01.00.sql +++ /dev/null @@ -1,29 +0,0 @@ -/* - -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.00.00.00.00.sql b/Oqtane.Server/Scripts/Tenant.00.00.00.00.sql deleted file mode 100644 index ffbe2d02..00000000 --- a/Oqtane.Server/Scripts/Tenant.00.00.00.00.sql +++ /dev/null @@ -1,14 +0,0 @@ -/* - -migrate to new naming convention for scripts - -*/ - -UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.00.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.0.sql' -GO -UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.1.sql' -GO -UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.00.09.02.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.0.9.2.sql' -GO -UPDATE [dbo].[SchemaVersions] SET ScriptName = 'Oqtane.Scripts.Tenant.01.00.01.00.sql' WHERE ScriptName = 'Oqtane.Scripts.Tenant.1.0.1.sql' -GO diff --git a/Oqtane.Server/Scripts/Tenant.00.09.00.00.sql b/Oqtane.Server/Scripts/Tenant.00.09.00.00.sql deleted file mode 100644 index 81a0df24..00000000 --- a/Oqtane.Server/Scripts/Tenant.00.09.00.00.sql +++ /dev/null @@ -1,528 +0,0 @@ -/* - -Create tables - -*/ - -CREATE TABLE [dbo].[Site]( - [SiteId] [int] IDENTITY(1,1) NOT NULL, - [TenantId] [int] NOT NULL, - [Name] [nvarchar](200) NOT NULL, - [LogoFileId] [int] NULL, - [FaviconFileId] [int] NULL, - [DefaultThemeType] [nvarchar](200) NOT NULL, - [DefaultLayoutType] [nvarchar](200) NOT NULL, - [DefaultContainerType] [nvarchar](200) NOT NULL, - [PwaIsEnabled] [bit] NOT NULL, - [PwaAppIconFileId] [int] NULL, - [PwaSplashIconFileId] [int] NULL, - [AllowRegistration] [bit] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - [DeletedBy] [nvarchar](256) NULL, - [DeletedOn] [datetime] NULL, - [IsDeleted][bit] NOT NULL, - CONSTRAINT [PK_Site] PRIMARY KEY CLUSTERED - ( - [SiteId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Page]( - [PageId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NOT NULL, - [Path] [nvarchar](50) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - [Title] [nvarchar](200) NULL, - [ThemeType] [nvarchar](200) NULL, - [Icon] [nvarchar](50) NOT NULL, - [ParentId] [int] NULL, - [Order] [int] NOT NULL, - [IsNavigation] [bit] NOT NULL, - [Url] [nvarchar](500) NULL, - [LayoutType] [nvarchar](200) NOT NULL, - [EditMode] [bit] NOT NULL, - [UserId] [int] NULL, - [IsPersonalizable] [bit] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - [DeletedBy] [nvarchar](256) NULL, - [DeletedOn] [datetime] NULL, - [IsDeleted][bit] NOT NULL, - CONSTRAINT [PK_Page] PRIMARY KEY CLUSTERED - ( - [PageId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Module]( - [ModuleId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NOT NULL, - [ModuleDefinitionName] [nvarchar](200) NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Module] PRIMARY KEY CLUSTERED - ( - [ModuleId] ASC - ) -) -GO - -CREATE TABLE [dbo].[PageModule]( - [PageModuleId] [int] IDENTITY(1,1) NOT NULL, - [PageId] [int] NOT NULL, - [ModuleId] [int] NOT NULL, - [Title] [nvarchar](200) NOT NULL, - [Pane] [nvarchar](50) NOT NULL, - [Order] [int] NOT NULL, - [ContainerType] [nvarchar](200) NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - [DeletedBy] [nvarchar](256) NULL, - [DeletedOn] [datetime] NULL, - [IsDeleted][bit] NOT NULL, - CONSTRAINT [PK_PageModule] PRIMARY KEY CLUSTERED - ( - [PageModuleId] ASC - ) -) -GO - -CREATE TABLE [dbo].[User]( - [UserId] [int] IDENTITY(1,1) NOT NULL, - [Username] [nvarchar](256) NOT NULL, - [DisplayName] [nvarchar](50) NOT NULL, - [Email] [nvarchar](256) NOT NULL, - [PhotoFileId] [int] NULL, - [LastLoginOn] [datetime] NULL, - [LastIPAddress] [nvarchar](50) NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - [DeletedBy] [nvarchar](256) NULL, - [DeletedOn] [datetime] NULL, - [IsDeleted][bit] NOT NULL, - CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED - ( - [UserId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Role]( - [RoleId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NULL, - [Name] [nvarchar](256) NOT NULL, - [Description] [nvarchar](50) NOT NULL, - [IsAutoAssigned] [bit] NOT NULL, - [IsSystem] [bit] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Role] PRIMARY KEY CLUSTERED - ( - [RoleId] ASC - ) -) -GO - -CREATE TABLE [dbo].[UserRole]( - [UserRoleId] [int] IDENTITY(1,1) NOT NULL, - [UserId] [int] NOT NULL, - [RoleId] [int] NOT NULL, - [EffectiveDate] [datetime] NULL, - [ExpiryDate] [datetime] NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_UserRole] PRIMARY KEY CLUSTERED - ( - [UserRoleId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Permission]( - [PermissionId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NOT NULL, - [EntityName] [nvarchar](50) NOT NULL, - [EntityId] [int] NOT NULL, - [PermissionName] [nvarchar](50) NOT NULL, - [RoleId] [int] NULL, - [UserId] [int] NULL, - [IsAuthorized] [bit] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Permission] PRIMARY KEY CLUSTERED - ( - [PermissionId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Setting]( - [SettingId] [int] IDENTITY(1,1) NOT NULL, - [EntityName] [nvarchar](50) NOT NULL, - [EntityId] [int] NOT NULL, - [SettingName] [nvarchar](50) NOT NULL, - [SettingValue] [nvarchar](max) NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Setting] PRIMARY KEY CLUSTERED - ( - [SettingId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Profile]( - [ProfileId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NULL, - [Name] [nvarchar](50) NOT NULL, - [Title] [nvarchar](50) NOT NULL, - [Description] [nvarchar](256) NULL, - [Category] [nvarchar](50) NOT NULL, - [ViewOrder] [int] NOT NULL, - [MaxLength] [int] NOT NULL, - [DefaultValue] [nvarchar](2000) NULL, - [IsRequired] [bit] NOT NULL, - [IsPrivate] [bit] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Profile] PRIMARY KEY CLUSTERED - ( - [ProfileId] ASC - ) -) - -GO - -CREATE TABLE [dbo].[Log] ( - - [LogId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NULL, - [LogDate] [datetime] NOT NULL, - [PageId] [int] NULL, - [ModuleId] [int] NULL, - [UserId] [int] NULL, - [Url] [nvarchar](2048) NOT NULL, - [Server] [nvarchar](200) NOT NULL, - [Category] [nvarchar](200) NOT NULL, - [Feature] [nvarchar](200) NOT NULL, - [Function] [nvarchar](20) NOT NULL, - [Level] [nvarchar](20) NOT NULL, - [Message] [nvarchar](max) NOT NULL, - [MessageTemplate] [nvarchar](max) NOT NULL, - [Exception] [nvarchar](max) NULL, - [Properties] [nvarchar](max) NULL - - CONSTRAINT [PK_Log] PRIMARY KEY CLUSTERED - ( - [LogId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Notification]( - [NotificationId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NOT NULL, - [FromUserId] [int] NULL, - [ToUserId] [int] NULL, - [ToEmail] [nvarchar](256) NOT NULL, - [Subject] [nvarchar](256) NOT NULL, - [Body] [nvarchar](max) NOT NULL, - [ParentId] [int] NULL, - [CreatedOn] [datetime] NOT NULL, - [IsDelivered] [bit] NOT NULL, - [DeliveredOn] [datetime] NULL, - [DeletedBy] [nvarchar](256) NULL, - [DeletedOn] [datetime] NULL, - [IsDeleted][bit] NOT NULL, - CONSTRAINT [PK_Notification] PRIMARY KEY CLUSTERED - ( - [NotificationId] ASC - ) -) -GO - -CREATE TABLE [dbo].[Folder]( - [FolderId] [int] IDENTITY(1,1) NOT NULL, - [SiteId] [int] NOT NULL, - [Path] [nvarchar](50) NOT NULL, - [Name] [nvarchar](50) NOT NULL, - [ParentId] [int] NULL, - [Order] [int] NOT NULL, - [IsSystem] [bit] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - [DeletedBy] [nvarchar](256) NULL, - [DeletedOn] [datetime] NULL, - [IsDeleted][bit] NOT NULL, - CONSTRAINT [PK_Folder] PRIMARY KEY CLUSTERED - ( - [FolderId] ASC - ) -) -GO - -CREATE TABLE [dbo].[File]( - [FileId] [int] IDENTITY(1,1) NOT NULL, - [FolderId] [int] NOT NULL, - [Name] [nvarchar](250) NOT NULL, - [Extension] [nvarchar](50) NOT NULL, - [Size] [int] NOT NULL, - [ImageHeight] [int] NOT NULL, - [ImageWidth] [int] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - [DeletedBy] [nvarchar](256) NULL, - [DeletedOn] [datetime] NULL, - [IsDeleted][bit] NOT NULL, - CONSTRAINT [PK_File] PRIMARY KEY CLUSTERED - ( - [FileId] ASC - ) -) -GO - -CREATE TABLE [dbo].[HtmlText]( - [HtmlTextId] [int] IDENTITY(1,1) NOT NULL, - [ModuleId] [int] NOT NULL, - [Content] [nvarchar](max) NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_HtmlText] PRIMARY KEY CLUSTERED - ( - [HtmlTextId] ASC - ) -) -GO - -/* - -Create foreign key relationships - -*/ -ALTER TABLE [dbo].[Module] WITH CHECK ADD CONSTRAINT [FK_Module_Site] FOREIGN KEY([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[Page] WITH CHECK ADD CONSTRAINT [FK_Page_Site] FOREIGN KEY([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[PageModule] WITH CHECK ADD CONSTRAINT [FK_PageModule_Module] FOREIGN KEY([ModuleId]) -REFERENCES [dbo].[Module] ([ModuleId]) -GO - -ALTER TABLE [dbo].[PageModule] WITH CHECK ADD CONSTRAINT [FK_PageModule_Page] FOREIGN KEY([PageId]) -REFERENCES [dbo].[Page] ([PageId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[Role] WITH CHECK ADD CONSTRAINT [FK_Role_Site] FOREIGN KEY ([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[UserRole] WITH CHECK ADD CONSTRAINT [FK_UserRole_User] FOREIGN KEY ([UserId]) -REFERENCES [dbo].[User] ([UserId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[UserRole] WITH CHECK ADD CONSTRAINT [FK_UserRole_Role] FOREIGN KEY ([RoleId]) -REFERENCES [dbo].[Role] ([RoleId]) -GO - -ALTER TABLE [dbo].[Permission] WITH CHECK ADD CONSTRAINT [FK_Permission_Site] FOREIGN KEY ([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[Permission] WITH CHECK ADD CONSTRAINT [FK_Permission_User] FOREIGN KEY ([UserId]) -REFERENCES [dbo].[User] ([UserId]) -GO - -ALTER TABLE [dbo].[Permission] WITH CHECK ADD CONSTRAINT [FK_Permission_Role] FOREIGN KEY ([RoleId]) -REFERENCES [dbo].[Role] ([RoleId]) -GO - -ALTER TABLE [dbo].[Profile] WITH NOCHECK ADD CONSTRAINT [FK_Profile_Sites] FOREIGN KEY([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[Log] WITH CHECK ADD CONSTRAINT [FK_Log_Site] FOREIGN KEY([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[Notification] WITH CHECK ADD CONSTRAINT [FK_Notification_Site] FOREIGN KEY([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[Folder] WITH CHECK ADD CONSTRAINT [FK_Folder_Site] FOREIGN KEY([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[File] WITH CHECK ADD CONSTRAINT [FK_File_Folder] FOREIGN KEY([FolderId]) -REFERENCES [dbo].[Folder] ([FolderId]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[HtmlText] WITH CHECK ADD CONSTRAINT [FK_HtmlText_Module] FOREIGN KEY([ModuleId]) -REFERENCES [dbo].[Module] ([ModuleId]) -ON DELETE CASCADE -GO - - -/* - -Create indexes - -*/ - -CREATE UNIQUE NONCLUSTERED INDEX IX_Setting ON [dbo].Setting - ( - EntityName, - EntityId, - SettingName - ) ON [PRIMARY] -GO - -CREATE UNIQUE NONCLUSTERED INDEX IX_User ON [dbo].[User] - ( - Username - ) ON [PRIMARY] -GO - -CREATE UNIQUE NONCLUSTERED INDEX IX_Permission ON [dbo].Permission - ( - SiteId, - EntityName, - EntityId, - PermissionName, - RoleId, - UserId - ) ON [PRIMARY] -GO - -CREATE UNIQUE NONCLUSTERED INDEX IX_Page ON [dbo].Page - ( - SiteId, - [Path], - UserId - ) ON [PRIMARY] -GO - -CREATE UNIQUE NONCLUSTERED INDEX IX_UserRole ON [dbo].UserRole - ( - RoleId, - UserId - ) ON [PRIMARY] -GO - -CREATE UNIQUE NONCLUSTERED INDEX IX_Folder ON [dbo].Folder - ( - SiteId, - [Path] - ) ON [PRIMARY] -GO - -/* - -ASP.NET Identity Minimal Schema - -*/ - -CREATE TABLE [dbo].[AspNetUsers]( - [Id] [nvarchar](450) NOT NULL, - [UserName] [nvarchar](256) NULL, - [NormalizedUserName] [nvarchar](256) NULL, - [Email] [nvarchar](256) NULL, - [NormalizedEmail] [nvarchar](256) NULL, - [EmailConfirmed] [bit] NOT NULL, - [PasswordHash] [nvarchar](max) NULL, - [SecurityStamp] [nvarchar](max) NULL, - [ConcurrencyStamp] [nvarchar](max) NULL, - [PhoneNumber] [nvarchar](max) NULL, - [PhoneNumberConfirmed] [bit] NOT NULL, - [TwoFactorEnabled] [bit] NOT NULL, - [LockoutEnd] [datetimeoffset](7) NULL, - [LockoutEnabled] [bit] NOT NULL, - [AccessFailedCount] [int] NOT NULL, - CONSTRAINT [PK_AspNetUsers] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -CREATE TABLE [dbo].[AspNetUserClaims]( - [Id] [int] IDENTITY(1,1) NOT NULL, - [UserId] [nvarchar](450) NOT NULL, - [ClaimType] [nvarchar](max) NULL, - [ClaimValue] [nvarchar](max) NULL, - CONSTRAINT [PK_AspNetUserClaims] PRIMARY KEY CLUSTERED -( - [Id] ASC -) ON [PRIMARY] -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO - -CREATE NONCLUSTERED INDEX [IX_AspNetUserClaims_UserId] ON [dbo].[AspNetUserClaims] -( - [UserId] ASC -) ON [PRIMARY] -GO - -CREATE NONCLUSTERED INDEX [EmailIndex] ON [dbo].[AspNetUsers] -( - [NormalizedEmail] ASC -) ON [PRIMARY] -GO - -CREATE UNIQUE NONCLUSTERED INDEX [UserNameIndex] ON [dbo].[AspNetUsers] -( - [NormalizedUserName] ASC -) -WHERE ([NormalizedUserName] IS NOT NULL) -ON [PRIMARY] -GO - -ALTER TABLE [dbo].[AspNetUserClaims] WITH CHECK ADD CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId] FOREIGN KEY([UserId]) -REFERENCES [dbo].[AspNetUsers] ([Id]) -ON DELETE CASCADE -GO - -ALTER TABLE [dbo].[AspNetUserClaims] CHECK CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId] -GO diff --git a/Oqtane.Server/Scripts/Tenant.00.09.01.00.sql b/Oqtane.Server/Scripts/Tenant.00.09.01.00.sql deleted file mode 100644 index 55825ada..00000000 --- a/Oqtane.Server/Scripts/Tenant.00.09.01.00.sql +++ /dev/null @@ -1,14 +0,0 @@ -/* - -Version 0.9.1 migration script - -*/ - -ALTER TABLE [dbo].[Module] ADD - [AllPages] [bit] NULL -GO - -UPDATE [dbo].[Module] -SET [AllPages] = 0 -GO - diff --git a/Oqtane.Server/Scripts/Tenant.00.09.02.00.sql b/Oqtane.Server/Scripts/Tenant.00.09.02.00.sql deleted file mode 100644 index 11330770..00000000 --- a/Oqtane.Server/Scripts/Tenant.00.09.02.00.sql +++ /dev/null @@ -1,18 +0,0 @@ -/* - -Version 0.9.2 migration script - -*/ - -ALTER TABLE [dbo].[Role] -ALTER COLUMN [Description] VARCHAR (256) NOT NULL -GO - -ALTER TABLE [dbo].[Page] ADD - [DefaultContainerType] [nvarchar](200) NULL -GO - -UPDATE [dbo].[Page] -SET [DefaultContainerType] = '' -GO - diff --git a/Oqtane.Server/Scripts/Tenant.01.00.01.00.sql b/Oqtane.Server/Scripts/Tenant.01.00.01.00.sql deleted file mode 100644 index 5737acf3..00000000 --- a/Oqtane.Server/Scripts/Tenant.01.00.01.00.sql +++ /dev/null @@ -1,39 +0,0 @@ -/* - -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 - -ALTER TABLE [dbo].[Notification] ADD - [FromDisplayName] [nvarchar](50) NULL, - [FromEmail] [nvarchar](256) NULL, - [ToDisplayName] [nvarchar](50) NULL -GO diff --git a/Oqtane.Server/Scripts/Tenant.01.00.01.01.sql b/Oqtane.Server/Scripts/Tenant.01.00.01.01.sql deleted file mode 100644 index 76af104c..00000000 --- a/Oqtane.Server/Scripts/Tenant.01.00.01.01.sql +++ /dev/null @@ -1,12 +0,0 @@ -/* - -Version 1.0.1 Notification migration script - -*/ - -ALTER TABLE [dbo].[Notification] ADD - [SendOn] [datetime] NULL -GO - -UPDATE [dbo].[Notification] SET SendOn = CreatedOn WHERE SendOn IS NULL -GO \ No newline at end of file diff --git a/Oqtane.Server/Scripts/Tenant.01.00.02.01.sql b/Oqtane.Server/Scripts/Tenant.01.00.02.01.sql deleted file mode 100644 index 409f4f10..00000000 --- a/Oqtane.Server/Scripts/Tenant.01.00.02.01.sql +++ /dev/null @@ -1,9 +0,0 @@ -/* - -Version 1.0.2.1 migration script - -*/ - -ALTER TABLE [dbo].[Page] - DROP COLUMN EditMode -GO \ No newline at end of file diff --git a/Oqtane.Server/Scripts/Tenant.02.00.00.01.sql b/Oqtane.Server/Scripts/Tenant.02.00.00.01.sql deleted file mode 100644 index 7f509242..00000000 --- a/Oqtane.Server/Scripts/Tenant.02.00.00.01.sql +++ /dev/null @@ -1,16 +0,0 @@ -/* - -Version 2.0.0 Tenant migration script - -*/ - -ALTER TABLE [dbo].[Page] -ALTER COLUMN [Path] [nvarchar](256) NOT NULL -GO - -ALTER TABLE [dbo].[Profile] ADD - [Options] [nvarchar](2000) NULL -GO - -UPDATE [dbo].[Profile] SET Options = '' -GO \ No newline at end of file diff --git a/Oqtane.Server/Scripts/Tenant.02.00.01.01.sql b/Oqtane.Server/Scripts/Tenant.02.00.01.01.sql deleted file mode 100644 index 149728be..00000000 --- a/Oqtane.Server/Scripts/Tenant.02.00.01.01.sql +++ /dev/null @@ -1,9 +0,0 @@ -/* - -Version 2.0.1 Tenant migration script - -*/ - -UPDATE [dbo].[Page] SET Icon = IIF(Icon <> '', 'oi oi-' + Icon, ''); -GO - diff --git a/Oqtane.Server/Scripts/Tenant.02.00.01.02.sql b/Oqtane.Server/Scripts/Tenant.02.00.01.02.sql deleted file mode 100644 index 6f12d62e..00000000 --- a/Oqtane.Server/Scripts/Tenant.02.00.01.02.sql +++ /dev/null @@ -1,27 +0,0 @@ -/* - -Version 2.0.1 Tenant migration script - -*/ - -CREATE TABLE [dbo].[Language]( - [LanguageId] [int] IDENTITY(1,1) NOT NULL, - [Name] [nvarchar](100) NOT NULL, - [Code] [nvarchar](10) NOT NULL, - [IsDefault] [bit] NOT NULL, - [SiteId] [int] NOT NULL, - [CreatedBy] [nvarchar](256) NOT NULL, - [CreatedOn] [datetime] NOT NULL, - [ModifiedBy] [nvarchar](256) NOT NULL, - [ModifiedOn] [datetime] NOT NULL, - CONSTRAINT [PK_Language] PRIMARY KEY CLUSTERED - ( - [LanguageId] ASC - ) -) -GO - -ALTER TABLE [dbo].[Language] WITH CHECK ADD CONSTRAINT [FK_Language_Site] FOREIGN KEY([SiteId]) -REFERENCES [dbo].[Site] ([SiteId]) -ON DELETE CASCADE -GO \ No newline at end of file diff --git a/Oqtane.Server/Scripts/Tenant.02.00.01.03.sql b/Oqtane.Server/Scripts/Tenant.02.00.01.03.sql deleted file mode 100644 index 4b1d2876..00000000 --- a/Oqtane.Server/Scripts/Tenant.02.00.01.03.sql +++ /dev/null @@ -1,17 +0,0 @@ -/* - -Version 2.0.1 Tenant migration script - -*/ - -DELETE FROM [dbo].[Page] -WHERE Path = 'admin/tenants'; -GO - -ALTER TABLE [dbo].[Site] ADD - [AdminContainerType] [nvarchar](200) NULL -GO - -UPDATE [dbo].[Site] SET AdminContainerType = '' -GO - diff --git a/Oqtane.Server/Scripts/Tenant.02.00.02.01.sql b/Oqtane.Server/Scripts/Tenant.02.00.02.01.sql deleted file mode 100644 index 03e5c566..00000000 --- a/Oqtane.Server/Scripts/Tenant.02.00.02.01.sql +++ /dev/null @@ -1,10 +0,0 @@ -/* - -Version 2.0.2 Tenant migration script - -*/ - -ALTER TABLE [dbo].[Site] ADD - [SiteGuid] [char](36) NULL -GO - diff --git a/Oqtane.Server/Scripts/Tenant.02.00.02.02.sql b/Oqtane.Server/Scripts/Tenant.02.00.02.02.sql deleted file mode 100644 index 64a08e76..00000000 --- a/Oqtane.Server/Scripts/Tenant.02.00.02.02.sql +++ /dev/null @@ -1,20 +0,0 @@ -/* - -Version 2.0.2 Tenant migration script - -*/ - -UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'; -GO -UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'; -GO - -UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'; -GO -UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'; -GO - -UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client'; -GO -UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.NoTitle, Oqtane.Client'; -GO diff --git a/Oqtane.Server/Scripts/Tenant.02.00.02.03.sql b/Oqtane.Server/Scripts/Tenant.02.00.02.03.sql deleted file mode 100644 index ae34cf33..00000000 --- a/Oqtane.Server/Scripts/Tenant.02.00.02.03.sql +++ /dev/null @@ -1,31 +0,0 @@ -/* - -Version 2.0.2 Tenant migration script - -*/ - -ALTER TABLE [dbo].[Setting] ALTER COLUMN [SettingName] [nvarchar](200) NOT NULL -GO - -ALTER TABLE [dbo].[Site] - DROP COLUMN DefaultLayoutType -GO - -ALTER TABLE [dbo].[Page] - DROP COLUMN LayoutType -GO - -UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'; -GO -UPDATE [dbo].[Site] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'; -GO - -UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'; -GO -UPDATE [dbo].[Page] SET DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE DefaultContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'; -GO - -UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultTitle, Oqtane.Client'; -GO -UPDATE [dbo].[PageModule] SET ContainerType = 'Oqtane.Themes.OqtaneTheme.Container, Oqtane.Client' WHERE ContainerType = 'Oqtane.Themes.OqtaneTheme.DefaultNoTitle, Oqtane.Client'; -GO diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 9fde30d5..22ebe5d3 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -5,8 +5,8 @@ namespace Oqtane.Shared { public class Constants { public const string PackageId = "Oqtane.Framework"; - public const string Version = "2.0.2"; - public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2"; + public const string Version = "2.1.0"; + public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0"; public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client"; public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client"; From 6e5496e9699ee74d7657aa79ec74287e6eb31fb2 Mon Sep 17 00:00:00 2001 From: hishamco Date: Wed, 21 Apr 2021 16:41:24 +0300 Subject: [PATCH 06/27] Exclude English from the languages list --- Oqtane.Client/Modules/Admin/Languages/Add.razor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor index 7efbcf85..59115679 100644 --- a/Oqtane.Client/Modules/Admin/Languages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor @@ -61,6 +61,10 @@ else { AddModuleMessage(Localizer["The Only Supported Culture That Has Been Defined Is English"], MessageType.Warning); } + else + { + _supportedCultures = _supportedCultures.Where(c => !c.Name.Equals(Constants.DefaultCulture)); + } } private async Task SaveLanguage() From 3cafb68f6b6e909e6c07e20ed3821c3e6cae9864 Mon Sep 17 00:00:00 2001 From: hishamco Date: Wed, 21 Apr 2021 17:31:22 +0300 Subject: [PATCH 07/27] Localize module titles in UI --- Oqtane.Client/Modules/Admin/Dashboard/Index.razor | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index 650eaee6..620bf65a 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -2,6 +2,7 @@ @inherits ModuleBase @inject IPageService PageService @inject IUserService UserService +@inject IStringLocalizer Localizer
@foreach (var p in _pages) @@ -11,7 +12,7 @@ string url = NavigateUrl(p.Path);
-

@p.Name +

@Localizer[p.Name]
} @@ -20,7 +21,7 @@ @code { private List _pages; - + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; protected override void OnInitialized() From c52f6c92f1e10275d32bcb761a087d7e5ce4cb11 Mon Sep 17 00:00:00 2001 From: hishamco Date: Wed, 21 Apr 2021 17:47:50 +0300 Subject: [PATCH 08/27] Add English to the language switcher --- Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor index bd4ac6fc..64b1d196 100644 --- a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor +++ b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor @@ -27,6 +27,10 @@ protected override async Task OnParametersSetAsync() { var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId); + var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture); + + languages.Add(new Language { Code = defaultCulture.Name, Name = defaultCulture.DisplayName }); + _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name }); } From 2780e4d02936826ad2a07b19d8d0bf56cbc33847 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Wed, 21 Apr 2021 19:31:02 -0400 Subject: [PATCH 09/27] modify nuget package installer to support satellite assemblies in subfolders --- .../Themes/OqtaneTheme/Themes/Default.razor | 6 +- .../OqtaneTheme/Themes/ThemeSettings.razor | 4 +- .../Infrastructure/InstallationManager.cs | 59 ++++++++++--------- .../Oqtane.Themes.OqtaneTheme/Theme.css | 1 + 4 files changed, 38 insertions(+), 32 deletions(-) diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor index e2ff2270..3de4b465 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor @@ -93,10 +93,14 @@ @if (_footer) { -
+
} + else + { + + }
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor index baaa940f..05d0351b 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor @@ -7,10 +7,10 @@ @@ -140,9 +140,10 @@ else await UserRoleService.AddUserRoleAsync(userrole); } - await GetUserRoles(); await logger.LogInformation("User Assigned To Role {UserRole}", userrole); AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } else { @@ -161,9 +162,10 @@ else try { await UserRoleService.DeleteUserRoleAsync(UserRoleId); - await GetUserRoles(); await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } catch (Exception ex) { diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 89b1e775..176050d3 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -131,26 +131,34 @@ { if (password == confirm) { - var user = new User(); - user.SiteId = PageState.Site.SiteId; - user.Username = username; - user.Password = password; - user.Email = email; - user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname; - user.PhotoFileId = null; - - user = await UserService.AddUserAsync(user); - - if (user != null) + var user = await UserService.GetUserAsync(username, PageState.Site.SiteId); + if (user == null) { - await SettingService.UpdateUserSettingsAsync(settings, user.UserId); - await logger.LogInformation("User Created {User}", user); - NavigationManager.NavigateTo(NavigateUrl()); + user = new User(); + user.SiteId = PageState.Site.SiteId; + user.Username = username; + user.Password = password; + user.Email = email; + user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname; + user.PhotoFileId = null; + + user = await UserService.AddUserAsync(user); + + if (user != null) + { + await SettingService.UpdateUserSettingsAsync(settings, user.UserId); + await logger.LogInformation("User Created {User}", user); + NavigationManager.NavigateTo(NavigateUrl()); + } + else + { + await logger.LogError("Error Adding User {Username} {Email}", username, email); + AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username And Email Are Not Already In Use."], MessageType.Error); + } } else { - await logger.LogError("Error Adding User {Username} {Email}", username, email); - AddModuleMessage(Localizer["Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use."], MessageType.Error); + AddModuleMessage(Localizer["Username Already Exists"], MessageType.Warning); } } else diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index e648083f..6b74a277 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -13,10 +13,15 @@ } else { - - -
- +
+
+ +
+
+
+   +
+
@@ -31,7 +36,10 @@ else
@@ -92,7 +92,14 @@ else userid = Int32.Parse(PageState.QueryString["id"]); User user = await UserService.GetUserAsync(userid, PageState.Site.SiteId); name = user.DisplayName; - roles = await RoleService.GetRolesAsync(PageState.Site.SiteId); + if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) + { + roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true); + } + else + { + roles = await RoleService.GetRolesAsync(PageState.Site.SiteId); + } await GetUserRoles(); } catch (Exception ex) @@ -171,9 +178,10 @@ else await UserRoleService.AddUserRoleAsync(userrole); } - await GetUserRoles(); await logger.LogInformation("User Assigned To Role {UserRole}", userrole); AddModuleMessage(Localizer["User Assigned To Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } else { @@ -192,9 +200,10 @@ else try { await UserRoleService.DeleteUserRoleAsync(UserRoleId); - await GetUserRoles(); await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId); AddModuleMessage(Localizer["User Removed From Role"], MessageType.Success); + await GetUserRoles(); + StateHasChanged(); } catch (Exception ex) { diff --git a/Oqtane.Client/Services/Interfaces/IRoleService.cs b/Oqtane.Client/Services/Interfaces/IRoleService.cs index 23ae0d05..66edc8de 100644 --- a/Oqtane.Client/Services/Interfaces/IRoleService.cs +++ b/Oqtane.Client/Services/Interfaces/IRoleService.cs @@ -1,4 +1,4 @@ -using Oqtane.Models; +using Oqtane.Models; using System.Collections.Generic; using System.Threading.Tasks; @@ -8,6 +8,8 @@ namespace Oqtane.Services { Task> GetRolesAsync(int siteId); + Task> GetRolesAsync(int siteId, bool includeGlobalRoles); + Task GetRoleAsync(int roleId); Task AddRoleAsync(Role role); diff --git a/Oqtane.Client/Services/RoleService.cs b/Oqtane.Client/Services/RoleService.cs index d304edf3..5d29dcd3 100644 --- a/Oqtane.Client/Services/RoleService.cs +++ b/Oqtane.Client/Services/RoleService.cs @@ -1,4 +1,4 @@ -using Oqtane.Models; +using Oqtane.Models; using System.Threading.Tasks; using System.Net.Http; using System.Linq; @@ -22,7 +22,12 @@ namespace Oqtane.Services public async Task> GetRolesAsync(int siteId) { - List roles = await GetJsonAsync>($"{Apiurl}?siteid={siteId}"); + return await GetRolesAsync(siteId, false); + } + + public async Task> GetRolesAsync(int siteId, bool includeGlobalRoles) + { + List roles = await GetJsonAsync>($"{Apiurl}?siteid={siteId}&global={includeGlobalRoles}"); return roles.OrderBy(item => item.Name).ToList(); } diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index 708e20c3..d04a59cb 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; using Oqtane.Enums; @@ -21,12 +21,16 @@ namespace Oqtane.Controllers _logger = logger; } - // GET: api/?siteid=x + // GET: api/?siteid=x&global=true/false [HttpGet] [Authorize(Roles = RoleNames.Registered)] - public IEnumerable Get(string siteid) + public IEnumerable Get(string siteid, string global) { - return _roles.GetRoles(int.Parse(siteid)); + if (string.IsNullOrEmpty(global)) + { + global = "false"; + } + return _roles.GetRoles(int.Parse(siteid), bool.Parse(global)); } // GET api//5 diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 11c875de..437c1e9e 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization; using Oqtane.Enums; @@ -6,6 +6,7 @@ using Oqtane.Models; using Oqtane.Shared; using Oqtane.Infrastructure; using Oqtane.Repository; +using System.Linq; namespace Oqtane.Controllers { @@ -13,13 +14,15 @@ namespace Oqtane.Controllers public class UserRoleController : Controller { private readonly IUserRoleRepository _userRoles; + private readonly IRoleRepository _roles; private readonly ITenantResolver _tenants; private readonly ISyncManager _syncManager; private readonly ILogManager _logger; - public UserRoleController(IUserRoleRepository userRoles, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger) + public UserRoleController(IUserRoleRepository userRoles, IRoleRepository roles, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger) { _userRoles = userRoles; + _roles = roles; _syncManager = syncManager; _tenants = tenants; _logger = logger; @@ -46,8 +49,13 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Admin)] public UserRole Post([FromBody] UserRole userRole) { - if (ModelState.IsValid) + var role = _roles.GetRole(userRole.RoleId); + if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { + if (role.Name == RoleNames.Host) + { + _userRoles.DeleteUserRoles(userRole.UserId); + } userRole = _userRoles.AddUserRole(userRole); _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); @@ -60,7 +68,8 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Admin)] public UserRole Put(int id, [FromBody] UserRole userRole) { - if (ModelState.IsValid) + var role = _roles.GetRole(userRole.RoleId); + if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { userRole = _userRoles.UpdateUserRole(userRole); _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); @@ -75,9 +84,17 @@ namespace Oqtane.Controllers public void Delete(int id) { UserRole userRole = _userRoles.GetUserRole(id); - _userRoles.DeleteUserRole(id); - _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); + if (User.IsInRole(RoleNames.Host) || userRole.Role.Name != RoleNames.Host) + { + _userRoles.DeleteUserRole(id); + if (userRole.Role.Name == RoleNames.Host) + { + var role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Registered); + _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + } + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); + } } } } diff --git a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs index c46a0e50..b26eb5dc 100644 --- a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs +++ b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Oqtane.Models; namespace Oqtane.Repository @@ -11,5 +11,6 @@ namespace Oqtane.Repository UserRole UpdateUserRole(UserRole userRole); UserRole GetUserRole(int userRoleId); void DeleteUserRole(int userRoleId); + void DeleteUserRoles(int userId); } } diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index b376b470..f3974ba8 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -649,9 +649,9 @@ namespace Oqtane.Repository _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Admin, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true}); _profileRepository.AddProfile(new Profile - {SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false}); + {SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false}); _profileRepository.AddProfile(new Profile - {SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false}); + {SiteId = site.SiteId, Name = "LastName", Title = "Last Name", Description = "Your Last Or Family Name", Category = "Name", ViewOrder = 2, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false}); _profileRepository.AddProfile(new Profile {SiteId = site.SiteId, Name = "Street", Title = "Street", Description = "Street Or Building Address", Category = "Address", ViewOrder = 3, MaxLength = 50, DefaultValue = "", IsRequired = false, IsPrivate = false}); _profileRepository.AddProfile( diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs index b47bd6f7..d62156f5 100644 --- a/Oqtane.Server/Repository/UserRoleRepository.cs +++ b/Oqtane.Server/Repository/UserRoleRepository.cs @@ -58,5 +58,14 @@ namespace Oqtane.Repository _db.UserRole.Remove(userRole); _db.SaveChanges(); } + + public void DeleteUserRoles(int userId) + { + foreach (UserRole userRole in _db.UserRole.Where(item => item.Role.SiteId != null)) + { + _db.UserRole.Remove(userRole); + } + _db.SaveChanges(); + } } } From 5a519510a90018e021ee24f3b40ff93a1bad830a Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 23 Apr 2021 16:29:18 -0400 Subject: [PATCH 11/27] improve comments and logging --- .../Controllers/UserRoleController.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index 437c1e9e..d8fa360b 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -52,13 +52,17 @@ namespace Oqtane.Controllers var role = _roles.GetRole(userRole.RoleId); if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { + userRole = _userRoles.AddUserRole(userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); + if (role.Name == RoleNames.Host) { + // host roles can only exist at global level - remove all site specific user roles _userRoles.DeleteUserRoles(userRole.UserId); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Roles Deleted For UserId {UserId}", userRole.UserId); } - userRole = _userRoles.AddUserRole(userRole); + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); } return userRole; } @@ -87,13 +91,20 @@ namespace Oqtane.Controllers if (User.IsInRole(RoleNames.Host) || userRole.Role.Name != RoleNames.Host) { _userRoles.DeleteUserRole(id); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); + if (userRole.Role.Name == RoleNames.Host) { + // add site specific user roles to preserve user access var role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Registered); - _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); + role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Admin); + userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); } + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRole}", userRole); } } } From d42c7a5ea5f7c7251c50d018177ed6c6763fd1ca Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Sat, 24 Apr 2021 13:47:20 -0400 Subject: [PATCH 12/27] user and role management improvements --- Oqtane.Client/Modules/Admin/Roles/Users.razor | 6 +++++- Oqtane.Client/Modules/Admin/Users/Index.razor | 5 +---- Oqtane.Client/Modules/Admin/Users/Roles.razor | 10 ++++++---- Oqtane.Server/Controllers/RoleController.cs | 10 +++++++--- Oqtane.Server/Controllers/UserRoleController.cs | 12 ++++++------ Oqtane.Server/Repository/RoleRepository.cs | 13 ++++++++++--- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index 16ab3a5e..c8049b18 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -58,12 +58,16 @@ else
+ + + + diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index 6b74a277..4245c649 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -36,10 +36,7 @@ else + + + + @@ -95,6 +96,7 @@ else if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) { roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true); + roles = roles.Where(item => item.Name != RoleNames.Everyone).ToList(); } else { diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs index d04a59cb..0e842509 100644 --- a/Oqtane.Server/Controllers/RoleController.cs +++ b/Oqtane.Server/Controllers/RoleController.cs @@ -28,7 +28,7 @@ namespace Oqtane.Controllers { if (string.IsNullOrEmpty(global)) { - global = "false"; + global = "False"; } return _roles.GetRoles(int.Parse(siteid), bool.Parse(global)); } @@ -72,8 +72,12 @@ namespace Oqtane.Controllers [Authorize(Roles = RoleNames.Admin)] public void Delete(int id) { - _roles.DeleteRole(id); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id); + var role = _roles.GetRole(id); + if (!role.IsSystem) + { + _roles.DeleteRole(id); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id); + } } } } diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs index d8fa360b..f7d9059d 100644 --- a/Oqtane.Server/Controllers/UserRoleController.cs +++ b/Oqtane.Server/Controllers/UserRoleController.cs @@ -52,16 +52,16 @@ namespace Oqtane.Controllers var role = _roles.GetRole(userRole.RoleId); if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || role.Name != RoleNames.Host)) { - userRole = _userRoles.AddUserRole(userRole); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); - if (role.Name == RoleNames.Host) { // host roles can only exist at global level - remove all site specific user roles _userRoles.DeleteUserRoles(userRole.UserId); - _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Roles Deleted For UserId {UserId}", userRole.UserId); + _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Roles Deleted For UserId {UserId}", userRole.UserId); } + userRole = _userRoles.AddUserRole(userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); + _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); } return userRole; @@ -98,10 +98,10 @@ namespace Oqtane.Controllers // add site specific user roles to preserve user access var role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Registered); userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); role = _roles.GetRoles(_tenants.GetAlias().SiteId).FirstOrDefault(item => item.Name == RoleNames.Admin); userRole = _userRoles.AddUserRole(new UserRole { UserId = userRole.UserId, RoleId = role.RoleId, EffectiveDate = null, ExpiryDate = null }); - _logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Added {UserRole}", userRole); + _logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", userRole); } _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.User, userRole.UserId); diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs index f41cc31f..b8afb4a4 100644 --- a/Oqtane.Server/Repository/RoleRepository.cs +++ b/Oqtane.Server/Repository/RoleRepository.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; using Oqtane.Models; @@ -16,12 +16,19 @@ namespace Oqtane.Repository public IEnumerable GetRoles(int siteId) { - return _db.Role.Where(item => item.SiteId == siteId); + return GetRoles(siteId, false); } public IEnumerable GetRoles(int siteId, bool includeGlobalRoles) { - return _db.Role.Where(item => item.SiteId == siteId || item.SiteId == null); + if (includeGlobalRoles) + { + return _db.Role.Where(item => item.SiteId == siteId || item.SiteId == null); + } + else + { + return _db.Role.Where(item => item.SiteId == siteId); + } } public Role AddRole(Role role) From 76c2a2f2f9ca994432201b154fc4d7f1ee9d79cc Mon Sep 17 00:00:00 2001 From: hishamco Date: Mon, 26 Apr 2021 01:55:27 +0300 Subject: [PATCH 13/27] Add English to supported cultures by default --- .../Infrastructure/LocalizationManager.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Oqtane.Server/Infrastructure/LocalizationManager.cs b/Oqtane.Server/Infrastructure/LocalizationManager.cs index 1ec6e740..998f3403 100644 --- a/Oqtane.Server/Infrastructure/LocalizationManager.cs +++ b/Oqtane.Server/Infrastructure/LocalizationManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.IO; using System.Reflection; @@ -9,7 +10,7 @@ namespace Oqtane.Infrastructure public class LocalizationManager : ILocalizationManager { private static readonly string DefaultCulture = Constants.DefaultCulture; - private static readonly string[] SupportedCultures = new[] { DefaultCulture }; + private static readonly string[] DefaultSupportedCultures = new[] { DefaultCulture }; private readonly LocalizationOptions _localizationOptions; @@ -19,25 +20,19 @@ namespace Oqtane.Infrastructure } public string GetDefaultCulture() - => string.IsNullOrEmpty(_localizationOptions.DefaultCulture) + => String.IsNullOrEmpty(_localizationOptions.DefaultCulture) ? DefaultCulture : _localizationOptions.DefaultCulture; public string[] GetSupportedCultures() { - List cultures = new List(); + var cultures = new List(DefaultSupportedCultures); foreach(var file in Directory.EnumerateFiles(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Oqtane.Client.resources.dll", SearchOption.AllDirectories)) { cultures.Add(Path.GetFileName(Path.GetDirectoryName(file))); } - if (cultures.Count == 0) - { - return SupportedCultures; - } - else - { - return cultures.ToArray(); - } + + return cultures.ToArray(); } } } From 55b69f0afc8e51d98720f309222982b29983353c Mon Sep 17 00:00:00 2001 From: hishamco Date: Mon, 26 Apr 2021 01:55:55 +0300 Subject: [PATCH 14/27] Order the cultures alphabatically --- Oqtane.Server/Infrastructure/LocalizationManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Oqtane.Server/Infrastructure/LocalizationManager.cs b/Oqtane.Server/Infrastructure/LocalizationManager.cs index 998f3403..83a9cf25 100644 --- a/Oqtane.Server/Infrastructure/LocalizationManager.cs +++ b/Oqtane.Server/Infrastructure/LocalizationManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Reflection; using Microsoft.Extensions.Options; using Oqtane.Shared; @@ -32,7 +33,7 @@ namespace Oqtane.Infrastructure cultures.Add(Path.GetFileName(Path.GetDirectoryName(file))); } - return cultures.ToArray(); + return cultures.OrderBy(c => c).ToArray(); } } } From a531a235a0bdb6f10280b365400f90a24a696e28 Mon Sep 17 00:00:00 2001 From: ijungleboy Date: Mon, 26 Apr 2021 13:51:37 +0200 Subject: [PATCH 15/27] Make version static-readonly https://github.com/oqtane/oqtane.framework/issues/1283 --- Oqtane.Shared/Shared/Constants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 28f065e6..8d8f64ec 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -5,7 +5,7 @@ namespace Oqtane.Shared { public class Constants { public const string PackageId = "Oqtane.Framework"; - public const string Version = "2.1.0"; + public static readonly string Version = "2.1.0"; public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0"; public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client"; From 189dcf5b903e8fb9221d9c88a929e14befeb1208 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Mon, 26 Apr 2021 15:38:33 +0200 Subject: [PATCH 16/27] Fix for Error with Footer on Oqtane Theme #1282 --- Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor | 1 + 1 file changed, 1 insertion(+) diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor index 3de4b465..039ecc07 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor @@ -93,6 +93,7 @@ @if (_footer) { +
From 1efd623a99542857de9db1e19d98f8fcd25b7217 Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Tue, 27 Apr 2021 15:35:10 -0700 Subject: [PATCH 17/27] Adding new DatabaseConfig components in the Client project for supported Databases to avoid deploying server dlls to client --- .../Installer/Controls/LocalDBConfig.razor | 63 +++++++ .../Installer/Controls/MySQLConfig.razor | 73 ++++++++ .../Installer/Controls/PostgreSQLConfig.razor | 131 ++++++++++++++ .../Installer/Controls/SqlServerConfig.razor | 131 ++++++++++++++ .../Installer/Controls/SqliteConfig.razor | 60 +++++++ .../{UI => Installer}/Installer.razor | 163 +++++++++++------- Oqtane.Client/Modules/Admin/Sites/Add.razor | 140 +++++++++------ Oqtane.Client/Program.cs | 11 -- Oqtane.Client/_Imports.razor | 1 + Oqtane.Database.MySQL/MySQLDatabase.cs | 33 +--- .../PostgreSQLDatabase.cs | 47 +---- Oqtane.Database.Sqlite/SqliteDatabase.cs | 21 +-- Oqtane.Server/Databases/LocalDbDatabase.cs | 23 +-- Oqtane.Server/Databases/SqlServerDatabase.cs | 46 +---- .../Databases/SqlServerDatabaseBase.cs | 2 +- .../Interfaces/IDatabaseConfigControl.cs | 9 + Oqtane.Shared/Interfaces/IOqtaneDatabase.cs | 4 - Oqtane.Shared/Models/Database.cs | 2 + Oqtane.Shared/Shared/OqtaneDatabaseBase.cs | 7 +- 19 files changed, 664 insertions(+), 303 deletions(-) create mode 100644 Oqtane.Client/Installer/Controls/LocalDBConfig.razor create mode 100644 Oqtane.Client/Installer/Controls/MySQLConfig.razor create mode 100644 Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor create mode 100644 Oqtane.Client/Installer/Controls/SqlServerConfig.razor create mode 100644 Oqtane.Client/Installer/Controls/SqliteConfig.razor rename Oqtane.Client/{UI => Installer}/Installer.razor (60%) create mode 100644 Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs diff --git a/Oqtane.Client/Installer/Controls/LocalDBConfig.razor b/Oqtane.Client/Installer/Controls/LocalDBConfig.razor new file mode 100644 index 00000000..9080675b --- /dev/null +++ b/Oqtane.Client/Installer/Controls/LocalDBConfig.razor @@ -0,0 +1,63 @@ +@namespace Oqtane.Installer.Controls + +@using System.ComponentModel.Design.Serialization +@implements Oqtane.Interfaces.IDatabaseConfigControl + +@inject IStringLocalizer Localizer + +@{ + foreach (var field in _connectionStringFields) + { + var fieldId = field.Name.ToLowerInvariant(); + field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); + + if (IsInstaller) + { + + + + + } + else + { + + + + + } + } +} + +@code { + [Parameter] + public bool IsInstaller { get; set; } + + private readonly List _connectionStringFields = new() + { + new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB", HelpText="Enter the database server"}, + new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"} + }; + + public string GetConnectionString() + { + var connectionString = String.Empty; + + var server = _connectionStringFields[0].Value; + var database = _connectionStringFields[1].Value; + + if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database)) + { + connectionString = $"Data Source={server};AttachDbFilename=|DataDirectory|\\{database}.mdf;Initial Catalog={database};Integrated Security=SSPI;"; + } + + return connectionString; + } +} \ No newline at end of file diff --git a/Oqtane.Client/Installer/Controls/MySQLConfig.razor b/Oqtane.Client/Installer/Controls/MySQLConfig.razor new file mode 100644 index 00000000..8655e0fd --- /dev/null +++ b/Oqtane.Client/Installer/Controls/MySQLConfig.razor @@ -0,0 +1,73 @@ +@namespace Oqtane.Installer.Controls + +@implements Oqtane.Interfaces.IDatabaseConfigControl + +@inject IStringLocalizer Localizer + +@{ + foreach (var field in _connectionStringFields) + { + var fieldId = field.Name.ToLowerInvariant(); + var fieldType = (field.Name == "Pwd") ? "password" : "text"; + field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); + + if (IsInstaller) + { + + + + + } + else + { + + + + + } + } +} + +@code { + [Parameter] + public bool IsInstaller { get; set; } + + private readonly List _connectionStringFields = new() + { + new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"}, + new() {Name = "Port", FriendlyName = "Port", Value = "3306", HelpText="Enter the port used to connect to the server"}, + new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}, + new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"}, + new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"} + }; + + public string GetConnectionString() + { + var connectionString = String.Empty; + + var server = _connectionStringFields[0].Value; + var port = _connectionStringFields[1].Value; + var database = _connectionStringFields[2].Value; + var userId = _connectionStringFields[3].Value; + var password = _connectionStringFields[4].Value; + + if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) + { + connectionString = $"Server={server};Database={database};Uid={userId};Pwd={password};"; + } + + if (!String.IsNullOrEmpty(port)) + { + connectionString += $"Port={port};"; + } + return connectionString; + } +} \ No newline at end of file diff --git a/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor b/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor new file mode 100644 index 00000000..93f72576 --- /dev/null +++ b/Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor @@ -0,0 +1,131 @@ +@namespace Oqtane.Installer.Controls + +@implements Oqtane.Interfaces.IDatabaseConfigControl + +@inject IStringLocalizer Localizer + +@{ + foreach (var field in _connectionStringFields) + { + var fieldId = field.Name.ToLowerInvariant(); + if (field.Name != "IntegratedSecurity") + { + var isVisible = ""; + var fieldType = (field.Name == "Pwd") ? "password" : "text"; + if ((field.Name == "Uid" || field.Name == "Pwd") ) + { + var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity"); + if (intSecurityField != null) + { + isVisible = (Convert.ToBoolean(intSecurityField.Value)) ? "display: none;" : ""; + } + } + + field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); + + if (IsInstaller) + { + + + + + } + else + { + + + + + } + } + else + { + if (IsInstaller) + { + + + + + } + else + { + + + + + } + } + } +} + +@code { + [Parameter] + public bool IsInstaller { get; set; } + + private readonly List _connectionStringFields = new() + { + new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"}, + new() {Name = "Port", FriendlyName = "Port", Value = "5432", HelpText="Enter the port used to connect to the server"}, + new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}, + new() {Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText="Select if you want integrated security or not"}, + new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"}, + new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"} + }; + + public string GetConnectionString() + { + var connectionString = String.Empty; + + var server = _connectionStringFields[0].Value; + var port = _connectionStringFields[1].Value; + var database = _connectionStringFields[2].Value; + var integratedSecurity = Boolean.Parse(_connectionStringFields[3].Value); + var userId = _connectionStringFields[4].Value; + var password = _connectionStringFields[5].Value; + + if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(port)) + { + connectionString = $"Server={server};Port={port};Database={database};"; + } + + if (integratedSecurity) + { + connectionString += "Integrated Security=true;"; + } + else + { + if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) + { + connectionString += $"User ID={userId};Password={password};"; + } + else + { + connectionString = String.Empty; + } + } + + return connectionString; + } +} \ No newline at end of file diff --git a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor new file mode 100644 index 00000000..3fdbd0c7 --- /dev/null +++ b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor @@ -0,0 +1,131 @@ +@namespace Oqtane.Installer.Controls + +@implements Oqtane.Interfaces.IDatabaseConfigControl + +@inject IStringLocalizer Localizer + +@{ + foreach (var field in _connectionStringFields) + { + var fieldId = field.Name.ToLowerInvariant(); + if (field.Name != "IntegratedSecurity") + { + var isVisible = ""; + var fieldType = (field.Name == "Pwd") ? "password" : "text"; + if ((field.Name == "Uid" || field.Name == "Pwd") ) + { + var intSecurityField = _connectionStringFields.Single(f => f.Name == "IntegratedSecurity"); + if (intSecurityField != null) + { + isVisible = (Convert.ToBoolean(intSecurityField.Value)) ? "display: none;" : ""; + } + } + + field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); + + if (IsInstaller) + { + + + + + } + else + { + + + + + } + } + else + { + if (IsInstaller) + { + + + + + } + else + { + + + + + } + } + } +} + +@code { + + [Parameter] + public bool IsInstaller { get; set; } + + private readonly List _connectionStringFields = new() + { + new() {Name = "Server", FriendlyName = "Server", Value = ".", HelpText="Enter the database server"}, + new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}, + new() {Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText="Select if you want integrated security or not"}, + new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"}, + new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"} + }; + + public string GetConnectionString() + { + var connectionString = String.Empty; + + var server = _connectionStringFields[0].Value; + var database = _connectionStringFields[1].Value; + var integratedSecurity = Boolean.Parse(_connectionStringFields[2].Value); + var userId = _connectionStringFields[3].Value; + var password = _connectionStringFields[4].Value; + + if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database)) + { + connectionString = $"Data Source={server};Initial Catalog={database};"; + } + + if (integratedSecurity) + { + connectionString += "Integrated Security=SSPI;"; + } + else + { + if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) + { + connectionString += $"User ID={userId};Password={password};"; + } + else + { + connectionString = String.Empty; + } + } + + return connectionString; + } + +} \ No newline at end of file diff --git a/Oqtane.Client/Installer/Controls/SqliteConfig.razor b/Oqtane.Client/Installer/Controls/SqliteConfig.razor new file mode 100644 index 00000000..23682365 --- /dev/null +++ b/Oqtane.Client/Installer/Controls/SqliteConfig.razor @@ -0,0 +1,60 @@ +@namespace Oqtane.Installer.Controls + +@implements Oqtane.Interfaces.IDatabaseConfigControl + +@inject IStringLocalizer Localizer + +@{ + foreach (var field in _connectionStringFields) + { + var fieldId = field.Name.ToLowerInvariant(); + field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); + + if (IsInstaller) + { + + + + + } + else + { + + + + + } + } +} + +@code { + [Parameter] + public bool IsInstaller { get; set; } + + private readonly List _connectionStringFields = new() + { + new() {Name = "Server", FriendlyName = "File Name", Value = "Oqtane-{{Date}}.db", HelpText="Enter the file name to use for the database"} + }; + + public string GetConnectionString() + { + var connectionstring = String.Empty; + + var server = _connectionStringFields[0].Value; + + if (!String.IsNullOrEmpty(server)) + { + connectionstring = $"Data Source={server};"; + } + + return connectionstring; + } +} \ No newline at end of file diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/Installer/Installer.razor similarity index 60% rename from Oqtane.Client/UI/Installer.razor rename to Oqtane.Client/Installer/Installer.razor index 3c013711..4ee19850 100644 --- a/Oqtane.Client/UI/Installer.razor +++ b/Oqtane.Client/Installer/Installer.razor @@ -1,13 +1,13 @@ +@namespace Oqtane.Installer @using Oqtane.Interfaces -@using System.Reflection -@namespace Oqtane.UI +@using Oqtane.Installer.Controls + @inject NavigationManager NavigationManager @inject IInstallationService InstallationService @inject ISiteService SiteService @inject IUserService UserService @inject IJSRuntime JSRuntime @inject IStringLocalizer Localizer -@inject IEnumerable Databases
@@ -22,63 +22,23 @@

@Localizer["Database Configuration"]


- + - diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs index 3962baf5..ef3b0b7e 100644 --- a/Oqtane.Server/Infrastructure/InstallationManager.cs +++ b/Oqtane.Server/Infrastructure/InstallationManager.cs @@ -38,7 +38,7 @@ namespace Oqtane.Infrastructure public static bool InstallPackages(string folders, string webRootPath, string contentRootPath) { bool install = false; - string binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); + string binPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location); foreach (string folder in folders.Split(',')) { @@ -82,40 +82,37 @@ namespace Oqtane.Infrastructure List assets = new List(); bool manifest = false; - // module and theme packages must be in form of name.1.0.0.nupkg + // packages are in form of name.1.0.0.nupkg or name.culture.1.0.0.nupkg string name = Path.GetFileNameWithoutExtension(packagename); string[] segments = name?.Split('.'); - if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3); + if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3); // remove version information // deploy to appropriate locations foreach (ZipArchiveEntry entry in archive.Entries) { - string foldername = Path.GetDirectoryName(entry.FullName).Split(Path.DirectorySeparatorChar)[0]; - string filename = Path.GetFileName(entry.FullName); + string filename = ""; - if (!manifest && filename == "assets.json") + // evaluate entry root folder + switch (entry.FullName.Split('/')[0]) { - manifest = true; + case "lib": // lib/net5.0/... + filename = ExtractFile(entry, binPath, 2); + break; + case "wwwroot": // wwwroot/... + filename = ExtractFile(entry, webRootPath, 1); + break; + case "runtimes": // runtimes/name/... + filename = ExtractFile(entry, binPath, 0); + break; } - switch (foldername) + if (filename != "") { - case "lib": - filename = Path.Combine(binFolder, filename); - ExtractFile(entry, filename); - assets.Add(filename.Replace(contentRootPath, "")); - break; - case "wwwroot": - filename = Path.Combine(webRootPath, Utilities.PathCombine(entry.FullName.Replace("wwwroot/", "").Split('/'))); - ExtractFile(entry, filename); - assets.Add(filename.Replace(contentRootPath, "")); - break; - case "runtimes": - var destSubFolder = Path.GetDirectoryName(entry.FullName); - filename = Path.Combine(binFolder, destSubFolder, filename); - ExtractFile(entry, filename); - assets.Add(filename.Replace(contentRootPath, "")); - break; + assets.Add(filename.Replace(contentRootPath, "")); + if (!manifest && Path.GetFileName(filename) == "assets.json") + { + manifest = true; + } } } @@ -145,21 +142,25 @@ namespace Oqtane.Infrastructure return install; } - private static void ExtractFile(ZipArchiveEntry entry, string filename) + private static string ExtractFile(ZipArchiveEntry entry, string folder, int ignoreLeadingSegments) { - if (!Directory.Exists(Path.GetDirectoryName(filename))) - { - Directory.CreateDirectory(Path.GetDirectoryName(filename)); - } + string[] segments = entry.FullName.Split('/'); // ZipArchiveEntries always use unix path separator + string filename = Path.Combine(folder, string.Join(Path.DirectorySeparatorChar, segments, ignoreLeadingSegments, segments.Length - ignoreLeadingSegments)); try { + if (!Directory.Exists(Path.GetDirectoryName(filename))) + { + Directory.CreateDirectory(Path.GetDirectoryName(filename)); + } entry.ExtractToFile(filename, true); } catch { // an error occurred extracting the file + filename = ""; } + return filename; } public void UpgradeFramework() diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css index a4c5f957..e95b6d11 100644 --- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css +++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css @@ -55,6 +55,7 @@ div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu min-height: 40px; text-align: center; color: #ffffff; + z-index: 1000; } @media (max-width: 767px) { From 9d083726be86e81b8f238fce987f14c5d10cdd09 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 23 Apr 2021 16:11:35 -0400 Subject: [PATCH 10/27] user and role management improvements --- Oqtane.Client/Modules/Admin/Roles/Users.razor | 8 ++-- Oqtane.Client/Modules/Admin/Users/Add.razor | 40 +++++++++++-------- Oqtane.Client/Modules/Admin/Users/Index.razor | 38 +++++++++++------- Oqtane.Client/Modules/Admin/Users/Roles.razor | 23 +++++++---- .../Services/Interfaces/IRoleService.cs | 4 +- Oqtane.Client/Services/RoleService.cs | 9 ++++- Oqtane.Server/Controllers/RoleController.cs | 12 ++++-- .../Controllers/UserRoleController.cs | 31 ++++++++++---- .../Interfaces/IUserRoleRepository.cs | 3 +- Oqtane.Server/Repository/SiteRepository.cs | 4 +- .../Repository/UserRoleRepository.cs | 9 +++++ 11 files changed, 123 insertions(+), 58 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index b9dcd431..16ab3a5e 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -63,7 +63,7 @@ else @context.User.DisplayName - + - + @if (context.Role.Name != RoleNames.Host) + { + + } @@ -57,19 +65,19 @@ else private List Search(string search) { + var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))); + if (string.IsNullOrEmpty(_search)) { - return allroles.Where(item => item.Role.Name == RoleNames.Registered).ToList(); + results = results.Where(item => + ( + item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) || + item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) || + item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase) + ) + ); } - return allroles - .Where(item => item.Role.Name == RoleNames.Registered && - ( - item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) || - item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) || - item.User.DisplayName.Contains(search, StringComparison.OrdinalIgnoreCase) - ) - ) - .ToList(); + return results.ToList(); } private async Task OnSearch() diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 037daabb..03d9e32e 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -64,10 +64,10 @@ else @context.Role.Name - @if (context.Role.Name != RoleNames.Registered) - { - - } + @if (context.Role.Name != RoleNames.Registered && (context.Role.Name != RoleNames.Host || userid != PageState.User.UserId)) + { + + } @Localizer["Users"]@Localizer["Effective"]@Localizer["Expiry"]   @context.User.DisplayName@context.EffectiveDate@context.ExpiryDate - + - @if (context.Role.Name != RoleNames.Host) - { - - } + diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 03d9e32e..13c4e780 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -59,15 +59,16 @@ else
@Localizer["Roles"]@Localizer["Effective"]@Localizer["Expiry"]   @context.Role.Name@context.EffectiveDate@context.ExpiryDate - @if (context.Role.Name != RoleNames.Registered && (context.Role.Name != RoleNames.Host || userid != PageState.User.UserId)) - { - - } +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
- - - - - @{ - _selectedDatabase = Databases.Single(d => d.Name == _databaseType); - foreach (var field in _selectedDatabase.ConnectionStringFields) - { - if (field.Name != "IntegratedSecurity") - { - var isVisible = ""; - var fieldType = (field.Name == "Pwd") ? "password" : "text"; - if ((field.Name == "Uid" || field.Name == "Pwd") && _selectedDatabase.Name != "MySQL" ) + + + - - - - } - else - { - - - - - } + + + + @{ + if (_databaseConfigType != null) + { + @DatabaseConfigComponent; } } @@ -135,8 +95,12 @@ @code { - private IOqtaneDatabase _selectedDatabase; - private string _databaseType = "LocalDB"; + private IList _databases; + private string _databaseName = "LocalDB"; + private Type _databaseConfigType; + private object _databaseConfig; + private RenderFragment DatabaseConfigComponent { get; set; } + private string _hostUsername = UserNames.Host; private string _hostPassword = string.Empty; private string _confirmPassword = string.Empty; @@ -144,6 +108,77 @@ private string _message = string.Empty; private string _loadingDisplay = "display: none;"; + protected override void OnInitialized() + { + base.OnInitialized(); + + _databases = new List + { + new() + { + Name = "LocalDB", + FriendlyName = "Local Database", + Type = "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client" + }, + new() + { + Name = "SqlServer", + FriendlyName = "SQL Server", + Type = "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client" + }, + new() + { + Name = "Sqlite", + FriendlyName = "Sqlite", + Type = "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client" + }, + new() + { + Name = "MySQL", + FriendlyName = "MySQL", + Type = "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client" + }, + new() + { + Name = "PostgreSQL", + FriendlyName = "PostgreSQL", + Type = "Oqtane.Installer.Controls.PostgreSQLConfig, Oqtane.Client" + } + }; + + LoadDatabaseConfigComponent(); + } + + private void DatabaseChanged(ChangeEventArgs eventArgs) + { + try + { + _databaseName = (string)eventArgs.Value; + + LoadDatabaseConfigComponent(); + } + catch (Exception exception) + { + _message = Localizer["Error loading Database Configuration Control"]; + } + } + + private void LoadDatabaseConfigComponent() + { + var database = _databases.SingleOrDefault(d => d.Name == _databaseName); + if (database != null) + { + _databaseConfigType = Type.GetType(database.Type); + DatabaseConfigComponent = builder => + { + builder.OpenComponent(0, _databaseConfigType); + builder.AddAttribute(1, "IsInstaller", true); + builder.AddComponentReferenceCapture(2, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); }); + builder.CloseComponent(); + }; + } + } + protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -155,7 +190,11 @@ private async Task Install() { - var connectionString = _selectedDatabase.BuildConnectionString(); + var connectionString = String.Empty; + if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) + { + connectionString = databaseConfigControl.GetConnectionString(); + } if (connectionString != "" && _hostUsername != "" && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && _hostEmail != "") { @@ -166,7 +205,7 @@ var config = new InstallConfig { - DatabaseType = _databaseType, + DatabaseType = _databaseName, ConnectionString = connectionString, Aliases = uri.Authority, HostEmail = _hostEmail, diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index c77bdca9..4d49474f 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -127,60 +127,17 @@ else + if (_databaseConfigType != null) { - _selectedDatabase = Databases.Single(d => d.Name == _databaseType); - foreach (var field in _selectedDatabase.ConnectionStringFields) - { - var fieldId = field.Name.ToLowerInvariant(); - if (field.Name != "IntegratedSecurity") - { - var isVisible = ""; - var fieldType = (field.Name == "Pwd") ? "password" : "text"; - if ((field.Name == "Uid" || field.Name == "Pwd") && _selectedDatabase.Name != "MySQL" ) - { - var intSecurityField = _selectedDatabase.ConnectionStringFields.Single(f => f.Name == "IntegratedSecurity"); - if (intSecurityField != null) - { - isVisible = (Convert.ToBoolean(intSecurityField.Value)) ? "display: none;" : ""; - } - } - - field.Value = field.Value.Replace("{{Date}}", DateTime.UtcNow.ToString("yyyyMMddHHmm")); - - - - - - } - else - { - - - - - } - } + @DatabaseConfigComponent; }
- - - -
+ + +
- - - -
- - - -
- + @foreach (var database in _databases) + { + }
- - - -
- - - -
@@ -205,6 +162,13 @@ else } @code { + private IList _databases; + private string _databaseName = "LocalDB"; + private Type _databaseConfigType; + private object _databaseConfig; + private RenderFragment DatabaseConfigComponent { get; set; } + + private List _themeList; private List _themes = new List(); private List _containers = new List(); @@ -213,9 +177,7 @@ else private string _tenantid = "-"; private string _tenantName = string.Empty; - private IOqtaneDatabase _selectedDatabase; - private string _databaseType = "LocalDB"; - + private string _hostUserName = UserNames.Host; private string _hostpassword = string.Empty; @@ -235,6 +197,72 @@ else _themeList = await ThemeService.GetThemesAsync(); _themes = ThemeService.GetThemeControls(_themeList); _siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync(); + + _databases = new List + { + new() + { + Name = "LocalDB", + FriendlyName = "Local Database", + Type = "Oqtane.Installer.Controls.LocalDBConfig, Oqtane.Client" + }, + new() + { + Name = "SqlServer", + FriendlyName = "SQL Server", + Type = "Oqtane.Installer.Controls.SqlServerConfig, Oqtane.Client" + }, + new() + { + Name = "Sqlite", + FriendlyName = "Sqlite", + Type = "Oqtane.Installer.Controls.SqliteConfig, Oqtane.Client" + }, + new() + { + Name = "MySQL", + FriendlyName = "MySQL", + Type = "Oqtane.Installer.Controls.MySQLConfig, Oqtane.Client" + }, + new() + { + Name = "PostgreSQL", + FriendlyName = "PostgreSQL", + Type = "Oqtane.Installer.Controls.PostGreSQLConfig, Oqtane.Client" + } + }; + + LoadDatabaseConfigComponent(); + } + + private void DatabaseChanged(ChangeEventArgs eventArgs) + { + try + { + _databaseName = (string)eventArgs.Value; + + LoadDatabaseConfigComponent(); + } + catch (Exception exception) + { + AddModuleMessage(Localizer["Error loading Database Configuration Control"], MessageType.Error); + } + } + + private void LoadDatabaseConfigComponent() + { + var database = _databases.SingleOrDefault(d => d.Name == _databaseName); + if (database != null) + { + _databaseConfigType = Type.GetType(database.Type); + DatabaseConfigComponent = builder => + { + builder.OpenComponent(0, _databaseConfigType); + builder.AddAttribute(1, "IsInstaller", false); + builder.AddComponentReferenceCapture(2, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); }); + builder.CloseComponent(); + }; + } } private void TenantChanged(ChangeEventArgs e) @@ -301,10 +329,14 @@ else user = await UserService.LoginUserAsync(user, false, false); if (user.IsAuthenticated) { - var connectionString = _selectedDatabase.BuildConnectionString(); + var connectionString = String.Empty; + if (_databaseConfig is IDatabaseConfigControl databaseConfigControl) + { + connectionString = databaseConfigControl.GetConnectionString(); + } if (connectionString != "") { - config.DatabaseType = _databaseType; + config.DatabaseType = _databaseName; config.ConnectionString = connectionString; config.HostPassword = _hostpassword; config.HostEmail = user.Email; diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs index fdc5145f..3ce0058f 100644 --- a/Oqtane.Client/Program.cs +++ b/Oqtane.Client/Program.cs @@ -86,17 +86,6 @@ namespace Oqtane.Client } } - // dynamically register database providers - var databaseTypes = assembly.GetInterfaces(); - foreach (var databaseType in databaseTypes) - { - if (databaseType.AssemblyQualifiedName != null) - { - var serviceType = Type.GetType("Oqtane.Interfaces.IDatabase, Oqtane.Shared"); - builder.Services.AddScoped(serviceType ?? databaseType, databaseType); - } - } - // register client startup services var startUps = assembly.GetInstances(); foreach (var startup in startUps) diff --git a/Oqtane.Client/_Imports.razor b/Oqtane.Client/_Imports.razor index 7afebdf1..cbf43e76 100644 --- a/Oqtane.Client/_Imports.razor +++ b/Oqtane.Client/_Imports.razor @@ -21,3 +21,4 @@ @using Oqtane.Themes.Controls @using Oqtane.UI @using Oqtane.Enums +@using Oqtane.Installer diff --git a/Oqtane.Database.MySQL/MySQLDatabase.cs b/Oqtane.Database.MySQL/MySQLDatabase.cs index 3e988aab..1998d7b8 100644 --- a/Oqtane.Database.MySQL/MySQLDatabase.cs +++ b/Oqtane.Database.MySQL/MySQLDatabase.cs @@ -15,16 +15,7 @@ namespace Oqtane.Database.MySQL private static string _name => "MySQL"; - private static readonly List _connectionStringFields = new() - { - new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"}, - new() {Name = "Port", FriendlyName = "Port", Value = "3306", HelpText="Enter the port used to connect to the server"}, - new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}, - new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"}, - new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"} - }; - - public MySQLDatabase() :base(_name, _friendlyName, _connectionStringFields) { } + public MySQLDatabase() :base(_name, _friendlyName) { } public override string Provider => "MySql.EntityFrameworkCore"; @@ -33,28 +24,6 @@ namespace Oqtane.Database.MySQL return table.Column(name: name, nullable: false).Annotation("MySQL:ValueGenerationStrategy", MySQLValueGenerationStrategy.IdentityColumn); } - public override string BuildConnectionString() - { - var connectionString = String.Empty; - - var server = ConnectionStringFields[0].Value; - var port = ConnectionStringFields[1].Value; - var database = ConnectionStringFields[2].Value; - var userId = ConnectionStringFields[3].Value; - var password = ConnectionStringFields[4].Value; - - if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) - { - connectionString = $"Server={server};Database={database};Uid={userId};Pwd={password};"; - } - - if (!String.IsNullOrEmpty(port)) - { - connectionString += $"Port={port};"; - } - return connectionString; - } - public override string ConcatenateSql(params string[] values) { var returnValue = "CONCAT("; diff --git a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs index 8d50debd..d3284232 100644 --- a/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs +++ b/Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs @@ -20,17 +20,7 @@ namespace Oqtane.Database.PostgreSQL private readonly INameRewriter _rewriter; - private static readonly List _connectionStringFields = new() - { - new() {Name = "Server", FriendlyName = "Server", Value = "127.0.0.1", HelpText="Enter the database server"}, - new() {Name = "Port", FriendlyName = "Port", Value = "5432", HelpText="Enter the port used to connect to the server"}, - new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}, - new() {Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText="Select if you want integrated security or not"}, - new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"}, - new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"} - }; - - public PostgreSQLDatabase() : base(_name, _friendlyName, _connectionStringFields) + public PostgreSQLDatabase() : base(_name, _friendlyName) { _rewriter = new SnakeCaseNameRewriter(CultureInfo.InvariantCulture); } @@ -42,41 +32,6 @@ namespace Oqtane.Database.PostgreSQL return table.Column(name: name, nullable: false).Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityAlwaysColumn); } - public override string BuildConnectionString() - { - var connectionString = String.Empty; - - var server = ConnectionStringFields[0].Value; - var port = ConnectionStringFields[1].Value; - var database = ConnectionStringFields[2].Value; - var integratedSecurity = Boolean.Parse(ConnectionStringFields[3].Value); - var userId = ConnectionStringFields[4].Value; - var password = ConnectionStringFields[5].Value; - - if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database) && !String.IsNullOrEmpty(port)) - { - connectionString = $"Server={server};Port={port};Database={database};"; - } - - if (integratedSecurity) - { - connectionString += "Integrated Security=true;"; - } - else - { - if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) - { - connectionString += $"User ID={userId};Password={password};"; - } - else - { - connectionString = String.Empty; - } - } - - return connectionString; - } - public override string ConcatenateSql(params string[] values) { var returnValue = String.Empty; diff --git a/Oqtane.Database.Sqlite/SqliteDatabase.cs b/Oqtane.Database.Sqlite/SqliteDatabase.cs index 50b901d0..655e6cdb 100644 --- a/Oqtane.Database.Sqlite/SqliteDatabase.cs +++ b/Oqtane.Database.Sqlite/SqliteDatabase.cs @@ -14,12 +14,7 @@ namespace Oqtane.Repository.Databases private static string _name => "Sqlite"; - private static readonly List _connectionStringFields = new() - { - new() {Name = "Server", FriendlyName = "File Name", Value = "Oqtane-{{Date}}.db", HelpText="Enter the file name to use for the database"} - }; - - public SqliteDatabase() :base(_name, _friendlyName, _connectionStringFields) { } + public SqliteDatabase() :base(_name, _friendlyName) { } public override string Provider => "Microsoft.EntityFrameworkCore.Sqlite"; @@ -28,20 +23,6 @@ namespace Oqtane.Repository.Databases return table.Column(name: name, nullable: false).Annotation("Sqlite:Autoincrement", true); } - public override string BuildConnectionString() - { - var connectionstring = String.Empty; - - var server = ConnectionStringFields[0].Value; - - if (!String.IsNullOrEmpty(server)) - { - connectionstring = $"Data Source={server};"; - } - - return connectionstring; - } - public override string ConcatenateSql(params string[] values) { var returnValue = String.Empty; diff --git a/Oqtane.Server/Databases/LocalDbDatabase.cs b/Oqtane.Server/Databases/LocalDbDatabase.cs index 77be3035..e70010ae 100644 --- a/Oqtane.Server/Databases/LocalDbDatabase.cs +++ b/Oqtane.Server/Databases/LocalDbDatabase.cs @@ -10,27 +10,6 @@ namespace Oqtane.Databases private static string _friendlyName => "Local Database"; private static string _name => "LocalDB"; - private static readonly List _connectionStringFields = new() - { - new() {Name = "Server", FriendlyName = "Server", Value = "(LocalDb)\\MSSQLLocalDB", HelpText="Enter the database server"}, - new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"} - }; - - public LocalDbDatabase() :base(_name, _friendlyName, _connectionStringFields) { } - - public override string BuildConnectionString() - { - var connectionString = String.Empty; - - var server = ConnectionStringFields[0].Value; - var database = ConnectionStringFields[1].Value; - - if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database)) - { - connectionString = $"Data Source={server};AttachDbFilename=|DataDirectory|\\{database}.mdf;Initial Catalog={database};Integrated Security=SSPI;"; - } - - return connectionString; - } + public LocalDbDatabase() :base(_name, _friendlyName) { } } } diff --git a/Oqtane.Server/Databases/SqlServerDatabase.cs b/Oqtane.Server/Databases/SqlServerDatabase.cs index cfb852c3..669cc50a 100644 --- a/Oqtane.Server/Databases/SqlServerDatabase.cs +++ b/Oqtane.Server/Databases/SqlServerDatabase.cs @@ -13,50 +13,6 @@ namespace Oqtane.Databases private static string _name => "SqlServer"; - private static readonly List _connectionStringFields = new() - { - new() {Name = "Server", FriendlyName = "Server", Value = ".", HelpText="Enter the database server"}, - new() {Name = "Database", FriendlyName = "Database", Value = "Oqtane-{{Date}}", HelpText="Enter the name of the database"}, - new() {Name = "IntegratedSecurity", FriendlyName = "Integrated Security", Value = "true", HelpText="Select if you want integrated security or not"}, - new() {Name = "Uid", FriendlyName = "User Id", Value = "", HelpText="Enter the username to use for the database"}, - new() {Name = "Pwd", FriendlyName = "Password", Value = "", HelpText="Enter the password to use for the database"} - }; - - public SqlServerDatabase() :base(_name, _friendlyName, _connectionStringFields) { } - - public override string BuildConnectionString() - { - var connectionString = String.Empty; - - var server = ConnectionStringFields[0].Value; - var database = ConnectionStringFields[1].Value; - var integratedSecurity = Boolean.Parse(ConnectionStringFields[2].Value); - var userId = ConnectionStringFields[3].Value; - var password = ConnectionStringFields[4].Value; - - if (!String.IsNullOrEmpty(server) && !String.IsNullOrEmpty(database)) - { - connectionString = $"Data Source={server};Initial Catalog={database};"; - } - - if (integratedSecurity) - { - connectionString += "Integrated Security=SSPI;"; - } - else - { - if (!String.IsNullOrEmpty(userId) && !String.IsNullOrEmpty(password)) - { - connectionString += $"User ID={userId};Password={password};"; - } - else - { - connectionString = String.Empty; - } - } - - return connectionString; - - } + public SqlServerDatabase() :base(_name, _friendlyName) { } } } diff --git a/Oqtane.Server/Databases/SqlServerDatabaseBase.cs b/Oqtane.Server/Databases/SqlServerDatabaseBase.cs index 70d3de3a..afe1a762 100644 --- a/Oqtane.Server/Databases/SqlServerDatabaseBase.cs +++ b/Oqtane.Server/Databases/SqlServerDatabaseBase.cs @@ -11,7 +11,7 @@ namespace Oqtane.Repository.Databases { public abstract class SqlServerDatabaseBase : OqtaneDatabaseBase { - protected SqlServerDatabaseBase(string name, string friendlyName, List connectionStringFields) : base(name, friendlyName, connectionStringFields) + protected SqlServerDatabaseBase(string name, string friendlyName) : base(name, friendlyName) { } diff --git a/Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs b/Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs new file mode 100644 index 00000000..b9ab5159 --- /dev/null +++ b/Oqtane.Shared/Interfaces/IDatabaseConfigControl.cs @@ -0,0 +1,9 @@ +namespace Oqtane.Interfaces +{ + public interface IDatabaseConfigControl + { + string GetConnectionString(); + + bool IsInstaller { get; set; } + } +} diff --git a/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs b/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs index 225ccffd..ac31a5f8 100644 --- a/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs +++ b/Oqtane.Shared/Interfaces/IOqtaneDatabase.cs @@ -14,12 +14,8 @@ namespace Oqtane.Interfaces public string Provider { get; } - public List ConnectionStringFields { get; } - public OperationBuilder AddAutoIncrementColumn(ColumnsBuilder table, string name); - public string BuildConnectionString(); - public string ConcatenateSql(params string[] values); public string RewriteName(string name); diff --git a/Oqtane.Shared/Models/Database.cs b/Oqtane.Shared/Models/Database.cs index e1855242..8cb27464 100644 --- a/Oqtane.Shared/Models/Database.cs +++ b/Oqtane.Shared/Models/Database.cs @@ -2,6 +2,8 @@ namespace Oqtane.Models { public class Database { + public string FriendlyName { get; set; } + public string Name { get; set; } public string Type { get; set; } diff --git a/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs b/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs index ff107ff5..5cbcc4bc 100644 --- a/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs +++ b/Oqtane.Shared/Shared/OqtaneDatabaseBase.cs @@ -10,11 +10,10 @@ namespace Oqtane.Shared { public abstract class OqtaneDatabaseBase : IOqtaneDatabase { - protected OqtaneDatabaseBase(string name, string friendlyName, List connectionStringFields) + protected OqtaneDatabaseBase(string name, string friendlyName) { Name = name; FriendlyName = friendlyName; - ConnectionStringFields = connectionStringFields; } public string FriendlyName { get; } @@ -23,12 +22,8 @@ namespace Oqtane.Shared public abstract string Provider { get; } - public List ConnectionStringFields { get; } - public abstract OperationBuilder AddAutoIncrementColumn(ColumnsBuilder table, string name); - public abstract string BuildConnectionString(); - public virtual string ConcatenateSql(params string[] values) { var returnValue = String.Empty; From a79ba591fe39fcf9fee25ab5bd347de03f2eb765 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 28 Apr 2021 07:01:39 +0200 Subject: [PATCH 18/27] Make container fluid to fill the pane --- Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor index 0f1dcafe..b90d8c32 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor @@ -17,7 +17,7 @@ }
-
+
@@ -27,7 +27,7 @@ public override string Name => "Customizable Container"; private bool _title = true; - private string _classes = "container"; + private string _classes = "container-fluid"; protected override void OnParametersSet() { From cad5ce51fc387a21dca041db230592101032560f Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 28 Apr 2021 09:17:01 +0200 Subject: [PATCH 19/27] Fix NuGet Warning NU5048 Icon URL is deprecated in favor of embedding the icon inside the NuGet package. --- Oqtane.Server/Oqtane.Server.csproj | 3 +++ .../Package/[Owner].[Module].Package.csproj | 9 ++++++++- .../External/Package/[Owner].[Module].nuspec | 7 ++++--- .../Modules/Templates/External/Package/icon.png | Bin 0 -> 5235 bytes .../Package/[Owner].[Theme].Package.csproj | 11 +++++++++-- .../External/Package/[Owner].[Theme].nuspec | 7 ++++--- .../Themes/Templates/External/Package/icon.png | Bin 0 -> 5235 bytes 7 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png create mode 100644 Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 37f69666..df9fba63 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -59,6 +59,9 @@ + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj index cef85f51..41dd5da4 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj @@ -1,10 +1,17 @@ - + net5.0 false + + + True + + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec index df6e4997..a202b302 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Module] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://www.oqtane.org/Portals/0/icon.jpg + icon.png oqtane module @@ -26,6 +26,7 @@ - + + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..026f566b72e337a824210fbc2f33109545ba47eb GIT binary patch literal 5235 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 literal 0 HcmV?d00001 diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj index 30043010..35a85019 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj @@ -1,10 +1,17 @@ - + net5.0 false - + + + + True + + + + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec index e73d4618..ab3f76ea 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Theme] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://www.oqtane.org/Portals/0/icon.jpg + icon.png oqtane module @@ -22,6 +22,7 @@ - + + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..026f566b72e337a824210fbc2f33109545ba47eb GIT binary patch literal 5235 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 literal 0 HcmV?d00001 From 6ae5777e1cc10a141f73487281aa0b3fca7d7855 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Wed, 28 Apr 2021 20:31:52 +0200 Subject: [PATCH 20/27] Revert "Fix NuGet Warning NU5048" This reverts commit cad5ce51fc387a21dca041db230592101032560f. --- Oqtane.Server/Oqtane.Server.csproj | 3 --- .../Package/[Owner].[Module].Package.csproj | 9 +-------- .../External/Package/[Owner].[Module].nuspec | 7 +++---- .../Modules/Templates/External/Package/icon.png | Bin 5235 -> 0 bytes .../Package/[Owner].[Theme].Package.csproj | 11 ++--------- .../External/Package/[Owner].[Theme].nuspec | 7 +++---- .../Themes/Templates/External/Package/icon.png | Bin 5235 -> 0 bytes 7 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png delete mode 100644 Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index df9fba63..37f69666 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -59,9 +59,6 @@ - - - diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj index 41dd5da4..cef85f51 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj @@ -1,17 +1,10 @@ - + net5.0 false - - - True - - - - diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec index a202b302..df6e4997 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Module] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - icon.png + https://www.oqtane.org/Portals/0/icon.jpg oqtane module @@ -26,7 +26,6 @@ - - + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png deleted file mode 100644 index 026f566b72e337a824210fbc2f33109545ba47eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5235 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 diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj index 35a85019..30043010 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj @@ -1,17 +1,10 @@ - + net5.0 false - - - - True - - - - + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec index ab3f76ea..e73d4618 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec @@ -1,4 +1,4 @@ - + [Owner].[Theme] @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - icon.png + https://www.oqtane.org/Portals/0/icon.jpg oqtane module @@ -22,7 +22,6 @@ - - + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png deleted file mode 100644 index 026f566b72e337a824210fbc2f33109545ba47eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5235 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 From d7966f2acf276520cc74b2d796eb0c918804840f Mon Sep 17 00:00:00 2001 From: hishamco Date: Thu, 29 Apr 2021 02:42:01 +0300 Subject: [PATCH 21/27] Revert changes in SiteRepository --- Oqtane.Server/Repository/SiteRepository.cs | 46 +++++++++++----------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs index 3e0dfa5a..8c12db8b 100644 --- a/Oqtane.Server/Repository/SiteRepository.cs +++ b/Oqtane.Server/Repository/SiteRepository.cs @@ -27,11 +27,10 @@ namespace Oqtane.Repository private readonly IModuleDefinitionRepository _moduleDefinitionRepository; private readonly IServiceProvider _serviceProvider; private readonly IConfigurationRoot _config; - private readonly IStringLocalizer _localizer; public SiteRepository(TenantDBContext context, IRoleRepository roleRepository, IProfileRepository profileRepository, IFolderRepository folderRepository, IPageRepository pageRepository, IModuleRepository moduleRepository, IPageModuleRepository pageModuleRepository, IModuleDefinitionRepository moduleDefinitionRepository, IServiceProvider serviceProvider, - IConfigurationRoot config, IStringLocalizer localizer) + IConfigurationRoot config) { _db = context; _roleRepository = roleRepository; @@ -43,7 +42,6 @@ namespace Oqtane.Repository _moduleDefinitionRepository = moduleDefinitionRepository; _serviceProvider = serviceProvider; _config = config; - _localizer = localizer; } private List CreateAdminPages(List pageTemplates = null) @@ -69,7 +67,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = _localizer["User Login"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = SharedResources.UserLogin, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -98,7 +96,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = _localizer["User Registration"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = SharedResources.UserRegistration, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -128,7 +126,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = _localizer["Password Reset"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = SharedResources.PasswordReset, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -157,7 +155,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = _localizer["User Profile"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = SharedResources.UserProfile, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -182,7 +180,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = _localizer["Admin Dashboard"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = SharedResources.AdminDashboard, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -209,7 +207,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = _localizer["Site Settings"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = SharedResources.SiteSettings, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -236,7 +234,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = _localizer["Page Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = SharedResources.PageManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -263,7 +261,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = _localizer["User Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = SharedResources.UserManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -290,7 +288,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = _localizer["Profile Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = SharedResources.ProfileManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -317,7 +315,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = _localizer["Role Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = SharedResources.RoleManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -344,7 +342,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = _localizer["File Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = SharedResources.FileManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -371,7 +369,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = _localizer["Recycle Bin"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = SharedResources.RecycleBin, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Admin, true), @@ -400,7 +398,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = _localizer["Event Log"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = SharedResources.EventLog, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -422,7 +420,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = _localizer["Site Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = SharedResources.SiteManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -444,7 +442,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = _localizer["Module Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = SharedResources.ModuleManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -466,7 +464,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = _localizer["Theme Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = SharedResources.ThemeManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -495,7 +493,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = _localizer["Language Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = SharedResources.LanguageManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -519,7 +517,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = _localizer["Scheduled Jobs"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = SharedResources.ScheduledJobs, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -541,7 +539,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = _localizer["Sql Management"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = SharedResources.SqlManagement, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -563,7 +561,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = _localizer["System Info"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = SharedResources.SystemInfo, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), @@ -585,7 +583,7 @@ namespace Oqtane.Repository { new PageTemplateModule { - ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = _localizer["System Update"], Pane = PaneNames.Admin, + ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = SharedResources.SystemUpdate, Pane = PaneNames.Admin, ModulePermissions = new List { new Permission(PermissionNames.View, RoleNames.Host, true), From 18aa8d48fea5611cc57a63916aa721a02c51ec0a Mon Sep 17 00:00:00 2001 From: hishamco Date: Thu, 29 Apr 2021 02:44:41 +0300 Subject: [PATCH 22/27] Use SharedResources --- Oqtane.Client/Localization/SharedResources.cs | 47 +++++++++++++++++++ .../Modules/Admin/Dashboard/Index.razor | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Oqtane.Client/Localization/SharedResources.cs diff --git a/Oqtane.Client/Localization/SharedResources.cs b/Oqtane.Client/Localization/SharedResources.cs new file mode 100644 index 00000000..77cb9d36 --- /dev/null +++ b/Oqtane.Client/Localization/SharedResources.cs @@ -0,0 +1,47 @@ +namespace Oqtane +{ + public class SharedResources + { + public static readonly string UserLogin = "User Login"; + + public static readonly string UserRegistration = "User Registration"; + + public static readonly string PasswordReset = "Password Reset"; + + public static readonly string UserProfile = "User Profile"; + + public static readonly string AdminDashboard = "Admin Dashboard"; + + public static readonly string SiteSettings = "Site Settings"; + + public static readonly string PageManagement = "Page Management"; + + public static readonly string UserManagement = "User Management"; + + public static readonly string ProfileManagement = "Profile Management"; + + public static readonly string RoleManagement = "Role Management"; + + public static readonly string FileManagement = "File Management"; + + public static readonly string RecycleBin = "Recycle Bin"; + + public static readonly string EventLog = "Event Log"; + + public static readonly string SiteManagement = "Site Management"; + + public static readonly string ModuleManagement = "Module Management"; + + public static readonly string ThemeManagement = "Theme Management"; + + public static readonly string LanguageManagement = "Language Management"; + + public static readonly string ScheduledJobs = "Scheduled Jobs"; + + public static readonly string SqlManagement = "Sql Management"; + + public static readonly string SystemInfo = "System Info"; + + public static readonly string SystemUpdate = "System Update"; + } +} diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor index 620bf65a..0c7cd842 100644 --- a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor +++ b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor @@ -2,7 +2,7 @@ @inherits ModuleBase @inject IPageService PageService @inject IUserService UserService -@inject IStringLocalizer Localizer +@inject IStringLocalizer Localizer
@foreach (var p in _pages) From 9e814fad64941e1377b77a42260d626ab2aaa698 Mon Sep 17 00:00:00 2001 From: Leigh Date: Fri, 30 Apr 2021 09:36:50 +0200 Subject: [PATCH 23/27] Permissions for edit are applied from the page permissions. --- Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor index 5c93bc9c..b2656741 100644 --- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor @@ -369,7 +369,10 @@ module.PageId = PageState.Page.PageId; module.ModuleDefinitionName = ModuleDefinitionName; module.AllPages = false; - module.Permissions = PageState.Page.Permissions; + List permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions); + permissions.Remove(permissions.Find(p => p.PermissionName == PermissionNames.View)); + List editpermissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions.Split(";").ToList(); + permissions.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = string.Join(";", editpermissions.ToArray()) }); module = await ModuleService.AddModuleAsync(module); ModuleId = module.ModuleId.ToString(); } From c36cd77ab42fb2b8d879d902cdfd641916ee91b1 Mon Sep 17 00:00:00 2001 From: Leigh Date: Fri, 30 Apr 2021 09:49:51 +0200 Subject: [PATCH 24/27] Check now displays warning instead of an Error --- Oqtane.Client/Modules/Admin/Pages/Add.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index c2f44bee..5c026fae 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -288,7 +288,7 @@ Page page = null; try { - if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && _containertype != "-") + if (!string.IsNullOrEmpty(_name) && !string.IsNullOrEmpty(_themetype) && _containertype != "-") { page = new Page(); page.SiteId = PageState.Page.SiteId; From 14801e7f0d794c9c23c810e3e515ed7ef855e7cb Mon Sep 17 00:00:00 2001 From: Leigh Date: Fri, 30 Apr 2021 10:50:12 +0200 Subject: [PATCH 25/27] NuGet Icon Warning The IconURL is depreciate in favor of an embedded icon file in the package --- .../Package/[Owner].[Module].Package.csproj | 7 +++++++ .../External/Package/[Owner].[Module].nuspec | 3 ++- .../Modules/Templates/External/Package/icon.png | Bin 0 -> 4895 bytes .../Package/[Owner].[Theme].Package.csproj | 7 +++++++ .../External/Package/[Owner].[Theme].nuspec | 3 ++- .../Themes/Templates/External/Package/icon.png | Bin 0 -> 4895 bytes 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png create mode 100644 Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj index cef85f51..680a66c7 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj @@ -5,6 +5,13 @@ false + + + True + + + + diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec index df6e4997..4d879f4a 100644 --- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec +++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://www.oqtane.org/Portals/0/icon.jpg + icon.png oqtane module @@ -27,5 +27,6 @@ + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3c43cce4c6604107eab529207edd44c386768ca1 GIT binary patch literal 4895 zcmV+)6X5KLP)Px#1ZP1_K>z@;j|==^1poj7B2Y|JMgRZ*{{H^`{r&v>{G+3zeSLkLoSa!%Sq26M z0|NsE1qDh25)y%dfpBneJ3BizHZ}s;WgrMN3Od zg@uKVj*gI!kau@?goK1!TU(u-or#HwuCA^uEG(Own>95xWMpIy4-c%YtT8b$NJvO^ zb#+owQYI!Qva+&FOiV5=E^KUUnVFfWsHl~dm3Vk~X=!OqO-;46wIU)SI5;>nGc&ff zwmv>SnwpxgudgpJFCQNtjg5^zKR>3Xri_e?dU|?OQ&VRaI57v9W-FfP;gB zZ*Omul$4j3m#3$vmX?-lYiqEuuvAo3h=_N?x0*=>;fLtmHDY5rf{_g*zKv)fg} z^!Chl^G)wePuHtg@2mIf>SH!&J(RLL`Ns{ziweNRq_s9qV=8Pt90B{`il-rL7BcnjL= zUz$gcD7CD%g)pYtT3eksqh<0_wpM4;_{P0lPY!`w%n91sUd{9Lu zT*tNVfPO3=Jjlq|brCfJdcBp*HmI_xg*X9M@rj|VgKXSD9j_;}LQ~pkg|iK{$;W~_ zuFW}UBuYJA9x;6%4wH*kvdQ1nd2m^6WitsIEgOs0ULOWTHlrXWG(vQ0e_JPinBo&Q zOE$qSc@iA_O~mN=ET2(exkOa9$imP`g%b3%r)-{#f~K^Et!$|^+5x@IX2>%7{bM13 zQ6$sD2twk~y20cGRCe1dyLeL>UAoJiS#H2x)Am4; zdo8?WF}Rd^#^3AGX7pAo%}~Km7B6A_s#1UQXE;D|FBvbV=lHd@qwg-8J3COl>=2(% z^xQpBEO8SF217H%U$X!*iEVqDFBp1wP-JZt9^#cC*hkXEd#Wlj0J3AhBd|bC=;^%> zjC>Ll4phiVx)b}E;32jhWOHL3!pG^=vxlEsV0pYf%PV_*2>aMFf$6123tVlUE3mbZ z$%ny%yomOm4Ub@iTSpdYJ?y%A1h_}%}NOU9B( zu_U;ihh`la56%!LCbK$3m~)wZtYyq#?NY&t4mQdKBBCoVN*(}=)>TQFiSF!=^zdYKr>v&DdZ`hPPQ3bCI)Hrqdp?k4A#`vxC-{zz>1*tbJ1u& zCXj+R7LC^-gz^EFWFXTjc9RA6bjJx+Ha3s^pimk_y4e~J6{ByL3>NCpa0gO*UjvVf zjZ19jKZL;Y(4e#}EN@W=Uh1JKR$UH+=5cXW`?=UsPg0KsJKR)E|4;?;JU(dgm91*a`HL-@$#)bz<#Z6fbMCKlaAX~_9r+TdI!(k3` zt7|`~)Nw1^C$elS(53Z6AfiH8LdWAgXiVi5N{+>NvQJH99x+4+ zo5rMxpqfv68i!3lk0nhVR;t%}c$SR$;s|IxMsqH;sL>hHP?t}NGe81VR$^FjvLBP{ z?{WTF7pAefF7gy` z=PcuP;*Exvp>_F9?%cR_Aj|wv^29U2(eiIucN?MBmr;XaLM_OgsLCm@>hYG%;c^Mh z_e=LP=e9V8XLr9FWOL)0FqdI-EP~oz`^Z%+wAsXxEZ-KaBntL4$S_1lbZK@_KvY>^ zZwL2SvDqS+IV4zPoNmy8vcV<9R^TZW@H1caX6?=)~m1*^M&2^2RzA5vR#TUW>T1Qc`GvIx!Vw`Sa#l`ZYQHklp>U^!=ALBsjWuF0RZQYZvBS4j; z!>JFE3fjOXU5J-e@Bz`_qMXn;LF!}z`#$uY(i7eKvMsL_AgzTJG*|Rad&!D!U-?M- zLzfkH!<1`Id#4Pxj)uZU9_dG5d8kn0$%>VA0NVF9(vlFYQ!Qf_UKGzm)NKNHtNYx2 zuvM?kWKz-^CS<~Zl;Q$N;zU~m11NPri*qIyj*4XZpbq4?XD}nHXfu@)k+2uHm6(Q` z3e9p_cXM#ztgm1qNu}er%^K7rpXvG|GI{ESl<^v?C3w`=$SIA0nJWjO51^_RdwUF4 zw>JGz1ces@k3�q3`kwQ;BU888;`$;WJ28OyUNR9n+_GyqC7;X zGWF*?|4RlHOoj@pZ6sE)Olt6ZWV)3~0J8B?(GywW2Pv{3czYIoU=)R^V4kJzIs9vHNe?+pFS5eZX*wiOS75JIJsdhbWW|!Vx{EA?Osq3qC)J=m1fx+bE(6Bv|bvR)DY6V9PvGKf% z2trQxH-B!fis?9~?5w8Z23jAchS!sC64?Z} z6OYEa(Muxf@UXai?QXMr$bs@>R_wZA+g=dhzeB}>3)GV!l}>C47P01$h4K*{c1(y| z*9=JhE91C*3#XYVVRmZ6h{a3d|F|;gm<~T|avdku6@nx9XGF1T8FSPB?`ocV5vdQ* zb8!W>xl@7&n7`p{e5^}QJv!{f)$A1gK{$;5^HZ9qG;30 z{G(BFK<$^)P~lQiJf!oYH`95?*FR7u^u)sBv{do1jSL!iHn^rv}423?YG#(5rpEr2Y9&;#t>I1WNl??MIv%%WwHp7VT5B+zB!j5bZ`g8L3LfG1O1qUU z9aI(R)KB-u15NM;{IqYHG$L(?FFd5>Ut^{MuByUMcqYcTDoO_M*m4m?w80}(2sve! zJcE%Q72DSJ*>_Na6x0r=e>r|mBr%AH4vS~MLG0Q>+JhDS;t+IS)xj?bm;!(5!Edeh zc4F6AHp5zx6cGiki>VXZ>kNw%i(!E^V^pwg)^R&;I|{+ad)W*iF%vm4gFlnrEoM!D ze}(4OB6{Ib`U5UCVR?$;UuYg9EV2)DC-(?8>iwpDZ8f$V=p-@zZeIcbCdDTOIrwX3a0k!E>+ z)>m7*E^h*4M}c1Sad$WWe3&<|B5#0nc~kUo@7T8T2xJV~L)N^xvji@FchFc)4l8z? zIY7?fxXeamkr6P%PQJhU&+dL&a5ZQorf=_#FF6zc$u`EY7F10N{`>leUG9rfT9>!X zdE&d6d|3mV_VW`nKI!hOd*+D3snpfEVBf|EvuJf3B0CE||L@YoyB|1n?%d@WGiH4H z-o$yg+)IhsXxP_*C{SvLd0o21gX$c^_|Ldvu>5edK};Ok^|bZKZGE)*=Ey@PFsc{Wd!6 R-3I^w002ovPDHLkV1nKx-0T1V literal 0 HcmV?d00001 diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj index 30043010..a415f456 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].Package.csproj @@ -5,6 +5,13 @@ false + + + True + + + + diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec index e73d4618..9f373b2a 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/[Owner].[Theme].nuspec @@ -11,7 +11,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://www.oqtane.org/Portals/0/icon.jpg + icon.png oqtane module @@ -23,5 +23,6 @@ + \ No newline at end of file diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png b/Oqtane.Server/wwwroot/Themes/Templates/External/Package/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3c43cce4c6604107eab529207edd44c386768ca1 GIT binary patch literal 4895 zcmV+)6X5KLP)Px#1ZP1_K>z@;j|==^1poj7B2Y|JMgRZ*{{H^`{r&v>{G+3zeSLkLoSa!%Sq26M z0|NsE1qDh25)y%dfpBneJ3BizHZ}s;WgrMN3Od zg@uKVj*gI!kau@?goK1!TU(u-or#HwuCA^uEG(Own>95xWMpIy4-c%YtT8b$NJvO^ zb#+owQYI!Qva+&FOiV5=E^KUUnVFfWsHl~dm3Vk~X=!OqO-;46wIU)SI5;>nGc&ff zwmv>SnwpxgudgpJFCQNtjg5^zKR>3Xri_e?dU|?OQ&VRaI57v9W-FfP;gB zZ*Omul$4j3m#3$vmX?-lYiqEuuvAo3h=_N?x0*=>;fLtmHDY5rf{_g*zKv)fg} z^!Chl^G)wePuHtg@2mIf>SH!&J(RLL`Ns{ziweNRq_s9qV=8Pt90B{`il-rL7BcnjL= zUz$gcD7CD%g)pYtT3eksqh<0_wpM4;_{P0lPY!`w%n91sUd{9Lu zT*tNVfPO3=Jjlq|brCfJdcBp*HmI_xg*X9M@rj|VgKXSD9j_;}LQ~pkg|iK{$;W~_ zuFW}UBuYJA9x;6%4wH*kvdQ1nd2m^6WitsIEgOs0ULOWTHlrXWG(vQ0e_JPinBo&Q zOE$qSc@iA_O~mN=ET2(exkOa9$imP`g%b3%r)-{#f~K^Et!$|^+5x@IX2>%7{bM13 zQ6$sD2twk~y20cGRCe1dyLeL>UAoJiS#H2x)Am4; zdo8?WF}Rd^#^3AGX7pAo%}~Km7B6A_s#1UQXE;D|FBvbV=lHd@qwg-8J3COl>=2(% z^xQpBEO8SF217H%U$X!*iEVqDFBp1wP-JZt9^#cC*hkXEd#Wlj0J3AhBd|bC=;^%> zjC>Ll4phiVx)b}E;32jhWOHL3!pG^=vxlEsV0pYf%PV_*2>aMFf$6123tVlUE3mbZ z$%ny%yomOm4Ub@iTSpdYJ?y%A1h_}%}NOU9B( zu_U;ihh`la56%!LCbK$3m~)wZtYyq#?NY&t4mQdKBBCoVN*(}=)>TQFiSF!=^zdYKr>v&DdZ`hPPQ3bCI)Hrqdp?k4A#`vxC-{zz>1*tbJ1u& zCXj+R7LC^-gz^EFWFXTjc9RA6bjJx+Ha3s^pimk_y4e~J6{ByL3>NCpa0gO*UjvVf zjZ19jKZL;Y(4e#}EN@W=Uh1JKR$UH+=5cXW`?=UsPg0KsJKR)E|4;?;JU(dgm91*a`HL-@$#)bz<#Z6fbMCKlaAX~_9r+TdI!(k3` zt7|`~)Nw1^C$elS(53Z6AfiH8LdWAgXiVi5N{+>NvQJH99x+4+ zo5rMxpqfv68i!3lk0nhVR;t%}c$SR$;s|IxMsqH;sL>hHP?t}NGe81VR$^FjvLBP{ z?{WTF7pAefF7gy` z=PcuP;*Exvp>_F9?%cR_Aj|wv^29U2(eiIucN?MBmr;XaLM_OgsLCm@>hYG%;c^Mh z_e=LP=e9V8XLr9FWOL)0FqdI-EP~oz`^Z%+wAsXxEZ-KaBntL4$S_1lbZK@_KvY>^ zZwL2SvDqS+IV4zPoNmy8vcV<9R^TZW@H1caX6?=)~m1*^M&2^2RzA5vR#TUW>T1Qc`GvIx!Vw`Sa#l`ZYQHklp>U^!=ALBsjWuF0RZQYZvBS4j; z!>JFE3fjOXU5J-e@Bz`_qMXn;LF!}z`#$uY(i7eKvMsL_AgzTJG*|Rad&!D!U-?M- zLzfkH!<1`Id#4Pxj)uZU9_dG5d8kn0$%>VA0NVF9(vlFYQ!Qf_UKGzm)NKNHtNYx2 zuvM?kWKz-^CS<~Zl;Q$N;zU~m11NPri*qIyj*4XZpbq4?XD}nHXfu@)k+2uHm6(Q` z3e9p_cXM#ztgm1qNu}er%^K7rpXvG|GI{ESl<^v?C3w`=$SIA0nJWjO51^_RdwUF4 zw>JGz1ces@k3�q3`kwQ;BU888;`$;WJ28OyUNR9n+_GyqC7;X zGWF*?|4RlHOoj@pZ6sE)Olt6ZWV)3~0J8B?(GywW2Pv{3czYIoU=)R^V4kJzIs9vHNe?+pFS5eZX*wiOS75JIJsdhbWW|!Vx{EA?Osq3qC)J=m1fx+bE(6Bv|bvR)DY6V9PvGKf% z2trQxH-B!fis?9~?5w8Z23jAchS!sC64?Z} z6OYEa(Muxf@UXai?QXMr$bs@>R_wZA+g=dhzeB}>3)GV!l}>C47P01$h4K*{c1(y| z*9=JhE91C*3#XYVVRmZ6h{a3d|F|;gm<~T|avdku6@nx9XGF1T8FSPB?`ocV5vdQ* zb8!W>xl@7&n7`p{e5^}QJv!{f)$A1gK{$;5^HZ9qG;30 z{G(BFK<$^)P~lQiJf!oYH`95?*FR7u^u)sBv{do1jSL!iHn^rv}423?YG#(5rpEr2Y9&;#t>I1WNl??MIv%%WwHp7VT5B+zB!j5bZ`g8L3LfG1O1qUU z9aI(R)KB-u15NM;{IqYHG$L(?FFd5>Ut^{MuByUMcqYcTDoO_M*m4m?w80}(2sve! zJcE%Q72DSJ*>_Na6x0r=e>r|mBr%AH4vS~MLG0Q>+JhDS;t+IS)xj?bm;!(5!Edeh zc4F6AHp5zx6cGiki>VXZ>kNw%i(!E^V^pwg)^R&;I|{+ad)W*iF%vm4gFlnrEoM!D ze}(4OB6{Ib`U5UCVR?$;UuYg9EV2)DC-(?8>iwpDZ8f$V=p-@zZeIcbCdDTOIrwX3a0k!E>+ z)>m7*E^h*4M}c1Sad$WWe3&<|B5#0nc~kUo@7T8T2xJV~L)N^xvji@FchFc)4l8z? zIY7?fxXeamkr6P%PQJhU&+dL&a5ZQorf=_#FF6zc$u`EY7F10N{`>leUG9rfT9>!X zdE&d6d|3mV_VW`nKI!hOd*+D3snpfEVBf|EvuJf3B0CE||L@YoyB|1n?%d@WGiH4H z-o$yg+)IhsXxP_*C{SvLd0o21gX$c^_|Ldvu>5edK};Ok^|bZKZGE)*=Ey@PFsc{Wd!6 R-3I^w002ovPDHLkV1nKx-0T1V literal 0 HcmV?d00001 From bc2e3a7333609c10f128fa0c206054e9fd528dd4 Mon Sep 17 00:00:00 2001 From: Leigh Date: Fri, 30 Apr 2021 09:36:50 +0200 Subject: [PATCH 26/27] Permissions for edit are applied from the page permissions. --- Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor index 5c93bc9c..b2656741 100644 --- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor @@ -369,7 +369,10 @@ module.PageId = PageState.Page.PageId; module.ModuleDefinitionName = ModuleDefinitionName; module.AllPages = false; - module.Permissions = PageState.Page.Permissions; + List permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions); + permissions.Remove(permissions.Find(p => p.PermissionName == PermissionNames.View)); + List editpermissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions.Split(";").ToList(); + permissions.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = string.Join(";", editpermissions.ToArray()) }); module = await ModuleService.AddModuleAsync(module); ModuleId = module.ModuleId.ToString(); } From 2be48e910e56e687bd9e7ce8097a1180cecaa899 Mon Sep 17 00:00:00 2001 From: Leigh Date: Fri, 30 Apr 2021 14:15:56 +0200 Subject: [PATCH 27/27] Set module view permissions to page edit permissions --- Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor index b2656741..e53b97a1 100644 --- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor @@ -369,10 +369,12 @@ module.PageId = PageState.Page.PageId; module.ModuleDefinitionName = ModuleDefinitionName; module.AllPages = false; + + // set module view permissions to page edit permissions List permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions); - permissions.Remove(permissions.Find(p => p.PermissionName == PermissionNames.View)); - List editpermissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions.Split(";").ToList(); - permissions.Add(new PermissionString { PermissionName = PermissionNames.View, Permissions = string.Join(";", editpermissions.ToArray()) }); + permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions; + module.Permissions = UserSecurity.SetPermissionStrings(permissions); + module = await ModuleService.AddModuleAsync(module); ModuleId = module.ModuleId.ToString(); }