From 836de5627668c95c62d606737d26a8c20bc326b7 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Fri, 25 Aug 2023 17:44:27 -0400
Subject: [PATCH] include only distinct items which have package names

---
 Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor | 3 ++-
 Oqtane.Client/Modules/Admin/Themes/Index.razor            | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 066da23b..ee962a80 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -128,7 +128,8 @@ else
     private async Task LoadModuleDefinitions()
     {
         _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
-        _packages = await PackageService.GetPackagesAsync(_moduleDefinitions.Select(item => item.PackageName).ToList());
+        var list = _moduleDefinitions.Where(item => !string.IsNullOrEmpty(item.PackageName)).Select(item => item.PackageName).Distinct().ToList();
+        _packages = await PackageService.GetPackagesAsync(list);
     }
 
     private string PurchaseLink(string packagename)
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index bb11f789..753451cc 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -79,7 +79,8 @@ else
         try
         {
             _themes = await ThemeService.GetThemesAsync();
-            _packages = await PackageService.GetPackagesAsync(_themes.Select(item => item.PackageName).ToList());
+            var list = _themes.Where(item => !string.IsNullOrEmpty(item.PackageName)).Select(item => item.PackageName).Distinct().ToList();
+            _packages = await PackageService.GetPackagesAsync(list);
         }
         catch (Exception ex)
         {