From 88d86f4a7ae0e19a427c1501ecfe90ca50c9e618 Mon Sep 17 00:00:00 2001
From: Braun Patrik <braun.patrik@aut.bme.hu>
Date: Fri, 14 Jul 2017 09:28:52 +0200
Subject: [PATCH] improving notifications

---
 backend/model/ConfigDiagnostics.ts      | 24 ++++++++++++------------
 frontend/app/admin/admin.component.html |  2 +-
 frontend/app/admin/admin.component.ts   | 15 ++++++++++++---
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/backend/model/ConfigDiagnostics.ts b/backend/model/ConfigDiagnostics.ts
index e7f370db..a4935dc4 100644
--- a/backend/model/ConfigDiagnostics.ts
+++ b/backend/model/ConfigDiagnostics.ts
@@ -44,9 +44,9 @@ export class ConfigDiagnostics {
   static async testThumbnailFolder(folder: string) {
     await new Promise((resolve, reject) => {
       if (!fs.existsSync(folder)) {
-        reject("Thumbnail folder not exists: " + folder);
+        reject("Thumbnail folder not exists: '" + folder + "'");
       }
-      fs.access(folder, fs.constants.W_OK, function (err) {
+      fs.access(folder, fs.constants.W_OK, (err) => {
         if (err) {
           reject({message: "Error during getting write access to temp folder", error: err});
         }
@@ -58,9 +58,9 @@ export class ConfigDiagnostics {
   static async testImageFolder(folder: string) {
     await new Promise((resolve, reject) => {
       if (!fs.existsSync(folder)) {
-        reject("Images folder not exists: " + folder);
+        reject("Images folder not exists: '" + folder + "'");
       }
-      fs.access(folder, fs.constants.R_OK, function (err) {
+      fs.access(folder, fs.constants.R_OK, (err) => {
         if (err) {
           reject({message: "Error during getting read access to images folder", error: err});
         }
@@ -103,8 +103,8 @@ export class ConfigDiagnostics {
         await ConfigDiagnostics.testDatabase(Config.Server.database);
       } catch (err) {
         Logger.warn(LOG_TAG, "[MYSQL error]", err);
-        Logger.warn(LOG_TAG, "Error during initializing mysql falling back to memory DB");
-        NotificationManager.warning("Error during initializing mysql falling back to memory DB", err);
+        Logger.warn(LOG_TAG, "Error during initializing mysql falling back temporally to memory DB");
+        NotificationManager.warning("Error during initializing mysql falling back temporally to memory DB", err);
         Config.setDatabaseType(DatabaseType.memory);
       }
     }
@@ -115,11 +115,11 @@ export class ConfigDiagnostics {
       } catch (err) {
         NotificationManager.warning("Thumbnail hardware acceleration is not possible." +
           " '" + ThumbnailProcessingLib[Config.Server.thumbnail.processingLibrary] + "' node module is not found." +
-          " Falling back to JS based thumbnail generation", err);
+          " Falling back temporally to JS based thumbnail generation", err);
         Logger.warn(LOG_TAG, "[Thumbnail hardware acceleration] module error: ", err);
         Logger.warn(LOG_TAG, "Thumbnail hardware acceleration is not possible." +
           " '" + ThumbnailProcessingLib[Config.Server.thumbnail.processingLibrary] + "' node module is not found." +
-          " Falling back to JS based thumbnail generation");
+          " Falling back temporally to JS based thumbnail generation");
         Config.Server.thumbnail.processingLibrary = ThumbnailProcessingLib.Jimp;
       }
     }
@@ -143,7 +143,7 @@ export class ConfigDiagnostics {
     try {
       await ConfigDiagnostics.testSearchConfig(Config.Client.Search);
     } catch (err) {
-      NotificationManager.warning("Search is not supported with these settings, switching off..", err);
+      NotificationManager.warning("Search is not supported with these settings. Disabling temporally. Please adjust the config properly.", err);
       Logger.warn(LOG_TAG, "Search is not supported with these settings, switching off..", err);
       Config.Client.Search.enabled = false;
     }
@@ -151,7 +151,7 @@ export class ConfigDiagnostics {
     try {
       await ConfigDiagnostics.testSharingConfig(Config.Client.Sharing);
     } catch (err) {
-      NotificationManager.warning("Sharing is not supported with these settings, switching off..", err);
+      NotificationManager.warning("Sharing is not supported with these settings. Disabling temporally. Please adjust the config properly.", err);
       Logger.warn(LOG_TAG, "Sharing is not supported with these settings, switching off..", err);
       Config.Client.Sharing.enabled = false;
     }
@@ -159,8 +159,8 @@ export class ConfigDiagnostics {
     try {
       await ConfigDiagnostics.testMapConfig(Config.Client.Map);
     } catch (err) {
-      NotificationManager.warning("Maps is not supported with these settings, switching off..", err);
-      Logger.warn(LOG_TAG, "Maps is not supported with these settings, switching off..", err);
+      NotificationManager.warning("Maps is not supported with these settings. Disabling temporally. Please adjust the config properly.", err);
+      Logger.warn(LOG_TAG, "Maps is not supported with these settings. Disabling temporally. Please adjust the config properly.", err);
       Config.Client.Map.enabled = false;
     }
 
diff --git a/frontend/app/admin/admin.component.html b/frontend/app/admin/admin.component.html
index 259807e5..c4b4c3a4 100644
--- a/frontend/app/admin/admin.component.html
+++ b/frontend/app/admin/admin.component.html
@@ -8,7 +8,7 @@
       <div class="panel-body">
         <ng-container *ngFor="let notification of notificationService.notifications">
 
-          <div class="alert alert-{{NotificationType[notification.type]}}" role="alert">
+          <div class="alert alert-{{getCss(notification.type)}}" role="alert">
             {{notification.message}}
             <br *ngIf="notification.details"/>
             {{notification.details | json}}
diff --git a/frontend/app/admin/admin.component.ts b/frontend/app/admin/admin.component.ts
index b7dc4e58..7928b091 100644
--- a/frontend/app/admin/admin.component.ts
+++ b/frontend/app/admin/admin.component.ts
@@ -13,13 +13,10 @@ import {NotificationType} from "../../../common/entities/NotificationDTO";
 export class AdminComponent implements OnInit {
   userManagementEnable: boolean = false;
 
-  NotificationType: any;
-
   constructor(private _authService: AuthenticationService,
               private _router: Router,
               public notificationService: NotificationService) {
     this.userManagementEnable = Config.Client.authenticationRequired;
-    this.NotificationType = NotificationType;
   }
 
   ngOnInit() {
@@ -30,6 +27,18 @@ export class AdminComponent implements OnInit {
     }
   }
 
+  public getCss(type: NotificationType) {
+    switch (type) {
+      case NotificationType.error:
+        return "danger";
+      case NotificationType.warning:
+        return "warning";
+      case NotificationType.info:
+        return "info";
+    }
+    return "info";
+  }
+
 }