Merge branch 'Development' into 'main'

Blazor: Added basic components for Hio Cloud See merge request tools/hio-dotnet!7
hardwario · Jan 7, 2025 · 57c7993 · 57c7993
2 parents 43aa57b + 25669a9
commit 57c7993
Show file tree

Hide file tree

Showing 38 changed files with 1,306 additions and 43 deletions.
diff --git a/hio-dotnet.APIs.HioCloudv2/CloudMessagesGrabberBase.cs b/hio-dotnet.APIs.HioCloudv2/CloudMessagesGrabberBase.cs
@@ -1,11 +1,11 @@
-using hio_dotnet.APIs.HioCloudv2.Models;
+using hio_dotnet.APIs.HioCloud.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2
+namespace hio_dotnet.APIs.HioCloud
 {
     public abstract class CloudMessagesGrabberBase : ICloudMessagesGrabber
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/CloudMessagesGrabbersHandler.cs b/hio-dotnet.APIs.HioCloudv2/CloudMessagesGrabbersHandler.cs
@@ -1,12 +1,12 @@
-using hio_dotnet.APIs.HioCloudv2.Models;
+using hio_dotnet.APIs.HioCloud.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2
+namespace hio_dotnet.APIs.HioCloud
 {
     public class CloudMessagesGrabbersHandler
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/HioCloudDriver.cs b/hio-dotnet.APIs.HioCloudv2/HioCloudDriver.cs
@@ -1,11 +1,11 @@
-using hio_dotnet.APIs.HioCloudv2.Models;
+using hio_dotnet.APIs.HioCloud.Models;
 using System.Data;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Text.Json;
 
-namespace hio_dotnet.APIs.HioCloudv2
+namespace hio_dotnet.APIs.HioCloud
 {
     public class HioCloudDriver
     {
@@ -97,7 +97,15 @@ public async Task<string> GetAuthTokenAsync(string baseUrl, string email, string
                 var credentials = new { email = email, password = password };
                 var content = new StringContent(System.Text.Json.JsonSerializer.Serialize(credentials), Encoding.UTF8, "application/json");
 
-                var response = await httpClient.PostAsync("/v2/auth/login", content);
+                HttpResponseMessage? response = null;
+                try
+                {
+                    response = await httpClient.PostAsync("/v2/auth/login", content);
+                }
+                catch(Exception ex)
+                {
+                    Console.WriteLine(ex.Message);
+                }
                 response.EnsureSuccessStatusCode();
 
                 var responseBody = await response.Content.ReadAsStringAsync();
@@ -508,6 +516,38 @@ private void CheckResponse(HttpResponseMessage? response)
             }
         }
 
+        /// <summary>
+        /// Get one specific message
+        /// </summary>
+        /// <param name="space_id">Guid of space</param>
+        /// <param name="message_id">Guid of message</param>
+        /// <returns>Message List</returns>
+        /// <exception cref="ArgumentException"></exception>
+        /// <exception cref="Exception"></exception>
+        public async Task<HioCloudMessage?> GetMessage(Guid space_id,
+                                                       Guid message_id)
+        {
+            using (var httpClient = GetHioClient())
+            {
+                var url = $"/v2/spaces/{space_id}/messages/{message_id}";
+
+                try
+                {
+                    var response = await httpClient.GetAsync(url);
+                    var cnt = response.Content.ReadAsStringAsync().Result;
+
+                    CheckResponse(response);
+
+                    var devices = System.Text.Json.JsonSerializer.Deserialize<HioCloudMessage?>(cnt);
+                    return devices;
+                }
+                catch (HttpRequestException ex)
+                {
+                    throw new Exception("An error occurred while fetching spaces data.", ex);
+                }
+            }
+        }
+
         /// <summary>
         /// Send downlink message to cloud to the specific device
         /// This version will send message_body as string

diff --git a/hio-dotnet.APIs.HioCloudv2/ICloudMessagesGrabber.cs b/hio-dotnet.APIs.HioCloudv2/ICloudMessagesGrabber.cs
@@ -1,11 +1,11 @@
-using hio_dotnet.APIs.HioCloudv2.Models;
+using hio_dotnet.APIs.HioCloud.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2
+namespace hio_dotnet.APIs.HioCloud
 {
     public interface ICloudMessagesGrabber
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/CloudMessagesGrabberEventArgs.cs b/hio-dotnet.APIs.HioCloudv2/Models/CloudMessagesGrabberEventArgs.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public class CloudMessagesGrabberEventArgs
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/FilterLogicFilters.cs b/hio-dotnet.APIs.HioCloudv2/Models/FilterLogicFilters.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public static class FilterLogicFilters
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudConnector.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudConnector.cs
@@ -5,7 +5,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
 
     public class HioCloudConnector

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudDefaults.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudDefaults.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public static class HioCloudDefaults
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudDevice.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudDevice.cs
@@ -6,7 +6,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public class HioCloudDevice
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudMessage.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudMessage.cs
@@ -5,7 +5,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public class HioCloudMessage
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudMessageDirection.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudMessageDirection.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public static class HioCloudMessageDirection
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudMessageType.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudMessageType.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public static class HioCloudMessageType
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudSpace.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudSpace.cs
@@ -5,7 +5,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public class HioCloudSpace
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/HioCloudTag.cs b/hio-dotnet.APIs.HioCloudv2/Models/HioCloudTag.cs
@@ -6,7 +6,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public class HioCloudTag
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/OrderByFilter.cs b/hio-dotnet.APIs.HioCloudv2/Models/OrderByFilter.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public static class OrderByFilter
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/Models/SortByFilters.cs b/hio-dotnet.APIs.HioCloudv2/Models/SortByFilters.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2.Models
+namespace hio_dotnet.APIs.HioCloud.Models
 {
     public static class SortByFilters
     {

diff --git a/hio-dotnet.APIs.HioCloudv2/SimpleCloudMessageGrabber.cs b/hio-dotnet.APIs.HioCloudv2/SimpleCloudMessageGrabber.cs
@@ -1,4 +1,4 @@
-using hio_dotnet.APIs.HioCloudv2.Models;
+using hio_dotnet.APIs.HioCloud.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace hio_dotnet.APIs.HioCloudv2
+namespace hio_dotnet.APIs.HioCloud
 {
     public class SimpleCloudMessageGrabber : CloudMessagesGrabberBase
     {

diff --git a/hio-dotnet.Demos.HardwarioMonitor/Components/Layout/MainLayout.razor b/hio-dotnet.Demos.HardwarioMonitor/Components/Layout/MainLayout.razor
@@ -21,6 +21,7 @@
                         <RadzenPanelMenuItem Text="Home" Icon="home" Path="/" MouseEnter="@(args => ShowTooltip(args, new TooltipOptions() { Text = "Home", Position = TooltipPosition.Right }) )" />
                         <RadzenPanelMenuItem Text="Graph" Icon="monitoring" Path="/graph" MouseEnter="@(args => ShowTooltip(args, new TooltipOptions() { Text = "Counter", Position = TooltipPosition.Right }) )" />
                         <RadzenPanelMenuItem Text="Configs" Icon="manufacturing" Path="/configs" MouseEnter="@(args => ShowTooltip(args, new TooltipOptions() { Text = "Configs", Position = TooltipPosition.Right }) )" />
+                        <RadzenPanelMenuItem Text="Cloud" Icon="cloud" Path="/hiocloud" MouseEnter="@(args => ShowTooltip(args, new TooltipOptions() { Text = "Cloud", Position = TooltipPosition.Right }) )" />
                     </RadzenPanelMenu>
                 </RadzenColumn>
             </RadzenRow>

diff --git a/hio-dotnet.Demos.HardwarioMonitor/Components/Pages/HioCloud.razor b/hio-dotnet.Demos.HardwarioMonitor/Components/Pages/HioCloud.razor
@@ -0,0 +1,118 @@
+@using Services
+@using hio_dotnet.UI.BlazorComponents.Radzen.CHESTER.HioCloud.Models
+@using hio_dotnet.UI.BlazorComponents.Radzen.CHESTER.HioCloud
+
+@page "/hiocloud"
+
+@inject ConsoleService ConsoleService
+
+<RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center">
+    <!-- Loading overlay -->
+    @if (isBusy)
+    {
+        <RadzenCard Style="z-index: 3; text-align: center; position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; background: rgba(0, 0, 0, .5)">
+            <div style="display: flex; justify-content: center; align-items: center; height: 100%; width: 100%;">
+                <RadzenProgressBarCircular ShowValue="true" Mode="ProgressBarMode.Indeterminate" Size="ProgressBarCircularSize.Medium">
+                    <Template>Wait</Template>
+                </RadzenProgressBarCircular>
+            </div>
+        </RadzenCard>
+    }
+</RadzenStack>
+
+<RadzenLayout Style="height: 100%; grid-template-rows: 1fr; grid-template-columns: 1fr auto; grid-template-areas: 'rz-body rz-sidebar'">
+    <RadzenSidebar Style="padding: 5px;">
+        <HioCloudLoginButton OnLoggedIn="@OnLoggedInHandler" OnLoggingIn="OnLoggingInHandler" Style="margin-top: 5px; width: 100%;" />
+    </RadzenSidebar>
+    <RadzenBody>
+        <RadzenRow Style="height: 100%;">
+            <RadzenColumn Style="height: 100%;">
+
+                <RadzenRow>
+                    <RadzenColumn Size="3">
+                        <HioCloudTreeView @ref=hioCloudTreeViewRef OnOpenMessageRequest="@OnOpenMessageHandler" 
+                                                                   OnOpenDeviceRequest="@OnOpenDeviceHandler"
+                                                                   OnOpenSpaceRequest="@OnOpenSpaceHandler"/>
+                    </RadzenColumn>
+                    <RadzenColumn Size="9">
+                        <HioCloudTabs @ref=hioCloudTabsRef />
+                    </RadzenColumn>
+                </RadzenRow>
+
+            </RadzenColumn>
+        </RadzenRow>
+    </RadzenBody>
+</RadzenLayout>
+
+
+@code {
+    private bool isBusy = false;
+    HioCloudTreeView? hioCloudTreeViewRef;
+    HioCloudTabs? hioCloudTabsRef;
+
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+    }
+
+    public async Task Refresh()
+    {
+        await InvokeAsync(StateHasChanged);
+    }
+
+    public async Task OnLoggingInHandler(bool busy)
+    {
+        isBusy = busy;
+    }
+
+    public async Task OnLoggedInHandler(bool isLoggedIn)
+    {
+        isBusy = false;
+        if (hioCloudTreeViewRef != null)
+        {
+            await hioCloudTreeViewRef.GetSpaces();
+        }
+    }
+
+    public async Task OnOpenMessageHandler(Message msg)
+    {
+        if (hioCloudTabsRef != null)
+        {
+            await hioCloudTabsRef.AddTab(new OpenedTab()
+                    {
+                        Data = msg,
+                        Type = OpenedTabType.Message,
+                        Id = msg.Id,
+                        Title = msg.Text
+                    });
+        }
+    }
+
+    public async Task OnOpenDeviceHandler(Device device)
+    {
+        if (hioCloudTabsRef != null)
+        {
+            await hioCloudTabsRef.AddTab(new OpenedTab()
+                {
+                    Data = device,
+                    Type = OpenedTabType.Device,
+                    Id = device.Id,
+                    Title = device.Name
+                });
+        }
+    }
+
+    public async Task OnOpenSpaceHandler(Space space)
+    {
+        if (hioCloudTabsRef != null)
+        {
+            await hioCloudTabsRef.AddTab(new OpenedTab()
+                {
+                    Data = space,
+                    Type = OpenedTabType.Space,
+                    Id = space.Id,
+                    Title = space.Name
+                });
+        }
+    }
+}
diff --git a/hio-dotnet.Demos.HardwarioMonitor/MauiProgram.cs b/hio-dotnet.Demos.HardwarioMonitor/MauiProgram.cs
@@ -1,4 +1,6 @@
-using hio_dotnet.Demos.HardwarioMonitor.Services;
+using CommunityToolkit.Maui;
+using hio_dotnet.Demos.HardwarioMonitor.Services;
+using hio_dotnet.UI.BlazorComponents.Radzen.Services;
 using Microsoft.Extensions.Logging;
 using Radzen;
 using System.Reflection;
@@ -13,6 +15,7 @@ public static MauiApp CreateMauiApp()
             var builder = MauiApp.CreateBuilder();
             builder
                 .UseMauiApp<App>()
+                .UseMauiCommunityToolkit()
                 .ConfigureFonts(fonts =>
                 {
                     fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
@@ -21,6 +24,7 @@ public static MauiApp CreateMauiApp()
             builder.Services.AddMauiBlazorWebView();
             builder.Services.AddRadzenComponents();
             builder.Services.AddScoped<ConsoleService>();
+            builder.Services.AddScoped<HioCloudService>();
 
 #if DEBUG
             builder.Services.AddBlazorWebViewDeveloperTools();