From 84ad1d83e19ecc38523b0b17c347366591a52712 Mon Sep 17 00:00:00 2001 From: Sam Chow Date: Mon, 7 May 2018 11:11:33 -0400 Subject: [PATCH] Add support for Enterprise logos in notifications --- static/js/services/features-config.js | 6 +++++- static/js/services/notification-service.js | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/static/js/services/features-config.js b/static/js/services/features-config.js index c3cb99817..d4a68f32a 100644 --- a/static/js/services/features-config.js +++ b/static/js/services/features-config.js @@ -71,8 +71,12 @@ angular.module('quay').factory('Config', ['Features', function(Features) { return value; }; - config.getEnterpriseLogo = function() { + config.getEnterpriseLogo = function(defaultValue) { if (!config.ENTERPRISE_LOGO_URL) { + if (defaultValue) { + return defaultValue; + } + if (Features.BILLING) { return '/static/img/quay-horizontal-color.svg'; } else { diff --git a/static/js/services/notification-service.js b/static/js/services/notification-service.js index 94c0b8bad..73d70d227 100644 --- a/static/js/services/notification-service.js +++ b/static/js/services/notification-service.js @@ -288,7 +288,6 @@ function($rootScope, $interval, UserService, ApiService, StringBuilderService, P mostRecentTimestamp = new Date(notificationService.notifications[0].created).getTime(); } - const newNotifications = notificationService.notifications .filter(obj => new Date(obj.created).getTime() > mostRecentTimestamp); @@ -299,8 +298,9 @@ function($rootScope, $interval, UserService, ApiService, StringBuilderService, P } new Notification(message, { - icon: window.location.origin + '/static/img/quay-logo.png', - image: window.location.origin + '/static/img/quay-logo.png', + // Chrome doesn't display SVGs for notifications, so we'll use a default if we don't have an enterprise logo + icon: window.location.origin + Config.getEnterpriseLogo('/static/img/quay-logo.png'), + image: window.location.origin + Config.getEnterpriseLogo('/static/img/quay-logo.png'), }); const newTimestamp = new Date(newNotifications[0].created).getTime();