Device model details

src/AzureIoTHub.Portal/Client/AzureIoTHub.Portal.Client.csproj

@@ -47,6 +47,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Remove="compilerconfig.json" />
     <Content Remove="package-lock.json" />
     <Content Remove="package.json" />
   </ItemGroup>

src/AzureIoTHub.Portal/Client/Pages/DeviceModels/CreateDeviceModelPage.razor

@@ -74,7 +74,7 @@
                                            Color="Color.Primary"
                                            StartIcon="@Icons.Filled.CloudUpload"
                                            for="fileInput">
-                                    Upload an images
+                                    Upload an image
                                 </MudButton>
 
                                 @if (_selectedImage != null)

src/AzureIoTHub.Portal/Client/Pages/DeviceModels/DeviceModelListPage.razor

@@ -25,9 +25,10 @@
             <MudItem xs="12">
                 <MudTable Items="@result" Dense=true Breakpoint="Breakpoint.Sm" Hover=true Bordered=true Striped=true>
                     <ColGroup>
+                        <col style="width: 5%;" />
                         <col style="width: 30%;" />
                         <col style="width: 30%;" />
-                        <col style="width: 30%;" />
+                        <col style="width: 25%;" />
                         <col style="width: 5%;" />
                         <col style="width: 5%;" />
                     </ColGroup>
@@ -37,13 +38,17 @@
                         <MudIconButton Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="LoadDeviceModels" Class="ma-2"></MudIconButton>
                     </ToolBarContent>
                     <HeaderContent>
+                        <MudTh></MudTh>
                         <MudTh>Name</MudTh>
                         <MudTh Style="text-align: center">Description</MudTh>
                         <MudTh Style="text-align: center">AppEUI</MudTh>
                         <MudTh Style="text-align: center">Details</MudTh>
                         <MudTh Style="text-align: center">Delete</MudTh>
                     </HeaderContent>
                     <RowTemplate>
+                        <MudTd Style="text-align: center">
+                            <img height="25" src="@context.ImageUrl" />
+                        </MudTd>
                         <MudTd DataLabel="Name" Style="word-break: break-all;">
                             <a href="/device-models/@context.ModelId">@context.Name</a>
                         </MudTd>

src/AzureIoTHub.Portal/Client/wwwroot/scss/app.scss

@@ -22,6 +22,11 @@
     width : 35px;
 }
 
+.img-device-model {
+    max-width: 200px;
+    margin-top: 1em;
+}
+
 /*//////////////////// Search Panel ////////////////*/
 .search-panel {
     /*width: max-content;*/

src/AzureIoTHub.Portal/Server/Controllers/CommandsController.cs

@@ -0,0 +1,77 @@
+// Copyright (c) CGI France. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace AzureIoTHub.Portal.Server.Controllers
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Azure.Data.Tables;
+    using AzureIoTHub.Portal.Server.Factories;
+    using AzureIoTHub.Portal.Server.Helpers;
+    using AzureIoTHub.Portal.Server.Managers;
+    using AzureIoTHub.Portal.Server.Mappers;
+    using AzureIoTHub.Portal.Server.Services;
+    using AzureIoTHub.Portal.Shared.Models;
+    using AzureIoTHub.Portal.Shared.Security;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Mvc;
+    using Newtonsoft.Json;
+
+    [Authorize]
+    [ApiController]
+    [Route("api/[controller]")]
+    [Authorize(Roles = RoleNames.Admin)]
+    public class CommandsController : ControllerBase
+    {
+        private readonly ITableClientFactory tableClientFactory;
+        private readonly IDeviceModelCommandMapper deviceModelCommandMapper;
+
+        public CommandsController(
+            IDeviceModelCommandMapper deviceModelCommandMapper,
+            ITableClientFactory tableClientFactory)
+        {
+            this.tableClientFactory = tableClientFactory;
+            this.deviceModelCommandMapper = deviceModelCommandMapper;
+        }
+
+        /// <summary>
+        /// Add a command to an Azure DataTable.
+        /// </summary>
+        /// <returns>Operation status.</returns>
+        [HttpPost("{modelId}")]
+        public async Task<IActionResult> Post(string modelId, DeviceModelCommand command)
+        {
+            try
+            {
+                TableEntity entity = new TableEntity()
+                {
+                    PartitionKey = modelId,
+                    RowKey = command.Name
+                };
+                this.deviceModelCommandMapper.UpdateTableEntity(entity, command);
+                await this.tableClientFactory
+                    .GetDeviceCommands()
+                    .AddEntityAsync(entity);
+                return this.Ok("Command successfully added");
+            }
+            catch (Exception e)
+            {
+                return this.BadRequest(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// Delete a command from an Azure DataTable.
+        /// </summary>
+        /// <returns>Operation status.</returns>
+        [HttpDelete("{modelId}/{commandId}")]
+        public async Task<IActionResult> Delete(string modelId, string commandId)
+        {
+            var result = await this.tableClientFactory.GetDeviceCommands().DeleteEntityAsync(modelId, commandId);
+            return this.StatusCode(result.Status);
+        }
+    }
+}

src/AzureIoTHub.Portal/Server/Controllers/DeviceModelsController.cs

@@ -67,9 +67,9 @@ public IEnumerable<DeviceModel> Get()
         }
 
         /// <summary>
-        /// Gets a list of device models from an Azure DataTable.
+        /// Get a specific device model from an Azure DataTable.
         /// </summary>
-        /// <returns>A list of DeviceModel.</returns>
+        /// <returns>A DeviceModel.</returns>
         [HttpGet("{modelID}")]
         public IActionResult Get(string modelID)
         {
@@ -85,6 +85,12 @@ public IActionResult Get(string modelID)
             return this.Ok(this.deviceModelMapper.CreateDeviceModel(query.Single()));
         }
 
+        [HttpGet("{modelID}/image")]
+        public Uri GetImage(string modelID)
+        {
+            return this.deviceModelImageManager.ComputeImageUri(modelID);
+        }
+
         [HttpPost]
         public async Task<IActionResult> Post([FromForm] string deviceModel, [FromForm] IFormFile file = null)
         {

src/AzureIoTHub.Portal/Server/Managers/DeviceModelCommandsManager.cs

@@ -0,0 +1,88 @@
+// Copyright (c) CGI France. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace AzureIoTHub.Portal.Server.Managers
+{
+    using System;
+    using System.Collections.Generic;
+    using Azure.Data.Tables;
+    using AzureIoTHub.Portal.Server.Factories;
+    using AzureIoTHub.Portal.Shared.Models;
+    using AzureIoTHub.Portal.Shared.Models.Device;
+
+    public class DeviceModelCommandsManager : IDeviceModelCommandsManager
+    {
+        private readonly ITableClientFactory tableClientFactory;
+
+        public DeviceModelCommandsManager(ITableClientFactory tableClientFactory)
+        {
+            this.tableClientFactory = tableClientFactory;
+        }
+
+        /// <summary>
+        /// Retrieve all the commands from a devicemodel.
+        /// </summary>
+        /// <param name="deviceModel"> the model type of the device.</param>
+        /// <returns>Corresponding list of commands or an empty list if it doesn't have any command.</returns>
+        public List<Command> RetrieveCommands(string deviceModel)
+        {
+            var commands = new List<Command>();
+
+            if (deviceModel == null)
+            {
+                return commands;
+            }
+
+            var queryResultsFilter = this.tableClientFactory
+                    .GetDeviceCommands()
+                    .Query<TableEntity>(filter: $"PartitionKey  eq '{deviceModel}'");
+
+            foreach (TableEntity qEntity in queryResultsFilter)
+            {
+                commands.Add(
+                    new Command()
+                    {
+                        CommandId = qEntity.RowKey,
+                        Frame = qEntity[nameof(Command.Frame)].ToString()
+                    });
+            }
+
+            return commands;
+        }
+
+        public List<DeviceModelCommand> RetrieveDeviceModelCommands(string deviceModel)
+        {
+            var commands = new List<DeviceModelCommand>();
+
+            if (deviceModel == null)
+            {
+                return commands;
+            }
+
+            var queryResultsFilter = this.tableClientFactory
+                    .GetDeviceCommands()
+                    .Query<TableEntity>(filter: $"PartitionKey  eq '{deviceModel}'");
+
+            foreach (TableEntity qEntity in queryResultsFilter)
+            {
+                try
+                {
+                    commands.Add(
+                    new DeviceModelCommand()
+                    {
+                        CommandId = qEntity.RowKey,
+                        Name = qEntity.RowKey,
+                        Frame = qEntity[nameof(DeviceModelCommand.Frame)].ToString(),
+                        Port = int.Parse(qEntity[nameof(DeviceModelCommand.Port)].ToString())
+                    });
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine(ex);
+                }
+            }
+
+            return commands;
+        }
+    }
+}

src/AzureIoTHub.Portal/Server/Managers/DeviceModelImageManager.cs

@@ -30,22 +30,22 @@ public DeviceModelImageManager(ILogger<DeviceModelImageManager> logger, BlobServ
             blobClient.CreateIfNotExists();
         }
 
-        public async Task<Uri> ChangeDeviceModelImageAsync(string deviceModelName, Stream stream)
+        public async Task<Uri> ChangeDeviceModelImageAsync(string deviceModelId, Stream stream)
         {
             var blobContainer = this.blobService.GetBlobContainerClient(ImageContainerName);
 
-            var blobClient = blobContainer.GetBlobClient(deviceModelName);
+            var blobClient = blobContainer.GetBlobClient(deviceModelId);
 
             this.logger.LogInformation($"Uploading to Blob storage as blob:\n\t {blobClient.Uri}\n");
 
-            _ = await blobClient.UploadAsync(stream);
+            _ = await blobClient.UploadAsync(stream, overwrite: true);
 
             return blobClient.Uri;
         }
 
-        public Uri ComputeImageUri(string deviceModelName)
+        public Uri ComputeImageUri(string deviceModelId)
         {
-            var imageName = string.IsNullOrWhiteSpace(deviceModelName) ? DefaultImageName : deviceModelName;
+            var imageName = string.IsNullOrWhiteSpace(deviceModelId) ? DefaultImageName : deviceModelId;
 
             var container = this.blobService.GetBlobContainerClient(ImageContainerName);
             var blobClient = container.GetBlobClient(imageName);

src/AzureIoTHub.Portal/Server/Managers/IDeviceModelCommandsManager.cs

@@ -0,0 +1,16 @@
+// Copyright (c) CGI France. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace AzureIoTHub.Portal.Server.Managers
+{
+    using System.Collections.Generic;
+    using AzureIoTHub.Portal.Shared.Models;
+    using AzureIoTHub.Portal.Shared.Models.Device;
+
+    public interface IDeviceModelCommandsManager
+    {
+        List<Command> RetrieveCommands(string deviceModel);
+
+        List<DeviceModelCommand> RetrieveDeviceModelCommands(string deviceModel);
+    }
+}

src/AzureIoTHub.Portal/Server/Managers/IDeviceModelImageManager.cs

@@ -9,9 +9,9 @@ namespace AzureIoTHub.Portal.Server.Managers
 
     public interface IDeviceModelImageManager
     {
-        Uri ComputeImageUri(string deviceModelName);
+        Uri ComputeImageUri(string deviceModelId);
 
-        Task<Uri> ChangeDeviceModelImageAsync(string deviceModelName, Stream stream);
+        Task<Uri> ChangeDeviceModelImageAsync(string deviceModelId, Stream stream);
 
         Task InitializeDefaultImageBlob();
     }

src/AzureIoTHub.Portal/Server/Mappers/DeviceModelMapper.cs

@@ -10,10 +10,12 @@ namespace AzureIoTHub.Portal.Server.Mappers
     public class DeviceModelMapper : IDeviceModelMapper
     {
         private readonly IDeviceModelImageManager deviceModelImageManager;
+        private readonly IDeviceModelCommandsManager deviceModelCommandsManager;
 
-        public DeviceModelMapper(IDeviceModelImageManager deviceModelImageManager)
+        public DeviceModelMapper(IDeviceModelImageManager deviceModelImageManager, IDeviceModelCommandsManager deviceModelCommandsManager)
         {
             this.deviceModelImageManager = deviceModelImageManager;
+            this.deviceModelCommandsManager = deviceModelCommandsManager;
         }
 
         public DeviceModel CreateDeviceModel(TableEntity entity)
@@ -25,7 +27,8 @@ public DeviceModel CreateDeviceModel(TableEntity entity)
                 Name = entity[nameof(DeviceModel.Name)]?.ToString(),
                 Description = entity[nameof(DeviceModel.Description)]?.ToString(),
                 AppEUI = entity[nameof(DeviceModel.AppEUI)]?.ToString(),
-                SensorDecoderURL = entity[nameof(DeviceModel.SensorDecoderURL)]?.ToString()
+                SensorDecoderURL = entity[nameof(DeviceModel.SensorDecoderURL)]?.ToString(),
+                Commands = this.deviceModelCommandsManager.RetrieveDeviceModelCommands(entity.RowKey)
             };
         }
 

src/AzureIoTHub.Portal/Server/Mappers/DeviceTwinMapper.cs

@@ -15,11 +15,13 @@ namespace AzureIoTHub.Portal.Server.Mappers
     internal class DeviceTwinMapper : IDeviceTwinMapper
     {
         private readonly IDeviceModelImageManager deviceModelImageManager;
+        private readonly IDeviceModelCommandsManager deviceModelCommandsManager;
         private readonly ITableClientFactory tableClientFactory;
 
-        public DeviceTwinMapper(IDeviceModelImageManager deviceModelImageManager, ITableClientFactory tableClientFactory)
+        public DeviceTwinMapper(IDeviceModelImageManager deviceModelImageManager, IDeviceModelCommandsManager deviceModelCommandsManager, ITableClientFactory tableClientFactory)
         {
             this.deviceModelImageManager = deviceModelImageManager;
+            this.deviceModelCommandsManager = deviceModelCommandsManager;
             this.tableClientFactory = tableClientFactory;
         }
 
@@ -42,7 +44,7 @@ public DeviceDetails CreateDeviceDetails(Twin twin)
                 AssetID = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.AssetID)),
                 SensorDecoder = Helpers.DeviceHelper.RetrievePropertyValue(twin, nameof(DeviceDetails.SensorDecoder)),
                 DeviceType = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.DeviceType)),
-                Commands = this.RetrieveCommands(modelId)
+                Commands = this.deviceModelCommandsManager.RetrieveCommands(modelId)
             };
         }
 
@@ -74,36 +76,5 @@ public void UpdateTwin(Twin twin, DeviceDetails item)
             twin.Properties.Desired[nameof(item.AppKey)] = item.AppKey;
             twin.Properties.Desired[nameof(item.SensorDecoder)] = item.SensorDecoder;
         }
-
-        /// <summary>
-        /// Retrieve all the commands of a device.
-        /// </summary>
-        /// <param name="deviceModel"> the model type of the device.</param>
-        /// <returns>Corresponding list of commands or an empty list if it doesn't have any command.</returns>
-        private List<Command> RetrieveCommands(string deviceModel)
-        {
-            var commands = new List<Command>();
-
-            if (deviceModel == null)
-            {
-                return commands;
-            }
-
-            var queryResultsFilter = this.tableClientFactory
-                    .GetDeviceCommands()
-                    .Query<TableEntity>(filter: $"PartitionKey  eq '{deviceModel}'");
-
-            foreach (TableEntity qEntity in queryResultsFilter)
-            {
-                commands.Add(
-                    new Command()
-                    {
-                        CommandId = qEntity.RowKey,
-                        Frame = qEntity[nameof(Command.Frame)].ToString()
-                    });
-            }
-
-            return commands;
-        }
     }
 }