Merge branch 'develop' into readmeUpdates

Author: petenicholls

assets/streaming_analytics_200x200.png

@@ -3,6 +3,11 @@
 "use strict";
 "use babel";
 
+import path from "path";
+
+const packageRoot = atom.packages.resolvePackagePath("build-ibmstreams");
+const STREAMING_ANALYTICS_ICON_PATH = `${packageRoot}${path.sep}assets${path.sep}streaming_analytics_200x200.png`;
+
 export class MessageHandler {
 	consoleService: null;
 
@@ -25,28 +30,15 @@ export class MessageHandler {
 				atom.notifications.addInfo(messageOutput, {});
 			}
 		}
-		// if (input && input.output) {
-		// 	const messageText = input.output
-		// 		.map(outputMsg => outputMsg.message_text)
-		// 		.join("\n");
-		// 	if (input.status === "building" || input.status === "waiting") {
-		// 		atom.notifications.addInfo(input.status+"...", {detail: messageText});
-		// 	}
-		// } else if (typeof(input) === "string") {
-		// 	this.consoleService.log(input);
-		// 	if (showNotification) {
-		// 		atom.notifications.addInfo(input, {});
-		// 	}
-		// }
 	}
 
 	handleBuildSuccess(messageOutput: Array<any>) {
 		const message = this.getLoggableMessage(messageOutput);
 		if (message) {
-			this.consoleService.log(message);
+			this.consoleService.success(message);
 			atom.notifications.addSuccess("Build succeeded", {detail: message, dismissable: true});
 		} else {
-			this.consoleService.log("Build succeeded");
+			this.consoleService.success("Build succeeded");
 			atom.notifications.addSuccess("Build succeeded", {dismissable: true});
 		}
 	}
@@ -63,14 +55,21 @@ export class MessageHandler {
 	}
 
 	handleSubmitProgressMessage(input) {
-
+		if (typeof(input) === "string") {
+			atom.notifications.addInfo(input, {});
+		}
+		this.consoleService.log(input);
 	}
 
-	handleSubmitSuccess(input) {
-		atom.notifications.addSuccess(`Job ${input.name} is ${input.health}`, {dismissable: true});
+	handleSubmitSuccess(input, notificationButtons = []) {
+		let addedButtons = {};
+		if (Array.isArray(notificationButtons)) {
+			addedButtons.buttons = notificationButtons.map(obj => ({onDidClick: obj.callbackFn, text: obj.label}));
+		}
+		atom.notifications.addSuccess(`Job ${input.name} is ${input.health}`, {...addedButtons, dismissable: true});
 
 		if (this.consoleService) {
-			this.consoleService.log(`Job ${input.name} is ${input.health}`);
+			this.consoleService.success(`Job ${input.name} is ${input.health}`);
 		}
 	}
 
@@ -99,9 +98,13 @@ export class MessageHandler {
 		}
 		console.error(input);
 	}
-	handleSuccess(input, detail, showNotification, showConsoleMsg) {
+	handleSuccess(input, detail, showNotification, showConsoleMsg, notificationButtons = []) {
+		let addedButtons = {};
+		if (Array.isArray(notificationButtons)) {
+			addedButtons.buttons = notificationButtons.map(obj => ({onDidClick: obj.callbackFn, text: obj.label}));
+		}
 		if (showNotification) {
-			atom.notifications.addSuccess(input, {detail: detail, dismissable: true});
+			atom.notifications.addSuccess(input, {...addedButtons, detail: detail, dismissable: true});
 		}
 		if (showConsoleMsg) {
 			if (this.consoleService) {
@@ -118,13 +121,29 @@ export class MessageHandler {
 	}
 
 	showDialog(message, detail, buttonObjs) {
+
+		const nativeImage = require("electron").nativeImage;
+
 		const labels = buttonObjs.map(obj => obj.label);
 		const callbacks = buttonObjs.map(obj => obj.callbackFn);
 		let buttons = {};
 		labels.forEach((label, index) => {
 			buttons[label] = callbacks[index];
 		});
-		atom.confirm({message: message, detailedMessage: detail, buttons: buttons});
+		atom.confirm(
+			{
+				message: message,
+				detail: detail,
+				buttons: labels,
+				icon: STREAMING_ANALYTICS_ICON_PATH
+			},
+			(chosen, checkboxChecked) => {
+				const callback = callbacks[chosen];
+				if (typeof(callback) === "function") {
+					return callback();
+				}
+			}
+		);
 	}
 
 	handleCredentialsMissing() {