Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #145 from fileman/ImprovedRecycleBin

Browse Source 
Improved recycle bin
This commit is contained in:
Shaun Walker 2019-10-22 12:31:20 -04:00 committed by GitHub
commit dde33639d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 193 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
View File

@ -2,43 +2,91 @@
@inherits ModuleBase
@inject NavigationManager NavigationManager
@inject IPageModuleService PageModuleService
@inject IModuleService ModuleService
@inject IPageService PageService
@*Add TabControl with Pages and Modules tabs*@
<h3>Pages</h3>
@if (pageModules.Count == 0)
{
<p>No deleted pages</p>
}
else
{
<Pager Items="@pageModules">
<Header>
<th>Name</th>
<th>Deletion audit</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</Header>
<Row>
<td>@context.Name</td>
<td>@context.DeletedBy - @context.DeletedOn</td>
<td><button @onclick="@(() => Restore(context))" class="btn btn-info" title="Restore">Restore</button></td>
<td><button @onclick="@(() => Delete(context.PageId))" class="btn btn-danger">Delete</button></td>
</Row>
</Pager>
}
<TabControl>
<TabPage Text="Pages">
@if (pages.Count == 0)
{
<br/>
<p>No deleted pages</p>
}
else
{
<Pager Items="@pages">
<Header>
<th>Name</th>
<th>Deletion Audit</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</Header>
<Row>
<td>@context.Name</td>
<td>@context.DeletedBy - @context.DeletedOn</td>
<td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
<td><button @onclick="@(() => DeletePage(context.PageId))" class="btn btn-danger">Delete</button></td>
</Row>
</Pager>
}
</TabPage>
<TabPage Text="Page Modules">
@if (pageModules.Count == 0)
{
<br/>
<p>No deleted modules in pages</p>
}
else
{
<Pager Items="@pageModules">
<Header>
<th>Page Name</th>
<th>Control Title</th>
<th>Deletion Audit</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</Header>
<Row>
<td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
<td>@context.Title</td>
<td>@context.DeletedBy - @context.DeletedOn</td>
<td><button @onclick="@(() => RestorePageModule(context))" class="btn btn-info" title="Restore">Restore</button></td>
<td><button @onclick="@(() => DeletePageModule(context.PageModuleId, context.ModuleId))" class="btn btn-danger">Delete</button></td>
</Row>
</Pager>
}
</TabPage>
</TabControl>
@code {
public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
List<Page> pages { get; set; }
List<PageModule> pageModules { get; set; }
List<Page> pageModules = new List<Page>();
protected override async Task OnInitializedAsync()
{
pages = new List<Page>();
pageModules = new List<PageModule>();
await LoadEntities();
}
protected override void OnParametersSet()
{
pageModules = PageState.Pages.Where(item => item.IsDeleted).ToList();
pages = PageState.Pages.Where(item => item.IsDeleted).ToList();
}
private async Task Restore(Page Page)
private async Task LoadEntities()
{
pageModules.Clear();
foreach (var module in PageState.Modules.Where(item => item.IsDeleted))
{
var pageModule = await PageModuleService.GetPageModuleAsync(module.PageModuleId);
pageModules.Add(pageModule);
}
}
private async Task RestorePage(Page Page)
{
try
{
@ -52,11 +100,50 @@ else
}
}
private async Task Delete(int PageId)
private async Task DeletePage(int PageId)
{
try
{
var deletedPageModules = PageState.Modules.Where(item => item.PageId == PageId);
await PageService.DeletePageAsync(PageId);
foreach (var module in deletedPageModules)
{
await ModuleService.DeleteModuleAsync(module.ModuleId);
}
NavigationManager.NavigateTo(NavigateUrl("admin/recyclebin", Reload.Site));
}
catch (Exception ex)
{
AddModuleMessage(ex.Message, MessageType.Error);
}
}
private async Task RestorePageModule(PageModule PageModule)
{
try
{
PageModule.IsDeleted = false;
await PageModuleService.UpdatePageModuleAsync(PageModule);
await LoadEntities();
NavigationManager.NavigateTo(NavigateUrl("admin/recyclebin", Reload.Site));
}
catch (Exception ex)
{
AddModuleMessage(ex.Message, MessageType.Error);
}
}
private async Task DeletePageModule(int PageModuleId, int ModuleId)
{
try
{
await PageModuleService.DeletePageModuleAsync(PageModuleId);
if (PageState.Modules.Count(item => item.ModuleId == ModuleId) == 1)
{
await ModuleService.DeleteModuleAsync(ModuleId);
}
PageState.Modules.RemoveAt(PageState.Modules.FindIndex(item => item.ModuleId == ModuleId));
await LoadEntities();
NavigationManager.NavigateTo(NavigateUrl("admin/recyclebin", Reload.Site));
}
catch (Exception ex)

5
Oqtane.Client/Themes/Controls/ControlPanel.razor
View File

@ -149,7 +149,7 @@
string moduletype = "new";
List<string> categories = new List<string>();
List<ModuleDefinition> moduledefinitions;
List<Page> pages;
List<Page> pages = new List<Page>();
string pageid = "";
string moduleid = "-";
List<Module> modules = new List<Module>();
@ -176,7 +176,7 @@
if (UserSecurity.IsAuthorized(PageState.User, "Edit", PageState.Page.Permissions))
{
pages = new List<Page>();
pages?.Clear();
foreach (ModuleDefinition moduledefinition in PageState.ModuleDefinitions)
{
@ -224,6 +224,7 @@
private void PageChanged(ChangeEventArgs e)
{
pageid = (string)e.Value;
modules?.Clear();
if (pageid != "")
{
foreach (Module module in PageState.Modules.Where(item => item.PageId == int.Parse(pageid) && !item.IsDeleted))

43
Oqtane.Client/Themes/Controls/TabControl.razor Normal file
View File

@ -0,0 +1,43 @@
@namespace Oqtane.Themes.Controls
@inherits ThemeControlBase
<CascadingValue Value="this">
<div>
@foreach (TabPanel tabPanel in TabPanels)
{
<button type="button"
class="btn @GetButtonClass(tabPanel)"
@onclick=@( () => ActivateTabPanel(tabPanel) )>
@tabPanel.Text
</button>
}
</div>
@ChildContent
</CascadingValue>
@code {
// Next line is needed so we are able to add <TabPanel> components inside
[Parameter]
public RenderFragment ChildContent { get; set; }
public TabPanel ActiveTabPanel { get; set; }
List<TabPanel> TabPanels = new List<TabPanel>();
internal void AddTabPanel(TabPanel tabPanel)
{
TabPanels.Add(tabPanel);
if (TabPanels.Count == 1)
ActiveTabPanel = tabPanel;
StateHasChanged();
}
string GetButtonClass(TabPanel tabPanel)
{
return tabPanel == ActiveTabPanel ? "btn-primary" : "btn-secondary";
}
void ActivateTabPanel(TabPanel tabPanel)
{
ActiveTabPanel = tabPanel;
}
}

27
Oqtane.Client/Themes/Controls/TabPanel.razor Normal file
View File

@ -0,0 +1,27 @@
@namespace Oqtane.Themes.Controls
@inherits ThemeControlBase
@if (Parent.ActiveTabPanel == (TabPanel)(object)this)
{
@ChildContent
}
@code {
[CascadingParameter]
private TabControl Parent { get; set; }
[Parameter]
public RenderFragment ChildContent { get; set; }
[Parameter]
public string Text { get; set; }
protected override void OnInitialized()
{
if (Parent == null)
throw new ArgumentNullException(nameof(Parent), "TabPanel must exist within a TabControl");
base.OnInitialized();
Parent.AddTabPanel((TabPanel)(object)this);
}
}

4
Oqtane.Server/Repository/PageRepository.cs
View File

@ -10,14 +10,12 @@ namespace Oqtane.Repository
private TenantDBContext db;
private readonly IPermissionRepository Permissions;
private readonly IPageModuleRepository PageModules;
private readonly IModuleRepository ModuleRepository;
public PageRepository(TenantDBContext context, IPermissionRepository Permissions, IPageModuleRepository PageModules, IModuleRepository ModuleRepository)
public PageRepository(TenantDBContext context, IPermissionRepository Permissions, IPageModuleRepository PageModules)
{
db = context;
this.Permissions = Permissions;
this.PageModules = PageModules;
this.ModuleRepository = ModuleRepository;
}
public IEnumerable<Page> GetPages()

6
Oqtane.Shared/Models/Module.cs
View File

@ -16,7 +16,11 @@ namespace Oqtane.Models
public DateTime CreatedOn { get; set; }
public string ModifiedBy { get; set; }
public DateTime ModifiedOn { get; set; }
[NotMapped]
public string DeletedBy { get; set; }
[NotMapped]
public DateTime? DeletedOn { get; set; }
[NotMapped]
public bool IsDeleted { get; set; }