From ccdef26fa057d651f82ae17ef5f9b6c284655791 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 14 Jul 2020 15:18:29 +0200
Subject: [PATCH] New Nodes

---
 .../Workspace/FunctionLibraries/SessionFunctions.js |  3 ++-
 FloatingSpace/UiObjectConstructor.js                | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
index 9bb544e9e..73bbf1b44 100644
--- a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
+++ b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js
@@ -40,7 +40,8 @@ function newSessionFunctions () {
     'Position Size->Position Rate->Formula->' +
     'Create Order Event->Move Order Event->Cancel Order Event->' +
     'Situation->Condition->Javascript Code->' +
-    'Market Order->Limit Order->'
+    'Market Order->Limit Order->' +
+    'Simulated Exchange Events->Simulated Partial Fill->Simulated Actual Rate->Simulated Fees Paid->Formula->'
 
     let tradingSystem = functionLibraryProtocolNode.getProtocolNode(node.tradingSystemReference.payload.referenceParent, false, true, true, false, false, lightingPath)
 
diff --git a/FloatingSpace/UiObjectConstructor.js b/FloatingSpace/UiObjectConstructor.js
index b2445657a..1c17ca23c 100644
--- a/FloatingSpace/UiObjectConstructor.js
+++ b/FloatingSpace/UiObjectConstructor.js
@@ -74,7 +74,7 @@ function newUiObjectConstructor () {
     */
 
     if (userAddingNew === true) {
-      let definition = getNodeDefinition (payload.parentNode)
+      let definition = getNodeDefinition(payload.parentNode)
       if (definition.properties !== undefined) {
         for (let i = 0; i < definition.properties.length; i++) {
           let property = definition.properties[i]
@@ -406,7 +406,7 @@ function newUiObjectConstructor () {
   function getMenuItemsInitialValues (uiObject, floatingObject, payload) {
     let menuItemsInitialValues = []
 
-    let nodeDefinition = getNodeDefinition (payload.node)
+    let nodeDefinition = getNodeDefinition(payload.node)
     if (nodeDefinition !== undefined) {
       if (nodeDefinition.editors !== undefined) {
         if (nodeDefinition.editors.config === true) {
@@ -450,7 +450,12 @@ function newUiObjectConstructor () {
 
         /* We need to reference the real function based on its name */
         if (menutItemDefinition.actionFunction !== undefined) {
-          newMenuItem.actionFunction = eval(menutItemDefinition.actionFunction)
+          try {
+            newMenuItem.actionFunction = eval(menutItemDefinition.actionFunction)
+          } catch (err) {
+            console.log('Error at Menu Item Action Function: ' + menutItemDefinition.actionFunction + ' ' + err.stack)
+            continue
+          }
         }
 
         /* Adding default values */
@@ -495,7 +500,7 @@ function newUiObjectConstructor () {
       }
 
       default: {
-        let nodeDefinition = getNodeDefinition (payload.node)
+        let nodeDefinition = getNodeDefinition(payload.node)
         if (nodeDefinition !== undefined) {
           switch (nodeDefinition.level) {
             case 0: {