improved file upload, enhanced module installation from Nuget to support upgrades, added ability to upgrade the framework from Nuget, completed isolated multitenancy and site alias management, created IPortable interface for importing data into modules, added default content to initial installation

2019-10-08 16:11:23 -04:00
parent dce53e10b0
commit 9971510b1e
48 changed files with 961 additions and 157 deletions
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@ -0,0 +1,104 @@
+@namespace Oqtane.Modules.Admin.Upgrade
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IFileService FileService
+@inject IPackageService PackageService
+@inject IInstallationService InstallationService
+
+<table class="table table-borderless">
+    <tr>
+        <td>
+            <label for="Name" class="control-label">Framework: </label>
+        </td>
+        <td>
+            <FileUpload Filter=".nupkg" @ref="fileupload"></FileUpload>
+        </td>
+    </tr>
+</table>
+@if (uploaded)
+{
+    <button type="button" class="btn btn-success" @onclick="Upgrade">Upgrade</button>
+}
+else
+{
+    <button type="button" class="btn btn-primary" @onclick="UploadFile">Upload</button>
+}
+
+@if (upgradeavailable)
+{
+    <hr />
+    <div class="mx-auto text-center"><h2>Upgrade Available</h2></div>
+
+    <button type="button" class="btn btn-success" @onclick=@(async () => await Download(Constants.PackageId, Constants.Version))>Upgrade Framework</button>
+}
+
+@code {
+    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+
+    bool uploaded = false;
+    bool upgradeavailable = false;
+    FileUpload fileupload;
+
+    protected override async Task OnInitializedAsync()
+    {
+        List<Package> packages = await PackageService.GetPackagesAsync("framework");
+        Package package = packages.FirstOrDefault();
+        if (package != null)
+        {
+            upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+        }
+        if (!upgradeavailable)
+        {
+            ModuleInstance.AddModuleMessage("Framework Up To Date", MessageType.Info);
+        }
+    }
+
+    private async Task UploadFile()
+    {
+        string[] files = await fileupload.GetFiles();
+        if (files.Length > 0)
+        {
+            if (files[0].Contains(".Framework."))
+            {
+                try
+                {
+                    if (await FileService.UploadFilesAsync("Framework", files, ""))
+                    {
+                        ModuleInstance.AddModuleMessage("Framework Uploaded Successfully. Click Upgrade To Complete Installation.", MessageType.Success);
+                        uploaded = true;
+                        StateHasChanged();
+                    }
+                    else
+                    {
+                        ModuleInstance.AddModuleMessage("Framework Upload Failed.", MessageType.Error);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ModuleInstance.AddModuleMessage("Framework Upload Failed. " + ex.Message, MessageType.Error);
+                }
+            }
+            else
+            {
+                ModuleInstance.AddModuleMessage("Invalid Framework Package", MessageType.Error);
+            }
+        }
+        else
+        {
+            ModuleInstance.AddModuleMessage("You Must Select A Framework Package To Upload", MessageType.Warning);
+        }
+    }
+
+    private async Task Upgrade()
+    {
+        await InstallationService.Upgrade();
+        NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
+    }
+
+    private async Task Download(string packageid, string version)
+    {
+        await PackageService.DownloadPackageAsync(packageid, version, "Framework");
+        await InstallationService.Upgrade();
+        NavigationManager.NavigateTo(NavigateUrl(Reload.Application));
+    }
+}