vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removes HTML tags shown in Browser Notification

Browse source 
Fixes https://jira.coreos.com/browse/QUAY-956
This commit is contained in:
Sida Chen 2018-07-31 11:48:14 -04:00
parent 5e4d52f1fd
commit bf4cef4870
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
static/js/services/notification-service.js
View file

@ -3,9 +3,9 @@
* in the sidebar) and provides helper methods for working with them. * in the sidebar) and provides helper methods for working with them.
*/ */
angular.module('quay').factory('NotificationService', angular.module('quay').factory('NotificationService',
['$rootScope', '$interval', 'UserService', 'ApiService', 'StringBuilderService', 'PlanService', 'CookieService', 'Features', 'Config', '$location', 'VulnerabilityService', ['$rootScope', '$interval', 'UserService', 'ApiService', 'StringBuilderService', 'PlanService', 'CookieService', 'Features', 'Config', '$location', 'VulnerabilityService', 'UtilService',
function($rootScope, $interval, UserService, ApiService, StringBuilderService, PlanService, CookieService, Features, Config, $location, VulnerabilityService) { function($rootScope, $interval, UserService, ApiService, StringBuilderService, PlanService, CookieService, Features, Config, $location, VulnerabilityService, UtilService) {
var notificationService = { var notificationService = {
'user': null, 'user': null,
'notifications': [], 'notifications': [],
@ -229,6 +229,16 @@ function($rootScope, $interval, UserService, ApiService, StringBuilderService, P
return StringBuilderService.buildTrustedString(kindInfo['message'], notification['metadata']); return StringBuilderService.buildTrustedString(kindInfo['message'], notification['metadata']);
}; };
notificationService.getBrowserNotificationMessage = function(notification) {
var kindInfo = notificationKinds[notification['kind']];
if (!kindInfo) {
return '(Unknown notification kind: ' + notification['kind'] + ')';
}
const unsafeHtml = StringBuilderService.buildString(kindInfo['message'], notification['metadata']);
return UtilService.removeHtmlTags(unsafeHtml);
}
notificationService.getClass = function(notification) { notificationService.getClass = function(notification) {
var kindInfo = notificationKinds[notification['kind']]; var kindInfo = notificationKinds[notification['kind']];
if (!kindInfo) { if (!kindInfo) {
@ -294,7 +304,7 @@ function($rootScope, $interval, UserService, ApiService, StringBuilderService, P
if (newNotifications.length > 0) { if (newNotifications.length > 0) {
let message = 'You have unread notifications'; let message = 'You have unread notifications';
if (newNotifications.length === 1) { if (newNotifications.length === 1) {
message = notificationService.getMessage(newNotifications[0]); message = notificationService.getBrowserNotificationMessage(newNotifications[0]);
} }
new Notification(message, { new Notification(message, {

4
static/js/services/util-service.js
View file

@ -136,5 +136,9 @@ angular.module('quay').factory('UtilService', ['$sanitize', 'markdownConverter',
utilService.UrlBuilder = UrlBuilder; utilService.UrlBuilder = UrlBuilder;
utilService.removeHtmlTags = function(text){
return new DOMParser().parseFromString(text, 'text/html').body.textContent || text;
};
return utilService; return utilService;
}]); }]);