fix some missing catches in UI (#1096)

* translate and enrich 6 more help pages * translate last help pages + fixes * fix some missing catches in UI
CactuseSecurity · Jul 5, 2021 · c4852f9 · c4852f9
1 parent 065efc2
commit c4852f9
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 16 deletions.
diff --git a/roles/database/files/sql/idempotent/fworch-texts.sql b/roles/database/files/sql/idempotent/fworch-texts.sql
@@ -334,6 +334,8 @@ INSERT INTO txt VALUES ('Months', 		        'German',	'Monat(e)');
 INSERT INTO txt VALUES ('Months', 		        'English',	'Month(s)');
 INSERT INTO txt VALUES ('Years', 		        'German',	'Jahr(e)');
 INSERT INTO txt VALUES ('Years', 		        'English',	'Year(s)');
+INSERT INTO txt VALUES ('schedule_fetch',       'German', 	'Abholen der Termine');
+INSERT INTO txt VALUES ('schedule_fetch',       'English', 	'Report Schedule Fetch');
 INSERT INTO txt VALUES ('save_scheduled_report','German',	'Termin speichern');
 INSERT INTO txt VALUES ('save_scheduled_report','English',	'Save scheduled report');
 INSERT INTO txt VALUES ('edit_scheduled_report','German',	'Termin bearbeiten');
@@ -356,6 +358,8 @@ INSERT INTO txt VALUES ('download_as_html',		'German', 	'Herunterladen als HTML'
 INSERT INTO txt VALUES ('download_as_html',		'English', 	'Download as HTML');
 INSERT INTO txt VALUES ('download_as_json',		'German', 	'Herunterladen als JSON');
 INSERT INTO txt VALUES ('download_as_json',		'English', 	'Download as JSON');
+INSERT INTO txt VALUES ('archive_fetch',        'German', 	'Abholen der archivierten Reports');
+INSERT INTO txt VALUES ('archive_fetch',        'English', 	'Archived Reports Fetch');
 INSERT INTO txt VALUES ('fetch_report',		    'German', 	'Erstellten Report holen');
 INSERT INTO txt VALUES ('fetch_report',		    'English', 	'Fetch downloads of generated report');
 INSERT INTO txt VALUES ('delete_report',		'German', 	'Erstellten Report l&ouml;schen');

diff --git a/roles/ui/files/FWO_UI/Pages/Reporting/Archive.razor b/roles/ui/files/FWO_UI/Pages/Reporting/Archive.razor
@@ -83,7 +83,14 @@
 
     protected override async Task OnInitializedAsync()
     {
-        archivedReports = (await apiConnection.SendQueryAsync<ReportFile[]>(ReportQueries.getGeneratedReports)).ToList();
+        try
+        {
+            archivedReports = (await apiConnection.SendQueryAsync<ReportFile[]>(ReportQueries.getGeneratedReports)).ToList();
+        }
+        catch (Exception exception)
+        {
+            DisplayMessageInUi(exception, userConfig.GetText("archive_fetch"), null, true);
+        }
     }
 
     private async Task GetGeneratedReportContent(int reportId)

diff --git a/roles/ui/files/FWO_UI/Pages/Reporting/Schedule.razor b/roles/ui/files/FWO_UI/Pages/Reporting/Schedule.razor
@@ -168,10 +168,17 @@
 
     protected override async Task OnInitializedAsync()
     {
-        scheduledReports = (await apiConnection.SendQueryAsync<ScheduledReport[]>(ReportQueries.getReportSchedules)).ToList();
-        reportTemplates = await apiConnection.SendQueryAsync<ReportTemplate[]>(ReportQueries.getReportTemplates);
-        uiUserDbId = userConfig.User.DbId;
-        authenticationState = await authenticationStateTask;
+        try
+        {
+            scheduledReports = (await apiConnection.SendQueryAsync<ScheduledReport[]>(ReportQueries.getReportSchedules)).ToList();
+            reportTemplates = await apiConnection.SendQueryAsync<ReportTemplate[]>(ReportQueries.getReportTemplates);
+            uiUserDbId = userConfig.User.DbId;
+            authenticationState = await authenticationStateTask;
+        }
+        catch (Exception exception)
+        {
+            DisplayMessageInUi(exception, userConfig.GetText("schedule_fetch"), null, true);
+        }
     }
 
     private async Task SaveScheduledReport()

diff --git a/roles/ui/files/FWO_UI/Pages/Settings/SettingsDefaults.razor b/roles/ui/files/FWO_UI/Pages/Settings/SettingsDefaults.razor
@@ -119,9 +119,9 @@
 
     protected override void OnInitialized()
     {
-        config = new ConfigDbAccess(apiConnection, 0);
         try
         {
+            config = new ConfigDbAccess(apiConnection, 0);
             selectedDefaultLanguage = config.Get(GlobalConfig.kDefaultLanguage);
             Log.WriteDebug("Default language", $"got language: {selectedDefaultLanguage}");
         }

diff --git a/roles/ui/files/FWO_UI/Pages/Settings/SettingsPasswordPolicy.razor b/roles/ui/files/FWO_UI/Pages/Settings/SettingsPasswordPolicy.razor
@@ -65,13 +65,20 @@
 
     protected override void OnInitialized()
     {
-        config = new ConfigDbAccess(apiConnection, 0);
+        try
+        {
+            config = new ConfigDbAccess(apiConnection, 0);
 
-        GetIntSetting(ref minLength, GlobalConfig.kPwMinLength);
-        GetBoolSetting(ref upperCaseRequired, GlobalConfig.kPwUpperCaseRequired);
-        GetBoolSetting(ref lowerCaseRequired, GlobalConfig.kPwLowerCaseRequired);
-        GetBoolSetting(ref numberRequired, GlobalConfig.kPwNumberRequired);
-        GetBoolSetting(ref specialCharactersRequired, GlobalConfig.kPwSpecialCharactersRequired);
+            GetIntSetting(ref minLength, GlobalConfig.kPwMinLength);
+            GetBoolSetting(ref upperCaseRequired, GlobalConfig.kPwUpperCaseRequired);
+            GetBoolSetting(ref lowerCaseRequired, GlobalConfig.kPwLowerCaseRequired);
+            GetBoolSetting(ref numberRequired, GlobalConfig.kPwNumberRequired);
+            GetBoolSetting(ref specialCharactersRequired, GlobalConfig.kPwSpecialCharactersRequired);
+        }
+        catch (Exception exception)
+        {
+            DisplayMessageInUi(exception, userConfig.GetText("read_config"), null, true);
+        }
     }
 
     private void GetIntSetting(ref int value, string setting)

diff --git a/roles/ui/files/FWO_UI/Pages/Settings/SettingsRecertification.razor b/roles/ui/files/FWO_UI/Pages/Settings/SettingsRecertification.razor
@@ -36,10 +36,10 @@
     protected override async Task OnInitializedAsync()
     {
         AuthenticationState authState = await authenticationStateTask;
-        UiUsersDbAccess uiUser = new UiUsersDbAccess(authState, apiConnection);
-        config = new ConfigDbAccess(apiConnection, uiUser.UiUser.DbId);
         try
         {
+            UiUsersDbAccess uiUser = new UiUsersDbAccess(authState, apiConnection);
+            config = new ConfigDbAccess(apiConnection, uiUser.UiUser.DbId);
             string settingsValue = config.Get(GlobalConfig.kRecertificationDisplayPeriod);
             if (settingsValue != "")
             {

diff --git a/roles/ui/files/FWO_UI/Pages/Settings/SettingsReport.razor b/roles/ui/files/FWO_UI/Pages/Settings/SettingsReport.razor
@@ -39,10 +39,10 @@
     protected override async Task OnInitializedAsync()
     {
         AuthenticationState authState = await authenticationStateTask;
-        UiUsersDbAccess uiUser = new UiUsersDbAccess(authState, apiConnection);
-        config = new ConfigDbAccess(apiConnection, uiUser.UiUser.DbId);
         try
         {
+            UiUsersDbAccess uiUser = new UiUsersDbAccess(authState, apiConnection);
+            config = new ConfigDbAccess(apiConnection, uiUser.UiUser.DbId);
             string settingsValue = config.Get(GlobalConfig.kElementsPerFetch);
             if (settingsValue != "")
             {