@kumologica/sdk 3.4.0-beta8 → 3.4.0

package/cli/commands/test.js

@@ -8,7 +8,7 @@ const { TestSuiteRunner } = require('./test-commands/TestSuiteRunner');
 const { DesignerServer } = require('../../src/server/DesignerServer');
 const { logError, logNotice, logInfo, logFatal } = require('../utils/logger');
 
-const isDirectory = util.isDirectorySync;
+const isDirectory = util.isDir.sync;
 
 
 exports.command = 'test [project_directory]';
@@ -56,16 +56,20 @@ exports.handler = ({ project_directory, testcase, iterative }) => {
 }
 
 async function runTestOnNewServer(flowFilePath, testcaseSelected, iterative) {
-  let designerServer = new DesignerServer(
-    flowFilePath,
-    false,
-    {
+  let options = {
+    flowPath: flowFilePath,
+    safe: false,
+    cliParams:  {
       loglevel: "error",
       noadmin: true
-    });
+    }
+  }
+
+  let designerServer = new DesignerServer(options);
+  
 
   try {
-    await designerServer.listen();
+    await designerServer.start();
     logInfo(`> Flow file: ${path.resolve(flowFilePath)} \n`);
     let testSuiteRunner = new TestSuiteRunner(designerServer);
 

package/cli/utils/logger.js

@@ -5,6 +5,10 @@ function logError(message) {
     console.log(chalk.red(message));
 }
 
+function logFatal(message) {
+    console.log(chalk.red(message));
+}
+
 function logNotice(message) {
     console.log(chalk.yellow(message));
 }
@@ -16,5 +20,6 @@ function logInfo(message) {
 module.exports = {
     logError,
     logNotice,
-    logInfo
+    logInfo,
+    logFatal
 }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@kumologica/sdk",
+  "version": "3.4.0",
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
-  "version": "3.4.0-beta8",
   "description": "Kumologica Designer, harnessing Serverless for your cloud integration needs",
   "main": "src/app/main.js",
   "files": [
@@ -64,9 +64,9 @@
   "license": "Proprietary",
   "dependencies": {
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.4.0-beta8",
-    "@kumologica/devkit": "3.4.0-beta8",
-    "@kumologica/runtime": "3.4.0-beta8",
+    "@kumologica/builder": "3.4.0",
+    "@kumologica/devkit": "3.4.0",
+    "@kumologica/runtime": "3.4.0",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "archive-type": "^4.0.0",

package/src/app/main-process/modal-newproject.js

@@ -76,7 +76,10 @@ class ModalNewProject {
   }
 
   close() {
-    this.window.close();
+    if (this.window){
+      this.window.close();
+    }
+    
   }
   get window() {
     return this.window;

package/src/app/main-process/modal-renameTab.js

@@ -0,0 +1,106 @@
+const electron = require('electron');
+const path = require('path');
+const url = require('url');
+const { BrowserWindow } = electron;
+const { isMac, isWin } = require('../util');
+const preloadJsPath = path.join(__dirname, '..', 'preload.js');
+const editorManager = require('./editor-manager');
+
+class ModalRenameTab {
+  window = null;
+  
+  constructor(parentWindow, cancellable, params) {
+    this.port = editorManager.getPort();
+    this.cancellable = cancellable;
+    this.tabId = params.tabId;
+    this.oldTabName = params.oldTabName;
+    let windowOptions = {
+      parent: parentWindow,
+      modal: true,
+      width: 540,
+      height: 220, //290,
+      minimizable: false,
+      maximizable: false,
+      resizable: true,
+      icon: "./src/assets/kumologica-app.png",
+      titleBarStyle: 'hiddenInset',
+      backgroundColor: '#fff',
+      webPreferences: {
+        nodeIntegration: false,
+        preload: preloadJsPath,
+        enableRemoteModule: true,
+        contextIsolation: false,
+        additionalArguments: [`--port=${this.port}`]
+      },
+      show: false,
+    };
+
+    this.window = new BrowserWindow(windowOptions);
+    if (isMac){
+      this.window.setWindowButtonVisibility(false);
+    } 
+
+    require("@electron/remote/main").enable(this.window.webContents);
+    // this.window.webContents.openDevTools(); 
+
+    this.window.webContents.on('did-finish-load', async () => {
+      // Send params to modal
+      this.window.webContents.send('receiveProps', {
+        payload: {
+          tabId: this.tabId,
+          oldTabName: this.oldTabName,
+        }
+      });
+    })
+
+    this.window.on('focus', () => this.window.webContents.send('focus'));
+    this.window.on('blur', () => this.window.webContents.send('blur'));
+
+    this.window.once('ready-to-show', () => {
+      this.window.show();
+    });
+
+    this.window.on('page-title-updated', (e) => {
+      e.preventDefault();
+    });
+
+    this.window.on('closed', () => {
+      // Dereference the window object, usually you would store windows
+      // in an array if your app supports multi windows, this is the time
+      // when you should delete the corresponding element.
+      this.window = null;
+    });
+  }
+
+  load() {
+    this.window.loadURL(
+      url.format({
+        pathname: `127.0.0.1:${this.port}/__renameTab`,
+        protocol: 'http:',
+        slashes: true,
+      }),
+      {
+        userAgent: 'Kumologica Designer'
+      }
+    );
+    this.window.removeMenu();
+  }
+  show() {
+    this.window.show();
+  }
+  reload() {
+    this.window.reload();
+  }
+
+  close() {
+    this.window.close();
+  }
+  get window() {
+    return this.window;
+  }
+  isCancellable() {
+    return this.cancellable;
+  }
+}
+
+module.exports = ModalRenameTab;

package/src/app/main.js

@@ -29,6 +29,7 @@ const MainWindow = require('./main-process/main-window');
 const ModalNewProject = require('./main-process/modal-newproject');
 const ModalHome = require('./main-process/modal-home');
 const ModalNewTab = require('./main-process/modal-newtab');
+const ModalRenameTab = require('./main-process/modal-renameTab');
 const ModalWelcome = require('./main-process/modal-welcome');
 const EventEmitter = require('events');
 const ModalNodeLibrary = require('./main-process/modal-nodelibrary');
@@ -232,6 +233,11 @@ ipcMain.on('navigator:open-new-tab-dialog', ()=> {
   currentModalWindow = new ModalNewTab(mainWindow.window, true);
   currentModalWindow.load();
 });
+ipcMain.on('navigator:open-rename-tab-dialog', (event, payload)=> {
+  const { tabId, oldTabName } = payload;
+  currentModalWindow = new ModalRenameTab(mainWindow.window, true, {tabId, oldTabName});
+  currentModalWindow.load();
+});
 
 // ***** Events from modal-node-library  *****
 
@@ -351,12 +357,28 @@ ipcMain.on('open-new-tab-dialog:close', async(event, payload)=> {
   }
 });
 
+ipcMain.on('open-rename-tab-dialog:close', async(event, payload)=> {
+  if (currentModalWindow.isCancellable()) {
+    currentModalWindow.close();
+  } else {
+    // Exit app by closing all windows
+    currentModalWindow.close();
+    mainWindow.close();
+  }
+});
+
 ipcMain.on('open-new-tab-dialog:create-tab', async(event, payload)=> {
   currentModalWindow.close();
   let tabName = payload['createTabName'];
   mainWindow.sendEventToRenderer('create-new-tab', { tabName });
 });
 
+ipcMain.on('open-rename-tab-dialog:rename-tab', async(event, payload)=> {
+  currentModalWindow.close();
+  const {tabId, newTabName} = payload;
+  mainWindow.sendEventToRenderer('explorer:rename-tab', { tabId, newTabName });
+});
+
 
 function showNewProjectDialog(cancellable) {
   currentModalWindow = new ModalNewProject(mainWindow.window, cancellable);

package/src/app/ui/editor-api/lib/editor/index.js

@@ -106,6 +106,14 @@ module.exports = {
         ui.modalNewTab
       );
 
+      editorApp.get(
+        '/__renameTab',
+        ensureInvocationFromDesigner,
+        ensureRuntimeStarted,
+        ui.ensureSlash,
+        ui.modalRenameTab
+      );
+
       // Serve the ModalNodeLibrary page
       editorApp.get(
         '/__nodeLibrary',

package/src/app/ui/editor-api/lib/editor/ui.js

@@ -59,6 +59,15 @@ let modalNewTabTemplatePath = path.join(
 );
 let modalNewTabTemplate;
 
+// Modal for rename tabs
+let modalRenameTabTemplatePath = path.join(
+  editorClientDir,
+  'templates',
+  'modals',
+  'modalRenameTab.mst'
+);
+let modalRenameTabTemplate;
+
 // Modal for library nodes
 let modalNodeLibraryPath = path.join(
   editorClientDir,
@@ -91,13 +100,20 @@ module.exports = {
     );
     Mustache.parse(modalNewProjectTemplate);
 
-    // Parse the modalNewProject page
+    // Parse the modalNewTab page
     modalNewTabTemplate = fs.readFileSync(
       modalNewTabTemplatePath,
       'utf8'
     );
     Mustache.parse(modalNewTabTemplate);
 
+     // Parse the RenameTab page
+     modalRenameTabTemplate = fs.readFileSync(
+      modalRenameTabTemplatePath,
+      'utf8'
+    );
+    Mustache.parse(modalRenameTabTemplate);
+
     // Parse the modalNodeLibary page
     modalNodeLibraryTemplate = fs.readFileSync(modalNodeLibraryPath, 'utf8');
     Mustache.parse(modalNodeLibraryTemplate);
@@ -154,6 +170,10 @@ module.exports = {
     res.send(Mustache.render(modalNewTabTemplate, theme.context()));
   },
 
+  modalRenameTab: function(req, res) {
+    res.send(Mustache.render(modalRenameTabTemplate, theme.context()));
+  },
+
   modalHomePage: function(req, res) {
     res.send(Mustache.render(modalHomeTemplate, theme.context()));
   },