From 724e78d4d50a535118eb60cdfd942cd0bc47381b Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Sat, 24 Feb 2024 20:45:22 +0800
Subject: [PATCH 1/2] avoid the infinite loop issue of calling AddModuleMessage
 method.

---
 .../Modules/Controls/ModuleMessage.razor      | 29 +++++++++++++++----
 Oqtane.Client/UI/RenderModeBoundary.razor     | 28 +++++++++++-------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index 76b6b6425..50d2b2642 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -2,10 +2,10 @@
 @inherits ModuleControlBase
 @inject NavigationManager NavigationManager
 
-@if (!string.IsNullOrEmpty(_message))
+@if (Visible)
 {
     <div class="@_classname alert-dismissible fade show mb-3" role="alert">
-        @((MarkupString)_message)
+        @((MarkupString)Message)
         @if (PageState != null)
         {
             @if (Type == MessageType.Error && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
@@ -21,7 +21,6 @@
 }
 
 @code {
-    private string _message = string.Empty;
     private string _classname = string.Empty;
     private string _formname = "ModuleMessageForm";
 
@@ -31,6 +30,20 @@
     [Parameter]
     public MessageType Type { get; set; }
 
+    [Parameter]
+    public bool Visible{ get; set; }
+
+    public void RefreshMessage(string message, MessageType type, bool visible)
+    {
+        Message = message;
+        Type = type;
+        Visible = visible;
+
+        UpdateClassName();
+
+        StateHasChanged();
+    }
+
     protected override void OnInitialized()
     {
         if (ModuleState != null)
@@ -41,8 +54,12 @@
 
     protected override void OnParametersSet()
     {
-        _message = Message;
-        if (!string.IsNullOrEmpty(_message))
+        UpdateClassName();
+    }
+
+    private void UpdateClassName()
+    {
+        if (!string.IsNullOrEmpty(Message))
         {
             _classname = GetMessageType(Type);
         }
@@ -72,6 +89,6 @@
 
     private void DismissModal()
     {
-        _message = "";
+        Message = "";
     }
 }
diff --git a/Oqtane.Client/UI/RenderModeBoundary.razor b/Oqtane.Client/UI/RenderModeBoundary.razor
index 56833e478..e8b16d898 100644
--- a/Oqtane.Client/UI/RenderModeBoundary.razor
+++ b/Oqtane.Client/UI/RenderModeBoundary.razor
@@ -10,19 +10,13 @@
         {
             @if (ModuleType != null)
             {
-                @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "top")
-                {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" />
-                }
+                <ModuleMessage @ref="moduleMessageTop" Message="@_messageContent" Type="@_messageType" Visible="@(!string.IsNullOrEmpty(_messageContent) && _messagePosition == "top")" />
                 @DynamicComponent
                 @if (_progressIndicator)
                 {
                     <div class="app-progress-indicator"></div>
                 }
-                @if (!string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom")
-                {
-                    <ModuleMessage Message="@_messageContent" Type="@_messageType" />
-                }
+                <ModuleMessage @ref="moduleMessageBottom" Message="@_messageContent" Type="@_messageType" Visible="@(!string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom")" />
             }
         }
         else
@@ -47,6 +41,8 @@
     private string _messagePosition;
     private bool _progressIndicator = false;
     private string _error;
+    private ModuleMessage moduleMessageTop;
+    private ModuleMessage moduleMessageBottom;
 
     [Parameter]
     public SiteState SiteState { get; set; }
@@ -111,19 +107,20 @@
         _messageType = type;
         _messagePosition = position;
         _progressIndicator = false;
-        StateHasChanged();
+
+        Refresh();
     }
 
     public void ShowProgressIndicator()
     {
         _progressIndicator = true;
-        StateHasChanged();
+        Refresh();
     }
 
     public void HideProgressIndicator()
     {
         _progressIndicator = false;
-        StateHasChanged();
+        Refresh();
     }
 
     private void DismissMessage()
@@ -131,6 +128,15 @@
         _messageContent = "";
     }
 
+    private void Refresh()
+    {
+        var messageTopVisible = !string.IsNullOrEmpty(_messageContent) && _messagePosition == "top";
+        var messageBottomVisible = !string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom";
+
+        moduleMessageTop.RefreshMessage(_messageContent, _messageType, messageTopVisible);
+        moduleMessageBottom.RefreshMessage(_messageContent, _messageType, messageBottomVisible);
+    }
+
     protected override async Task OnErrorAsync(Exception exception)
     {
         // retrieve friendly localized error

From fc0b3264431fd6838035f4eefffd092fcb0d5da0 Mon Sep 17 00:00:00 2001
From: Ben <zyhfish@163.com>
Date: Sat, 24 Feb 2024 22:02:07 +0800
Subject: [PATCH 2/2] set the visible default to true.

---
 Oqtane.Client/Modules/Controls/ModuleMessage.razor |  2 +-
 Oqtane.Client/UI/RenderModeBoundary.razor          | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index 50d2b2642..b99704750 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -31,7 +31,7 @@
     public MessageType Type { get; set; }
 
     [Parameter]
-    public bool Visible{ get; set; }
+    public bool Visible { get; set; } = true;
 
     public void RefreshMessage(string message, MessageType type, bool visible)
     {
diff --git a/Oqtane.Client/UI/RenderModeBoundary.razor b/Oqtane.Client/UI/RenderModeBoundary.razor
index 6565b6e7e..05509b0f3 100644
--- a/Oqtane.Client/UI/RenderModeBoundary.razor
+++ b/Oqtane.Client/UI/RenderModeBoundary.razor
@@ -134,8 +134,15 @@
         var messageTopVisible = !string.IsNullOrEmpty(_messageContent) && _messagePosition == "top";
         var messageBottomVisible = !string.IsNullOrEmpty(_messageContent) && _messagePosition == "bottom";
 
-        moduleMessageTop.RefreshMessage(_messageContent, _messageType, messageTopVisible);
-        moduleMessageBottom.RefreshMessage(_messageContent, _messageType, messageBottomVisible);
+        if (moduleMessageTop != null)
+        {
+            moduleMessageTop.RefreshMessage(_messageContent, _messageType, messageTopVisible);
+        }
+
+        if (moduleMessageBottom != null)
+        {
+            moduleMessageBottom.RefreshMessage(_messageContent, _messageType, messageBottomVisible);
+        }
     }
 
     protected override async Task OnErrorAsync(Exception exception)