add new page for assemblies

Lamond Lu · Lamond Lu · commit 9919d7a40c13 · 2019-10-20T16:44:50.000+08:00
diff --git a/Mystique.Core.Mvc/Infrastructure/MystiqueStartup.cs b/Mystique.Core.Mvc/Infrastructure/MystiqueStartup.cs
@@ -25,13 +25,13 @@ public static void MystiqueSetup(this IServiceCollection services, IConfiguratio
             services.AddOptions();
             services.Configure<ConnectionStringSetting>(configuration.GetSection("ConnectionStringSetting"));
 
-            services.AddScoped<IMvcModuleSetup, MvcModuleSetup>();
+            services.AddSingleton<IMvcModuleSetup, MvcModuleSetup>();
             services.AddScoped<IPluginManager, PluginManager>();
             services.AddScoped<IUnitOfWork, UnitOfWork>();
             services.AddSingleton<IActionDescriptorChangeProvider>(MystiqueActionDescriptorChangeProvider.Instance);
-            services.AddScoped<IReferenceContainer, DefaultReferenceContainer>();
-            services.AddScoped<IReferenceLoader, DefaultReferenceLoader>();
-            services.AddScoped<IDependanceLoader, DefaultDependanceLoader>();
+            services.AddSingleton<IReferenceContainer, DefaultReferenceContainer>();
+            services.AddSingleton<IReferenceLoader, DefaultReferenceLoader>();
+            services.AddSingleton<IDependanceLoader, DefaultDependanceLoader>();
             services.AddSingleton(MystiqueActionDescriptorChangeProvider.Instance);
 
             var mvcBuilder = services.AddMvc();
diff --git a/Mystique.Core/Contracts/IReferenceContainer.cs b/Mystique.Core/Contracts/IReferenceContainer.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Mystique.Core.DomainModel;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -7,6 +8,8 @@ namespace Mystique.Core.Contracts
 {
     public interface IReferenceContainer
     {
+        List<CachedReferenceItemKey> GetAll();
+
         bool Exist(string name, string version);
 
         void SaveStream(string name, string version, Stream stream);
diff --git a/Mystique.Core/Helpers/DefaultReferenceContainer.cs b/Mystique.Core/Helpers/DefaultReferenceContainer.cs
@@ -1,5 +1,7 @@
 ﻿using Mystique.Core.Contracts;
 using Mystique.Core.DomainModel;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -8,7 +10,13 @@ namespace Mystique.Core.Helpers
 {
     public class DefaultReferenceContainer : IReferenceContainer
     {
-        private Dictionary<CachedReferenceItemKey, Stream> _cachedReferences = new Dictionary<CachedReferenceItemKey, Stream>();
+        private static Dictionary<CachedReferenceItemKey, Stream> _cachedReferences = new Dictionary<CachedReferenceItemKey, Stream>();
+
+
+        public List<CachedReferenceItemKey> GetAll()
+        {
+            return _cachedReferences.Keys.ToList();
+        }
 
         public bool Exist(string name, string version)
         {
@@ -23,6 +31,7 @@ public void SaveStream(string name, string version, Stream stream)
                 return;
             }
 
+
             _cachedReferences.Add(new CachedReferenceItemKey { ReferenceName = name, Version = version }, stream);
         }
 
diff --git a/Mystique/Controllers/PluginsController.cs b/Mystique/Controllers/PluginsController.cs
@@ -12,11 +12,13 @@ public class PluginsController : Controller
     {
         private IPluginManager _pluginManager = null;
         private ApplicationPartManager _partManager = null;
+        private IReferenceContainer _referenceContainer = null;
 
-        public PluginsController(IPluginManager pluginManager, ApplicationPartManager partManager)
+        public PluginsController(IPluginManager pluginManager, ApplicationPartManager partManager, IReferenceContainer referenceContainer)
         {
             _pluginManager = pluginManager;
             _partManager = partManager;
+            _referenceContainer = referenceContainer;
         }
 
         private void RefreshControllerAction()
@@ -25,6 +27,13 @@ private void RefreshControllerAction()
             MystiqueActionDescriptorChangeProvider.Instance.TokenSource.Cancel();
         }
 
+        public IActionResult Assemblies()
+        {
+            var items = _referenceContainer.GetAll();
+
+            return View(items);
+        }
+
         // GET: /<controller>/
         public IActionResult Index()
         {
diff --git a/Mystique/Mystique.csproj b/Mystique/Mystique.csproj
@@ -7,7 +7,14 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.12" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/Mystique/Views/Plugins/Assemblies.cshtml b/Mystique/Views/Plugins/Assemblies.cshtml
@@ -0,0 +1,35 @@
+﻿@model List<Mystique.Core.DomainModel.CachedReferenceItemKey>
+@{
+    ViewData["Title"] = "Index";
+}
+
+<h1>Assemblies</h1>
+
+<table class="table table-bordered">
+    <thead>
+        <tr>
+            <th>Assembly Name</th>
+            <th>Version</th>
+        </tr>
+    </thead>
+    <tbody>
+        @if (Model != null && Model.Count > 0)
+        {
+            foreach (var row in Model)
+            {
+                <tr>
+                    <td>@row.ReferenceName</td>
+                    <td>@row.Version</td>
+                </tr>
+            }
+        }
+        else
+        {
+            <tr>
+                <td colspan="2">No Data.</td>
+            </tr>
+        }
+    </tbody>
+</table>
+
+
diff --git a/Mystique/Views/Shared/_Layout.cshtml b/Mystique/Views/Shared/_Layout.cshtml
@@ -37,6 +37,9 @@
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Plugins" asp-action="Index">Plugins</a>
                         </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Plugins" asp-action="Assemblies">Assemblies</a>
+                        </li>
                     </ul>
                 </div>
             </div>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+using Mystique.Core.DomainModel;`
	`2`	`+using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.IO;`
`4`	`5`	`using System.Text;`
`@@ -7,6 +8,8 @@ namespace Mystique.Core.Contracts`
`7`	`8`	`{`
`8`	`9`	`public interface IReferenceContainer`
`9`	`10`	`{`
	`11`	`+ List<CachedReferenceItemKey> GetAll();`
	`12`	`+`
`10`	`13`	`bool Exist(string name, string version);`
`11`	`14`
`12`	`15`	`void SaveStream(string name, string version, Stream stream);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`using Mystique.Core.Contracts;`
`2`	`2`	`using Mystique.Core.DomainModel;`
	`3`	`+using Newtonsoft.Json;`
	`4`	`+using System;`
`3`	`5`	`using System.Collections.Generic;`
`4`	`6`	`using System.IO;`
`5`	`7`	`using System.Linq;`
`@@ -8,7 +10,13 @@ namespace Mystique.Core.Helpers`
`8`	`10`	`{`
`9`	`11`	`public class DefaultReferenceContainer : IReferenceContainer`
`10`	`12`	`{`
`11`		`- private Dictionary<CachedReferenceItemKey, Stream> _cachedReferences = new Dictionary<CachedReferenceItemKey, Stream>();`
	`13`	`+ private static Dictionary<CachedReferenceItemKey, Stream> _cachedReferences = new Dictionary<CachedReferenceItemKey, Stream>();`
	`14`	`+`
	`15`	`+`
	`16`	`+ public List<CachedReferenceItemKey> GetAll()`
	`17`	`+ {`
	`18`	`+ return _cachedReferences.Keys.ToList();`
	`19`	`+ }`
`12`	`20`
`13`	`21`	`public bool Exist(string name, string version)`
`14`	`22`	`{`
`@@ -23,6 +31,7 @@ public void SaveStream(string name, string version, Stream stream)`
`23`	`31`	`return;`
`24`	`32`	`}`
`25`	`33`
	`34`	`+`
`26`	`35`	`_cachedReferences.Add(new CachedReferenceItemKey { ReferenceName = name, Version = version }, stream);`
`27`	`36`	`}`
`28`	`37`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,13 @@ public class PluginsController : Controller`
`12`	`12`	`{`
`13`	`13`	`private IPluginManager _pluginManager = null;`
`14`	`14`	`private ApplicationPartManager _partManager = null;`
	`15`	`+ private IReferenceContainer _referenceContainer = null;`
`15`	`16`
`16`		`- public PluginsController(IPluginManager pluginManager, ApplicationPartManager partManager)`
	`17`	`+ public PluginsController(IPluginManager pluginManager, ApplicationPartManager partManager, IReferenceContainer referenceContainer)`
`17`	`18`	`{`
`18`	`19`	`_pluginManager = pluginManager;`
`19`	`20`	`_partManager = partManager;`
	`21`	`+ _referenceContainer = referenceContainer;`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`private void RefreshControllerAction()`
`@@ -25,6 +27,13 @@ private void RefreshControllerAction()`
`25`	`27`	`MystiqueActionDescriptorChangeProvider.Instance.TokenSource.Cancel();`
`26`	`28`	`}`
`27`	`29`
	`30`	`+ public IActionResult Assemblies()`
	`31`	`+ {`
	`32`	`+ var items = _referenceContainer.GetAll();`
	`33`	`+`
	`34`	`+ return View(items);`
	`35`	`+ }`
	`36`	`+`
`28`	`37`	`// GET: /<controller>/`
`29`	`38`	`public IActionResult Index()`
`30`	`39`	`{`