Merge pull request #62 from qJake/project-updates

Hass.io API fixes
qJake · Feb 8, 2020 · e53600b · e53600b
2 parents f7571fa + 876f370
commit e53600b
Show file tree

Hide file tree

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

diff --git a/HADotNet.CommandCenter/Controllers/AdminController.cs b/HADotNet.CommandCenter/Controllers/AdminController.cs
@@ -90,12 +90,14 @@ public async Task<IActionResult> Settings()
         }
 
         [HttpPost]
-        public async Task<IActionResult> Settings(SystemSettings newSettings)
+        public async Task<IActionResult> Settings([FromForm] SystemSettings newSettings)
         {
             try
             {
                 if (ModelState.IsValid)
                 {
+                    newSettings ??= new SystemSettings();
+
                     if (newSettings.IsHassIo)
                     {
                         newSettings.BaseUri = "http://hassio/homeassistant";

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.3.0</AssemblyVersion>
-    <FileVersion>1.0.3.0</FileVersion>
+    <AssemblyVersion>1.0.4.0</AssemblyVersion>
+    <FileVersion>1.0.4.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Deterministic>false</Deterministic>

diff --git a/HADotNet.CommandCenter/Views/Admin/Settings.cshtml b/HADotNet.CommandCenter/Views/Admin/Settings.cshtml
@@ -49,6 +49,9 @@
 }
 
 <form class="ui form" asp-action="Settings" method="post">
+
+    <input type="hidden" asp-for="IsHassIo" />
+
     @if (Model?.IsHassIo ?? false)
     {
         <div class="ui icon labeled info message">
@@ -59,6 +62,9 @@
             </div>
         </div>
 
+        <input type="hidden" asp-for="BaseUri" />
+        <input type="hidden" asp-for="AccessToken" />
+
         <div class="ui grid">
             <div class="row">
                 <div class="six wide computer twelve wide tablet sixteen wide mobile column">

diff --git a/HADotNet.CommandCenter/Views/Dashboard/Index.cshtml b/HADotNet.CommandCenter/Views/Dashboard/Index.cshtml
@@ -130,6 +130,7 @@
         window.ccOptions.autoReturn = @Model.CurrentPage.AutoReturnSeconds;
         window.ccOptions.pageId = '@Model.CurrentPage.Name';
         window.ccOptions.baseUrl = '@Model.SystemSettings.BaseUri';
+        window.ccOptions.socketUrl = '@(Model.SystemSettings.IsHassIo ? "http://hassio/homeassistant/websocket" : Model.SystemSettings.BaseUri)';
         window.ccOptions.overrideAssetUrl = '@Model.SystemSettings.OverrideAssetUri';
         window.ccOptions.token = '@Model.SystemSettings.AccessToken';
     </script>

diff --git a/HADotNet.CommandCenter/wwwroot/js/app.js b/HADotNet.CommandCenter/wwwroot/js/app.js
@@ -997,8 +997,8 @@ class CommandCenter {
         }
     }
     initUser() {
-        if (window.ccOptions.baseUrl) {
-            this.conn = new HAConnection(window.ccOptions.baseUrl);
+        if (window.ccOptions.socketUrl) {
+            this.conn = new HAConnection(window.ccOptions.socketUrl);
         }
         this.conn.OnConnectionStateChanged.on(state => {
             if (state == HAConnectionState.Closed) {

diff --git a/HADotNet.CommandCenter/wwwroot/js/app.min.js b/HADotNet.CommandCenter/wwwroot/js/app.min.js
diff --git a/HADotNet.CommandCenter/wwwroot/js/app.ts b/HADotNet.CommandCenter/wwwroot/js/app.ts
@@ -149,9 +149,9 @@ class CommandCenter
 
     private initUser(): void
     {
-        if (window.ccOptions.baseUrl)
+        if (window.ccOptions.socketUrl)
         {
-            this.conn = new HAConnection(window.ccOptions.baseUrl);
+            this.conn = new HAConnection(window.ccOptions.socketUrl);
         }
 
         this.conn.OnConnectionStateChanged.on(state =>

diff --git a/HADotNet.CommandCenter/wwwroot/js/typings/window-options.d.ts b/HADotNet.CommandCenter/wwwroot/js/typings/window-options.d.ts
@@ -4,6 +4,7 @@ declare interface ICcOptions
 {
     baseUrl: string;
     overrideAssetUrl: string;
+    socketUrl: string;
     token: string;
     tilePadding: number;
     tilePreviewPadding: number;