Disable save button on save device #848

CGI-FR · Jul 11, 2022 · 1458060 · 1458060
1 parent f122fd1
commit 1458060
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Devices/CreateDevicePageTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Devices/CreateDevicePageTests.cs
@@ -104,11 +104,6 @@ public async Task ClickOnSaveShouldPostDeviceDetailsAsync()
                 .Setup(service => service.SetDeviceProperties(expectedDeviceDetails.DeviceID, It.IsAny<IList<DevicePropertyValue>>()))
                 .Returns(Task.CompletedTask);
 
-            var mockDialogReference = new DialogReference(Guid.NewGuid(), this.mockDialogService.Object);
-            _ = this.mockDialogService.Setup(c => c.Show<ProcessingDialog>("Processing", It.IsAny<DialogParameters>()))
-                .Returns(mockDialogReference);
-            _ = this.mockDialogService.Setup(c => c.Close(It.Is<DialogReference>(x => x == mockDialogReference)));
-
             var cut = RenderComponent<CreateDevicePage>();
             var saveButton = cut.WaitForElement("#SaveButton");
 
@@ -209,11 +204,6 @@ public async Task SaveShouldProcessProblemDetailsExceptionWhenIssueOccursOnCreat
                 .Setup(service => service.GetDeviceModelModelProperties(mockDeviceModel.ModelId))
                 .ReturnsAsync(new List<DeviceProperty>());
 
-            var mockDialogReference = new DialogReference(Guid.NewGuid(), this.mockDialogService.Object);
-            _ = this.mockDialogService.Setup(c => c.Show<ProcessingDialog>("Processing", It.IsAny<DialogParameters>()))
-                .Returns(mockDialogReference);
-            _ = this.mockDialogService.Setup(c => c.Close(It.Is<DialogReference>(x => x == mockDialogReference)));
-
             // Act
             var cut = RenderComponent<CreateDevicePage>();
             var saveButton = cut.WaitForElement("#SaveButton");

diff --git a/src/AzureIoTHub.Portal/Client/Pages/Devices/CreateDevicePage.razor b/src/AzureIoTHub.Portal/Client/Pages/Devices/CreateDevicePage.razor
@@ -9,7 +9,6 @@
 @attribute [Authorize]
 @inject ISnackbar Snackbar
 @inject NavigationManager NavManager
-@inject IDialogService DialogService
 @inject IDeviceModelsClientService DeviceModelsClientService
 @inject ILoRaWanDeviceModelsClientService LoRaWanDeviceModelsClientService
 @inject IDeviceTagSettingsClientService DeviceTagSettingsClientService
@@ -33,7 +32,7 @@
                 </MudCardContent>
             </MudCard>
             <MudItem xs="12" Class="d-flex justify-center py-2 px-1 mt-4">
-                <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="Save" id="SaveButton">Save Changes</MudButton>
+                <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="Save" id="SaveButton" Disabled="isProcessing">Save Changes</MudButton>
             </MudItem>
         </MudItem>
         <MudItem xs="12" sm="8" md="9">
@@ -259,6 +258,8 @@
 
     private bool displayValidationErrorMessages = false;
 
+    private bool isProcessing;
+
     protected override async Task OnInitializedAsync()
     {
         try
@@ -288,24 +289,24 @@
     /// </summary>
     public async void Save()
     {
-        var parameters = new DialogParameters { { "ContentText", "Processing" } };
-        DialogReference processingDialog = DialogService.Show<ProcessingDialog>("Processing", parameters) as DialogReference;
-
         try
         {
+            isProcessing = true;
+
             await form.Validate();
             bool tagValidationError = CheckTagsError();
 
             if (!standardValidator.Validate(Device).IsValid
                 || (IsLoRa && !this.loraValidator.Validate(this.Device as LoRaDeviceDetails).IsValid)
                 || tagValidationError)
             {
-                DialogService.Close(processingDialog);
                 Snackbar.Add("One or more validation errors occurred", Severity.Error);
 
                 // Allows to display ValidationError messages for the MudAutocomplete field.
                 displayValidationErrorMessages = true;
 
+                isProcessing = false;
+
                 return;
             }
 
@@ -329,7 +330,7 @@
         }
         finally
         {
-            DialogService.Close(processingDialog);
+            isProcessing = false;   
         }
     }