Merge pull request #39184 from /issues/39178

Jan · web-flow · commit b3d4fe0b40b1 · 2021-09-16T16:06:48.000+02:00
Display clickable links in upgrade process
diff --git a/changelog/unreleased/39184 b/changelog/unreleased/39184
@@ -0,0 +1,7 @@
+Enhancement: Display clickable links during web UI upgrade process
+
+Before this PR, error messages can contain links that have not been clickable.
+With this PR, links are clickable and open them in a new tab.
+
+https://github.com/owncloud/core/pull/39184
+https://github.com/owncloud/core/issues/39178
diff --git a/core/js/update.js b/core/js/update.js
@@ -110,33 +110,43 @@
 		},
 
 		setMessage: function(message) {
-			$('#update-progress-message').html(message);
+			var parsedMessage = this.parseMessage(message);
+			$('#update-progress-message').html(parsedMessage);
 			$('#update-progress-detailed')
 				.append($('<span>'))
-				.append(message)
+				.append(parsedMessage)
 				.append($('<br>'));
 		},
 
 		setPermanentMessage: function(message) {
-			$('#update-progress-message').html(message);
+			var parsedMessage = this.parseMessage(message);
+			$('#update-progress-message').html(parsedMessage);
 			$('#update-progress-message-warnings')
 				.show()
-				.append($('<ul>').append(message));
+				.append($('<ul>').append(parsedMessage));
 			$('#update-progress-detailed')
 				.append($('<span>'))
-				.append(message)
+				.append(parsedMessage)
 				.append($('<br>'));
 		},
-		
+
 		setErrorMessage: function (message) {
+			var parsedMessage = this.parseMessage(message);
 			$('#update-progress-message-error')
 				.show()
-				.html(message);
+				.html(parsedMessage);
 			$('#update-progress-detailed')
 				.append($('<span>'))
-				.append(message)
+				.append(parsedMessage)
 				.append($('<br>'));
-		}
+		},
+
+		parseMessage: function (message) {
+			// generate a tags from urls
+			var urlRegex = /(https?:\/\/[^\s]+)/g;
+			return message.replace(urlRegex, '<a href="$1" target="_blank">$1</a>');
+		},
+
 	};
 
 })();
