From 70bcb9580f09eefbf036d0879c5e773463e8ebe8 Mon Sep 17 00:00:00 2001
From: Smidy13 <77650800+Smidy13@users.noreply.github.com>
Date: Fri, 11 Jun 2021 18:55:03 +1200
Subject: [PATCH] Bug Fix: Failing to Load Plugins + Tutorials Not Playing

---
 Projects/Education/Schemas/App-Schema/tutorial.json       | 3 +++
 .../UI/Function-Libraries/UiObjectsFromNodes.js           | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Projects/Education/Schemas/App-Schema/tutorial.json b/Projects/Education/Schemas/App-Schema/tutorial.json
index cae85ff63..c0d67ff91 100644
--- a/Projects/Education/Schemas/App-Schema/tutorial.json
+++ b/Projects/Education/Schemas/App-Schema/tutorial.json
@@ -3,6 +3,7 @@
     "menuItems": [
         {
             "action": "Play Tutorial",
+            "actionProject": "Foundations",
             "label": "Play",
             "iconPathOn": "play",
             "iconPathOff": "play",
@@ -10,6 +11,7 @@
         },
         {
             "action": "Resume Tutorial",
+            "actionProject": "Foundations",
             "label": "Resume",
             "iconPathOn": "resume",
             "iconPathOff": "resume",
@@ -38,6 +40,7 @@
         },
         {
             "action": "Reset Tutorial Progress",
+            "actionProject": "Foundations",
             "askConfirmation": true,
             "confirmationLabel": "Confirm to Reset",
             "label": "Reset Tutorial Progress",
diff --git a/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js b/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
index db85cbe37..1d0e40a6b 100644
--- a/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
+++ b/Projects/Foundations/UI/Function-Libraries/UiObjectsFromNodes.js
@@ -142,8 +142,12 @@ function newFoundationsFunctionLibraryUiObjectsFromNodes() {
                     let project = "Foundations"
                     try {
                         let config = JSON.parse(pluginFile.config)
-                        project = config.project
-                        name = config.fileName
+                        if (config.project !== undefined) {
+                            project = config.project
+                        }
+                        if (config.fileName !== undefined) {
+                            name = config.fileName
+                        }
                     } catch (err) { }
 
                     httpRequest(undefined, 'LoadPlugin' + '/' + project + '/' + pluginType + '/' + name + '.json', onFileReceived)