Use shared page state classes

Hcs.WebApp/Components/Pages/Campaigns.razor

@@ -26,7 +26,7 @@
             </RadzenRow>
             <RadzenRow>
                 <RadzenColumn SizeMD="12">
-                    <RadzenDataGrid @ref="@campaignsDataGrid" TItem="Campaign" Data="@campaigns" RowExpand="@RowExpandAsync" RowCollapse="@RowCollapse" IsLoading="@(state != CampaignsPageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" AllowColumnResize="true" ExpandMode="DataGridExpandMode.Single">
+                    <RadzenDataGrid @ref="@campaignsDataGrid" TItem="Campaign" Data="@campaigns" RowExpand="@RowExpandAsync" RowCollapse="@RowCollapse" IsLoading="@(state != PageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" AllowColumnResize="true" ExpandMode="DataGridExpandMode.Single">
                         <Template Context="campaign">
                             <RadzenDataGrid @ref="@operationsDataGrid" Data="@campaign.Operations" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" AllowColumnResize="true">
                                 <Columns>
@@ -61,14 +61,7 @@
 </AuthorizedContent>
 
 @code {
-    enum CampaignsPageState
+    PageState state;
-    {
-        Init,
-        Loading,
-        Idle
-    }
-
-    CampaignsPageState state;
     RadzenDataGrid<Campaign> campaignsDataGrid;
     RadzenDataGrid<Operation> operationsDataGrid;
     IEnumerable<Campaign>? campaigns;
@@ -80,7 +73,7 @@
 
         if (firstRender)
         {
-            ChangeState(CampaignsPageState.Loading);
+            ChangeState(PageState.Loading);
 
             var state = await AuthenticationStateProvider.GetAuthenticationStateAsync();
             if (state.User.IsInRole(AppRole.ADMINISTRATOR_TYPE) || state.User.IsInRole(AppRole.OPERATOR_TYPE))
@@ -99,7 +92,7 @@
                 ResultWaitState.OnOperationEnded += OnOperationEnded;
             }
 
-            ChangeState(CampaignsPageState.Idle);
+            ChangeState(PageState.Idle);
         }
     }
 
@@ -123,7 +116,7 @@
         campaign.Operations = null;
     }
 
-    void ChangeState(CampaignsPageState state)
+    void ChangeState(PageState state)
     {
         if (this.state == state) return;
 
@@ -139,7 +132,7 @@
 
     async Task RefreshCampaigns()
     {
-        await InvokeAsync(() => ChangeState(CampaignsPageState.Loading));
+        await InvokeAsync(() => ChangeState(PageState.Loading));
 
         var refreshedCampaigns = await HeadquartersService.GetCampaignsAsync();
 
@@ -148,7 +141,7 @@
             campaigns = refreshedCampaigns;
             expandedCampaign = null;
 
-            ChangeState(CampaignsPageState.Idle);
+            ChangeState(PageState.Idle);
         });
     }
 

Hcs.WebApp/Components/Pages/Operations.razor

@@ -25,7 +25,7 @@
             </RadzenRow>
             <RadzenRow>
                 <RadzenColumn SizeMD="12">
-                    <RadzenDataGrid @ref="@dataGrid" TItem="Operation" Data="@operations" IsLoading="@(state != OperationPageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" AllowColumnResize="true">
+                    <RadzenDataGrid @ref="@dataGrid" TItem="Operation" Data="@operations" IsLoading="@(state != PageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" AllowColumnResize="true">
                         <Columns>
                             <RadzenDataGridColumn TItem="Operation" Property="@nameof(Operation.Id)" Title="ID" SortOrder="SortOrder.Descending" Resizable="false" Width="100px" MaxWidth="100px" />
                             <RadzenDataGridColumn TItem="Operation" Property="@nameof(Operation.CampaignId)" Title="ID кампании" Resizable="false" Width="100px" MaxWidth="100px" />
@@ -44,14 +44,7 @@
 </AuthorizedContent>
 
 @code {
-    enum OperationPageState
+    PageState state;
-    {
-        Init,
-        Loading,
-        Idle
-    }
-
-    OperationPageState state;
     RadzenDataGrid<Operation> dataGrid;
     ICollection<Operation>? operations;
 
@@ -61,7 +54,7 @@
 
         if (firstRender)
         {
-            ChangeState(OperationPageState.Loading);
+            ChangeState(PageState.Loading);
 
             var state = await AuthenticationStateProvider.GetAuthenticationStateAsync();
             if (state.User.IsInRole(AppRole.ADMINISTRATOR_TYPE) || state.User.IsInRole(AppRole.OPERATOR_TYPE))
@@ -76,11 +69,11 @@
                 ResultWaitState.OnOperationEnded += OnOperationEnded;
             }
 
-            ChangeState(OperationPageState.Idle);
+            ChangeState(PageState.Idle);
         }
     }
 
-    void ChangeState(OperationPageState state)
+    void ChangeState(PageState state)
     {
         if (this.state == state) return;
 

Hcs.WebApp/Components/Pages/Registry/Common.razor

@@ -29,7 +29,7 @@
                 </RadzenColumn>
                 <RadzenColumn Size="12" SizeMD="6">
                     <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.End" Gap="0.5rem">
-                        <RadzenButton Icon="sync" Text="@syncText" Disabled="@(state != CommonPageState.Idle)" Click="@SyncRegistriesAsync" ButtonStyle="ButtonStyle.Primary" />
+                        <RadzenButton Icon="sync" Text="@syncText" Disabled="@(state != SyncedPageState.Idle)" Click="@SyncRegistriesAsync" ButtonStyle="ButtonStyle.Primary" />
                     </RadzenStack>
                 </RadzenColumn>
             </RadzenRow>
@@ -38,7 +38,7 @@
                     <RadzenAlert Visible="@hasError" AlertStyle="AlertStyle.Danger" Variant="Variant.Flat" Shade="Shade.Lighter" AllowClose="false">
                         @errorMessage
                     </RadzenAlert>
-                    <RadzenDataGrid TItem="Registry" Data="@registries" RowExpand="@RowExpandAsync" IsLoading="@(state != CommonPageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" ExpandMode="DataGridExpandMode.Single">
+                    <RadzenDataGrid TItem="Registry" Data="@registries" RowExpand="@RowExpandAsync" IsLoading="@(state != SyncedPageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" ExpandMode="DataGridExpandMode.Single">
                         <Template Context="registry">
                             <RadzenDataGrid Data="@registry.Elements" AllowFiltering="true" AllowSorting="true">
                                 <Columns>
@@ -64,15 +64,7 @@
 </AuthorizedContent>
 
 @code {
-    enum CommonPageState
+    SyncedPageState state;
-    {
-        Init,
-        Loading,
-        Idle,
-        OperationWaiting
-    }
-
-    CommonPageState state;
     IEnumerable<Registry> registries;
     string syncText = "...";
     bool hasError;
@@ -84,16 +76,16 @@
 
         if (firstRender)
         {
-            ChangeState(CommonPageState.Init);
+            ChangeState(SyncedPageState.Init);
 
-            var finalState = CommonPageState.Idle;
+            var finalState = SyncedPageState.Idle;
             var state = await AuthenticationStateProvider.GetAuthenticationStateAsync();
             if (state.User.IsInRole(AppRole.ADMINISTRATOR_TYPE) || state.User.IsInRole(AppRole.OPERATOR_TYPE))
             {
                 var operationInProgress = await HeadquartersService.HasActiveCampaignAsync(Campaign.CampaignType.ExportCommonRegistryElements_15_7_0_1);
                 if (operationInProgress)
                 {
-                    finalState = CommonPageState.OperationWaiting;
+                    finalState = SyncedPageState.SyncWaiting;
                 }
 
                 CampaignManagementState.OnCampaignCreated += OnCampaignCreated;
@@ -108,13 +100,13 @@
 
     async Task SyncRegistriesAsync()
     {
-        if (state == CommonPageState.OperationWaiting) return;
+        if (state == SyncedPageState.SyncWaiting) return;
 
-        ChangeState(CommonPageState.OperationWaiting);
+        ChangeState(SyncedPageState.SyncWaiting);
 
         if (await HeadquartersService.HasActiveCampaignAsync(Campaign.CampaignType.ExportCommonRegistryElements_15_7_0_1))
         {
-            ChangeState(CommonPageState.Idle);
+            ChangeState(SyncedPageState.Idle);
         }
         else
         {
@@ -147,7 +139,7 @@
             });
     }
 
-    void ChangeState(CommonPageState state)
+    void ChangeState(SyncedPageState state)
     {
         if (this.state == state) return;
 
@@ -161,16 +153,16 @@
     {
         switch (state)
         {
-            case CommonPageState.Init:
+            case SyncedPageState.Init:
                 syncText = "...";
                 break;
 
-            case CommonPageState.Loading:
+            case SyncedPageState.Loading:
-            case CommonPageState.Idle:
+            case SyncedPageState.Idle:
                 syncText = "Синхронизировать";
                 break;
 
-            case CommonPageState.OperationWaiting:
+            case SyncedPageState.SyncWaiting:
                 syncText = "Идет синхронизация...";
                 break;
         }
@@ -180,7 +172,7 @@
     {
         if (campaign.Type == Campaign.CampaignType.ExportCommonRegistryElements_15_7_0_1)
         {
-            InvokeAsync(() => ChangeState(CommonPageState.OperationWaiting));
+            InvokeAsync(() => ChangeState(SyncedPageState.SyncWaiting));
         }
     }
 
@@ -194,7 +186,7 @@
 
     async Task RefreshRegistries()
     {
-        await InvokeAsync(() => ChangeState(CommonPageState.Loading));
+        await InvokeAsync(() => ChangeState(SyncedPageState.Loading));
 
         var refreshedRegistries = await RegistryService.GetAllRegistriesAsync(true);
 
@@ -202,7 +194,7 @@
         {
             registries = refreshedRegistries;
 
-            ChangeState(CommonPageState.Idle);
+            ChangeState(SyncedPageState.Idle);
         });
     }
 

Hcs.WebApp/Components/Pages/Registry/Private.razor

@@ -29,7 +29,7 @@
                 </RadzenColumn>
                 <RadzenColumn Size="12" SizeMD="6">
                     <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.End" Gap="0.5rem">
-                        <RadzenButton Icon="sync" Text="@syncText" Disabled="@(state != PrivatePageState.Idle)" Click="@SyncRegistriesAsync" ButtonStyle="ButtonStyle.Primary" />
+                        <RadzenButton Icon="sync" Text="@syncText" Disabled="@(state != SyncedPageState.Idle)" Click="@SyncRegistriesAsync" ButtonStyle="ButtonStyle.Primary" />
                     </RadzenStack>
                 </RadzenColumn>
             </RadzenRow>
@@ -38,7 +38,7 @@
                     <RadzenAlert Visible="@hasError" AlertStyle="AlertStyle.Danger" Variant="Variant.Flat" Shade="Shade.Lighter" AllowClose="false">
                         @errorMessage
                     </RadzenAlert>
-                    <RadzenDataGrid TItem="Registry" Data="@registries" RowExpand="@RowExpandAsync" IsLoading="@(state != PrivatePageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" ExpandMode="DataGridExpandMode.Single">
+                    <RadzenDataGrid TItem="Registry" Data="@registries" RowExpand="@RowExpandAsync" IsLoading="@(state != SyncedPageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true" ExpandMode="DataGridExpandMode.Single">
                         <Template Context="registry">
                             <RadzenDataGrid Data="@registry.Elements" AllowFiltering="true" AllowSorting="true">
                                 <Columns>
@@ -64,16 +64,8 @@
 </AuthorizedContent>
 
 @code {
-    enum PrivatePageState
-    {
-        Init,
-        Loading,
-        Idle,
-        OperationWaiting
-    }
-
     IEnumerable<Registry> registries;
-    PrivatePageState state;
+    SyncedPageState state;
     string syncText = "...";
     bool hasError;
     string errorMessage;
@@ -84,16 +76,16 @@
 
         if (firstRender)
         {
-            ChangeState(PrivatePageState.Init);
+            ChangeState(SyncedPageState.Init);
 
-            var finalState = PrivatePageState.Idle;
+            var finalState = SyncedPageState.Idle;
             var state = await AuthenticationStateProvider.GetAuthenticationStateAsync();
             if (state.User.IsInRole(AppRole.ADMINISTRATOR_TYPE) || state.User.IsInRole(AppRole.OPERATOR_TYPE))
             {
                 var operationInProgress = await HeadquartersService.HasActiveCampaignAsync(Campaign.CampaignType.ExportPrivateRegistryElements_15_7_0_1);
                 if (operationInProgress)
                 {
-                    finalState = PrivatePageState.OperationWaiting;
+                    finalState = SyncedPageState.SyncWaiting;
                 }
 
                 CampaignManagementState.OnCampaignCreated += OnCampaignCreated;
@@ -108,13 +100,13 @@
 
     async Task SyncRegistriesAsync()
     {
-        if (state == PrivatePageState.OperationWaiting) return;
+        if (state == SyncedPageState.SyncWaiting) return;
 
-        ChangeState(PrivatePageState.OperationWaiting);
+        ChangeState(SyncedPageState.SyncWaiting);
 
         if (await HeadquartersService.HasActiveCampaignAsync(Campaign.CampaignType.ExportPrivateRegistryElements_15_7_0_1))
         {
-            ChangeState(PrivatePageState.Idle);
+            ChangeState(SyncedPageState.Idle);
         }
         else
         {
@@ -147,7 +139,7 @@
             });
     }
 
-    void ChangeState(PrivatePageState state)
+    void ChangeState(SyncedPageState state)
     {
         if (this.state == state) return;
 
@@ -161,16 +153,16 @@
     {
         switch (state)
         {
-            case PrivatePageState.Init:
+            case SyncedPageState.Init:
                 syncText = "...";
                 break;
 
-            case PrivatePageState.Loading:
+            case SyncedPageState.Loading:
-            case PrivatePageState.Idle:
+            case SyncedPageState.Idle:
                 syncText = "Синхронизировать";
                 break;
 
-            case PrivatePageState.OperationWaiting:
+            case SyncedPageState.SyncWaiting:
                 syncText = "Идет синхронизация...";
                 break;
         }
@@ -180,7 +172,7 @@
     {
         if (campaign.Type == Campaign.CampaignType.ExportPrivateRegistryElements_15_7_0_1)
         {
-            InvokeAsync(() => ChangeState(PrivatePageState.OperationWaiting));
+            InvokeAsync(() => ChangeState(SyncedPageState.SyncWaiting));
         }
     }
 
@@ -194,7 +186,7 @@
 
     async Task RefreshRegistries()
     {
-        await InvokeAsync(() => ChangeState(PrivatePageState.Loading));
+        await InvokeAsync(() => ChangeState(SyncedPageState.Loading));
 
         var refreshedRegistries = await RegistryService.GetAllRegistriesAsync(false);
 
@@ -202,7 +194,7 @@
         {
             registries = refreshedRegistries;
 
-            ChangeState(PrivatePageState.Idle);
+            ChangeState(SyncedPageState.Idle);
         });
     }
 

Hcs.WebApp/Components/Shared/PageState.cs

@@ -0,0 +1,9 @@
+namespace Hcs.WebApp.Components.Shared
+{
+    public enum PageState
+    {
+        Init,
+        Loading,
+        Idle
+    }
+}

Hcs.WebApp/Components/Shared/SyncedPageState.cs

@@ -0,0 +1,10 @@
+namespace Hcs.WebApp.Components.Shared
+{
+    public enum SyncedPageState
+    {
+        Init,
+        Loading,
+        Idle,
+        SyncWaiting
+    }
+}