From 8c31cc47b0b0844df13c06f97b81d161300cc66a Mon Sep 17 00:00:00 2001
From: Nicola Murino <nicola.murino@gmail.com>
Date: Sun, 29 Oct 2023 08:17:24 +0100
Subject: [PATCH] web UIs: fix dismissable alerts

alerts can now be shown again after the user dismissal

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
---
 internal/httpd/webclient.go          |  2 +-
 templates/webadmin/admins.html       |  9 +++++++--
 templates/webadmin/connections.html  |  9 +++++++--
 templates/webadmin/defender.html     |  9 +++++++--
 templates/webadmin/eventactions.html |  9 +++++++--
 templates/webadmin/eventrules.html   |  9 +++++++--
 templates/webadmin/events.html       |  9 +++++++--
 templates/webadmin/folders.html      |  9 +++++++--
 templates/webadmin/groups.html       |  9 +++++++--
 templates/webadmin/iplists.html      |  9 +++++++--
 templates/webadmin/mfa.html          | 18 ++++++++++++++----
 templates/webadmin/roles.html        |  9 +++++++--
 templates/webadmin/users.html        |  9 +++++++--
 templates/webclient/editfile.html    |  9 +++++++--
 templates/webclient/mfa.html         | 18 ++++++++++++++----
 templates/webclient/sharefiles.html  |  9 +++++++--
 templates/webclient/shares.html      |  9 +++++++--
 17 files changed, 127 insertions(+), 37 deletions(-)

diff --git a/internal/httpd/webclient.go b/internal/httpd/webclient.go
index 1208a4a6..b7c0f301 100644
--- a/internal/httpd/webclient.go
+++ b/internal/httpd/webclient.go
@@ -1231,7 +1231,7 @@ func (s *httpdServer) handleClientEditFile(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	s.renderEditFilePage(w, r, name, b.String(), util.Contains(user.Filters.WebClient, sdk.WebClientWriteDisabled))
+	s.renderEditFilePage(w, r, name, b.String(), !user.CanAddFilesFromWeb(path.Dir(name)))
 }
 
 func (s *httpdServer) handleClientAddShareGet(w http.ResponseWriter, r *http.Request) {
diff --git a/templates/webadmin/admins.html b/templates/webadmin/admins.html
index 85d0094d..f1f033bc 100644
--- a/templates/webadmin/admins.html
+++ b/templates/webadmin/admins.html
@@ -28,12 +28,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 {{define "page_body"}}
 
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">
diff --git a/templates/webadmin/connections.html b/templates/webadmin/connections.html
index 79a51254..8933a905 100644
--- a/templates/webadmin/connections.html
+++ b/templates/webadmin/connections.html
@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">
diff --git a/templates/webadmin/defender.html b/templates/webadmin/defender.html
index be9026d4..9c1a2920 100644
--- a/templates/webadmin/defender.html
+++ b/templates/webadmin/defender.html
@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">View and manage auto blocklist</h6>
diff --git a/templates/webadmin/eventactions.html b/templates/webadmin/eventactions.html
index 532ceb72..f0f528dd 100644
--- a/templates/webadmin/eventactions.html
+++ b/templates/webadmin/eventactions.html
@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">View and manage event actions</h6>
diff --git a/templates/webadmin/eventrules.html b/templates/webadmin/eventrules.html
index aed23845..5480056f 100644
--- a/templates/webadmin/eventrules.html
+++ b/templates/webadmin/eventrules.html
@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div id="successMsg" class="card mb-4 border-left-success" style="display: none;">
     <div id="successTxt" class="card-body"></div>
 </div>
diff --git a/templates/webadmin/events.html b/templates/webadmin/events.html
index edcaf139..e83d84e1 100644
--- a/templates/webadmin/events.html
+++ b/templates/webadmin/events.html
@@ -28,12 +28,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">Search logs</h6>
diff --git a/templates/webadmin/folders.html b/templates/webadmin/folders.html
index 69bd6fc3..753be648 100644
--- a/templates/webadmin/folders.html
+++ b/templates/webadmin/folders.html
@@ -27,12 +27,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div id="successMsg" class="card mb-4 border-left-success" style="display: none;">
     <div id="successTxt" class="card-body"></div>
diff --git a/templates/webadmin/groups.html b/templates/webadmin/groups.html
index 56e6f9cb..ec904667 100644
--- a/templates/webadmin/groups.html
+++ b/templates/webadmin/groups.html
@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">
diff --git a/templates/webadmin/iplists.html b/templates/webadmin/iplists.html
index e58afed1..20243cf4 100644
--- a/templates/webadmin/iplists.html
+++ b/templates/webadmin/iplists.html
@@ -27,12 +27,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header py-3">
         <h6 class="m-0 font-weight-bold text-primary">View and manage IP Lists</h6>
diff --git a/templates/webadmin/mfa.html b/templates/webadmin/mfa.html
index f48b90e2..44a981e5 100644
--- a/templates/webadmin/mfa.html
+++ b/templates/webadmin/mfa.html
@@ -31,12 +31,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successTOTPMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successTOTPTxt" class="card-body"></div>
         </div>
-        <div id="errorTOTPMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorTOTPMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorTOTPTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorTOTPMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorTOTPMsg(){
+                $('#errorTOTPMsg').hide();
+            }
+        </script>
         <div>
             <p>Status: {{if .TOTPConfig.Enabled }}"Enabled". Current configuration: "{{.TOTPConfig.ConfigName}}"{{else}}"Disabled"{{end}}</p>
         </div>
@@ -93,12 +98,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successRecCodesMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successRecCodesTxt" class="card-body"></div>
         </div>
-        <div id="errorRecCodesMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorRecCodesMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorRecCodesTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorRecCodesMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorRecCodesMsg(){
+                $('#errorRecCodesMsg').hide();
+            }
+        </script>
         <div>
             <p>Recovery codes are a set of one time use codes that can be used in place of the TOTP to login to the web UI. You can use them if you lose access to your phone to login to your account and disable or regenerate TOTP configuration.</p>
             <p>To keep your account secure, don't share or distribute your recovery codes. We recommend saving them with a secure password manager.</p>
diff --git a/templates/webadmin/roles.html b/templates/webadmin/roles.html
index 9e051f10..f2654905 100644
--- a/templates/webadmin/roles.html
+++ b/templates/webadmin/roles.html
@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">
diff --git a/templates/webadmin/users.html b/templates/webadmin/users.html
index 6a59084f..ea3b0bd0 100644
--- a/templates/webadmin/users.html
+++ b/templates/webadmin/users.html
@@ -28,12 +28,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 {{define "page_body"}}
 
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div id="successMsg" class="card mb-4 border-left-success" style="display: none;">
     <div id="successTxt" class="card-body"></div>
diff --git a/templates/webclient/editfile.html b/templates/webclient/editfile.html
index 1b665dcf..8b486520 100644
--- a/templates/webclient/editfile.html
+++ b/templates/webclient/editfile.html
@@ -42,12 +42,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 <div class="card shadow mb-4">
     <div class="card-header">
         <h6 class="d-flex justify-content-between align-items-center">
diff --git a/templates/webclient/mfa.html b/templates/webclient/mfa.html
index 23a03007..cb7f5469 100644
--- a/templates/webclient/mfa.html
+++ b/templates/webclient/mfa.html
@@ -31,12 +31,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successTOTPMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successTOTPTxt" class="card-body"></div>
         </div>
-        <div id="errorTOTPMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorTOTPMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorTOTPTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorTOTPMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorTOTPMsg(){
+                $('#errorTOTPMsg').hide();
+            }
+        </script>
         <div>
             <p>Status: {{if .TOTPConfig.Enabled }}"Enabled". Current configuration: "{{.TOTPConfig.ConfigName}}"{{else}}"Disabled"{{end}}</p>
         </div>
@@ -118,12 +123,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
         <div id="successRecCodesMsg" class="card mb-4 border-left-success" style="display: none;">
             <div id="successRecCodesTxt" class="card-body"></div>
         </div>
-        <div id="errorRecCodesMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorRecCodesMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorRecCodesTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorRecCodesMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorRecCodesMsg(){
+                $('#errorRecCodesMsg').hide();
+            }
+        </script>
         <div>
             <p>Recovery codes are a set of one time use codes that can be used in place of the TOTP to login to the web UI. You can use them if you lose access to your phone to login to your account and disable or regenerate TOTP configuration.</p>
             <p>To keep your account secure, don't share or distribute your recovery codes. We recommend saving them with a secure password manager.</p>
diff --git a/templates/webclient/sharefiles.html b/templates/webclient/sharefiles.html
index 9daec775..149cc4e7 100644
--- a/templates/webclient/sharefiles.html
+++ b/templates/webclient/sharefiles.html
@@ -46,12 +46,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
             </button>
         </div>
         {{end}}
-        <div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+        <div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
             <span id="errorTxt"></span>
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
               <span aria-hidden="true">&times;</span>
             </button>
         </div>
+        <script type="text/javascript">
+            function dismissErrorMsg(){
+                $('#errorMsg').hide();
+            }
+        </script>
         <div id="tableContainer" class="table-responsive">
             <table class="table table-hover nowrap" id="dataTable" width="100%" cellspacing="0">
                 <thead>
diff --git a/templates/webclient/shares.html b/templates/webclient/shares.html
index 4b9d0507..c6b454cf 100644
--- a/templates/webclient/shares.html
+++ b/templates/webclient/shares.html
@@ -26,12 +26,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {{end}}
 
 {{define "page_body"}}
-<div id="errorMsg" class="alert alert-warning alert-dismissible fade show" style="display: none;" role="alert">
+<div id="errorMsg" class="alert alert-warning fade show" style="display: none;" role="alert">
     <span id="errorTxt"></span>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <button type="button" class="close" aria-label="Close" onclick="dismissErrorMsg();">
       <span aria-hidden="true">&times;</span>
     </button>
 </div>
+<script type="text/javascript">
+    function dismissErrorMsg(){
+        $('#errorMsg').hide();
+    }
+</script>
 
 <div class="card shadow mb-4">
     <div class="card-header py-3">