@kumologica/sdk 3.0.27-beta5 → 3.0.27-beta7

package/cli/commands/export-commands/cloudformation.js

@@ -125,6 +125,11 @@ exports.builder = {
 		type: 'string',
 		nargs: 1
 	},
+	"layers": {
+		describe: `\nList of arn of lambda layers to be added.`,
+		type: 'string',
+		nargs: 1
+	},
 	"policy": {
 		describe: `\nAdditional iam policy to add to the role. It must be in valid aws policy format, for example: '{"Effect": "Allow", "Resource": ["*"],"Action": ["sns:Publish"]}'. if policy is invalid, cloudformation stack will fail. The value can be single policy statement or array of statements if required. This parameter is ignored if role-arn is provided.`,
 		type: 'string',
@@ -156,12 +161,18 @@ Examples:
 3. Creates event trigger using rate expression that runs every minute for event listener with reference "cleanup":\n
 			{"event": {"expression": "rate(1 minute)", "reference": "cleanup"}}\n
 
+SNS:\n----
+			* topicArn - the ARN of sns topic, required
+
+Example:
+			{"sns": {"topicArn": "arn:aws:sns: ..."}}
+
 SQS:\n----
 			* queueArn - the ARN of sqs queue, required
 			* batchSize - the size of batch, optional
 
 Example:
-			{"sqs": {"queueArn": "arn:aws: ..."}}
+			{"sqs": {"queueArn": "arn:aws:sqs: ..."}}
 
 DynamoDB Stream:\n----
 			* streamArn - the ARN of dynamodb stream, required
@@ -265,6 +276,7 @@ function display(argv) {
 	console.log('  log-retention-days:  %s', argv["log-retention-days"]||'');
 	console.log('  role-arn:            %s', argv["role-arn"]||'');
 	console.log('  policy:              %s', argv["policy"] || '');
+	console.log('  layers:              %s', argv["layers"] || '');
 	console.log(`  strict-mode:         ${argv["strict-mode"]}`);
 	console.log('  triggers:            %s', argv.triggers||'');	
 }
@@ -309,6 +321,9 @@ function validate(argv) {
 	if (argv["file-system-configs"]) {
 		validateJson("file-system-configs", argv["file-system-configs"]);
 	}
+	if (argv["layers"]) {
+		validateJson("layers", argv["layers"]);
+	}
 	if (argv.triggers) {
 		validateJson("triggers", argv.triggers);
 		validator.validate("triggers", JSON.parse(argv.triggers));

package/cli/commands/export-commands/utils/validator.js

@@ -58,6 +58,23 @@ const triggersSchema = {
 					}
 				}
 			},
+			"sns": {
+				"$id": "#root/items/sns", 
+				"title": "Sns", 
+				"type": "object",
+				"required": [
+					"topicArn"
+				],
+				additionalProperties: false,
+				"properties": {
+					"topicArn": {
+						"$id": "#root/items/sns/topicArn", 
+						"title": "Topicarn", 
+						"type": "string",
+						"pattern": "^.*$"
+					}
+				}
+			},
 			"api": {
 				"$id": "#root/items/api", 
 				"title": "Api", 

package/package.json

@@ -3,7 +3,7 @@
   "productName": "Kumologica Designer",
   "copyright": "Copyright 2020 Kumologica Pty Ltd, All Rights Reserved.",
   "author": "Kumologica Pty Ltd <contact@kumologica.com>",
-  "version": "3.0.27-beta5",
+  "version": "3.0.27-beta7",
   "description": "Kumologica Designer, harnessing Serverless for your cloud integration needs",
   "main": "src/app/main.js",
   "files": [
@@ -65,9 +65,9 @@
   "license": "Proprietary",
   "dependencies": {
     "@electron/remote": "^2.0.8",
-    "@kumologica/builder": "3.0.27-beta5",
-    "@kumologica/devkit": "3.0.27-beta5",
-    "@kumologica/runtime": "3.0.27-beta5",
+    "@kumologica/builder": "3.0.27-beta7",
+    "@kumologica/devkit": "3.0.27-beta7",
+    "@kumologica/runtime": "3.0.27-beta7",
     "adm-zip": "0.4.13",
     "ajv": "8.10.0",
     "aws-sdk": "2.513.0",
@@ -111,12 +111,14 @@
     "request": "2.88.0",
     "rimraf": "3.0.0",
     "shell-path": "2.1.0",
+    "simple-git": "^3.14.1",
     "simplemde": "1.11.2",
     "smoketail": "0.2.2",
     "socket.io": "2.3.0",
     "tcp-port-used": "1.0.2",
     "util": "0.12.1",
     "when": "3.7.8",
+    "wide-align": "^1.1.5",
     "wildcard-match": "^5.1.2",
     "ws": "7.1.1",
     "xterm": "4.1.0",

package/src/app/main-process/main-window.js

@@ -85,7 +85,7 @@ class MainWindow {
 
     this.window.webContents.on('did-finish-load', () => {
       // this.checkForUpdates();
-      this.updateProjectInfo(this.lastUserProjectDir, this.lastFlowfile || "untitled");
+      this.updateProjectInfo(this.lastUserProjectDir, this.lastFlowfile || "__untitled__");
       this.emitter.emit('did-load', null);
 
       if (this.startupErrorEvent) {

package/src/app/main-process/menu.js

@@ -117,7 +117,7 @@ let appTemplate = [
     submenu: [
       { role: 'reload' },
       { role: 'forcereload' },
-//      { role: 'toggledevtools' },
+     { role: 'toggledevtools' },
       { type: 'separator' },
       { role: 'resetzoom' },
       { role: 'zoomin' },

package/src/app/main.js

@@ -75,7 +75,7 @@ ipcMain.on('modal-welcome:show-dialog-newproject', async () => {
   
   let userDir = codegen.generateInitialCode(
     userPrefStore.getUserDataPath(),
-    'untitled',
+    '__untitled__',
     null,
     version
   );
@@ -477,7 +477,7 @@ async function openWelcomePage() {
   
   let userDir = codegen.generateInitialCode(
     userPrefStore.getUserDataPath(),
-    'untitled',
+    '__untitled__',
     null,
     version 
   );

package/src/app/preload.js

@@ -11,7 +11,7 @@ const { AppServer, lambdify } = require('./lib/runtime-loader');
 const { Terminal } = require('xterm');
 const { FitAddon } = require('xterm-addon-fit');
 const electron = require('electron');
-const remote = require('@electron/remote')
+const remote = require('@electron/remote');
 
 // Parse arguments from: webPreferences.additionalArguments
 const argv = require('yargs/yargs')(process.argv.slice(2)).parse();
@@ -22,6 +22,7 @@ const debounce = require('debounce');
 const { promisify } = require('util');
 
 const dagre = require('dagre');
+const simpleGit = require('simple-git');
 const request = require('request');
 const requestAsync = promisify(request);
 
@@ -168,7 +169,7 @@ async function getRegion(profile) {
   return region;
 }
 
-async function testFlow(testEvent, targetNode, environmentVariables, traceabilityEnabled) {
+async function testFlow(testEvent, targetNode, environmentVariables) {
 
   let event;
 
@@ -185,10 +186,6 @@ async function testFlow(testEvent, targetNode, environmentVariables, traceabilit
   
   headers = { ...headers, 'x-kumologica-testcasenode': targetNode };
 
-  if (traceabilityEnabled === true){
-    headers = { ...headers, 'x-kumologica-traceability': true}
-  }
-
   if (environmentVariables) {
     if (Object.keys(environmentVariables).length > 0) {
       headers = {
@@ -536,6 +533,7 @@ async function azureLogin(profile) {
   await azure.login(alias);
   return {alias: alias};
 }
+
 /**
  * Dispatch an action from the ipcRenderer to the main process
  * @param {string} type
@@ -622,7 +620,7 @@ window.__kumologica.libs.testFlow = testFlow;
 window.__kumologica.libs.openFileOnEditor = openFileOnEditor;
 window.__kumologica.libs.openFolder = openFolder;
 window.__kumologica.libs.dagre = dagre;
-
+window.__kumologica.libs.simpleGit = simpleGit;
 
 // Node Library
 window.__kumologica.nodeLibrary = {};

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

@@ -57,7 +57,7 @@ function CommsConnection(ws) {
   var self = this;
 
   log.audit({ event: 'comms.open' });
-  log.trace('comms.open ' + self.session);
+  // log.trace('comms.open ' + self.session);
   var pendingAuth = settings.adminAuth != null;
 
   if (!pendingAuth) {
@@ -65,7 +65,7 @@ function CommsConnection(ws) {
   }
   ws.on('close', function () {
     log.audit({ event: 'comms.close', user: self.user, session: self.session });
-    log.trace('comms.close ' + self.session);
+    // log.trace('comms.close ' + self.session);
     removeActiveConnection(self);
   });
   ws.on('message', function (data, flags) {
@@ -73,7 +73,7 @@ function CommsConnection(ws) {
     try {
       msg = JSON.parse(data);
     } catch (err) {
-      log.trace('comms received malformed message : ' + err.toString());
+      // log.trace('comms received malformed message : ' + err.toString());
       return;
     }
     if (!pendingAuth) {

package/src/app/ui/editor-client/public/red/red.js

@@ -21235,11 +21235,13 @@ RED.view.tools = (function() {
     RED.sidebar.nodeinfo.init();
     RED.sidebar.info.init();
     RED.sidebar.test.init();
+    RED.sidebar.git.init();
     RED.sidebar.kumohub.init();
     RED.sidebar.azure.init();
     RED.sidebar.awsDeploy.init();
 
 
+
     // hide info bar at start if screen rather narrow...
     // if ($(window).width() < 600) {
     //   RED.menu.setSelected('menu-item-sidebar', false);
@@ -24849,9 +24851,6 @@ RED.sidebar.nodeinfo = (function(){
     // Clear the cache of debug messages
     $('#test-debug-messages-caches').empty();
 
-    // Check if traceability is enabled
-    let traceabilityEnabled = $('#isTraceabilitySelected').is(':checked');
-
     // Run the selected case
     // - check whether there is only one test case to run or we should run all of them
     if (testCaseIdSelected) {
@@ -24868,7 +24867,7 @@ RED.sidebar.nodeinfo = (function(){
           createDebugMessageCache(testNodes[i].id);
           try{
             // console.log(`[tab-test] Running testcase: ${testNodes[i].id} ...`, )
-            await window.__kumologica.libs.testFlow('{}', testNodes[i].id, environment, traceabilityEnabled);
+            await window.__kumologica.libs.testFlow('{}', testNodes[i].id, environment);
           }catch(err){
             console.log('[tab-test] error found: ', err);
           }
@@ -24876,7 +24875,7 @@ RED.sidebar.nodeinfo = (function(){
       } else {
         try {
           createDebugMessageCache(testCaseIdSelected);
-          await window.__kumologica.libs.testFlow('{}', testCaseIdSelected, environment, traceabilityEnabled);
+          await window.__kumologica.libs.testFlow('{}', testCaseIdSelected, environment);
         } catch(err) {
           console.log('[tab-test] error found: ', err);
           //App.notify(`Error found: ${JSON.stringify(err)}`, { type: 'error'});
@@ -26088,6 +26087,312 @@ RED.sidebar.nodeinfo = (function(){
     init: init,
     show: show,
   };
+})();;RED.sidebar.git = (function(){
+
+    let tabContent;
+    let sections;
+    let stackContainer;
+    const PUSHING_LABEL = 'Pushing...';
+    const COMMIT_MESSAGE_LABEL = `Commit message... (ctrl+enter to commit)`;
+    let initalizationRequired = true;
+
+    const simpleGit = window.__kumologica.libs.simpleGit;
+
+    function getGitOptions() {
+        return {
+            baseDir: window.__kumologica.settings.projectDir,
+            binary: 'git',
+            maxConcurrentProcesses: 6,
+            trimmed: false,
+            // config: ['http.proxy=someproxy']
+        }
+    }
+
+    function initHTML() {
+        tabContent = document.createElement('div');
+        tabContent.className = 'sidebar-git';
+
+        RED.actions.add('core:show-git-tab', show);
+
+        stackContainer = $('<div>', {
+            class: 'sidebar-node-info-stack',
+        }).appendTo(tabContent);
+
+        // Append the header
+        let headerContentHtml = `
+        <div class="sidebar-title-wrapper">
+            <div style="display:flex;flex-direction:column;padding-right:10px; width:100%">
+                <div id="sidebar-title-wrapper-left" style="display:flex">
+                    <span>Source Control</span>
+                </div>
+
+                <div id="sidebar-git-body">
+                    <div id="sidebar-git-error-wrapper" style="display:none">
+                        <span><b>The directoryLocal is not under git source control</b> 
+                        <span>The project {projectDir} is not a git repository</span>
+                    </div>
+                    <div id="sidebar-git-general-options-wrapper">
+                        <div id="sidebar-git-general-pullpush-wrapper">
+                            <a id="sidebar-git-push-btn" class="sidebar-header-button" href="#" style="display:flex; margin-right: 5px;">
+                                <span id="git-ahead" style="display:none"><i class="icofont-arrow-up"></i><span id="git-ahead-value" style="margin-right:4px"></span></span>
+                                <span id="git-behind" style="display:none"><i class="icofont-arrow-down"></i><span id="git-behind-value" style="margin-right:4px"></span></span>
+                                <span id="git-push-label">Push</span>
+                            </a>
+                            <!-- reload btn -->
+                            <a id="sidebar-git-reload-btn" class="sidebar-header-button" href="#">
+                                <i id="git-reload-icon" class="fa fa-refresh" aria-hidden="true"></i>
+                            </a>
+                        </div>
+                    </div>
+
+                    <div id="pending-commit-wrapper">
+                        <div id="sidebar-git-commit-msg-wrapper">
+                            <textarea id="sidebar-git-commit-msg" rows="4" placeholder="${COMMIT_MESSAGE_LABEL}" style="min-height:130px"></textarea>
+                        </div>
+                        <div id="sidebar-git-commit-options-wrapper">
+                            <div id="sidebar-git-branch-info-wrapper">
+                                Commit to  
+                                <div id="sidebar-git-branch"></div>
+                                branch
+                            </div>
+                            <div id="sidebar-git-commit-wrapper">
+                                <!-- commit btn -->
+                                <a id="sidebar-git-commit-btn" class="sidebar-header-button" href="#" style="width: 70px; color: white !important; background: #2979ff; margin-right:5px">
+                                    Commit
+                                </a>
+                                <!-- commit & push btn -->
+                                <a id="sidebar-git-commitpush-btn" class="sidebar-header-button" href="#" style="width: 140px;">
+                                    Commit and Push...
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="git-not-initialized" style="display:none">
+                    <div style="display:flex; flex-direction: column; align-items: center; margin-top: 150px">
+                        <div><i class="fa fa-code-fork" style="font-size: 56px; color: lightgrey;"></i></div>
+                        <div style="font-weight: bold; font-size: 22px; margin-top: 15px;color: grey;">Unversioned project</div>
+                        <div style="margin-top: 5px; color: grey;font-weight: 400; font-size: 13px;">Git repository not found on project directory</div>
+                    </div>
+                </div>
+            </div>
+          </div>
+        `;
+
+        $(headerContentHtml).appendTo(stackContainer);
+
+        RED.sidebar.addTab({
+            id: 'git',
+            label: ' Git',
+            name: 'Source Control',
+            iconClass: 'fa fa-code-fork',
+            action: 'core:show-git-tab',
+            content: tabContent,
+            pinned: true,
+            enableOnEdit: true,
+            onchange: refreshTab,
+            onsame: onsame
+        })
+    }
+
+    function reloading(){
+        $('#git-reload-icon').addClass('fa-spin');
+    }
+
+    function resetReload(){
+        $('#git-reload-icon').removeClass('fa-spin');
+    }
+
+    function initJS() {
+        $('#sidebar-git-commit-msg').keydown(e => {
+            if ((e.ctrlKey || e.metaKey) && (e.keyCode == 13 || e.keyCode == 10)) {
+                $('#sidebar-git-commit-btn').click();
+            }
+        })
+        $('#sidebar-git-commit-btn').click(async e => {
+            let commitMessage = $('#sidebar-git-commit-msg').val();
+            addAllAndCommit(commitMessage);
+            await wait(2000);
+            checkGitStatus();
+        });
+        
+        $('#sidebar-git-commitpush-btn').click(async e => {
+            let commitMessage = $('#sidebar-git-commit-msg').val();
+            addAllAndCommit(commitMessage);
+            await wait(3000);
+            pushChanges();
+        });
+
+        $('#sidebar-git-reload-btn').click(async e => {
+            reloading();
+            checkGitStatus();
+            await wait(1000);
+            resetReload();
+        });
+
+        $('#sidebar-git-push-btn').click(e => {
+            if ($('#sidebar-git-push-btn').html() !== PUSHING_LABEL){
+                pushChanges();
+            }
+        });
+    }
+
+    function renderInitializationRequired() {
+        $('#sidebar-git-body').hide();
+        $('#git-not-initialized').show();
+        initalizationRequired = true;
+    }
+
+    function renderGitInitialized() {
+        $('#sidebar-git-body').show();
+        $('#git-not-initialized').hide();
+        initalizationRequired = false;
+    }
+
+    async function checkGitStatus(){
+        if (initalizationRequired) {
+            $('#sidebar-git-body').hide();
+            $('#git-not-initialized').hide();
+        }
+        const git = simpleGit(getGitOptions());
+        try{
+            // ==> Compare with stage
+            const status = await git.status()
+            if ( status.not_added.length > 0 ||
+                status.created.length > 0 ||
+                status.deleted.length > 0 ||
+                status.modified.length > 0 ||
+                status.renamed.length > 0 ) {
+                    allowCommits();
+            } else {
+                disallowCommits()
+            }
+            let newStatus = await git.status(['-','sb']);  // newStatus = {ahead, behind, current, tracking};
+            renderGitInitialized();
+            $('#sidebar-git-branch').html(newStatus.current);
+            renderAhead(newStatus.ahead);
+            renderBehind(newStatus.behind);
+        }catch(err){
+            renderInitializationRequired();
+        }
+    }
+
+    async function wait(msecs){
+        await sleep(msecs);
+    }
+
+    function sleep(ms) {
+        return new Promise((resolve) => {
+            setTimeout(resolve, ms);
+        });
+    }
+
+    function renderAhead(numCommits){
+        if (numCommits === 0){
+            $('#git-ahead').hide();
+        } else {
+            $('#git-ahead-value').html(numCommits);
+            $('#git-ahead').show();
+        }
+    }
+
+    function renderBehind(numCommits){
+        if (numCommits === 0){
+            $('#git-behind').hide();
+        } else {
+            $('#git-behind-value').html(numCommits);
+            $('#git-behind').show();
+        }
+    }
+
+    function showPushing() {
+        $('#git-ahead').hide();
+        $('#git-behind').hide();
+        $('#git-push-label').html(PUSHING_LABEL);
+    }
+
+    function resetPushButton() {
+        $('#git-push-label').html('Push');
+    }
+
+    async function pushChanges() {
+        const git = simpleGit(getGitOptions());
+        try{
+            let currentBranch = await readCurrentBranch();
+            showPushing();
+            const result = await git.push('origin', currentBranch);
+            RED.notify(`Changes pushed successfully`, 'success', undefined, 800);
+        } catch(e) {
+            RED.notify(`<strong>Error</strong>: ${e.message}`, 'error');
+        } finally {
+            resetPushButton();
+            checkGitStatus();
+        }
+    }
+
+    async function addAllAndCommit(message){
+        const git = simpleGit(getGitOptions());
+        try{
+            await git.add('./*').commit(message);
+            disallowCommits();
+            RED.notify(`Changed committed successfully`, 'success', undefined, 800);
+        } catch(e) {
+            RED.notify(`<strong>Error</strong>: ${e.message}`, 'error');
+            clearCommitMessage();
+        }
+    }
+
+    async function readCurrentBranch(){
+        const git = simpleGit(getGitOptions());
+        try{
+            const localBranches = await git.branchLocal();
+            return localBranches.current;
+        }catch(e){
+            RED.notify(`<strong>Error</strong>: ${e.message}`, 'error');
+            return ''
+        }
+        
+    }
+    function allowCommits() {
+        $("#sidebar-git-commit-msg").attr("placeholder", `${COMMIT_MESSAGE_LABEL}`).val("");
+        $("#sidebar-git-commit-msg").attr("disabled", false);
+        $('#sidebar-git-commit-wrapper').show();
+    }
+    function disallowCommits() {
+        $("#sidebar-git-commit-msg").attr("placeholder", "Nothing to commit").val("").focus().blur();
+        $("#sidebar-git-commit-msg").attr("disabled", true)
+        $('#sidebar-git-commit-wrapper').hide();
+    }
+
+    function clearCommitMessage() {
+        $('#sidebar-git-commit-msg').val('');
+    }
+
+    function init() {
+        initHTML();
+        initJS();
+    }
+
+    function show() {
+        RED.sidebar.show('git');
+        checkGitStatus();
+    }
+
+    function refreshTab(silently){
+        if (!silently) {
+            RED.actions.invoke('core:show-sidebar');
+        }
+        checkGitStatus();
+    }
+
+    function onsame(){
+        RED.actions.invoke('core:hide-sidebar');
+      }
+
+    return {
+        init: init,
+        show: show,
+    }
 })();;
 RED.sidebar.azure = (function () {
     marked.setOptions({