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

Merge pull request #147 from sbwalker/master

Browse Source 
added logging and minor cleanup
This commit is contained in:
Shaun Walker 2019-10-22 12:50:06 -04:00 committed by GitHub
commit 71b4db6050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,56 +6,60 @@
@inject IPageService PageService @inject IPageService PageService
<TabControl> <TabControl>
<TabPage Text="Pages"> <TabPanel Text="Pages">
@if (pages.Count == 0) @if (pages.Count == 0)
{ {
<br/> <br/>
<p>No deleted pages</p> <p>No Deleted Pages</p>
} }
else else
{ {
<Pager Items="@pages"> <Pager Items="@pages">
<Header> <Header>
<th>Name</th> <th>Name</th>
<th>Deletion Audit</th> <th>Deleted By</th>
<th>Deleted On</th>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</Header> </Header>
<Row> <Row>
<td>@context.Name</td> <td>@context.Name</td>
<td>@context.DeletedBy - @context.DeletedOn</td> <td>@context.DeletedBy</td>
<td>@context.DeletedOn</td>
<td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></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> <td><button @onclick="@(() => DeletePage(context.PageId))" class="btn btn-danger">Delete</button></td>
</Row> </Row>
</Pager> </Pager>
} }
</TabPage> </TabPanel>
<TabPage Text="Page Modules"> <TabPanel Text="Modules">
@if (pageModules.Count == 0) @if (pageModules.Count == 0)
{ {
<br/> <br/>
<p>No deleted modules in pages</p> <p>No Deleted Modules</p>
} }
else else
{ {
<Pager Items="@pageModules"> <Pager Items="@pageModules">
<Header> <Header>
<th>Page Name</th> <th>Page</th>
<th>Control Title</th> <th>Module</th>
<th>Deletion Audit</th> <th>Deleted By</th>
<th>Deleted On</th>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>&nbsp;</th> <th>&nbsp;</th>
</Header> </Header>
<Row> <Row>
<td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td> <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
<td>@context.Title</td> <td>@context.Title</td>
<td>@context.DeletedBy - @context.DeletedOn</td> <td>@context.DeletedBy</td>
<td>@context.DeletedOn</td>
<td><button @onclick="@(() => RestorePageModule(context))" class="btn btn-info" title="Restore">Restore</button></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> <td><button @onclick="@(() => DeletePageModule(context.PageModuleId, context.ModuleId))" class="btn btn-danger">Delete</button></td>
</Row> </Row>
</Pager> </Pager>
} }
</TabPage> </TabPanel>
</TabControl> </TabControl>
@code { @code {
@ -65,11 +69,19 @@
List<PageModule> pageModules { get; set; } List<PageModule> pageModules { get; set; }
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{
try
{ {
pages = new List<Page>(); pages = new List<Page>();
pageModules = new List<PageModule>(); pageModules = new List<PageModule>();
await LoadEntities(); await LoadEntities();
} }
catch (Exception ex)
{
await logger.LogError(ex, "Error Loading Deleted Pages Or Modules {Error}", ex.Message);
AddModuleMessage("Error Loading Deleted Pages Or Modules", MessageType.Error);
}
}
protected override void OnParametersSet() protected override void OnParametersSet()
{ {
@ -92,11 +104,13 @@
{ {
Page.IsDeleted = false; Page.IsDeleted = false;
await PageService.UpdatePageAsync(Page); await PageService.UpdatePageAsync(Page);
NavigationManager.NavigateTo(NavigateUrl("admin/recyclebin", Reload.Site)); await logger.LogInformation("Page Restored {Page}", Page);
NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
} }
catch (Exception ex) catch (Exception ex)
{ {
AddModuleMessage(ex.Message, MessageType.Error); await logger.LogError(ex, "Error Restoring Deleted Page {Page} {Error}", Page, ex.Message);
AddModuleMessage("Error Restoring Deleted Page", MessageType.Error);
} }
} }
@ -110,10 +124,12 @@
{ {
await ModuleService.DeleteModuleAsync(module.ModuleId); await ModuleService.DeleteModuleAsync(module.ModuleId);
} }
NavigationManager.NavigateTo(NavigateUrl("admin/recyclebin", Reload.Site)); await logger.LogInformation("Page Permanently Deleted {PageId}", PageId);
NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
} }
catch (Exception ex) catch (Exception ex)
{ {
await logger.LogError(ex, "Error Permanently Deleting Page {PageId} {Error}", PageId, ex.Message);
AddModuleMessage(ex.Message, MessageType.Error); AddModuleMessage(ex.Message, MessageType.Error);
} }
} }
@ -125,11 +141,13 @@
PageModule.IsDeleted = false; PageModule.IsDeleted = false;
await PageModuleService.UpdatePageModuleAsync(PageModule); await PageModuleService.UpdatePageModuleAsync(PageModule);
await LoadEntities(); await LoadEntities();
NavigationManager.NavigateTo(NavigateUrl("admin/recyclebin", Reload.Site)); await logger.LogInformation("Page Module Restored {PageModule}", PageModule);
NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
} }
catch (Exception ex) catch (Exception ex)
{ {
AddModuleMessage(ex.Message, MessageType.Error); await logger.LogError(ex, "Error Restoring Deleted Page Module {PageModule} {Error}", PageModule, ex.Message);
AddModuleMessage("Error Restoring Deleted Page Module", MessageType.Error);
} }
} }
@ -144,11 +162,13 @@
} }
PageState.Modules.RemoveAt(PageState.Modules.FindIndex(item => item.ModuleId == ModuleId)); PageState.Modules.RemoveAt(PageState.Modules.FindIndex(item => item.ModuleId == ModuleId));
await LoadEntities(); await LoadEntities();
NavigationManager.NavigateTo(NavigateUrl("admin/recyclebin", Reload.Site)); await logger.LogInformation("Page Module Permanently Deleted {PageModuleId}", PageModuleId);
NavigationManager.NavigateTo(NavigateUrl(Reload.Site));
} }
catch (Exception ex) catch (Exception ex)
{ {
AddModuleMessage(ex.Message, MessageType.Error); await logger.LogError(ex, "Error Permanently Deleting Page Module {PageModuleId} {Error}", PageModuleId, ex.Message);
AddModuleMessage("Error Permanently Deleting Page Module", MessageType.Error);
} }
} }
} }

2
Oqtane.Client/Themes/Controls/TabControl.razor → Oqtane.Client/Modules/Controls/TabControl.razor
View File

@ -1,4 +1,4 @@
@namespace Oqtane.Themes.Controls @namespace Oqtane.Modules.Controls
@inherits ThemeControlBase @inherits ThemeControlBase
<CascadingValue Value="this"> <CascadingValue Value="this">

2
Oqtane.Client/Themes/Controls/TabPanel.razor → Oqtane.Client/Modules/Controls/TabPanel.razor
View File

@ -1,4 +1,4 @@
@namespace Oqtane.Themes.Controls @namespace Oqtane.Modules.Controls
@inherits ThemeControlBase @inherits ThemeControlBase
@if (Parent.ActiveTabPanel == (TabPanel)(object)this) @if (Parent.ActiveTabPanel == (TabPanel)(object)this)