From a0e289dcd6383517c69f71ba35e208459b516cec Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 16 Oct 2023 08:03:31 -0400
Subject: [PATCH] resolve issue in making Pager search work with sorting

---
 Oqtane.Client/Modules/Controls/Pager.razor | 4 ++++
 Oqtane.Server/Repository/FileRepository.cs | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index 668fa4ee..79642eaa 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -295,6 +295,10 @@
         if (!string.IsNullOrEmpty(SearchProperties))
         {
             AllItems = Items; // only used in search
+            if (!string.IsNullOrEmpty(_search))
+            {
+                Search();
+            }
         }
 
         if (!string.IsNullOrEmpty(PageSize))
diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs
index e57ca3f1..829659e1 100644
--- a/Oqtane.Server/Repository/FileRepository.cs
+++ b/Oqtane.Server/Repository/FileRepository.cs
@@ -32,8 +32,9 @@ namespace Oqtane.Repository
 
         public IEnumerable<File> GetFiles(int folderId, bool tracking)
         {
-            var alias = _tenants.GetAlias();
-            IEnumerable<Permission> permissions = _permissions.GetPermissions(alias.SiteId, EntityNames.Folder, folderId).ToList();
+            var folder = _folderRepository.GetFolder(folderId, false);
+            IEnumerable<Permission> permissions = _permissions.GetPermissions(folder.SiteId, EntityNames.Folder, folderId).ToList();
+
             IEnumerable<File> files;
             if (tracking)
             {
@@ -46,6 +47,7 @@ namespace Oqtane.Repository
             foreach (File file in files)
             {
                 file.Folder.PermissionList = permissions.ToList();
+                var alias = _tenants.GetAlias();
                 file.Url = GetFileUrl(file, alias);
             }
             return files;