Merge pull request #1913 from sbwalker/dev

add option to Control Panel to specify module visibility

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

@@ -628,7 +628,7 @@
 		foreach (Alias alias in _aliases)
 		{
 			_urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
-			if (alias.IsDefault) _defaultalias = alias.Name.Trim();
+			if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias)) _defaultalias = alias.Name.Trim();
 		}
 		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
 	}

Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx

@@ -177,4 +177,13 @@
   <data name="System.Update" xml:space="preserve">
     <value>Check For System Updates</value>
   </data>
+  <data name="Visibility" xml:space="preserve">
+    <value>Visibility:</value>
+  </data>
+  <data name="VisibilityEdit" xml:space="preserve">
+    <value>Page Editors Only</value>
+  </data>
+  <data name="VisibilityView" xml:space="preserve">
+    <value>Same As Page</value>
+  </data>
 </root>

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -61,14 +61,13 @@
 							<label class="control-label">@Localizer["Page.Manage"] </label>
 						</div>
 					</div>
-				<div class="row d-flex">
+					<div class="row d-flex mb-2">
 						<div class="col d-flex justify-content-between">
 							<button type="button" class="btn btn-secondary col me-1" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
 							<button type="button" class="btn btn-secondary col" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
 							<button type="button" class="btn btn-danger col ms-1" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
 						</div>
 					</div>
-				<br />
 					<div class="row d-flex">
 						<div class="col">
 							@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
@@ -150,7 +149,6 @@
 										}
 									}
 								</select>
-							@((MarkupString) Description)
 							}
 						}
 						else
@@ -203,21 +201,23 @@
 						</select>
 					</div>
 				</div>
-			<br />
+				<div class="row">
-			<button type="button" class="btn btn-primary col-12" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
+					<div class="col text-center">
+						<label for="visibility" class="control-label">@Localizer["Visibility"]</label>
+						<select class="form-select" @bind="@Visibility">
+							<option value="edit" selected>@Localizer["VisibilityEdit"]</option>
+							<option value="view">@Localizer["VisibilityView"]</option>
+						</select>
+					</div>
+				</div>
+				<button type="button" class="btn btn-success col-12 mt-4" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
 				@((MarkupString) Message)
-			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-			{
-				<hr class="app-rule" />
-				<NavLink class="btn btn-info col-12" data-bs-dismiss="offcanvas" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink>
-			}
 			</div>
 		</div>
 	</div>
 }
 
 @code{
-
 	private bool _deleteConfirmation = false;
 	private List<string> _categories = new List<string>();
 	private List<ModuleDefinition> _allModuleDefinitions;
@@ -242,7 +242,7 @@
 				_category = value;
 				_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
 				ModuleDefinitionName = "-";
-				Description = "";
+				Message = "";
 				StateHasChanged();
 				_ = UpdateSettingsAsync();
 			}
@@ -262,11 +262,9 @@
 		}
 	}
 
-
-	protected string Description { get; private set; } = "";
-
 	protected string Title { get; private set; } = "";
 	protected string ContainerType { get; private set; } = "";
+	protected string Visibility { get; private set; } = "edit";
 	protected string Message { get; private set; } = "";
 
 	[Parameter]
@@ -320,13 +318,12 @@
 		if (ModuleDefinitionName != "-")
 		{
 			var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName);
-			Description = "<br /><div class=\"alert alert-info\" role=\"alert\">" + moduleDefinition.Description + "</div>";
+			Message = "<div class=\"alert alert-info mt-2 text-center\" role=\"alert\">" + moduleDefinition.Description + "</div>";
 		}
 		else
 		{
-			Description = "";
+			Message = "";
 		}
-
 		StateHasChanged();
 	}
 
@@ -359,9 +356,17 @@
 					module.ModuleDefinitionName = ModuleDefinitionName;
 					module.AllPages = false;
 
-					// set module view permissions to page edit permissions
 					List<PermissionString> permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions);
+					if (Visibility == "view")
+					{
+						// set module view permissions to page view permissions
+						permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions;
+					}
+					else
+					{
+						// set module view permissions to page edit permissions
 						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);

Oqtane.Server/Migrations/Master/03000201_AddAliasIsDefault.cs

@@ -19,7 +19,7 @@ namespace Oqtane.Migrations.Master
             //Add Column to Alias table
             var aliasEntityBuilder = new AliasEntityBuilder(migrationBuilder, ActiveDatabase);
             aliasEntityBuilder.AddBooleanColumn("IsDefault", true);
-            aliasEntityBuilder.UpdateColumn("IsDefault", "0", "bool", "");
+            aliasEntityBuilder.UpdateColumn("IsDefault", "1", "bool", "");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)