Commit f6d832de authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '1558-map-listing-performance' into 'devel_16.0.x'

Resolve "this query takes ~7.5second"

See merge request !1354
parents 9a86f6b9 dfbebb2e
Pipeline #47661 passed with stage
in 20 minutes and 48 seconds
minerva (16.0.0~beta.3) stable; urgency=medium
* Bug fix: speed of opening map is improved (#1558)
* Bug fix: typo (#1555)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 27 Sep 2021 08:00:00 +0200
minerva (16.0.0~beta.2) stable; urgency=medium minerva (16.0.0~beta.2) stable; urgency=medium
* Small improvement: backgrounds are separated from general overlays (#1532) * Small improvement: backgrounds are separated from general overlays (#1532)
* Small improvement: layout of pin popup window is slitghly improved (#1493) * Small improvement: layout of pin popup window is slitghly improved (#1493)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>CellDesigner-plugin</artifactId> <artifactId>CellDesigner-plugin</artifactId>
<!-- dependency from the MapViewer model --> <!-- dependency from the MapViewer model -->
...@@ -50,19 +50,19 @@ ...@@ -50,19 +50,19 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId> <artifactId>commons</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId> <artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>annotation</artifactId> <artifactId>annotation</artifactId>
<name>Annotation module</name> <name>Annotation module</name>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- dependency from the MapViewer dao --> <!-- dependency from the MapViewer dao -->
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId> <artifactId>persist</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- dependency from the MapViewer cell designer parser (we need access <!-- dependency from the MapViewer cell designer parser (we need access
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId> <artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId> <artifactId>converter</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- Log4J2 --> <!-- Log4J2 -->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>commons</artifactId> <artifactId>commons</artifactId>
<name>Mapviewer commons</name> <name>Mapviewer commons</name>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>converter-CellDesigner</artifactId> <artifactId>converter-CellDesigner</artifactId>
<name>CellDesigner converter</name> <name>CellDesigner converter</name>
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId> <artifactId>converter</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- Log4J2 --> <!-- Log4J2 -->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>converter-SBGNML</artifactId> <artifactId>converter-SBGNML</artifactId>
...@@ -20,26 +20,26 @@ ...@@ -20,26 +20,26 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId> <artifactId>persist</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId> <artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId> <artifactId>converter-graphics</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>converter-graphics</artifactId> <artifactId>converter-graphics</artifactId>
<name>MapViewer graphics converter</name> <name>MapViewer graphics converter</name>
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId> <artifactId>model-command</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- Log4J2--> <!-- Log4J2-->
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>converter-sbml</artifactId> <artifactId>converter-sbml</artifactId>
<name>converter-sbml</name> <name>converter-sbml</name>
...@@ -40,22 +40,22 @@ ...@@ -40,22 +40,22 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId> <artifactId>model-command</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId> <artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId> <artifactId>converter</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- Log4J2 --> <!-- Log4J2 -->
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId> <artifactId>converter-graphics</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>converter</artifactId> <artifactId>converter</artifactId>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
......
...@@ -27,15 +27,6 @@ set -e ...@@ -27,15 +27,6 @@ set -e
case "$1" in case "$1" in
configure) configure)
#if we update the package from version before flyway was introduced
if [ -f $DB_SCRIPT_DIR/db_${OLD_VERSION}_to_${MAX_DB_VERSION_FOR_MIGRTION}.sql ]; then
mkdir -p /usr/share/dbconfig-common/data/minerva/upgrade/pgsql/
cp $DB_SCRIPT_DIR/db_${OLD_VERSION}_to_${MAX_DB_VERSION_FOR_MIGRTION}.sql /usr/share/dbconfig-common/data/minerva/upgrade/pgsql/$CURRENT_VERSION
else
log "INFO: File doesn't exist: $DB_SCRIPT_DIR/db_${OLD_VERSION}_to_${MAX_DB_VERSION_FOR_MIGRTION}.sql"
fi
. /usr/share/dbconfig-common/dpkg/postinst.pgsql . /usr/share/dbconfig-common/dpkg/postinst.pgsql
dbc_generate_include_owner="root:root" dbc_generate_include_owner="root:root"
dbc_generate_include_perms="0640" dbc_generate_include_perms="0640"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>frontend-js</artifactId> <artifactId>frontend-js</artifactId>
<name>frontend-js</name> <name>frontend-js</name>
......
...@@ -492,14 +492,14 @@ AbstractInfoWindow.prototype._createTargetInfoDiv = function (params) { ...@@ -492,14 +492,14 @@ AbstractInfoWindow.prototype._createTargetInfoDiv = function (params) {
}; };
showAllButton.style.display = "inline-block"; showAllButton.style.display = "inline-block";
showAllButton.innerHTML = "Click to show all " + overlay.getName() + "s for ths element"; showAllButton.innerHTML = "Click to show all " + overlay.getName() + "s for this element";
showAllButton.onclick = function () { showAllButton.onclick = function () {
toggleAll(true); toggleAll(true);
} }
checkboxDiv.appendChild(showAllButton); checkboxDiv.appendChild(showAllButton);
hideAllButton.style.display = "inline-block"; hideAllButton.style.display = "inline-block";
hideAllButton.innerHTML = "Click to hide all " + overlay.getName() + "s for ths element"; hideAllButton.innerHTML = "Click to hide all " + overlay.getName() + "s for this element";
hideAllButton.onclick = function () { hideAllButton.onclick = function () {
toggleAll(false); toggleAll(false);
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>model-command</artifactId> <artifactId>model-command</artifactId>
<name>Model commands</name> <name>Model commands</name>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId> <artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- Log4J2--> <!-- Log4J2-->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<name>model MapViewer</name> <name>model MapViewer</name>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId> <artifactId>commons</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- Java xml serialization --> <!-- Java xml serialization -->
......
...@@ -370,6 +370,10 @@ public class Project implements Serializable { ...@@ -370,6 +370,10 @@ public class Project implements Serializable {
return topModel.getModel(); return topModel.getModel();
} }
public ModelData getTopModelData() {
return topModel;
}
public void setTopModel(ModelData topModel) { public void setTopModel(ModelData topModel) {
this.topModel = topModel; this.topModel = topModel;
addModel(topModel); addModel(topModel);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>pathvisio</artifactId> <artifactId>pathvisio</artifactId>
<name>Pathvisio plugin</name> <name>Pathvisio plugin</name>
...@@ -77,20 +77,20 @@ ...@@ -77,20 +77,20 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId> <artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId> <artifactId>converter-graphics</artifactId>
<scope>test</scope> <scope>test</scope>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- Log4J2 --> <!-- Log4J2 -->
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>persist</artifactId> <artifactId>persist</artifactId>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId> <artifactId>model</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</dependency> </dependency>
<!-- apache ftp --> <!-- apache ftp -->
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>parent MapViewer</name> <name>parent MapViewer</name>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<parent> <parent>
<groupId>lcsb.mapviewer</groupId> <groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<version>16.0.0~beta.2</version> <version>16.0.0~beta.3</version>
</parent> </parent>
<artifactId>rest-api</artifactId> <artifactId>rest-api</artifactId>
<name>rest-api</name>