Refactor Notify event

aminmarashi · aminmarashi · commit 01c162941e80 · 2017-04-13T11:33:01.000+08:00
diff --git a/src/botPage/bot/cli.js b/src/botPage/bot/cli.js
@@ -50,7 +50,7 @@ const interpreter = createInterpreter()
 
 globalObserver.register('Error', e => log(e))
 
-globalObserver.register('Notify', e => log(e))
+globalObserver.register('Notify', e => log(`${e[0].toUpperCase()}: ${e[1]}`))
 
 lineReader
   .on('line', line => (code += `${line}\n`))
diff --git a/src/botPage/bot/tools.js b/src/botPage/bot/tools.js
@@ -57,11 +57,8 @@ export const registerStream = (observer, name, cb) => {
 
 const maxRetries = 10
 
-const notifyRetry = (msg, error, delay) => globalObserver.emit('Notify', [
-  `${msg}: ${error.error.msg_type}, ${translate('retrying in')} ${delay}s`,
-  'error',
-  'right',
-])
+const notifyRetry = (msg, error, delay) => globalObserver.emit('Notify', ['warn',
+  `${msg}: ${error.error.msg_type}, ${translate('retrying in')} ${delay}s`, 'right'])
 
 const getBackoffDelay = (error, delayIndex) => {
   const offset = 0.5 // 500ms
diff --git a/src/botPage/view/blockly/blocks/tools/notify.js b/src/botPage/view/blockly/blocks/tools/notify.js
@@ -18,7 +18,7 @@ Blockly.Blocks.notify = {
 Blockly.JavaScript.notify = (block) => {
   const notificationType = block.getFieldValue('NOTIFICATION_TYPE')
   const message = Blockly.JavaScript.valueToCode(block, 'MESSAGE', Blockly.JavaScript.ORDER_ATOMIC)
-  const code = `Bot.notify(${message}, '${notificationType}');
+  const code = `Bot.notify('${notificationType}', ${message});
 `
   return code
 }
diff --git a/src/botPage/view/logger.js b/src/botPage/view/logger.js
@@ -27,11 +27,11 @@ const isNew = msg => {
   return true
 }
 
-const notifyUniq = (msg, ...args) => isNew(msg) && $.notify(msg, ...args)
-
-const notify = (msg, className, position = 'left') => {
+const notify = (className, msg, position = 'left') => {
   log(className, msg)
-  notifyUniq(msg, { position: `bottom ${position}`, className })
+  if (isNew(msg)) {
+    $.notify(msg, { position: `bottom ${position}`, className })
+  }
 }
 
 const notifyError = error => {
@@ -63,7 +63,7 @@ const notifyError = error => {
     trackJs.track(errorWithCode)
   }
 
-  notify(message, 'error', 'right')
+  notify('error', message, 'right')
 }
 
 const waitForNotifications = () => {
@@ -90,7 +90,7 @@ const waitForNotifications = () => {
 
   notifList.forEach(className =>
     globalObserver.register(`ui.log.${className}`, message =>
-      notify(message, className, 'right')))
+      notify(className, message, 'right')))
 
   amplitudeList.forEach(event =>
     globalObserver.register(event, (d) => amplitude.getInstance().logEvent(event, d)))

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ Blockly.Blocks.notify = {`
`18`	`18`	`Blockly.JavaScript.notify = (block) => {`
`19`	`19`	`const notificationType = block.getFieldValue('NOTIFICATION_TYPE')`
`20`	`20`	`const message = Blockly.JavaScript.valueToCode(block, 'MESSAGE', Blockly.JavaScript.ORDER_ATOMIC)`
`21`		- const code = `Bot.notify(${message}, '${notificationType}');
	`21`	+ const code = `Bot.notify('${notificationType}', ${message});
`22`	`22`	`
`23`	`23`	`return code`
`24`	`24`	`}`