From bf452eedf5ab3719bcbfa89e9cecd211ac32f0b0 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Wed, 25 Sep 2019 14:26:18 -0400
Subject: [PATCH] implement new AddModuleMessage

---
 Oqtane.Client/Modules/Admin/Login/Index.razor          |  6 ++----
 .../Modules/Admin/ModuleDefinitions/Edit.razor         |  8 ++------
 Oqtane.Client/Modules/Admin/Pages/Add.razor            | 10 +++-------
 Oqtane.Client/Modules/Admin/Pages/Delete.razor         |  8 ++------
 Oqtane.Client/Modules/Admin/Pages/Edit.razor           | 10 +++-------
 Oqtane.Client/Modules/Admin/Profile/Index.razor        |  9 +++------
 Oqtane.Client/Modules/Controls/ModuleMessage.razor     |  3 ++-
 Oqtane.Client/Modules/HtmlText/Edit.razor              |  7 ++-----
 8 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
index 21e66851..40c461a1 100644
--- a/Oqtane.Client/Modules/Admin/Login/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -14,7 +14,6 @@
     </Authorized>
     <NotAuthorized>
         <div class="container">
-            @((MarkupString)Message)
             <div class="form-group">
                 <label for="Username" class="control-label">Username: </label>
                 <input type="text" name="Username" class="form-control" placeholder="Username" @bind="@Username" />
@@ -38,7 +37,6 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Anonymous; } }
 
-    public string Message { get; set; } = "";
     public string Username { get; set; } = "";
     public string Password { get; set; } = "";
     public bool Remember { get; set; } = false;
@@ -66,7 +64,7 @@
             }
             else
             {
-                Message = "<div class=\"alert alert-danger\" role=\"alert\">Login Failed. Please Remember That Passwords Are Case Sensitive.</div>";
+                ModuleInstance.AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive.", MessageType.Error);
             }
         }
         else
@@ -84,7 +82,7 @@
             }
             else
             {
-                Message = "<div class=\"alert alert-danger\" role=\"alert\">Login Failed. Please Remember That Passwords Are Case Sensitive.</div>";
+                ModuleInstance.AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive.", MessageType.Error);
             }
         }
     }
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
index 461d7bd5..e9d389a0 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
@@ -3,8 +3,6 @@
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject NavigationManager NavigationManager
 
-<ModuleMessage Message="@message" />
-
 <table class="table table-borderless">
     <tr>
         <td>
@@ -32,8 +30,6 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
 
-    string message = "";
-
     int ModuleDefinitionId;
     string name;
     string permissions;
@@ -62,7 +58,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -77,7 +73,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 0e413bec..999b14e2 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -4,8 +4,6 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 
-<ModuleMessage Message="@message" />
-
 <table class="table table-borderless">
     <tr>
         <td>
@@ -136,8 +134,6 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
 
-    string message = "";
-
     Dictionary<string, string> themes = new Dictionary<string, string>();
     Dictionary<string, string> panelayouts = new Dictionary<string, string>();
 
@@ -177,7 +173,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -198,7 +194,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -277,7 +273,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
index 1372a997..b199f6c8 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -4,8 +4,6 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 
-<ModuleMessage Message="@message" />
-
 <table class="table table-borderless">
     <tr>
         <td>
@@ -113,8 +111,6 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
 
-    string message = "";
-
     Dictionary<string, string> themes = new Dictionary<string, string>();
     Dictionary<string, string> panelayouts = new Dictionary<string, string>();
 
@@ -162,7 +158,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -175,7 +171,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 0eb64d17..32954007 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -4,8 +4,6 @@
 @inject IPageService PageService
 @inject IThemeService  ThemeService
 
-<ModuleMessage Message="@message" />
-
 <table class="table table-borderless">
     <tr>
         <td>
@@ -150,8 +148,6 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Admin; } }
 
-    string message = "";
-
     Dictionary<string, string> themes = new Dictionary<string, string>();
     Dictionary<string, string> panelayouts = new Dictionary<string, string>();
 
@@ -220,7 +216,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -249,7 +245,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -350,7 +346,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/Profile/Index.razor b/Oqtane.Client/Modules/Admin/Profile/Index.razor
index 52bc2fe3..32558069 100644
--- a/Oqtane.Client/Modules/Admin/Profile/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Profile/Index.razor
@@ -5,8 +5,6 @@
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 
-<ModuleMessage Message="@message" />
-
 @if (PageState.User != null && profiles != null)
 {
     <table class="table table-borderless">
@@ -58,7 +56,6 @@
 @code {
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.View; } }
 
-    string message = "";
     string displayname = "";
     string email = "";
     List<Profile> profiles;
@@ -78,12 +75,12 @@
             }
             else
             {
-                message = "Current User Is Not Logged In";
+                ModuleInstance.AddModuleMessage("Current User Is Not Logged In", MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -106,7 +103,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index b51038d9..a756e9dd 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -4,7 +4,7 @@
 @if (!string.IsNullOrEmpty(message))
 {
     <div class="@classname" role="alert">@message</div>
-    <br /><br />
+    <br />
 }
 
 @code {
@@ -27,6 +27,7 @@
     {
         this.message = message;
         classname = GetMessageType(type);
+        StateHasChanged();
     }
 
     private string GetMessageType(MessageType type)
diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
index f8a993b6..042ef07a 100644
--- a/Oqtane.Client/Modules/HtmlText/Edit.razor
+++ b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -6,8 +6,6 @@
 @inject HttpClient http
 @inject SiteState sitestate
 
-<ModuleMessage Message="@message" />
-
 <table class="form-group">
     <tr>
         <td>
@@ -28,7 +26,6 @@
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Edit; } }
     public override string Title { get { return "Edit Html/Text"; } }
 
-    string message = "";
     string content;
     string createdby;
     DateTime createdon;
@@ -52,7 +49,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 
@@ -78,7 +75,7 @@
         }
         catch (Exception ex)
         {
-            message = ex.Message;
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
 }