argoproj#46 Job notifications connected to multiple service launch pa…

…nel.
wokeGit · Oct 11, 2017 · 2fcc2b8 · 2fcc2b8
1 parent 61efb9b
commit 2fcc2b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...i/src/app/common/multiple-service-launch-panel/multiple-service-launch-panel.component.ts b/...i/src/app/common/multiple-service-launch-panel/multiple-service-launch-panel.component.ts
@@ -280,6 +280,7 @@ export class MultipleServiceLaunchPanelComponent {
                     observableList.push(this.taskService.launchTask({
                         template_id: this.templatesToSubmit[index].id,
                         arguments: this.listParameters(this.allForms.controls[index.toString()]['controls']),
+                        notifications: notifications
                     }));
                 });
 

diff --git a/...ultiple-service-launch-panel/setup-job-notifications/setup-job-notifications.component.ts b/...ultiple-service-launch-panel/setup-job-notifications/setup-job-notifications.component.ts
@@ -1,3 +1,4 @@
+import * as _ from 'lodash';
 import { Component, OnInit } from '@angular/core';
 
 import { FilterMultiSelect } from 'argo-ui-lib/src/components';
@@ -177,7 +178,7 @@ export class SetupJobNotificationsComponent implements OnInit {
         }
     }
 
-    public getNotifications() {
+    public getNotifications(): PolicyNotification[] {
         let isAnyError = false;
         this.notificationsList.forEach(notification => {
             if (!notification.rules.when.length) {
@@ -209,14 +210,14 @@ export class SetupJobNotificationsComponent implements OnInit {
             return notification.rules;
         });
 
-        return this.rules;
+        return _.uniqBy(this.rules, v => [v.whom, v.when].join());
     }
 
     private addDefaultNotificationRule() {
         let notification = JSON.parse(JSON.stringify(this.notification));
         notification.rules = {
             whom: [this.authenticationService.getUsername()],
-            when: ['on_success', 'on_failure']
+            when: ['on_failure', 'on_success']
         };
         notification.isArgoUsersAndGroupsVisible = true;
 

diff --git a/saas/axops/src/ui/src/app/services/task.service.ts b/saas/axops/src/ui/src/app/services/task.service.ts
@@ -31,7 +31,9 @@ export class TaskService {
     }
 
     public launchTask(args: TaskCreationArgs, runPartial = false) {
-        args = Object.assign({}, args, { notifications: DEFAULT_NOTIFICATIONS });
+        if (!args.hasOwnProperty('notifications') && !args.notifications) {
+            args = Object.assign({}, args, { notifications: DEFAULT_NOTIFICATIONS });
+        }
         return this.http.post(`v1/services?run_partial=${runPartial}`, JSON.stringify(args))
             .map(res => res.json());
     }