Merge pull request #2 from xgeek-net/dev

Fix error message bug, Add Menu

Author: xgeek-net

package-lock.json

@@ -14,7 +14,6 @@
     "jsforce": "^1.8.4",
     "make-dir": "^1.3.0",
     "moment": "^2.22.2",
-    "os": "^0.1.1",
     "querystring": "^0.2.0",
     "raven": "^2.6.3",
     "request": "^2.87.0",

package.json

@@ -0,0 +1,31 @@
+const electron = require('electron');
+const app = electron.app;
+const shell = electron.shell;
+const Menu = electron.Menu;
+const appVersion = require('../../package.json').version;
+
+const appMenu = {
+
+  initMenu : function() {
+    const template = [{
+      label: "Pipeline",
+      submenu: [
+        { label: "Pipeline v" + appVersion, click () { shell.openExternal('https://www.xgeek.net/salesforce/pipeline-for-salesforce/'); } },
+        { type: "separator" },
+        { label: "Check for Updates...", click () { shell.openExternal('https://github.com/xgeek-net/pipeline/releases'); } },
+        { type: "separator" },
+        { label: "Quit Pipeline", accelerator: "Command+Q", click: function() { app.quit(); }}
+      ]}, {
+      label: "Edit",
+      submenu: [
+        { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
+        { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
+        { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
+        { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
+      ]}
+    ];
+    Menu.setApplicationMenu(Menu.buildFromTemplate(template));
+  }
+}
+
+module.exports = appMenu;

src/class/AppMenu.js

@@ -334,7 +334,7 @@ class Connect {
   getMetadataList(ev, arg) {
     const self = this;
     const callback = function(err, result) {
-      ev.sender.send('sfdc-metadata-list-callback',err, result);
+      ev.sender.send('sfdc-metadata-list-callback',utils.serialize(err), result);
     }
     try{
       let metadataList = [];

src/class/Connect.js

@@ -21,7 +21,7 @@ class Pipeline {
 
   savePipeline(ev, arg) {
     const callback = function(err, result) {
-      ev.sender.send('data-save-pipeline-callback',err, result);
+      ev.sender.send('data-save-pipeline-callback',utils.serialize(err), result);
     }
     try{
       const self = this;
@@ -61,7 +61,7 @@ class Pipeline {
    */
   clonePipeline(ev, arg) {
     const callback = function(err, result) {
-      ev.sender.send('data-clone-pipeline-callback',err, result);
+      ev.sender.send('data-clone-pipeline-callback',utils.serialize(err), result);
     }
     try{
       let pipelines = this.storage.getAll({ cache : false }); 
@@ -94,7 +94,7 @@ class Pipeline {
   removePipeline(ev, arg) {
     const self = this;
     const callback = function(err, result) {
-      ev.sender.send('data-remove-pipeline-callback',err, result);
+      ev.sender.send('data-remove-pipeline-callback',utils.serialize(err), result);
     }
     try{
       let pipelines = self.storage.getAll({ cache : false }); 
@@ -150,7 +150,7 @@ class Pipeline {
 
   getPipelines(ev, arg) {
     const callback = function(err, result) {
-      ev.sender.send('data-pipelines-callback',err, result);
+      ev.sender.send('data-pipelines-callback',utils.serialize(err), result);
     }
     try{
       let result = this.storage.getAll({ cache : false }); 
@@ -170,7 +170,7 @@ class Pipeline {
    */
   getPipelineLog(ev, arg) {
     const callback = function(err, result) {
-      ev.sender.send('data-pipeline-log-callback',err, result);
+      ev.sender.send('data-pipeline-log-callback',utils.serialize(err), result);
     }
     try{
       let index = 1;
@@ -203,7 +203,7 @@ class Pipeline {
   runPipeline(ev, arg) {
     const self = this;
     const callback = function(err, result) {
-      ev.sender.send('pipeline-run-callback',err, result);
+      ev.sender.send('pipeline-run-callback',utils.serialize(err), result);
     }
     const processing = function() {
       ev.sender.send('pipeline-run-callback',null, { type : 'process' });

src/class/Pipeline.js

@@ -47,13 +47,13 @@ class SfdcApi {
       if(!self.conn) return reject(new Error('SFDC Connect ERROR!'));
       self.conn.identity(function(err, res) {
         // console.log('>>> identity ', err, res);
-        // language: 'en_US',
-        // locale: 'ja_JP',
         if (err) {
-          if(err.errorCode.indexOf('INVALID_SESSION_ID') >= 0 ||
-            err.errorCode.indexOf('INVALID_LOGIN') >= 0 || 
-            err.errorCode.indexOf('INVALID_OPERATION_WITH_EXPIRED_PASSWORD') >= 0 || 
-            err.name.indexOf('invalid_grant') >= 0
+          const errorCode = err.errorCode || '';
+          const errorName = err.name || '';
+          if(errorCode.indexOf('INVALID_SESSION_ID') >= 0 ||
+            errorCode.indexOf('INVALID_LOGIN') >= 0 || 
+            errorCode.indexOf('INVALID_OPERATION_WITH_EXPIRED_PASSWORD') >= 0 || 
+            errorName.indexOf('invalid_grant') >= 0
           ) {
             //console.log('Refresh Token', self.conn.refreshToken);
             self.conn.oauth2.refreshToken(self.conn.refreshToken, function(err, ret) {

src/class/SfdcApi.js

@@ -4,7 +4,6 @@
 const electron = require('electron');
 const moment = require('moment');
 const path = require('path');
-const os = require('os');
 
 const utils = {
 
@@ -145,7 +144,12 @@ const utils = {
       res[key] = obj[key];
     }
     return res;
-  } 
+  },
+  
+  serialize : function(err) {
+    if(err instanceof Error)  return err.toString();
+    return err;
+  }
 }
 
 module.exports = utils;

src/class/Utils.js

@@ -17,6 +17,7 @@ const Setting = require('./class/Setting');
 const Connect = require('./class/Connect');
 const Pipeline = require('./class/Pipeline');
 const utils = require('./class/Utils');
+const appMenu = require('./class/AppMenu');
 const setting = new Setting();
 const connect = new Connect();
 const pipeline = new Pipeline();
@@ -26,7 +27,6 @@ const CLIENT = require('./config/client');
 const Raven = require('raven');
 Raven.config(CLIENT.RAVEN_CLIENT_ID).install();
 
-// メインウィンドウ
 let mainWindow;
 
 function createWindow() {
@@ -56,20 +56,18 @@ function createWindow() {
     let { width, height } = mainWindow.getBounds();
     setting.set('windowBounds', { width, height });
   });
+  // App Menu
+  appMenu.initMenu();
 }
 
 app.on('ready', createWindow);
 
-// 全てのウィンドウが閉じたときの処理
 app.on('window-all-closed', () => {
-  // macOSのとき以外はアプリケーションを終了させます
   if (process.platform !== 'darwin') {
     app.quit();
   }
 });
-// アプリケーションがアクティブになった時の処理(Macだと、Dockがクリックされた時）
 app.on('activate', () => {
-  // メインウィンドウが消えている場合は再度メインウィンドウを作成する
   if (mainWindow === null) {
     createWindow();
   }