Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3784 from sbwalker/dev

Browse Source 
changes to allow adding modules via control panel in static rendering  (note that onchange events have not been changed to an alternative approach yet)
This commit is contained in:
Shaun Walker 2024-02-13 13:09:25 -05:00 committed by GitHub
commit 7283f48b36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 170 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

356
Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
View File

@ -118,119 +118,122 @@
</div> </div>
} }
<div class="row"> <form method="post" class="app-form-button col-12" @formname="AddModuleForm" @onsubmit="@AddModule">
<div class="col text-center"> <input type="hidden" name="__RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
<label for="Module" class="control-label">@Localizer["Module.Manage"]</label> <div class="row">
<select class="form-select" @bind="@ModuleType"> <div class="col text-center">
<option value="new">@Localizer["Module.AddNew"]</option> <label for="Module" class="control-label">@Localizer["Module.Manage"]</label>
<option value="existing">@Localizer["Module.AddExisting"]</option> <select name="moduletype" class="form-select" @bind="@_moduleType">
</select> <option value="new">@Localizer["Module.AddNew"]</option>
@if (ModuleType == "new") <option value="existing">@Localizer["Module.AddExisting"]</option>
{ </select>
@if (_moduleDefinitions != null) @if (_moduleType == "new")
{ {
<select class="form-select mt-1" @onchange="(e => CategoryChanged(e))"> @if (_moduleDefinitions != null)
@foreach (var category in _categories) {
{ <select name="category" class="form-select mt-1" @onchange="(e => CategoryChanged(e))">
if (category == Category) @foreach (var category in _categories)
{ {
<option value="@category" selected>@category @Localizer["Modules"]</option> if (category == _category)
} {
else <option value="@category" selected>@category @Localizer["Modules"]</option>
{ }
<option value="@category">@category @Localizer["Modules"]</option> else
} {
} <option value="@category">@category @Localizer["Modules"]</option>
</select> }
<select class="form-select mt-1" @onchange="(e => ModuleChanged(e))"> }
@if (ModuleDefinitionName == "-") </select>
{ <select name="moduledefinitionname" class="form-select mt-1" @onchange="(e => ModuleDefinitionChanged(e))">
<option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option> @if (_moduleDefinitionName == "-")
} {
else <option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
{ }
<option value="-">&lt;@Localizer["Module.Select"]&gt;</option> else
} {
@foreach (var moduledefinition in _moduleDefinitions) <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
{ }
if (moduledefinition.IsEnabled && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.PermissionList)) @foreach (var moduledefinition in _moduleDefinitions)
{ {
if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString())) if (moduledefinition.IsEnabled && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.PermissionList))
{ {
<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option> if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
} {
} <option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
} }
</select> }
} }
} </select>
else }
{ }
<select class="form-select mt-1" @onchange="(e => PageChanged(e))"> else
<option value="-">&lt;@Localizer["Page.Select"]&gt;</option> {
@foreach (Page p in _pages) <select name="pageid" class="form-select mt-1" @onchange="(e => PageChanged(e))">
{ <option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
<option value="@p.PageId">@p.Name</option> @foreach (Page p in _pages)
} {
</select> <option value="@p.PageId">@p.Name</option>
<select class="form-select mt-1" @bind="@ModuleId"> }
<option value="-">&lt;@Localizer["Module.Select"]&gt;</option> </select>
@foreach (Module module in _modules) <select name="moduleid" class="form-select mt-1" @bind="@_moduleId">
{ <option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
<option value="@module.ModuleId">@module.Title</option> @foreach (Module module in _modules)
} {
</select> <option value="@module.ModuleId">@module.Title</option>
} }
</div> </select>
</div> }
<div class="row"> </div>
<div class="col text-center"> </div>
<label for="Title" class="control-label">@Localizer["Title"]</label> <div class="row">
<input type="text" name="Title" class="form-control" @bind="@Title" /> <div class="col text-center">
</div> <label for="Title" class="control-label">@Localizer["Title"]</label>
</div> <input type="text" name="title" class="form-control" @bind="@_title" />
<div class="row"> </div>
<div class="col text-center"> </div>
<label for="Pane" class="control-label">@Localizer["Pane"]</label> <div class="row">
<select class="form-select" @bind="@Pane"> <div class="col text-center">
@foreach (string pane in PageState.Page.Panes) <label for="Pane" class="control-label">@Localizer["Pane"]</label>
{ <select name="pane" class="form-select" @bind="@_pane">
<option value="@pane">@pane Pane</option> @foreach (string pane in PageState.Page.Panes)
} {
</select> <option value="@pane">@pane Pane</option>
</div> }
</div> </select>
<div class="row"> </div>
<div class="col text-center"> </div>
<label for="Insert" class="control-label">@Localizer["Location"]</label> <div class="row">
<select class="form-select" @bind="@Location"> <div class="col text-center">
<option value="@int.MinValue">@Localizer["LocationTop"]</option> <label for="Insert" class="control-label">@Localizer["Location"]</label>
<option value="@int.MaxValue">@Localizer["LocationBottom"]</option> <select name="location" class="form-select" @bind="@_location">
</select> <option value="@int.MinValue">@Localizer["LocationTop"]</option>
<option value="@int.MaxValue">@Localizer["LocationBottom"]</option>
</select>
</div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col text-center">
<div class="col text-center"> <label for="Container" class="control-label">@Localizer["Container"]</label>
<label for="Container" class="control-label">@Localizer["Container"]</label> <select name="container" class="form-select" @bind="@_container">
<select class="form-select" @bind="@ContainerType"> @foreach (var container in _containers)
@foreach (var container in _containers) {
{ <option value="@container.TypeName">@container.Name</option>
<option value="@container.TypeName">@container.Name</option> }
} </select>
</select> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col text-center">
<div class="col text-center"> <label for="visibility" class="control-label">@Localizer["Visibility"]</label>
<label for="visibility" class="control-label">@Localizer["Visibility"]</label> <select name="visibility" class="form-select" @bind="@_visibility">
<select class="form-select" @bind="@Visibility"> <option value="view">@Localizer["VisibilityView"]</option>
<option value="view">@Localizer["VisibilityView"]</option> <option value="edit">@Localizer["VisibilityEdit"]</option>
<option value="edit">@Localizer["VisibilityEdit"]</option> </select>
</select> </div>
</div> </div>
</div> <button type="submit" class="btn btn-primary col-12 mt-4">@Localizer["Page.Module.Add"]</button>
<button type="button" class="btn btn-primary col-12 mt-4" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button> </form>
@((MarkupString)Message) @((MarkupString)_message)
<hr class="app-rule" /> <hr class="app-rule" />
} }
@ -244,8 +247,6 @@
</div> </div>
} }
@code{ @code{
[Parameter] [Parameter]
public string ButtonClass { get; set; } = "btn-outline-secondary"; public string ButtonClass { get; set; } = "btn-outline-secondary";
@ -274,53 +275,34 @@
private List<Page> _pages = new List<Page>(); private List<Page> _pages = new List<Page>();
private List<Module> _modules = new List<Module>(); private List<Module> _modules = new List<Module>();
private List<ThemeControl> _containers = new List<ThemeControl>(); private List<ThemeControl> _containers = new List<ThemeControl>();
[SupplyParameterFromForm] public string ModuleType { get => ""; set => _moduleType = value; }
[SupplyParameterFromForm] public string Category { get => ""; set => _category = value; }
[SupplyParameterFromForm] public string ModuleDefinitionName { get => ""; set => _moduleDefinitionName = value; }
[SupplyParameterFromForm] public string PageId { get => ""; set => _pageId = value; }
[SupplyParameterFromForm] public string ModuleId { get => ""; set => _moduleId = value; }
[SupplyParameterFromForm] public string Title { get => ""; set => _title = value; }
[SupplyParameterFromForm] public string Pane { get => ""; set => _pane = value; }
[SupplyParameterFromForm] public int Location { get => -1; set => _location = value; }
[SupplyParameterFromForm] public string Container { get => ""; set => _container = value; }
[SupplyParameterFromForm] public string Visibility { get => ""; set => _visibility = value; }
protected string _moduleType = "new";
private string _category = "Common"; private string _category = "Common";
protected string _moduleDefinitionName = "-";
protected string _pageId = "-";
protected string _moduleId = "-";
protected string _title = "";
private string _pane = ""; private string _pane = "";
protected int _location = int.MaxValue;
protected string _container = "";
protected string _visibility = "view";
protected string PageId { get; private set; } = "-"; protected string _message { get; private set; } = "";
protected string ModuleId { get; private set; } = "-";
protected string ModuleType { get; private set; } = "new";
protected string ModuleDefinitionName { get; private set; } = "-";
protected string Title { get; private set; } = "";
protected string ContainerType { get; private set; } = "";
protected int Location { get; private set; } = int.MaxValue;
protected string Visibility { get; private set; } = "view";
protected string Message { get; private set; } = "";
private string settingCategory = "CP-category"; private string settingCategory = "CP-category";
private string settingPane = "CP-pane"; private string settingPane = "CP-pane";
protected string Category
{
get => _category;
private set
{
if (_category != value)
{
_category = value;
_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
ModuleDefinitionName = "-";
Message = "";
StateHasChanged();
_ = UpdateSettingsAsync();
}
}
}
protected string Pane
{
get => _pane;
private set
{
if (_pane != value)
{
_pane = value;
_ = UpdateSettingsAsync();
}
}
}
private void AdminDashboard() private void AdminDashboard()
{ {
Navigate("Admin"); Navigate("Admin");
@ -351,9 +333,9 @@
var themes = await ThemeService.GetThemesAsync(); var themes = await ThemeService.GetThemesAsync();
_containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType); _containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
ContainerType = PageState.Site.DefaultContainerType; _container = PageState.Site.DefaultContainerType;
_allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList(); _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
_categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList(); _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
} }
else else
@ -387,35 +369,38 @@
private void CategoryChanged(ChangeEventArgs e) private void CategoryChanged(ChangeEventArgs e)
{ {
Category = (string)e.Value; _category = (string)e.Value;
_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
_moduleDefinitionName = "-";
_message = "";
} }
private void ModuleChanged(ChangeEventArgs e) private void ModuleDefinitionChanged(ChangeEventArgs e)
{ {
ModuleDefinitionName = (string)e.Value; _moduleDefinitionName = (string)e.Value;
if (ModuleDefinitionName != "-") if (_moduleDefinitionName != "-")
{ {
var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName); var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == _moduleDefinitionName);
Message = "<div class=\"alert alert-info mt-2 text-center\" role=\"alert\">" + moduleDefinition.Description + "</div>"; _message = "<div class=\"alert alert-info mt-2 text-center\" role=\"alert\">" + moduleDefinition.Description + "</div>";
} }
else else
{ {
Message = ""; _message = "";
} }
StateHasChanged(); StateHasChanged();
} }
private void PageChanged(ChangeEventArgs e) private void PageChanged(ChangeEventArgs e)
{ {
PageId = (string)e.Value; _pageId = (string)e.Value;
if (PageId != "-") if (_pageId != "-")
{ {
_modules = PageState.Modules _modules = PageState.Modules
.Where(module => module.PageId == int.Parse(PageId) && .Where(module => module.PageId == int.Parse(_pageId) &&
UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList)) UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList))
.ToList(); .ToList();
} }
ModuleId = "-"; _moduleId = "-";
StateHasChanged(); StateHasChanged();
} }
@ -423,18 +408,18 @@
{ {
if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList)) if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
{ {
if ((ModuleType == "new" && ModuleDefinitionName != "-") || (ModuleType != "new" && ModuleId != "-")) if ((_moduleType == "new" && _moduleDefinitionName != "-") || (_moduleType != "new" && _moduleId != "-"))
{ {
if (ModuleType == "new") if (_moduleType == "new")
{ {
Module module = new Module(); Module module = new Module();
module.SiteId = PageState.Site.SiteId; module.SiteId = PageState.Site.SiteId;
module.PageId = PageState.Page.PageId; module.PageId = PageState.Page.PageId;
module.ModuleDefinitionName = ModuleDefinitionName; module.ModuleDefinitionName = _moduleDefinitionName;
module.AllPages = false; module.AllPages = false;
var permissions = new List<Permission>(); var permissions = new List<Permission>();
if (Visibility == "view") if (_visibility == "view")
{ {
// set module view permissions to page view permissions // set module view permissions to page view permissions
permissions = SetPermissions(permissions, module.SiteId, PermissionNames.View, PermissionNames.View); permissions = SetPermissions(permissions, module.SiteId, PermissionNames.View, PermissionNames.View);
@ -455,24 +440,24 @@
var pageModule = new PageModule var pageModule = new PageModule
{ {
PageId = PageState.Page.PageId, PageId = PageState.Page.PageId,
ModuleId = int.Parse(ModuleId), ModuleId = int.Parse(_moduleId),
Title = Title Title = _title
}; };
if (pageModule.Title == "") if (pageModule.Title == "")
{ {
if (ModuleType == "new") if (_moduleType == "new")
{ {
pageModule.Title = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName)?.Name; pageModule.Title = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == _moduleDefinitionName)?.Name;
} }
else else
{ {
pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(ModuleId))?.Title; pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(_moduleId))?.Title;
} }
} }
pageModule.Pane = Pane; pageModule.Pane = _pane;
pageModule.Order = Location; pageModule.Order = _location;
pageModule.ContainerType = ContainerType; pageModule.ContainerType = _container;
if (pageModule.ContainerType == PageState.Site.DefaultContainerType) if (pageModule.ContainerType == PageState.Site.DefaultContainerType)
{ {
@ -481,19 +466,20 @@
await PageModuleService.AddPageModuleAsync(pageModule); await PageModuleService.AddPageModuleAsync(pageModule);
await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane); await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
await UpdateSettingsAsync();
Message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>"; _message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
Title = ""; _title = "";
NavigationManager.NavigateTo(NavigateUrl()); NavigationManager.NavigateTo(NavigateUrl());
} }
else else
{ {
Message = $"<div class=\"alert alert-warning mt-2 text-center\" role=\"alert\">{Localizer["Message.Require.ModuleSelect"]}</div>"; _message = $"<div class=\"alert alert-warning mt-2 text-center\" role=\"alert\">{Localizer["Message.Require.ModuleSelect"]}</div>";
} }
} }
else else
{ {
Message = $"<div class=\"alert alert-error mt-2 text-center\" role=\"alert\">{Localizer["Error.Authorize.No"]}</div>"; _message = $"<div class=\"alert alert-error mt-2 text-center\" role=\"alert\">{Localizer["Error.Authorize.No"]}</div>";
} }
} }
@ -712,8 +698,6 @@
private void ClearMessage() private void ClearMessage()
{ {
_message = "";
Message = "";
} }
} }