Change GatewayID field to list in device creation/edition pages

src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/LoRaWan/CreateLoraDeviceTests.cs

@@ -5,10 +5,13 @@ namespace AzureIoTHub.Portal.Tests.Unit.Client.Pages.Devices
 {
     using System;
     using AzureIoTHub.Portal.Client.Pages.Devices.LoRaWAN;
+    using AzureIoTHub.Portal.Client.Services;
     using AzureIoTHub.Portal.Client.Validators;
     using AzureIoTHub.Portal.Models.v10.LoRaWAN;
+    using AzureIoTHub.Portal.Shared.Models.v1._0;
     using Bunit;
     using Microsoft.Extensions.DependencyInjection;
+    using Moq;
     using MudBlazor.Services;
     using NUnit.Framework;
     using UnitTests.Bases;
@@ -17,10 +20,14 @@ namespace AzureIoTHub.Portal.Tests.Unit.Client.Pages.Devices
     [TestFixture]
     public class CreateLoraDeviceTests : BlazorUnitTest
     {
+        private Mock<ILoRaWanDeviceClientService> mockLoRaWanDeviceClientService;
 
         public override void Setup()
         {
             base.Setup();
+            this.mockLoRaWanDeviceClientService = MockRepository.Create<ILoRaWanDeviceClientService>();
+
+            _ = Services.AddSingleton(this.mockLoRaWanDeviceClientService.Object);
 
             Services.Add(new ServiceDescriptor(typeof(IResizeObserver), new MockResizeObserver()));
         }
@@ -44,6 +51,9 @@ public void WhenUseOTAAShouldDisplayOTAATextboxes()
 
             var validator = new LoRaDeviceDetailsValidator();
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
 
             var cut = RenderComponent<CreateLoraDevice>(
@@ -76,6 +86,9 @@ public void WhenNotUseOTAAShouldDisplayABPTextboxes()
             };
             var validator = new LoRaDeviceDetailsValidator();
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
             var cut = RenderComponent<CreateLoraDevice>(
             ComponentParameter.CreateParameter(nameof(CreateLoraDevice.LoRaDevice), deviceDetails),

src/AzureIoTHub.Portal.Tests.Unit/Client/Pages/Devices/LoRaWan/EditLoraDeviceTests.cs

@@ -20,6 +20,7 @@ namespace AzureIoTHub.Portal.Tests.Unit.Client.Pages.Devices
     using UnitTests.Mocks;
     using System.Linq;
     using System.Threading.Tasks;
+    using AzureIoTHub.Portal.Shared.Models.v1._0;
 
     [TestFixture]
     public class EditLoraDeviceTests : BlazorUnitTest
@@ -58,6 +59,9 @@ public void WhenUseOTAAShouldDisplayOTAATextboxes()
 
             var validator = new LoRaDeviceDetailsValidator();
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
             var cut = RenderComponent<EditLoraDevice>(
                 ComponentParameter.CreateParameter(nameof(EditLoraDevice.LoRaDevice), deviceDetails),
@@ -89,6 +93,9 @@ public void WhenNotUseOTAAShouldDisplayABPTextboxes()
             };
             var validator = new LoRaDeviceDetailsValidator();
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
             var cut = RenderComponent<EditLoraDevice>(
                 ComponentParameter.CreateParameter(nameof(EditLoraDevice.LoRaDevice), deviceDetails),
@@ -122,6 +129,9 @@ public void EditLoRaDevicePageShouldBeRenderedProperly()
             };
             var validator = new LoRaDeviceDetailsValidator();
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
             var cut = RenderComponent<EditLoraDevice>(
                 ComponentParameter.CreateParameter(nameof(EditLoraDevice.LoRaDevice), deviceDetails),
@@ -153,6 +163,9 @@ public void WhenDeviceNeverConnectedCommandsShouldBeDisabled()
                 ModelId = model.ModelId
             };
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
             var cut = RenderComponent<EditLoraDevice>(
                 ComponentParameter.CreateParameter(nameof(EditLoraDevice.LoRaDevice), device),
@@ -187,6 +200,9 @@ public void WhenDeviceAlteadyConnectedCommandsShouldBeEnabled()
                 AlreadyLoggedInOnce = true
             };
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
             var cut = RenderComponent<EditLoraDevice>(
                 ComponentParameter.CreateParameter(nameof(EditLoraDevice.LoRaDevice), device),
@@ -226,6 +242,9 @@ public void WhenClickToSendCommandShouldExecuteCommandToService()
             _ = this.mockSnackbarService.Setup(c => c.Add(It.IsAny<string>(), Severity.Success, It.IsAny<Action<SnackbarOptions>>()))
                 .Returns((Snackbar)null);
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
+
             // Act
             var cut = RenderComponent<EditLoraDevice>(
                 ComponentParameter.CreateParameter(nameof(EditLoraDevice.LoRaDevice), device),
@@ -261,6 +280,8 @@ public void EditLoRaDeviceDetailPageShouldBeRenderedProperly()
             var validator = new LoRaDeviceDetailsValidator();
             var LoraDevice = new LoRaDeviceDetails();
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
 
             // Act
             var cut = RenderComponent<EditLoraDevice>(
@@ -295,6 +316,8 @@ public void EditLoRaDeviceDetailPageWithReportedProperties()
             var validator = new LoRaDeviceDetailsValidator();
             var LoraDevice = new LoRaDeviceDetails();
 
+            _ = this.mockLoRaWanDeviceClientService.Setup(c => c.GetGatewayIdList())
+                .ReturnsAsync(new LoRaGatewayIDList());
 
             // Act
             var cut = RenderComponent<EditLoraDevice>(

src/AzureIoTHub.Portal.Tests.Unit/Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesControllerTests.cs

@@ -47,10 +47,16 @@ public void SetUp()
 
         private LoRaWANDevicesController CreateLoRaWANDevicesController()
         {
+            var loRaGatewayIDList = new LoRaGatewayIDList
+            {
+                GatewayIds = new List<string>(){ Guid.NewGuid().ToString(), Guid.NewGuid().ToString() }
+            };
+
             return new LoRaWANDevicesController(
                 this.mockLogger.Object,
                 this.mockLoRaWANCommandService.Object,
-                this.mockDeviceService.Object)
+                this.mockDeviceService.Object,
+                loRaGatewayIDList)
             {
                 Url = this.mockUrlHelper.Object
             };

src/AzureIoTHub.Portal/Client/Pages/Devices/LoRaWAN/CreateLoraDevice.razor

@@ -1,6 +1,7 @@
 @using AzureIoTHub.Portal.Client.Validators
 @using AzureIoTHub.Portal.Models.v10.LoRaWAN
 @using AzureIoTHub.Portal.Models.v10
+@inject ILoRaWanDeviceClientService LoRaWanDeviceClientService
 
 <MudExpansionPanels MultiExpansion="true">
     <MudGrid>
@@ -40,6 +41,22 @@
                                 <MudTextField id="@nameof(LoRaDevice.DevAddr)" @bind-Value="@LoRaDevice.DevAddr" Label="DevAddr" For="@(() => LoRaDevice.DevAddr)" Variant="Variant.Outlined" Required="true"></MudTextField>
                             </MudItem>
                         }
+                        <MudItem xs="12" md="6">
+                            <MudAutocomplete T="string"
+                                             id="@nameof(LoRaDevice.GatewayID)"
+                                             @bind-Value="LoRaDevice.GatewayID"
+                                             SearchFunc="@SearchGatewayID"
+                                             Label="GatewayID"
+                                             Dense=true
+                                             For="@(() => LoRaDevice.GatewayID)"
+                                             Variant="Variant.Outlined"
+                                             ResetValueOnEmptyText=true
+                                             Immediate=true
+                                             Clearable=true
+                                             CoerceText=true
+                                             CoerceValue=false>
+                            </MudAutocomplete>
+                        </MudItem>
                     </MudGrid>
                 </ChildContent>
             </MudExpansionPanel>
@@ -48,6 +65,9 @@
 </MudExpansionPanels>
 
 @code {
+    [CascadingParameter]
+    public Error Error { get; set; }
+
     [Parameter]
     public LoRaDeviceDetails LoRaDevice { get; set; }
 
@@ -57,4 +77,27 @@
     [Parameter]
     public LoRaDeviceModelDto LoraModelDto { get; set; }
 
+    private List<string> GatewayIdList = new();
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            GatewayIdList = (await LoRaWanDeviceClientService.GetGatewayIdList()).GatewayIds;
+        }
+        catch (ProblemDetailsException exception)
+        {
+            Error?.ProcessProblemDetails(exception);
+        }
+    }
+
+    private async Task<IEnumerable<string>> SearchGatewayID(string value)
+    {
+        // if text is null or empty, show complete list
+        if (string.IsNullOrEmpty(value))
+            return GatewayIdList;
+
+        return GatewayIdList
+                    .Where(x => x.Contains(value, StringComparison.InvariantCultureIgnoreCase));
+    }
 }

src/AzureIoTHub.Portal/Client/Pages/Devices/LoRaWAN/EditLoraDevice.razor

@@ -54,7 +54,7 @@
                                 </MudItem>
                                 <MudItem md="3" xs="6">
                                     <MudSelect id="@nameof(LoRaDevice.Deduplication)"
-                                        Disabled="true"
+                                               Disabled="true"
                                                @bind-Value="@LoRaDevice.Deduplication"
                                                For="@(() => LoRaDevice.Deduplication)"
                                                AnchorOrigin="Origin.BottomCenter"
@@ -66,8 +66,21 @@
                                         }
                                     </MudSelect>
                                 </MudItem>
-                                <MudItem md="6" xs="12">
-                                    <MudTextField id="@nameof(LoRaDevice.GatewayID)" @bind-Value="@LoRaDevice.GatewayID" Label="Gateway Id" For="@(() => LoRaDevice.GatewayID)" Variant="Variant.Outlined"></MudTextField>
+                                <MudItem xs="12" md="6">
+                                    <MudAutocomplete T="string"
+                                                     id="@nameof(LoRaDevice.GatewayID)"
+                                                     @bind-Value="LoRaDevice.GatewayID"
+                                                     SearchFunc="@SearchGatewayID"
+                                                     Label="GatewayID"
+                                                     Dense=true
+                                                     For="@(() => LoRaDevice.GatewayID)"
+                                                     Variant="Variant.Outlined"
+                                                     ResetValueOnEmptyText=true
+                                                     Immediate=true
+                                                     Clearable=true
+                                                     CoerceText=true
+                                                     CoerceValue=false>
+                                    </MudAutocomplete>
                                 </MudItem>
                             </MudGrid>
                         </MudItem>
@@ -157,8 +170,8 @@
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
-    
+    public Error Error { get; set; }
+
     [Parameter]
     public LoRaDeviceDetails LoRaDevice { get; set; }
 
@@ -173,6 +186,30 @@
 
     private bool isProcessing;
 
+    private List<string> GatewayIdList = new();
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            GatewayIdList = (await LoRaWanDeviceClientService.GetGatewayIdList()).GatewayIds;
+        }
+        catch (ProblemDetailsException exception)
+        {
+            Error?.ProcessProblemDetails(exception);
+        }
+    }
+
+    private async Task<IEnumerable<string>> SearchGatewayID(string value)
+    {
+        // if text is null or empty, show complete list
+        if (string.IsNullOrEmpty(value))
+            return GatewayIdList;
+
+        return GatewayIdList
+                    .Where(x => x.Contains(value, StringComparison.InvariantCultureIgnoreCase));
+    }
+
     private async Task ExecuteMethod(DeviceModelCommandDto method)
     {
         try

src/AzureIoTHub.Portal/Client/Services/ILoRaWanDeviceClientService.cs

@@ -5,6 +5,7 @@ namespace AzureIoTHub.Portal.Client.Services
 {
     using System.Threading.Tasks;
     using AzureIoTHub.Portal.Models.v10.LoRaWAN;
+    using AzureIoTHub.Portal.Shared.Models.v1._0;
 
     public interface ILoRaWanDeviceClientService
     {
@@ -15,5 +16,7 @@ public interface ILoRaWanDeviceClientService
         Task UpdateDevice(LoRaDeviceDetails device);
 
         Task ExecuteCommand(string deviceId, string commandId);
+
+        Task<LoRaGatewayIDList> GetGatewayIdList();
     }
 }

src/AzureIoTHub.Portal/Client/Services/LoRaWanDeviceClientService.cs

@@ -3,9 +3,11 @@
 
 namespace AzureIoTHub.Portal.Client.Services
 {
+    using System.Collections.Generic;
     using System.Net.Http;
     using System.Net.Http.Json;
     using System.Threading.Tasks;
+    using AzureIoTHub.Portal.Shared.Models.v1._0;
     using Portal.Models.v10.LoRaWAN;
 
     public class LoRaWanDeviceClientService : ILoRaWanDeviceClientService
@@ -36,5 +38,10 @@ public Task ExecuteCommand(string deviceId, string commandId)
         {
             return this.http.PostAsJsonAsync($"api/lorawan/devices/{deviceId}/_command/{commandId}", string.Empty);
         }
+
+        public Task<LoRaGatewayIDList> GetGatewayIdList()
+        {
+            return this.http.GetFromJsonAsync<LoRaGatewayIDList>($"api/lorawan/devices/gateways");
+        }
     }
 }

src/AzureIoTHub.Portal/Server/Controllers/v1.0/LoRaWAN/LoRaWANDevicesController.cs

@@ -4,6 +4,7 @@
 namespace AzureIoTHub.Portal.Server.Controllers.V10
 {
     using System.Threading.Tasks;
+    using AzureIoTHub.Portal.Shared.Models.v1._0;
     using Filters;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -21,14 +22,17 @@ namespace AzureIoTHub.Portal.Server.Controllers.V10
     public class LoRaWANDevicesController : DevicesControllerBase<LoRaDeviceDetails>
     {
         private readonly ILoRaWANCommandService loRaWanCommandService;
+        private readonly LoRaGatewayIDList gatewayIdList;
 
         public LoRaWANDevicesController(
             ILogger<LoRaWANDevicesController> logger,
             ILoRaWANCommandService loRaWanCommandService,
-            IDeviceService<LoRaDeviceDetails> deviceService)
+            IDeviceService<LoRaDeviceDetails> deviceService,
+            LoRaGatewayIDList gatewayIdList)
             : base(logger, deviceService)
         {
             this.loRaWanCommandService = loRaWanCommandService;
+            this.gatewayIdList = gatewayIdList;
         }
 
         /// <summary>
@@ -112,5 +116,11 @@ public override Task<ActionResult<EnrollmentCredentials>> GetCredentials(string
         {
             return Task.FromResult<ActionResult<EnrollmentCredentials>>(NotFound());
         }
+
+        [HttpGet("gateways", Name = "Get Gateways")]
+        public ActionResult<LoRaGatewayIDList> GetGateways()
+        {
+            return this.gatewayIdList;
+        }
     }
 }