From 15a15699fe95304f55397ad5930d259f92f3a665 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 3 Dec 2019 10:16:02 +0100
Subject: [PATCH 1/3] if by any chance user is null then reload webpage (but it
 should never happen)

---
 frontend-js/src/main/js/ServerConnector.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 1b12de302..d8f03818b 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -1340,6 +1340,10 @@ ServerConnector.getLoggedUser = function () {
   if (self._loggedUser !== undefined && self._loggedUser !== null) {
     return Promise.resolve(self._loggedUser);
   } else {
+    if (self.getSessionData().getLogin() === null) {
+      logger.warn("User login is null...");
+      window.location.reload(false);
+    }
     //this prevents double calls
     self._loggedUser = self.getUser(self.getSessionData().getLogin()).then(function (user) {
       if (user !== null) {
@@ -2049,7 +2053,7 @@ ServerConnector.createSession = function () {
 ServerConnector.login = function (login, password) {
   var self = this;
   var params = {};
-  if (login !== undefined && login !== "") {
+  if (login !== undefined && login !== "" && login !== null) {
     params.login = login;
     params.password = password;
   } else {
-- 
GitLab


From 32a6930e704476752bb162539d29ddddbaa99f05 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 3 Dec 2019 10:38:18 +0100
Subject: [PATCH 2/3] clear button disappear in the right order

---
 CHANGELOG                                     |  3 +++
 frontend-js/src/main/css/global.css           |  4 +---
 .../src/main/js/gui/topMenu/TopMenu.js        | 23 ++++++++-----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 95d304a9c..09a1b022d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,9 @@ minerva (14.0.5) stable; urgency=medium
     #1012)
   * Bug fix: after loading/removing too many plugins it was impossible to load
     new plugins (#1011)
+  * Bug fix: CLEAR button disappears after legend, comment checkboxes when 
+    plugin tab used to much space (#976)
+
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 02 Dec 2019 16:00:00 +0200
 
diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css
index 85376e0f3..cdfb749a0 100644
--- a/frontend-js/src/main/css/global.css
+++ b/frontend-js/src/main/css/global.css
@@ -57,9 +57,7 @@ h5 {
     color: #ffffff;
     display: inline;
     width: auto;
-    position: absolute;
-    top: 0;
-    right: 0;
+    float: right;
 }
 
 .minerva-header a:hover {
diff --git a/frontend-js/src/main/js/gui/topMenu/TopMenu.js b/frontend-js/src/main/js/gui/topMenu/TopMenu.js
index 08ba1e70d..23969f0da 100644
--- a/frontend-js/src/main/js/gui/topMenu/TopMenu.js
+++ b/frontend-js/src/main/js/gui/topMenu/TopMenu.js
@@ -102,17 +102,22 @@ TopMenu.prototype._createGui = function () {
   showOverviewDiv.appendChild(showOverviewButton);
   self.setControlElement(PanelControlElementType.MENU_SHOW_OVERVIEW_BUTTON, showOverviewButton);
 
-  var rightHeaderMenuDiv = Functions.createElement({
-    type: "div",
-    className: "minerva-header-right-menu"
+  var clearButton = Functions.createElement({
+    type: "button",
+    name: "clearButton",
+    className: "minerva-overview-button",
+    style: "float:right",
+    content: "<i class='fa fa-times' style='font-size:18px; font-weight:300; padding-right:10px;'></i>CLEAR",
+    xss: false
   });
-  self.getElement().appendChild(rightHeaderMenuDiv);
+  self.getElement().appendChild(clearButton);
 
   var div4checkboxes = Functions.createElement({
     type: "div",
+    style: "float:right",
     className: "minerva-top-checkbox-div"
   });
-  rightHeaderMenuDiv.appendChild(div4checkboxes);
+  self.getElement().appendChild(div4checkboxes);
 
   var legendCheckbox = Functions.createElement({
     type: "input",
@@ -149,14 +154,6 @@ TopMenu.prototype._createGui = function () {
   div4checkboxes.appendChild(refreshCommentButton);
   self.setControlElement(PanelControlElementType.MENU_REFRESH_COMMENTS_BUTTON, refreshCommentButton);
 
-  var clearButton = Functions.createElement({
-    type: "button",
-    name: "clearButton",
-    className: "minerva-overview-button",
-    content: "<i class='fa fa-times' style='font-size:18px; font-weight:300; padding-right:10px;'></i>CLEAR",
-    xss: false
-  });
-  rightHeaderMenuDiv.appendChild(clearButton);
   self.setControlElement(PanelControlElementType.MENU_CLEAR_BUTTON, clearButton);
 
 };
-- 
GitLab


From f099a38a16411a1bd81f881702a09ffd0a48264f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 3 Dec 2019 10:40:04 +0100
Subject: [PATCH 3/3] changelog updated

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 09a1b022d..6d617bcff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,7 +20,7 @@ minerva (14.0.5) stable; urgency=medium
     plugin tab used to much space (#976)
 
 
- -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 02 Dec 2019 16:00:00 +0200
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Tue, 03 Dec 2019 12:00:00 +0200
 
 minerva (14.0.4) stable; urgency=high
   * Bug fix: some SBGN files uploaded to minerva could not be exported to SBML
-- 
GitLab