Merge pull request #1781 from sbwalker/dev

fix UX in module/theme creators

Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor

@@ -91,14 +91,9 @@ else
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnParametersSetAsync()
+    protected override void OnInitialized()
-    {
-        try
     {
         _moduledefinitionname = SettingService.GetSetting(ModuleState.Settings, "ModuleDefinitionName", "");
-            _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
-            _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-
         if (string.IsNullOrEmpty(_moduledefinitionname))
         {
             AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
@@ -108,6 +103,14 @@ else
             AddModuleMessage(Localizer["Info.Module.Activate"], MessageType.Info);
         }
     }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        try
+        {
+            _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
+            _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
+        }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Module Creator");
@@ -130,7 +133,6 @@ else
                 await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
 
                 GetLocation();
-
                 AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
             }
             catch (Exception ex)

Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor

@@ -87,13 +87,17 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
+    protected override void OnInitialized()
+    {
+        AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
+    }
+
     protected override async Task OnParametersSetAsync()
     {
         try
         {
             _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
         }
         catch (Exception ex)
         {

Oqtane.Client/Modules/Admin/Themes/Create.razor

@@ -51,7 +51,8 @@
 				</select>
 			</div>
 		</div>
-    @if (!string.IsNullOrEmpty(_location)) {
+		@if (!string.IsNullOrEmpty(_location)) 
+		{
 			<div class="row mb-1 align-items-center">
 				<Label Class="col-sm-3" For="location" HelpText="Location where the theme will be created" ResourceKey="Location">Location: </Label>
 				<div class="col-sm-9">
@@ -77,13 +78,17 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
+    protected override void OnInitialized()
+    {
+        AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
+    }
+	
 	protected override async Task OnParametersSetAsync()
     {
         try
         {
             _templates = await ThemeService.GetThemeTemplatesAsync();
             _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
-            AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
         }
         catch (Exception ex)
         {

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -38,6 +38,7 @@ namespace Oqtane.SiteTemplates
             {
                 Name = "Home",
                 Parent = "",
+                Order = 1,
                 Path = "",
                 Icon = "oi oi-home",
                 IsNavigation = true,
@@ -84,6 +85,7 @@ namespace Oqtane.SiteTemplates
             {
                 Name = "Private",
                 Parent = "",
+                Order = 3,
                 Path = "private",
                 Icon = "oi oi-lock-locked",
                 IsNavigation = true,
@@ -108,6 +110,7 @@ namespace Oqtane.SiteTemplates
             {
                 Name = "My Page",
                 Parent = "",
+                Order = 5,
                 Path = "mypage",
                 Icon = "oi oi-target",
                 IsNavigation = true,

Oqtane.Server/wwwroot/Modules/Templates/External/template.json

@@ -1,5 +1,5 @@
 {
   "Title": "Default Module Template",
   "Type": "External",
-  "Version": "2.2.0"
+  "Version": "3.0.0"
 }

Oqtane.Server/wwwroot/Themes/Templates/External/template.json

@@ -1,5 +1,5 @@
 {
   "Title": "Default Theme Template",
   "Type": "External",
-  "Version": "2.2.0"
+  "Version": "3.0.0"
 }