Merge pull request #745 from tom114/hotfix-remote-status-constructor

Hotfix: Changed RemoteStatus constructor to `protected`
phac-nml · Jun 25, 2020 · 132cfb6 · 132cfb6
2 parents 1845c17 + 3f232b8
commit 132cfb6
Show file tree

Hide file tree

Showing 6 changed files with 209 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ Changes
 --------------
 * [UI]: Fixed bug when creating/modifying a metadata template the user could not search for a field. (20.05.1)
 * [UI]: Fixed bug where managers could not load Users listing page. (20.05.1)
+* [UI]: Fixed issue where analysis results pages would hang after running with remote synchronized data. (20.05.2)
+* [Developer]: Updated chromedriver to version `latest`. (20.05.2)
 
 20.01 to 20.05
 --------------

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>ca.corefacility.bioinformatics</groupId>
 	<artifactId>irida</artifactId>
 	<packaging>war</packaging>
-	<version>20.05.1</version>
+	<version>20.05.2</version>
 	<name>irida</name>
 	<url>http://www.irida.ca</url>
 

diff --git a/src/main/java/ca/corefacility/bioinformatics/irida/model/remote/RemoteStatus.java b/src/main/java/ca/corefacility/bioinformatics/irida/model/remote/RemoteStatus.java
@@ -65,7 +65,7 @@ public class RemoteStatus {
 	private Date lastUpdate;
 
 	@SuppressWarnings("unused")
-	private RemoteStatus() {
+	protected RemoteStatus() {
 	}
 
 	public RemoteStatus(String url, RemoteAPI api) {

diff --git a/src/main/webapp/package.json b/src/main/webapp/package.json
@@ -99,7 +99,7 @@
     "babel-loader": "^8.1.0",
     "babel-plugin-import": "^1.13.0",
     "bootstrap-sass": "^3.3.7",
-    "chromedriver": "^79.0.0",
+    "chromedriver": "latest",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.5.2",
     "cssnano": "^4.1.10",