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
* Small improvement: backgrounds are separated from general overlays (#1532)
* Small improvement: layout of pin popup window is slitghly improved (#1493)
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>CellDesigner-plugin</artifactId>
<!-- dependency from the MapViewer model -->
......@@ -50,19 +50,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>annotation</artifactId>
<name>Annotation module</name>
......@@ -18,7 +18,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- dependency from the MapViewer dao -->
......@@ -26,7 +26,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- dependency from the MapViewer cell designer parser (we need access
......@@ -34,13 +34,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- Log4J2 -->
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>commons</artifactId>
<name>Mapviewer commons</name>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>converter-CellDesigner</artifactId>
<name>CellDesigner converter</name>
......@@ -17,13 +17,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- Log4J2 -->
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>converter-SBGNML</artifactId>
......@@ -20,26 +20,26 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>persist</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>converter-graphics</artifactId>
<name>MapViewer graphics converter</name>
......@@ -18,13 +18,13 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- Log4J2-->
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>converter-sbml</artifactId>
<name>converter-sbml</name>
......@@ -40,22 +40,22 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model-command</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- Log4J2 -->
......@@ -154,7 +154,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
<scope>test</scope>
</dependency>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>converter</artifactId>
......@@ -15,7 +15,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
......
......@@ -27,15 +27,6 @@ set -e
case "$1" in
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
dbc_generate_include_owner="root:root"
dbc_generate_include_perms="0640"
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>frontend-js</artifactId>
<name>frontend-js</name>
......
......@@ -492,14 +492,14 @@ AbstractInfoWindow.prototype._createTargetInfoDiv = function (params) {
};
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 () {
toggleAll(true);
}
checkboxDiv.appendChild(showAllButton);
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 () {
toggleAll(false);
}
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>model-command</artifactId>
<name>Model commands</name>
......@@ -16,7 +16,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
......@@ -24,7 +24,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- Log4J2-->
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>model</artifactId>
<name>model MapViewer</name>
......@@ -15,7 +15,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>commons</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- Java xml serialization -->
......
......@@ -370,6 +370,10 @@ public class Project implements Serializable {
return topModel.getModel();
}
public ModelData getTopModelData() {
return topModel;
}
public void setTopModel(ModelData topModel) {
this.topModel = topModel;
addModel(topModel);
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>pathvisio</artifactId>
<name>Pathvisio plugin</name>
......@@ -77,20 +77,20 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-CellDesigner</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>converter-graphics</artifactId>
<scope>test</scope>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- Log4J2 -->
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>persist</artifactId>
......@@ -27,7 +27,7 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<!-- apache ftp -->
......
......@@ -6,7 +6,7 @@
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
<packaging>pom</packaging>
<name>parent MapViewer</name>
......
......@@ -7,7 +7,7 @@
<parent>
<groupId>lcsb.mapviewer</groupId>
<artifactId>parent</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</parent>
<artifactId>rest-api</artifactId>
<name>rest-api</name>
......@@ -19,19 +19,19 @@
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>model</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>service</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
<groupId>lcsb.mapviewer</groupId>
<artifactId>pathvisio</artifactId>
<version>16.0.0~beta.2</version>
<version>16.0.0~beta.3</version>
</dependency>
<dependency>
......
......@@ -114,8 +114,8 @@ public class ModelRestImpl extends BaseRestImpl {
List<Map<String, Object>> result = new ArrayList<>();
Collection<ModelData> originalModels = getModelService().getModelsByProjectId(project.getProjectId());
List<ModelData> models = new ArrayList<>();
if (project.getTopModel() != null) {
ModelData topModel = project.getTopModel().getModelData();
if (project.getTopModelData() != null) {
ModelData topModel = project.getTopModelData();
for (ModelData model : originalModels) {
if (!Objects.equals(model.getId(), topModel.getId())) {
models.add(model);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment