diff --git a/app/scripts/modules/core/src/bootstrap/angular.config.ts b/app/scripts/modules/core/src/bootstrap/angular.config.ts index 0117814899f..e72c252d5a6 100644 --- a/app/scripts/modules/core/src/bootstrap/angular.config.ts +++ b/app/scripts/modules/core/src/bootstrap/angular.config.ts @@ -24,7 +24,7 @@ bootstrapModule.config([ bootstrapModule.config([ '$compileProvider', ($compileProvider: ICompileProvider) => { - $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|mailto|hipchat|slack|ssh):/); + $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|mailto|slack|ssh):/); $compileProvider.preAssignBindingsEnabled(true); }, ]); diff --git a/app/scripts/modules/core/src/config/settings.ts b/app/scripts/modules/core/src/config/settings.ts index 97c241c52b9..754bb918909 100644 --- a/app/scripts/modules/core/src/config/settings.ts +++ b/app/scripts/modules/core/src/config/settings.ts @@ -21,10 +21,6 @@ export interface INotificationSettings { googlechat: { enabled: boolean; }; - hipchat: { - botName: string; - enabled: boolean; - }; sms: { enabled: boolean; }; diff --git a/app/scripts/modules/core/src/notification/notificationList.directive.js b/app/scripts/modules/core/src/notification/notificationList.directive.js index fdad4d4b2c4..d4ddad36c6a 100644 --- a/app/scripts/modules/core/src/notification/notificationList.directive.js +++ b/app/scripts/modules/core/src/notification/notificationList.directive.js @@ -34,7 +34,6 @@ module.exports = angular we currently store application level notifications in front50 as a map indexed by type { "application": "ayuda", - "hipchat": [ { ... } ], "email": [ { ... } ] } the code below unwraps it into a table friendly format and the saveNotifications code will @@ -47,9 +46,7 @@ module.exports = angular AppNotificationsService.getNotificationsForApplication($scope.application).then(function(notifications) { $scope.notifications = _.filter( _.flatten( - _.map(['email', 'bearychat', 'googlechat', 'sms', 'hipchat', 'slack', 'githubstatus', 'pubsub'], function( - type, - ) { + _.map(['email', 'bearychat', 'googlechat', 'sms', 'slack', 'githubstatus', 'pubsub'], function(type) { if (notifications[type]) { return _.map(notifications[type], function(entry) { return _.extend(entry, { type: type }); diff --git a/app/scripts/modules/core/src/notification/notifications.module.js b/app/scripts/modules/core/src/notification/notifications.module.js index 63ef9abf75c..a508961c4e8 100644 --- a/app/scripts/modules/core/src/notification/notifications.module.js +++ b/app/scripts/modules/core/src/notification/notifications.module.js @@ -15,7 +15,6 @@ module.exports = angular.module('spinnaker.core.notifications', [ require('./types/email/email.notification.type.module').name, SPINNAKER_CORE_NOTIFICATION_TYPES_GITHUB_STATUS, require('./types/googlechat/googlechat.notification.type.module').name, - require('./types/hipchat/hipchat.notification.type.module').name, require('./types/pubsub/pubsub.notification.type.module').name, require('./types/slack/slack.notification.type.module').name, require('./types/sms/sms.notification.type.module').name, diff --git a/app/scripts/modules/core/src/notification/types/hipchat/additionalFields.html b/app/scripts/modules/core/src/notification/types/hipchat/additionalFields.html deleted file mode 100644 index dd844b8fed3..00000000000 --- a/app/scripts/modules/core/src/notification/types/hipchat/additionalFields.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
- Please note: You need to invite the - {{vm.notificationConfig.botName}} bot to private rooms to - receive HipChat notifications
-
-
HipChat Room
-
- -
-
diff --git a/app/scripts/modules/core/src/notification/types/hipchat/hipchat.notification.type.module.js b/app/scripts/modules/core/src/notification/types/hipchat/hipchat.notification.type.module.js deleted file mode 100644 index bb6ae2a7a65..00000000000 --- a/app/scripts/modules/core/src/notification/types/hipchat/hipchat.notification.type.module.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -const angular = require('angular'); - -module.exports = angular.module('spinnaker.core.notification.types.hipchat', []).config([ - 'notificationTypeConfigProvider', - function(notificationTypeConfigProvider) { - notificationTypeConfigProvider.registerNotificationType({ - label: 'HipChat', - key: 'hipchat', - addressTemplateUrl: require('./additionalFields.html'), - }); - }, -]); diff --git a/halconfig/settings.js b/halconfig/settings.js index e037895633c..8791b3f8a1d 100644 --- a/halconfig/settings.js +++ b/halconfig/settings.js @@ -187,10 +187,6 @@ window.spinnakerSettings = { googlechat: { enabled: true, }, - hipchat: { - botName: 'Skynet T-800', - enabled: true, - }, pubsub: { enabled: true, }, diff --git a/settings.js b/settings.js index b6b9b656a89..a2c84139492 100644 --- a/settings.js +++ b/settings.js @@ -98,10 +98,6 @@ window.spinnakerSettings = { googlechat: { enabled: true, }, - hipchat: { - botName: 'Skynet T-800', - enabled: true, - }, pubsub: { enabled: true, },