Merge pull request #113 from qJake/v1.1-prep

Basic caching and Calendar fix
qJake · Jan 25, 2021 · 8c1f8dd · 8c1f8dd
2 parents e18cf4d + 2aca0af
commit 8c1f8dd
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 13 deletions.
diff --git a/Docker/BuildHaccContainers.ps1 b/Docker/BuildHaccContainers.ps1
@@ -1,4 +1,4 @@
-$version = '1.0.25'
+$version = '1.0.26'
 
 function Test-ExitCode ([int] $Expected = 0)
 {

diff --git a/HADotNet.CommandCenter/Controllers/CalendarTileController.cs b/HADotNet.CommandCenter/Controllers/CalendarTileController.cs
@@ -24,6 +24,8 @@ public CalendarTileController(IConfigStore configStore, EntityClient entityClien
         public async Task<IActionResult> Add()
         {
             ViewBag.Entities = (await EntityClient.GetEntities("calendar")).OrderBy(e => e).Select(e => new SelectListItem(e, e));
+            ViewBag.CurrentConfig = await ConfigStore.GetConfigAsync();
+
             return View();
         }
 
@@ -35,6 +37,7 @@ public async Task<IActionResult> Edit([FromRoute] string page, [FromQuery] strin
             var tile = config[page].Tiles.FirstOrDefault(t => t.Name == name);
 
             ViewBag.Entities = (await EntityClient.GetEntities("calendar")).OrderBy(e => e).Select(e => new SelectListItem(e, e));
+            ViewBag.CurrentConfig = await ConfigStore.GetConfigAsync();
 
             return View("Add", tile);
         }
@@ -48,6 +51,8 @@ public async Task<IActionResult> Save([FromRoute] string page, CalendarTile tile
             }
 
             ViewBag.Entities = (await EntityClient.GetEntities("calendar")).OrderBy(e => e).Select(e => new SelectListItem(e, e));
+            ViewBag.CurrentConfig = await ConfigStore.GetConfigAsync();
+
             return View("Add", tile);
         }
     }

diff --git a/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj b/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj
@@ -5,8 +5,8 @@
     <RuntimeIdentifiers>win10;alpine.3.10-x64;debian.10-arm</RuntimeIdentifiers>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AssemblyVersion>1.0.25.0</AssemblyVersion>
-    <FileVersion>1.0.25.0</FileVersion>
+    <AssemblyVersion>1.0.26.0</AssemblyVersion>
+    <FileVersion>1.0.26.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Deterministic>false</Deterministic>

diff --git a/HADotNet.CommandCenter/Hubs/TileHub.cs b/HADotNet.CommandCenter/Hubs/TileHub.cs
@@ -12,15 +12,13 @@ public class TileHub : Hub<ITileHub>
     {
         private StatesClient StatesClient { get; }
         public ServiceClient ServiceClient { get; }
-        public CalendarClient CalendarClient { get; }
         public IConfigStore ConfigStore { get; }
 
-        public TileHub(StatesClient statesClient, ServiceClient serviceClient, CalendarClient calendarClient, IConfigStore configStore)
+        public TileHub(StatesClient statesClient, ServiceClient serviceClient, IConfigStore configStore)
         {
             StatesClient = statesClient;
             ServiceClient = serviceClient;
             ConfigStore = configStore;
-            CalendarClient = calendarClient;
         }
 
         public async Task RequestTileState(string page, string tileName)
@@ -66,8 +64,14 @@ private async Task ProcessOverrides(BaseTile tile)
             {
                 // Calendars use a special API that isn't (might not be?) exposed via the WebSocket API.
                 case CalendarTile ct:
+                    // Required because for some reason, the calendar API is not available
+                    // via the "inside" supervisor API, only the "external" fully-qualified
+                    // API endpoint.
+                    var config = await ConfigStore.GetConfigAsync();
+                    var calClient = new CalendarClient(new Uri(config.Settings.OverrideAssetUri), config.Settings.AccessToken);
+
                     var state = await StatesClient.GetState(ct.EntityId);
-                    var calItems = await CalendarClient.GetEvents(ct.EntityId);
+                    var calItems = await calClient.GetEvents(ct.EntityId);
                     await Clients.Caller.SendCalendarInfo(ct, state, calItems);
                     break;
 

diff --git a/HADotNet.CommandCenter/Services/JsonConfigStore.cs b/HADotNet.CommandCenter/Services/JsonConfigStore.cs
@@ -40,6 +40,8 @@ public class JsonConfigStore : IConfigStore
         private HaccOptions Options { get; }
         private ILogger<JsonConfigStore> Log { get; }
 
+        private static ConfigRoot CachedConfig { get; set; } = null;
+
         public JsonConfigStore(IOptions<HaccOptions> haccOptions, ILogger<JsonConfigStore> log)
         {
             Options = haccOptions.Value;
@@ -67,6 +69,11 @@ public async Task ManipulateConfig(params Action<ConfigRoot>[] changes)
 
         public async Task<ConfigRoot> GetConfigAsync()
         {
+            if (CachedConfig != null)
+            {
+                return CachedConfig;
+            }
+
             if (CheckPermissions())
             {
                 // One-time config Linux platform migration
@@ -106,6 +113,8 @@ public async Task<ConfigRoot> GetConfigAsync()
 
                 var cfg = JsonConvert.DeserializeObject<ConfigRoot>(contents, SerializerSettings);
 
+                CachedConfig = cfg;
+
                 return cfg;
             }
             else
@@ -116,6 +125,7 @@ public async Task<ConfigRoot> GetConfigAsync()
 
         public async Task SaveConfigAsync(ConfigRoot config)
         {
+            CachedConfig = null;
             if (CheckPermissions())
             {
                 await File.WriteAllTextAsync(ConfigPath, JsonConvert.SerializeObject(config, SerializerSettings));

diff --git a/HADotNet.CommandCenter/Startup.cs b/HADotNet.CommandCenter/Startup.cs
@@ -73,7 +73,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddScoped(_ => ClientFactory.GetClient<StatesClient>());
             services.AddScoped(_ => ClientFactory.GetClient<ServiceClient>());
             services.AddScoped(_ => ClientFactory.GetClient<DiscoveryClient>());
-            services.AddScoped(_ => ClientFactory.GetClient<CalendarClient>());
 
             services.AddSignalR()
                     .AddNewtonsoftJsonProtocol();

diff --git a/HADotNet.CommandCenter/Views/Admin/Settings.cshtml b/HADotNet.CommandCenter/Views/Admin/Settings.cshtml
@@ -89,7 +89,10 @@
                                 <i class="globe icon"></i>
                                 <input asp-for="OverrideAssetUri" />
                             </div>
-                            <small>If your image assets are not showing up correctly, you can enter a base URL to use. This URL must start with http(s):// and be accessible from your HACC device.</small>
+                            <small>
+                                If your image assets are not showing up correctly, you can enter a base URL to use. This URL must start with http(s):// and be accessible from your HACC device.<br /><br />
+                                This is also required if you want to use a <b>calendar</b> tile, due to the way the API call is handled.
+                            </small>
                             <span class="ui up pointing small red label" asp-validation-for="OverrideAssetUri"></span>
                         </div>
                     </div>
@@ -128,7 +131,11 @@
                                 <i class="globe icon"></i>
                                 <input asp-for="OverrideAssetUri" />
                             </div>
-                            <small>If your image assets are not showing up correctly, you can enter a base URL to use. This URL must start with http(s):// and be accessible from your HACC device.</small>
+                            <small>
+                                If your image assets are not showing up correctly, you can enter a base URL to use. This URL must start with http(s):// and be accessible from your HACC device.<br /><br />
+                                This is also required if you want to use a <b>calendar</b> tile, due to the way the API call is handled.<br /><br />
+                                For non-supervised environments, this can be (and is usually) the same as your <b>Home Assistant Base URL</b>, so try that if you aren't sure.
+                            </small>
                             <span class="ui up pointing small red label" asp-validation-for="OverrideAssetUri"></span>
                         </div>
                     </div>

diff --git a/HADotNet.CommandCenter/Views/CalendarTile/Add.cshtml b/HADotNet.CommandCenter/Views/CalendarTile/Add.cshtml
@@ -13,7 +13,7 @@
     @Html.Raw(header)
 </h1>
 
-@if (SupervisorEnvironment.IsSupervisorAddon)
+@if (SupervisorEnvironment.IsSupervisorAddon && string.IsNullOrWhiteSpace((ViewBag.CurrentConfig as ConfigRoot)?.Settings?.OverrideAssetUri))
 {
     <div class="ui visible icon labeled warning message">
         <i class="triangle exclamation icon"></i>

diff --git a/HADotNet.CommandCenter/wwwroot/css/admin.min.css b/HADotNet.CommandCenter/wwwroot/css/admin.min.css
diff --git a/HADotNet.CommandCenter/wwwroot/css/dashboard.css b/HADotNet.CommandCenter/wwwroot/css/dashboard.css
@@ -155,6 +155,7 @@ body.dashboard .debug-window {
 }
 .tile.tile-type--calendar {
   justify-content: flex-start !important;
+  overflow-y: auto !important;
 }
 .tile.tile-type--calendar .top-label {
   display: block;

diff --git a/HADotNet.CommandCenter/wwwroot/css/dashboard.less b/HADotNet.CommandCenter/wwwroot/css/dashboard.less
@@ -218,6 +218,7 @@ body.dashboard
     &.tile-type--calendar
     {
         justify-content: flex-start !important;
+        overflow-y: auto !important;
 
         .top-label
         {

diff --git a/HADotNet.CommandCenter/wwwroot/css/dashboard.min.css b/HADotNet.CommandCenter/wwwroot/css/dashboard.min.css