Merge branch '1008-incorrect-display-of-available-overlays-in-the-user-view' into 'devel_14.0.x'

list of overlays for admin and curator included also other people overlays

See merge request !1003

CHANGELOG

-minerva (14.0.3) stable; urgency=medium
+minerva (14.0.3) stable; urgency=high
   * Bug fix: some SBGN files uploaded to minerva could not be exported to SBML
     due to problems with identifiers used by SBGN (#1006)
   * Bug fix: upload of data overlay with conflicting overlay types caused error
     (#998)
   * Bug fix: upload of sbml file with protein modifications inside complex 
     crashed visualization (#966)
+  * Bug fix: list of overlays for admin and curator included also other people
+    overlays (regression 14.0.3, #1008)
 
- -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 06 Nov 2019 12:00:00 +0200
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 07 Nov 2019 16:00:00 +0200
 
 minerva (14.0.3) stable; urgency=medium
   * Bug fix: default zoom level on main map works even when x or y are

frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js

@@ -8,7 +8,7 @@ require('datatables.net-rowreorder')();
 var AddOverlayDialog = require('../AddOverlayDialog');
 var Panel = require('../Panel');
 var PanelControlElementType = require('../PanelControlElementType');
-var ValidationError  = require('../../ValidationError');
+var ValidationError = require('../../ValidationError');
 
 var GuiConnector = require('../../GuiConnector');
 // noinspection JSUnusedLocalSymbols
@@ -469,7 +469,7 @@ OverlayPanel.prototype.refresh = function (showDefault) {
       selectedOverlay[visibleDataOverlays[j].getId()] = true;
     }
 
-    return self.getServerConnector().getOverlays();
+    return self.getServerConnector().getOverlays({creator: user.getLogin()});
   }).then(function (overlaysFromServer) {
     self.getProject().addOrUpdateDataOverlays(overlaysFromServer);
 

frontend-js/testFiles/apiCalls/projects/complex_model_with_images/overlays/creator=anonymous&token=MOCK_TOKEN_ID&

+[{"defaultOverlay":false,"deprecatedColumns":[],"description":null,"googleLicenseConsent":false,"idObject":17987,"images":[{"modelId":19397,"path":"_nested0"},{"modelId":19399,"path":"_nested3"},{"modelId":19398,"path":"_nested1"},{"modelId":19400,"path":"_nested2"}],"inputDataAvailable":false,"name":"Pathways and compartments","order":1,"publicOverlay":true},{"defaultOverlay":false,"deprecatedColumns":[],"description":null,"googleLicenseConsent":false,"idObject":17988,"images":[{"modelId":19397,"path":"_normal0"},{"modelId":19399,"path":"_normal3"},{"modelId":19398,"path":"_normal1"},{"modelId":19400,"path":"_normal2"}],"inputDataAvailable":false,"name":"Network","order":1,"publicOverlay":true},{"defaultOverlay":false,"deprecatedColumns":[],"description":null,"googleLicenseConsent":false,"idObject":17989,"images":[{"modelId":19397,"path":"_empty0"},{"modelId":19399,"path":"_empty3"},{"modelId":19398,"path":"_empty1"},{"modelId":19400,"path":"_empty2"}],"inputDataAvailable":false,"name":"Empty","order":1,"publicOverlay":true}]
\ No newline at end of file

frontend-js/testFiles/apiCalls/projects/sample/overlays/creator=admin&token=ADMIN_TOKEN_ID&

+[{"defaultOverlay":false,"description":"","googleLicenseConsent":false,"idObject":14081,"images":[{"modelId":15781,"path":"_nested0"}],"inputDataAvailable":false,"name":"Pathways and compartments","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"","googleLicenseConsent":false,"idObject":14082,"images":[{"modelId":15781,"path":"_normal0"}],"inputDataAvailable":false,"name":"Network","order":1,"publicOverlay":true},{"defaultOverlay":true,"description":"","googleLicenseConsent":false,"idObject":14083,"images":[{"modelId":15781,"path":"_empty0"}],"inputDataAvailable":false,"name":"Empty","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"xxx","googleLicenseConsent":false,"idObject":18076,"images":[{"modelId":15781,"path":".18076"}],"inputDataAvailable":true,"name":"C:\\fakepath\\test.txt","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"yyy","googleLicenseConsent":false,"idObject":18077,"images":[{"modelId":15781,"path":".18077"}],"inputDataAvailable":true,"name":"xxx","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"","googleLicenseConsent":false,"idObject":22750,"images":[{"modelId":15781,"path":".22750"}],"inputDataAvailable":true,"name":"new-global","order":1,"publicOverlay":true},{"creator":"admin","defaultOverlay":false,"description":"","googleLicenseConsent":true,"idObject":26107,"images":[{"modelId":15781,"path":".26107"}],"inputDataAvailable":true,"name":"s1","order":1,"publicOverlay":false},{"creator":"admin","defaultOverlay":false,"description":"","googleLicenseConsent":true,"idObject":26108,"images":[{"modelId":15781,"path":".26108"}],"inputDataAvailable":true,"name":"s2","order":2,"publicOverlay":false}]
\ No newline at end of file

frontend-js/testFiles/apiCalls/projects/sample/overlays/creator=anonymous&token=MOCK_TOKEN_ID&

+[{"defaultOverlay":false,"description":"","googleLicenseConsent":false,"idObject":14081,"images":[{"modelId":15781,"path":"_nested0"}],"inputDataAvailable":false,"name":"Pathways and compartments","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"","googleLicenseConsent":false,"idObject":14082,"images":[{"modelId":15781,"path":"_normal0"}],"inputDataAvailable":false,"name":"Network","order":1,"publicOverlay":true},{"defaultOverlay":true,"description":"","googleLicenseConsent":false,"idObject":14083,"images":[{"modelId":15781,"path":"_empty0"}],"inputDataAvailable":false,"name":"Empty","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"xxx","googleLicenseConsent":false,"idObject":18076,"images":[{"modelId":15781,"path":".18076"}],"inputDataAvailable":true,"name":"C:\\fakepath\\test.txt","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"yyy","googleLicenseConsent":false,"idObject":18077,"images":[{"modelId":15781,"path":".18077"}],"inputDataAvailable":true,"name":"xxx","order":1,"publicOverlay":true},{"defaultOverlay":false,"description":"","googleLicenseConsent":false,"idObject":22750,"images":[{"modelId":15781,"path":".22750"}],"inputDataAvailable":true,"name":"new-global","order":1,"publicOverlay":true}]
\ No newline at end of file