From 26ec3fc7cf79147b6be8a14d384ca2b4dc0a28f3 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Wed, 28 Sep 2022 13:55:12 -0400
Subject: [PATCH] fix #2426 - error in recycle bin

---
 .../Modules/Admin/RecycleBin/Index.razor      | 149 +++++++++---------
 .../Modules/Admin/RecycleBin/Index.resx       |  16 +-
 Oqtane.Server/Pages/_Host.cshtml              |   3 +
 3 files changed, 87 insertions(+), 81 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index 34a46b6c..51752e84 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -7,75 +7,77 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Pages" ResourceKey="Pages">
-        @if (_pages == null)
-        {
-            <br />
-            <p>@Localizer["NoPage.Deleted"]</p>
-        }
-        else
-        {
-            <Pager Items="@_pages">
-                <Header>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th>@SharedLocalizer["Name"]</th>
-                    <th>@Localizer["DeletedBy"]</th>
-                    <th>@Localizer["DeletedOn"]</th>
-                </Header>
-                <Row>
-                    <td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-success" title="Restore">Restore</button></td>
-                    <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
-                    <td>@context.Name</td>
-                    <td>@context.DeletedBy</td>
-                    <td>@context.DeletedOn</td>
-                </Row>
-            </Pager>
-            @if (_pages.Any())
-            {
-                <br /><ActionDialog Header="Delete All Pages" Message="Are You Sure You Wish To Permanently Delete All Pages?" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
-            }
-        }
-    </TabPanel>
-    <TabPanel Name="Modules" ResourceKey="Modules">
-        @if (_modules == null)
-        {
-            <br />
-            <p>@Localizer["NoModule.Deleted"]</p>
-        }
-        else
-        {
-            <Pager Items="@_modules">
-                <Header>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th style="width: 1px;">&nbsp;</th>
-                    <th>@Localizer["Page"]</th>
-                    <th>@Localizer["Module"]</th>
-                    <th>@Localizer["DeletedBy"]</th>
-                    <th>@Localizer["DeletedOn"]</th>
-                </Header>
-                <Row>
-                    <td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
-                    <td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
-                    <td>@_pages.Find(item => item.PageId == context.PageId).Name</td>
-                    <td>@context.Title</td>
-                    <td>@context.DeletedBy</td>
-                    <td>@context.DeletedOn</td>
-                </Row>
-            </Pager>
-            @if (_modules.Any())
-            {
-                <br /><ActionDialog Header="Delete All Modules" Message="Are You Sure You Wish To Permanently Delete All Modules?" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
-            }
-
-        }
-    </TabPanel>
-</TabStrip>
+@if (_pages == null || _modules == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+	<TabStrip>
+		<TabPanel Name="Pages" ResourceKey="Pages">
+			@if (!_pages.Where(item => item.IsDeleted).Any())
+			{
+				<br />
+				<p>@Localizer["NoPage.Deleted"]</p>
+			}
+			else
+			{
+				<Pager Items="@_pages.Where(item => item.IsDeleted)">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@SharedLocalizer["Name"]</th>
+						<th>@Localizer["DeletedBy"]</th>
+						<th>@Localizer["DeletedOn"]</th>
+					</Header>
+					<Row>
+						<td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-success" title="Restore">Restore</button></td>
+						<td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+						<td>@context.Name</td>
+						<td>@context.DeletedBy</td>
+						<td>@context.DeletedOn</td>
+					</Row>
+				</Pager>
+				<br />
+				<ActionDialog Header="Remove All Deleted Pages" Message="Are You Sure You Wish To Permanently Remove All Deleted Pages?" Action="Remove All Deleted Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
+			}
+		</TabPanel>
+		<TabPanel Name="Modules" ResourceKey="Modules">
+			@if (!_modules.Where(item => item.IsDeleted).Any())
+			{
+				<br />
+				<p>@Localizer["NoModule.Deleted"]</p>
+			}
+			else
+			{
+				<Pager Items="@_modules.Where(item => item.IsDeleted)">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@Localizer["Page"]</th>
+						<th>@Localizer["Module"]</th>
+						<th>@Localizer["DeletedBy"]</th>
+						<th>@Localizer["DeletedOn"]</th>
+					</Header>
+					<Row>
+						<td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
+						<td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
+						<td>@_pages.Find(item => item.PageId == context.PageId).Name</td>
+						<td>@context.Title</td>
+						<td>@context.DeletedBy</td>
+						<td>@context.DeletedOn</td>
+					</Row>
+				</Pager>
+				<br />
+				<ActionDialog Header="Remove All Deleted Modules" Message="Are You Sure You Wish To Permanently Remove All Deleted Modules?" Action="Remove All Deleted Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
+			}
+		</TabPanel>
+	</TabStrip>
+}
 
 @code {
-    private List<Page> _pages;
-    private List<Module> _modules;
+	private List<Page> _pages;
+	private List<Module> _modules;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -95,10 +97,7 @@
     private async Task Load()
     {
         _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
-        _pages = _pages.Where(item => item.IsDeleted).ToList();
-
         _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-        _modules = _modules.Where(item => item.IsDeleted).ToList();
     }
 
     private async Task RestorePage(Page page)
@@ -141,7 +140,7 @@
         try
         {
             ModuleInstance.ShowProgressIndicator();
-            foreach (Page page in _pages)
+			foreach (Page page in _pages.Where(item => item.IsDeleted))
             {
                 await PageService.DeletePageAsync(page.PageId);
                 await logger.LogInformation("Page Permanently Deleted {Page}", page);
@@ -184,9 +183,8 @@
         try
         {
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
-            // check if there are any remaining module instances in the site
-            _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
 
+            // check if there are any remaining module instances in the site
             if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
             {
                 await ModuleService.DeleteModuleAsync(module.ModuleId);
@@ -208,12 +206,11 @@
         try
         {
             ModuleInstance.ShowProgressIndicator();
-            foreach (Module module in _modules)
+			foreach (Module module in _modules.Where(item => item.IsDeleted))
             {
                 await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
-                // check if there are any remaining module instances in the site
-                _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
 
+                // check if there are any remaining module instances in the site
                 if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
                 {
                     await ModuleService.DeleteModuleAsync(module.ModuleId);
diff --git a/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx b/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
index 864b7170..25184660 100644
--- a/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/RecycleBin/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -166,16 +166,22 @@
     <value>Error Permanently Deleting Modules</value>
   </data>
   <data name="DeleteAllPages.Header" xml:space="preserve">
-    <value>Delete All Pages</value>
+    <value>Remove All Deleted Pages</value>
   </data>
   <data name="DeleteAllPages.Message" xml:space="preserve">
-    <value>Are You Sure You Wish To Permanently Delete All Pages?</value>
+    <value>Are You Sure You Wish To Permanently Remove All Deleted Pages?</value>
+  </data>
+  <data name="DeleteAllPages.Text" xml:space="preserve">
+    <value>Remove All Deleted Pages</value>
   </data>
   <data name="DeleteAllModules.Header" xml:space="preserve">
-    <value>Delete All Modules</value>
+    <value>Remove All Deleted Modules</value>
   </data>
   <data name="DeleteAllModules.Message" xml:space="preserve">
-    <value>Are You Sure You Wish To Permanently Delete All Modules?</value>
+    <value>Are You Sure You Wish To Permanently Remove All Deleted Modules?</value>
+  </data>
+  <data name="DeleteAllModules.Text" xml:space="preserve">
+    <value>Remove All Deleted Modules</value>
   </data>
   <data name="Pages.Heading" xml:space="preserve">
     <value>Pages</value>
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index 21518a22..488bcff9 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -49,6 +49,9 @@
 		@if (Model.Runtime == "Server")
 		{
 			<script src="_framework/blazor.server.js"></script>
+		}
+		@if (!string.IsNullOrEmpty(Model.ReconnectScript))
+		{
 			@Html.Raw(Model.ReconnectScript)
 		}
 		@if (!string.IsNullOrEmpty(Model.PWAScript))