From 39516b97784141de507bd3c58c878db13a6a12e1 Mon Sep 17 00:00:00 2001
From: Aytunc BEKEN <aytunc@authenteq.com>
Date: Wed, 27 May 2020 13:56:48 +0200
Subject: [PATCH 1/3] JENKINS-62285

---
 .../index.jelly                               |  1 +
 src/main/webapp/js/addrole.js                 | 22 +++++++++----------
 src/main/webapp/js/folders.js                 |  2 +-
 src/main/webapp/js/managesids.js              | 12 +++++-----
 src/main/webapp/js/notification.js            | 16 ++++++++++++++
 5 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 src/main/webapp/js/notification.js

diff --git a/src/main/resources/io/jenkins/plugins/folderauth/FolderAuthorizationStrategyManagementLink/index.jelly b/src/main/resources/io/jenkins/plugins/folderauth/FolderAuthorizationStrategyManagementLink/index.jelly
index a2dec7e..c42f111 100644
--- a/src/main/resources/io/jenkins/plugins/folderauth/FolderAuthorizationStrategyManagementLink/index.jelly
+++ b/src/main/resources/io/jenkins/plugins/folderauth/FolderAuthorizationStrategyManagementLink/index.jelly
@@ -3,6 +3,7 @@
     <l:layout permission="${app.ADMINISTER}" norefresh="true" title="${%title}">
         <st:include it="${app}" page="sidepanel.jelly" optional="true"/>
         <l:main-panel>
+            <script src="${rootURL}/plugin/folder-auth/js/notification.js"/>
             <script src="${rootURL}/plugin/folder-auth/js/addrole.js"/>
             <script src="${rootURL}/plugin/folder-auth/js/folders.js"/>
             <script src="${rootURL}/plugin/folder-auth/js/managesids.js"/>
diff --git a/src/main/webapp/js/addrole.js b/src/main/webapp/js/addrole.js
index 62657a5..9acb5d4 100644
--- a/src/main/webapp/js/addrole.js
+++ b/src/main/webapp/js/addrole.js
@@ -7,7 +7,7 @@
 const addGlobalRole = () => {
     const roleName = document.getElementById('globalRoleName').value;
     if (!roleName || roleName.length < 3) {
-        alert('Please enter a valid name for the role to be added.');
+        showNotificationERROR('Please enter a valid name for the role to be added.');
         return;
     }
 
@@ -17,7 +17,7 @@ const addGlobalRole = () => {
     };
 
     if (response.permissions.length <= 0) {
-        alert('Please select at least one permission');
+        showNotificationERROR('Please select at least one permission');
         return;
     }
 
@@ -31,7 +31,7 @@ const addGlobalRole = () => {
 const addFolderRole = () => {
     const roleName = document.getElementById('folderRoleName').value;
     if (!roleName || roleName.length < 3) {
-        alert('Please enter a valid name for the role to be added');
+        showNotificationERROR('Please enter a valid name for the role to be added');
         return;
     }
 
@@ -42,12 +42,12 @@ const addFolderRole = () => {
     };
 
     if (!response.permissions || response.permissions.length <= 0) {
-        alert('Please select at least one permission');
+        showNotificationERROR('Please select at least one permission');
         return;
     }
 
     if (!response.folderNames || response.folderNames.length <= 0) {
-        alert('Please select at least one folder on which this role will be applicable');
+        showNotificationERROR('Please select at least one folder on which this role will be applicable');
         return;
     }
 
@@ -61,7 +61,7 @@ const addFolderRole = () => {
 const addAgentRole = () => {
     const roleName = document.getElementById('agentRoleName').value;
     if (!roleName || roleName.length < 3) {
-        alert('Please enter a valid name for the role to be added');
+        showNotificationERROR('Please enter a valid name for the role to be added');
         return;
     }
 
@@ -72,12 +72,12 @@ const addAgentRole = () => {
     };
 
     if (!response.permissions || response.permissions.length <= 0) {
-        alert('Please select at least one permission');
+        showNotificationERROR('Please select at least one permission');
         return;
     }
 
     if (!response.agentNames || response.agentNames.length <= 0) {
-        alert('Please select at least one agent on which this role will be applicable');
+        showNotificationERROR('Please select at least one agent on which this role will be applicable');
         return;
     }
 
@@ -100,10 +100,10 @@ const sendPostRequest = (postUrl, json) => {
 
     xhr.onload = () => {
         if (xhr.status === 200) {
-            alert('The role was added successfully');
-            location.reload(); // refresh the page
+            showNotificationOK('The role was added successfully');
+            //location.reload(); // refresh the page
         } else {
-            alert('Unable to add the role\n' + xhr.responseText);
+            showNotificationERROR('Unable to add the role\n' + xhr.responseText);
         }
     };
 
diff --git a/src/main/webapp/js/folders.js b/src/main/webapp/js/folders.js
index 4c980e6..f264a28 100644
--- a/src/main/webapp/js/folders.js
+++ b/src/main/webapp/js/folders.js
@@ -13,7 +13,7 @@ const getFolders = () => {
     };
 
     xhr.onerror = () => {
-        alert(`Unable to get the list of folders: ${xhr.responseText}`);
+        showNotificationERROR(`Unable to get the list of folders: ${xhr.responseText}`);
     };
 };
 
diff --git a/src/main/webapp/js/managesids.js b/src/main/webapp/js/managesids.js
index 9d2590f..b369677 100644
--- a/src/main/webapp/js/managesids.js
+++ b/src/main/webapp/js/managesids.js
@@ -21,16 +21,16 @@ function assignSid(roleType, roleName, sidInputBoxId) {
     request.open('POST', url);
     request.onload = () => {
         if (request.status === 200) {
-            alert('Sid added successfully.');
+            showNotificationOK('Sid added successfully.');
             location.reload();
         } else {
-            alert('Unable to remove the sid.' + request.responseText);
+            showNotificationERROR('Unable to remove the sid.' + request.responseText);
         }
 
     };
 
     request.onerror = () => {
-        alert('Unable to add the sid to the role: ' + request.responseText);
+        showNotificationERROR('Unable to add the sid to the role: ' + request.responseText);
     };
 
     // see addRole.js
@@ -59,15 +59,15 @@ function removeSid(roleType, roleName, sidInputBoxId) {
     request.open('POST', url);
     request.onload = () => {
         if (request.status === 200) {
-            alert('Sid removed successfully.');
+            showNotificationOK('Sid removed successfully.');
             location.reload();
         } else {
-            alert('Unable to remove the sid.' + request.responseText);
+            showNotificationERROR('Unable to remove the sid.' + request.responseText);
         }
     };
 
     request.onerror = () => {
-        alert('Unable to remove the sid from the role: ' + request.responseText);
+        showNotificationERROR('Unable to remove the sid from the role: ' + request.responseText);
     };
 
     // see addRole.js
diff --git a/src/main/webapp/js/notification.js b/src/main/webapp/js/notification.js
new file mode 100644
index 0000000..c5580ef
--- /dev/null
+++ b/src/main/webapp/js/notification.js
@@ -0,0 +1,16 @@
+function showNotification(message, options, reload = false) {
+    notificationBar.show(message, options);
+    if (reload) {
+        window.setTimeout(function () {
+            location.reload();
+        }, notificationBar.DELAY);
+    }
+}
+
+function showNotificationOK(message) {
+    showNotification(message, notificationBar.OK, true);
+}
+
+function showNotificationERROR(message) {
+    showNotification(message, notificationBar.ERROR);
+}

From 7239149c857b5ddf463685fecd0cb3fb770b5336 Mon Sep 17 00:00:00 2001
From: Aytunc BEKEN <aytunc@authenteq.com>
Date: Wed, 27 May 2020 15:26:57 +0200
Subject: [PATCH 2/3] additional location.reload() removed

---
 src/main/webapp/js/addrole.js    | 1 -
 src/main/webapp/js/managesids.js | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/webapp/js/addrole.js b/src/main/webapp/js/addrole.js
index 9acb5d4..b59a323 100644
--- a/src/main/webapp/js/addrole.js
+++ b/src/main/webapp/js/addrole.js
@@ -101,7 +101,6 @@ const sendPostRequest = (postUrl, json) => {
     xhr.onload = () => {
         if (xhr.status === 200) {
             showNotificationOK('The role was added successfully');
-            //location.reload(); // refresh the page
         } else {
             showNotificationERROR('Unable to add the role\n' + xhr.responseText);
         }
diff --git a/src/main/webapp/js/managesids.js b/src/main/webapp/js/managesids.js
index b369677..a5dfd68 100644
--- a/src/main/webapp/js/managesids.js
+++ b/src/main/webapp/js/managesids.js
@@ -22,7 +22,6 @@ function assignSid(roleType, roleName, sidInputBoxId) {
     request.onload = () => {
         if (request.status === 200) {
             showNotificationOK('Sid added successfully.');
-            location.reload();
         } else {
             showNotificationERROR('Unable to remove the sid.' + request.responseText);
         }
@@ -60,8 +59,7 @@ function removeSid(roleType, roleName, sidInputBoxId) {
     request.onload = () => {
         if (request.status === 200) {
             showNotificationOK('Sid removed successfully.');
-            location.reload();
-        } else {
+        } else {s
             showNotificationERROR('Unable to remove the sid.' + request.responseText);
         }
     };

From 5f3f128462528df99d96d1d1a99160723a1abf89 Mon Sep 17 00:00:00 2001
From: Aytunc BEKEN <aytunc@authenteq.com>
Date: Wed, 27 May 2020 15:33:18 +0200
Subject: [PATCH 3/3] additional location.reload() removed

---
 src/main/webapp/js/managesids.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/js/managesids.js b/src/main/webapp/js/managesids.js
index a5dfd68..860876c 100644
--- a/src/main/webapp/js/managesids.js
+++ b/src/main/webapp/js/managesids.js
@@ -59,7 +59,7 @@ function removeSid(roleType, roleName, sidInputBoxId) {
     request.onload = () => {
         if (request.status === 200) {
             showNotificationOK('Sid removed successfully.');
-        } else {s
+        } else {
             showNotificationERROR('Unable to remove the sid.' + request.responseText);
         }
     };