diff --git a/Hcs.WebApp/Components/Pages/Campaigns.razor b/Hcs.WebApp/Components/Pages/Campaigns.razor
index b4cce59..0a49f70 100644
--- a/Hcs.WebApp/Components/Pages/Campaigns.razor
+++ b/Hcs.WebApp/Components/Pages/Campaigns.razor
@@ -26,7 +26,7 @@
-
+
@@ -61,14 +61,7 @@
@code {
- enum CampaignsPageState
- {
- Init,
- Loading,
- Idle
- }
-
- CampaignsPageState state;
+ PageState state;
RadzenDataGrid campaignsDataGrid;
RadzenDataGrid operationsDataGrid;
IEnumerable? 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);
});
}
diff --git a/Hcs.WebApp/Components/Pages/Operations.razor b/Hcs.WebApp/Components/Pages/Operations.razor
index 91b6ed6..15aa4c9 100644
--- a/Hcs.WebApp/Components/Pages/Operations.razor
+++ b/Hcs.WebApp/Components/Pages/Operations.razor
@@ -25,7 +25,7 @@
-
+
@@ -44,14 +44,7 @@
@code {
- enum OperationPageState
- {
- Init,
- Loading,
- Idle
- }
-
- OperationPageState state;
+ PageState state;
RadzenDataGrid dataGrid;
ICollection? 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;
diff --git a/Hcs.WebApp/Components/Pages/Registry/Common.razor b/Hcs.WebApp/Components/Pages/Registry/Common.razor
index 4ac3684..7800a22 100644
--- a/Hcs.WebApp/Components/Pages/Registry/Common.razor
+++ b/Hcs.WebApp/Components/Pages/Registry/Common.razor
@@ -29,7 +29,7 @@
-
+
@@ -38,7 +38,7 @@
@errorMessage
-
+
@@ -64,15 +64,7 @@
@code {
- enum CommonPageState
- {
- Init,
- Loading,
- Idle,
- OperationWaiting
- }
-
- CommonPageState state;
+ SyncedPageState state;
IEnumerable 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 CommonPageState.Idle:
+ case SyncedPageState.Loading:
+ 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);
});
}
diff --git a/Hcs.WebApp/Components/Pages/Registry/Private.razor b/Hcs.WebApp/Components/Pages/Registry/Private.razor
index 5240494..3f78f9c 100644
--- a/Hcs.WebApp/Components/Pages/Registry/Private.razor
+++ b/Hcs.WebApp/Components/Pages/Registry/Private.razor
@@ -29,7 +29,7 @@
-
+
@@ -38,7 +38,7 @@
@errorMessage
-
+
@@ -64,16 +64,8 @@
@code {
- enum PrivatePageState
- {
- Init,
- Loading,
- Idle,
- OperationWaiting
- }
-
IEnumerable 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 PrivatePageState.Idle:
+ case SyncedPageState.Loading:
+ 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);
});
}
diff --git a/Hcs.WebApp/Components/Shared/PageState.cs b/Hcs.WebApp/Components/Shared/PageState.cs
new file mode 100644
index 0000000..5487ffd
--- /dev/null
+++ b/Hcs.WebApp/Components/Shared/PageState.cs
@@ -0,0 +1,9 @@
+namespace Hcs.WebApp.Components.Shared
+{
+ public enum PageState
+ {
+ Init,
+ Loading,
+ Idle
+ }
+}
diff --git a/Hcs.WebApp/Components/Shared/SyncedPageState.cs b/Hcs.WebApp/Components/Shared/SyncedPageState.cs
new file mode 100644
index 0000000..8435744
--- /dev/null
+++ b/Hcs.WebApp/Components/Shared/SyncedPageState.cs
@@ -0,0 +1,10 @@
+namespace Hcs.WebApp.Components.Shared
+{
+ public enum SyncedPageState
+ {
+ Init,
+ Loading,
+ Idle,
+ SyncWaiting
+ }
+}