Skip to content

Commit

Permalink
#2234 Feature: move dialogs to dialogs folder (#2270)
Browse files Browse the repository at this point in the history 
* Move edgemodels and ideas dialogs

* Refactor edge devices dialogs

* Refactor device dialogs

* Move ProblemDetailsDialog into the DIalog folder
  • Loading branch information
@JeremyTremblay2
JeremyTremblay2 authored Jun 27, 2023
1 parent dca312d commit d97a77b
Show file tree
Hide file tree
Showing 45 changed files with 35 additions and 19 deletions.
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Client/Components/Devices/EditDevice.razor
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@using IoTHub.Portal.Client.Enums;
@using IoTHub.Portal.Client.Pages.Devices
@using IoTHub.Portal.Client.Dialogs.Devices
@using IoTHub.Portal.Client.Validators
@using IoTHub.Portal.Shared.Constants;
@using IoTHub.Portal.Shared.Models
Expand Down
0 ...ages/Devices/ConnectionStringDialog.razor → ...logs/Devices/ConnectionStringDialog.razor
View file
File renamed without changes.
0 ...nt/Pages/Devices/ImportReportDialog.razor → .../Dialogs/Devices/ImportReportDialog.razor
View file
File renamed without changes.
0 ...s/Devices/LoRaDeviceTelemetryDialog.razor → ...s/Devices/LoRaDeviceTelemetryDialog.razor
View file
File renamed without changes.
0 .../EdgeDevices/ConnectionStringDialog.razor → .../EdgeDevices/ConnectionStringDialog.razor
View file
File renamed without changes.
0 .../EdgeDeviceDeleteConfirmationDialog.razor → .../EdgeDeviceDeleteConfirmationDialog.razor
View file
File renamed without changes.
0 .../Pages/EdgeDevices/ModuleLogsDialog.razor → ...ialogs/EdgeDevices/ModuleLogsDialog.razor
View file
File renamed without changes.
0 ...es/EdgeModels/DeleteEdgeModelDialog.razor → ...gs/EdgeModels/DeleteEdgeModelDialog.razor
View file
File renamed without changes.
0 .../EdgeModels/EdgeModule/ModuleDialog.razor → .../EdgeModels/EdgeModule/ModuleDialog.razor
View file
File renamed without changes.
0 ...eModels/EdgeModule/ModuleDialogTab1.razor → ...eModels/EdgeModule/ModuleDialogTab1.razor
View file
File renamed without changes.
0 ...eModels/EdgeModule/ModuleDialogTab2.razor → ...eModels/EdgeModule/ModuleDialogTab2.razor
View file
File renamed without changes.
0 ...eModels/EdgeModule/ModuleDialogTab3.razor → ...eModels/EdgeModule/ModuleDialogTab3.razor
View file
File renamed without changes.
0 ...odels/EdgeModule/SystemModuleDialog.razor → ...odels/EdgeModule/SystemModuleDialog.razor
View file
File renamed without changes.
0 ...Client/Pages/Ideas/SubmitIdeaDialog.razor → ...ient/Dialogs/Ideas/SubmitIdeaDialog.razor
View file
File renamed without changes.
0 ....Client/Shared/ProblemDetailsDialog.razor → ...Dialogs/Shared/ProblemDetailsDialog.razor
View file
File renamed without changes.
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Client/Pages/Devices/DeviceListPage.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@using IoTHub.Portal
@using IoTHub.Portal.Models.v10
@using IoTHub.Portal.Shared.Models.v10;
@using IoTHub.Portal.Client.Dialogs.Devices
@using System.Web
@using System.IO
@using System.Text.RegularExpressions
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceDetailPage.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@using IoTHub.Portal.Models.v10
@using IoTHub.Portal.Shared.Models.v10
@using IoTHub.Portal.Shared.Constants
@using IoTHub.Portal.Client.Dialogs.EdgeDevices;

@attribute [Authorize]
@inject PortalSettings Portal
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Client/Pages/EdgeDevices/EdgeDeviceListPage.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@using IoTHub.Portal.Models.v10
@using System.Web
@using IoTHub.Portal.Shared.Models.v10;
@using IoTHub.Portal.Client.Dialogs.EdgeDevices;

@attribute [Authorize]
@inject PortalSettings Portal
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Client/Pages/EdgeModels/CreateEdgeModelsPage.razor
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@page "/edge/models/new"

@using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule
@using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule
@using IoTHub.Portal.Models
@using IoTHub.Portal.Models.v10
@using IoTHub.Portal.Shared.Models.v10
Expand Down
3 changes: 2 additions & 1 deletion src/IoTHub.Portal.Client/Pages/EdgeModels/EdgeModelDetailPage.razor
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
@page "/edge/models/{ModelID}"

@using Microsoft.AspNetCore.Authorization
@using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule
@using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule
@using System.Net.Http.Headers
@using IoTHub.Portal.Models.v10
@using IoTHub.Portal.Shared.Models.v10
@using IoTHub.Portal.Client.Validators
@using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule
@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
@using IoTHub.Portal.Shared.Constants

Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Client/Pages/EdgeModels/EdgeModelListPage.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@using IoTHub.Portal.Shared.Models.v10.Filters;
@using Microsoft.AspNetCore.Authorization
@using IoTHub.Portal.Models.v10
@using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule
@using Microsoft.AspNetCore.Components.WebAssembly.Authentication

@attribute [Authorize]
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Client/Shared/Appbar.razor
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@using IoTHub.Portal.Models.v10
@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
@using IoTHub.Portal.Client.Pages.Ideas
@using IoTHub.Portal.Client.Dialogs.Ideas

@inject PortalSettings Portal
@inject NavigationManager Navigation
Expand Down
2 changes: 2 additions & 0 deletions src/IoTHub.Portal.Client/Shared/Error.razor
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@inject ISnackbar Snackbar;
@inject IDialogService DialogService

@using IoTHub.Portal.Client.Dialogs.Shared

<CascadingValue Value="this">
@ChildContent
</CascadingValue>
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Tests.Unit/Client/Components/Devices/EditDeviceTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace AzureIoTHub.Portal.Tests.Unit.Client.Components.Devices
using IoTHub.Portal.Shared.Models;
using IoTHub.Portal.Shared.Models.v1._0;
using IoTHub.Portal.Shared.Models.v10.Filters;
using IoTHub.Portal.Client.Dialogs.Devices;
using IoTHub.Portal.Tests.Unit.UnitTests.Bases;
using IoTHub.Portal.Tests.Unit.UnitTests.Mocks;
using Microsoft.Extensions.DependencyInjection;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Configurations/EdgeModule/ModuleDialogTab1Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Configurations.EdgeModule
{
using System;
using System.Collections.Generic;
using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule;
using Models.v10;
using IoTHub.Portal.Shared.Models.v10;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Configurations/EdgeModule/ModuleDialogTab2Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Configurations.EdgeModule
{
using System;
using System.Collections.Generic;
using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule;
using Models.v10;
using IoTHub.Portal.Shared.Models.v10;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Configurations/EdgeModule/ModuleDialogTab3Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Configurations.EdgeModule
{
using System;
using System.Collections.Generic;
using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule;
using Models.v10;
using IoTHub.Portal.Shared.Models.v10;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Configurations/EdgeModule/ModuleDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Configurations.EdgeModule
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule;
using Models.v10;
using IoTHub.Portal.Shared.Models.v10;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/ConnectionStringDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Devices
using System.Threading.Tasks;
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.Devices;
using IoTHub.Portal.Client.Dialogs.Devices;
using IoTHub.Portal.Client.Services;
using UnitTests.Bases;
using Bunit;
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/DevicesListPageTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Devices
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.Devices;
using IoTHub.Portal.Client.Dialogs.Devices;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Shared.Models.v10;
using Bunit;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/ImportReportDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Devices
using System.Threading.Tasks;
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.Devices;
using IoTHub.Portal.Client.Dialogs.Devices;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Shared.Models.v10;
using IoTHub.Portal.Tests.Unit.UnitTests.Bases;
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Tests.Unit/Client/Pages/Devices/LoRaDeviceTelemetryDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Devices
using System.Threading.Tasks;
using IoTHub.Portal.Client.Pages.Devices;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Client.Dialogs.Devices;
using UnitTests.Bases;
using Bunit;
using Microsoft.Extensions.DependencyInjection;
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ConnectionStringDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeDevices
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeDevices;
using IoTHub.Portal.Client.Dialogs.EdgeDevices;
using IoTHub.Portal.Client.Services;
using Models.v10;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion ...Hub.Portal.Tests.Unit/Client/Pages/EdgeDevices/EdgeDeviceDeleteConfirmationDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeDevices
using System.Threading.Tasks;
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeDevices;
using IoTHub.Portal.Client.Dialogs.EdgeDevices;
using IoTHub.Portal.Client.Services;
using Models.v10;
using UnitTests.Bases;
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/EdgeDeviceDetailPageTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeDevices
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeDevices;
using IoTHub.Portal.Client.Dialogs.EdgeDevices;
using IoTHub.Portal.Client.Services;
using Models.v10;
using UnitTests.Bases;
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/EdgeDeviceListPageTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeDevices
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Shared.Models.v10;
using IoTHub.Portal.Client.Pages.EdgeDevices;
using IoTHub.Portal.Client.Dialogs.EdgeDevices;
using IoTHub.Portal.Client.Services;
using Models.v10;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeDevices/ModuleLogsDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeDevices
using System.Threading.Tasks;
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeDevices;
using IoTHub.Portal.Client.Dialogs.EdgeDevices;
using IoTHub.Portal.Client.Services;
using Models.v10;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/CreateEdgeModelsPageTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeModels
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeModels;
using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Models.v10;
using IoTHub.Portal.Shared.Models.v10;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/DeleteEdgeModelDialogTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeModels
using System.Threading.Tasks;
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeModels;
using IoTHub.Portal.Client.Dialogs.EdgeModels;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Tests.Unit.UnitTests.Bases;
using Bunit;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/EdgeModelDetailPageTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeModels
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeModels;
using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Models.v10;
using IoTHub.Portal.Shared.Models.v10;
Expand Down
5 changes: 3 additions & 2 deletions src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/EdgeModelsListPageTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeModels
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using AutoFixture;
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.EdgeModels;
using IoTHub.Portal.Client.Dialogs.EdgeModels;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Models.v10;
using IoTHub.Portal.Shared.Models.v10.Filters;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/EdgeModels/SystemModuleDialogTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.EdgeModels
using System.Collections.Generic;
using System.Threading.Tasks;
using AutoFixture;
using IoTHub.Portal.Client.Pages.EdgeModels.EdgeModule;
using IoTHub.Portal.Client.Dialogs.EdgeModels.EdgeModule;
using IoTHub.Portal.Shared.Models.v10;
using IoTHub.Portal.Tests.Unit.UnitTests.Bases;
using Bunit;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Ideas/SubmitIdeaDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Ideas
using AutoFixture;
using IoTHub.Portal.Client.Exceptions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Pages.Ideas;
using IoTHub.Portal.Client.Dialogs.Ideas;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Shared.Models.v1._0;
using UnitTests.Bases;
Expand Down
2 changes: 1 addition & 1 deletion src/IoTHub.Portal.Tests.Unit/Client/Pages/Shared/AppbarTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace IoTHub.Portal.Tests.Unit.Client.Pages.Shared
{
using System;
using IoTHub.Portal.Client.Pages.Ideas;
using IoTHub.Portal.Client.Dialogs.Ideas;
using IoTHub.Portal.Client.Services;
using IoTHub.Portal.Client.Shared;
using Models.v10;
Expand Down
1 change: 1 addition & 0 deletions src/IoTHub.Portal.Tests.Unit/Client/Pages/Shared/ProblemDetailsDialogTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace IoTHub.Portal.Tests.Unit.Client.Pages.Shared
using IoTHub.Portal.Client.Extensions;
using IoTHub.Portal.Client.Models;
using IoTHub.Portal.Client.Shared;
using IoTHub.Portal.Client.Dialogs.Shared;
using UnitTests.Bases;
using Bunit;
using FluentAssertions;
Expand Down

0 comments on commit d97a77b

Please sign in to comment.