Merge pull request #557 from sbwalker/master

fix for #525 when running locally without a network connection

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -54,21 +54,27 @@ else
             _packages = await PackageService.GetPackagesAsync("module");
         }
         catch (Exception ex)
+        {
+            if (_moduleDefinitions == null)
             {
                 await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
                 AddModuleMessage("Error Loading Modules", MessageType.Error);
             }
         }
+    }
 
     private bool UpgradeAvailable(string moduledefinitionname, string version)
     {
         var upgradeavailable = false;
+        if (_packages != null)
+        {
             var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault();
             if (package != null)
             {
                 upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
             }
 
+        }
         return upgradeavailable;
     }
 

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -4,7 +4,7 @@
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
 
-@if (themes == null)
+@if (_themes == null)
 {
     <p><em>Loading...</em></p>
 }
@@ -12,7 +12,7 @@ else
 {
     <ActionLink Action="Add" Text="Install Theme" />
 
-    <Pager Items="@themes">
+    <Pager Items="@_themes">
         <Header>
             <th>&nbsp;</th>
             <th>Name</th>
@@ -39,41 +39,70 @@ else
 }
 
 @code {
-    private List<Theme> themes;
+    private List<Theme> _themes;
-    private List<Package> packages;
+    private List<Package> _packages;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
-        themes = await ThemeService.GetThemesAsync();
+        try
-        packages = await PackageService.GetPackagesAsync("module");
+        {
+            _themes = await ThemeService.GetThemesAsync();
+            _packages = await PackageService.GetPackagesAsync("theme");
+        }
+        catch (Exception ex)
+        {
+            if (_themes == null)
+            {
+                await logger.LogError(ex, "Error Loading Themes {Error}", ex.Message);
+                AddModuleMessage("Error Loading Themes", MessageType.Error);
+            }
+        }
     }
 
     private bool UpgradeAvailable(string themename, string version)
     {
         var upgradeavailable = false;
-        var package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault();
+        if (_packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault();
             if (package != null)
             {
                 upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
             }
-        
+        }
         return upgradeavailable;
     }
 
     private async Task DownloadTheme(string themename, string version)
+    {
+        try
         {
             await PackageService.DownloadPackageAsync(themename, version, "Themes");
-        await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
             await ThemeService.InstallThemesAsync();
+            await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
             NavigationManager.NavigateTo(NavigateUrl());
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Theme {ThemeName} {Version} {Error}", themename, version, ex.Message);
+            AddModuleMessage("Error Downloading Theme", MessageType.Error);
+        }
+    }
 
     private async Task DeleteTheme(Theme Theme)
+    {
+        try
         {
             await ThemeService.DeleteThemeAsync(Theme.ThemeName);
             await logger.LogInformation("Theme Deleted {Theme}", Theme);
             NavigationManager.NavigateTo(NavigateUrl());
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Theme {Theme} {Error}", Theme, ex.Message);
+            AddModuleMessage("Error Deleting Theme", MessageType.Error);
+        }
+    }
 }

Oqtane.Client/Modules/Admin/Upgrade/Index.razor

@@ -42,8 +42,12 @@
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
+    {
+        try
         {
             List<Package> packages = await PackageService.GetPackagesAsync("framework");
+            if (packages != null)
+            {
                 _package = packages.FirstOrDefault();
                 if (_package != null)
                 {
@@ -54,17 +58,39 @@
                     _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
                 }
             }
+        }
+        catch 
+        {
+            // can be caused by no network connection
+        }
+    }
 
     private async Task Upgrade()
+    {
+        try
         {
             await InstallationService.Upgrade();
             NavigationManager.NavigateTo(NavigateUrl());
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Executing Upgrade {Error}", ex.Message);
+            AddModuleMessage("Error Executing Upgrade", MessageType.Error);
+        }
+    }
 
     private async Task Download(string packageid, string version)
+    {
+        try
         {
             await PackageService.DownloadPackageAsync(packageid, version, "Framework");
             await InstallationService.Upgrade();
             NavigationManager.NavigateTo(NavigateUrl());
         }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message);
+            AddModuleMessage("Error Downloading Framework", MessageType.Error);
+        }
+    }
 }