feat: Slider add children to thumb

I am not super happy with how this works as the child is inside the thumb div. Ideally it should be moving around the thumb, but then that might be a tooltip lib?

.github/workflows/build-noodl-editor.yml

@@ -1,4 +1,4 @@
-name: Build fluxscape-editor
+name: Build noodl-editor
 
 on:
   # Allows you to run this workflow manually from the Actions tab
@@ -72,6 +72,6 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: fluxscape-editor-${{ matrix.platform }}-${{ github.head_ref }}-${{ github.sha }}
+          name: noodl-editor-${{ matrix.platform }}-${{ github.head_ref }}-${{ github.sha }}
           path: publish
-          retention-days: '12'
+          retention-days: "12"

.github/workflows/test-noodl-editor.yml

@@ -1,4 +1,4 @@
-name: Test fluxscape-editor
+name: Test noodl-editor
 
 on:
   # Allows you to run this workflow manually from the Actions tab

README.md

@@ -1,21 +1,21 @@
-# Fluxscape
+# Noodl
 
-Fluxscape is a low-code platform where designers and developers build custom applications and experiences. Designed as a visual programming environment, it aims to expedite your development process. It promotes the swift and efficient creation of applications, requiring minimal coding knowledge.
+[Noodl](https://noodl.net) is a low-code platform where designers and developers build custom applications and experiences. Designed as a visual programming environment, it aims to expedite your development process. It promotes the swift and efficient creation of applications, requiring minimal coding knowledge.
 
 ## Documentation
-Documentation for how to use Fluxscape can be found here:
+Documentation for how to use Noodl can be found here:
-[Fluxscape Documentation](https://docs.fluxscape.io)
+[https://noodlapp.github.io/noodl-docs/](https://noodlapp.github.io/noodl-docs/)
 
 ## Community
-Main support channel is Discord: [Fluxscape Discord](https://discord.gg/fXNW9EXa6A)
+Main support channel is Discord: [https://www.noodl.net/community](https://www.noodl.net/community)
 
 ## Download releases
-Pre-built binaries can be [downloaded from Github](https://github.com/fluxscape/fluxscape/releases)
+Pre-built binaries can be [downloaded from Github](https://github.com/noodlapp/noodl/releases)
 
 ## Note for users who are migrating from the deprecated closed source version
-- [Migrating the project files and workspaces to a Git provider](https://docs.fluxscape.io/docs/guides/collaboration/migrating-from-noodl-hosted-git/)
+- [Migrating the project files and workspaces to a Git provider](https://noodlapp.github.io/noodl-docs/docs/guides/collaboration/migrating-from-noodl-hosted-git)
-- [Migrate backend and database](https://docs.fluxscape.io/docs/guides/deploy/using-an-external-backend/#migrating-from-a-noodl-cloud-service)
+- [Migrate backend and database](https://noodlapp.github.io/noodl-docs/docs/guides/deploy/using-an-external-backend#migrating-from-a-noodl-cloud-service)
-- [Self-host frontend](https://docs.fluxscape.io/docs/guides/deploy/hosting-frontend/)
+- [Self-host frontend](https://noodlapp.github.io/noodl-docs/docs/guides/deploy/hosting-frontend)
 
 ## Building from source
 
@@ -23,24 +23,24 @@ Pre-built binaries can be [downloaded from Github](https://github.com/fluxscape/
 # Install all dependencies
 $ npm install
 
-# Start the Fluxscape Editor and build a production version of the cloud and react runtime (useful when running Fluxscape from source but want to deploy to production)
+# Start the Noodl Editor and build a production version of the cloud and react runtime (useful when running Noodl from source but want to deploy to production)
 $ npm start
 
-# Start the Fluxscape Editor and watch the filesystem for changes to the runtimes. Development versions of the runtimes, not meant for production (mostly due to source maps and file size)
+# Start the Noodl Editor and watch the filesystem for changes to the runtimes. Development versions of the runtimes, not meant for production (mostly due to source maps and file size)
 # This is ideal for a quick workflow when doing changes on the runtimes.
 $ npm run dev
 
-# Start Fluxscape Editor test runner
+# Start Noodl Editor test runner
 $ npm run test:editor
 ```
 
 ## Licenses
-This repository contains two different licenses for different parts of the Fluxscape platform.
+This repository contains two different licenses for different parts of the Noodl platform.
 
-- Components related to the editor, used to edit Fluxscape projects, are under GPLv3
+- Components related to the editor, used to edit Noodl projects, are under GPLv3
-- Components related to the end applications, used by the applications Fluxscape deploys, are under MIT
+- Components related to the end applications, used by the applications Noodl deploys, are under MIT
 
-All of the source code of applications created with Fluxscape are under MIT. This means you can do project specific changes to the runtime without having to redistribute your changes.
+All of the source code of applications created with Noodl are under MIT. This means you can do project specific changes to the runtime without having to redistribute your changes.
 
 Packaged licensed under MIT:
 - `noodl-runtime`

package-lock.json

@@ -2849,9 +2849,9 @@
       }
     },
     "node_modules/@electron/remote": {
-      "version": "2.1.2",
+      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.1.tgz",
-      "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==",
+      "integrity": "sha512-Lfxul2yBxL+FBVaKszNAkuUqSIDbUQ1I7BC394iRXyqA2XGz7im2bAxroNIM51jhySSPKUaOLHaFLxfV6pC9VQ==",
       "peerDependencies": {
         "electron": ">= 13.0.0"
       }
@@ -25220,13 +25220,13 @@
       }
     },
     "node_modules/electron": {
-      "version": "31.3.1",
+      "version": "28.1.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-31.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.4.tgz",
-      "integrity": "sha512-9fiuWlRhBfygtcT+auRd/WdBK/f8LZZcrpx0RjpXhH2DPTP/PfnkC4JB1PW55qCbGbh4wAgkYbf4ExIag8oGCA==",
+      "integrity": "sha512-WE6go611KOhtH6efRPMnVC7FE7DCKnQ3ZyHFeI1DbaCy8OU4UjZ8/CZGcuZmZgRdxSBEHoHdgaJkWRHZzF0FOg==",
       "hasInstallScript": true,
       "dependencies": {
         "@electron/get": "^2.0.0",
-        "@types/node": "^20.9.0",
+        "@types/node": "^18.11.18",
         "extract-zip": "^2.0.1"
       },
       "bin": {
@@ -25452,14 +25452,6 @@
         "tiny-typed-emitter": "^2.1.0"
       }
     },
-    "node_modules/electron/node_modules/@types/node": {
-      "version": "20.14.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
-      "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
     "node_modules/elliptic": {
       "version": "6.5.4",
       "dev": true,
@@ -27211,10 +27203,6 @@
         "react": "^15.0.2 || ^16.0.0 || ^17.0.0"
       }
     },
-    "node_modules/fluxscape-editor": {
-      "resolved": "packages/noodl-editor",
-      "link": true
-    },
     "node_modules/focus-lock": {
       "version": "0.8.1",
       "dev": true,
@@ -35455,6 +35443,10 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/noodl-editor": {
+      "resolved": "packages/noodl-editor",
+      "link": true
+    },
     "node_modules/nopt": {
       "version": "1.0.10",
       "license": "MIT",
@@ -43199,11 +43191,6 @@
       "version": "1.13.6",
       "license": "MIT"
     },
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
     "node_modules/unfetch": {
       "version": "4.2.0",
       "dev": true,
@@ -48980,10 +48967,9 @@
       "dev": true
     },
     "packages/noodl-editor": {
-      "name": "fluxscape-editor",
+      "version": "1.0.0",
-      "version": "1.2.0",
       "dependencies": {
-        "@electron/remote": "^2.1.2",
+        "@electron/remote": "^2.1.1",
         "@jaames/iro": "^5.5.2",
         "@microsoft/fetch-event-source": "^2.0.1",
         "@noodl/git": "file:../noodl-git",
@@ -49039,7 +49025,7 @@
         "babel-loader": "^8.2.4",
         "concurrently": "^7.4.0",
         "css-loader": "^6.7.1",
-        "electron": "31.3.1",
+        "electron": "28.1.4",
         "electron-builder": "^24.9.1",
         "file-loader": "^6.2.0",
         "html-loader": "^3.1.0",
@@ -53389,9 +53375,9 @@
       }
     },
     "@electron/remote": {
-      "version": "2.1.2",
+      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.1.tgz",
-      "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==",
+      "integrity": "sha512-Lfxul2yBxL+FBVaKszNAkuUqSIDbUQ1I7BC394iRXyqA2XGz7im2bAxroNIM51jhySSPKUaOLHaFLxfV6pC9VQ==",
       "requires": {}
     },
     "@electron/universal": {
@@ -74071,23 +74057,13 @@
       }
     },
     "electron": {
-      "version": "31.3.1",
+      "version": "28.1.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-31.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.4.tgz",
-      "integrity": "sha512-9fiuWlRhBfygtcT+auRd/WdBK/f8LZZcrpx0RjpXhH2DPTP/PfnkC4JB1PW55qCbGbh4wAgkYbf4ExIag8oGCA==",
+      "integrity": "sha512-WE6go611KOhtH6efRPMnVC7FE7DCKnQ3ZyHFeI1DbaCy8OU4UjZ8/CZGcuZmZgRdxSBEHoHdgaJkWRHZzF0FOg==",
       "requires": {
         "@electron/get": "^2.0.0",
-        "@types/node": "^20.9.0",
+        "@types/node": "^18.11.18",
         "extract-zip": "^2.0.1"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "20.14.10",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz",
-          "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==",
-          "requires": {
-            "undici-types": "~5.26.4"
-          }
-        }
       }
     },
     "electron-builder": {
@@ -75432,144 +75408,6 @@
         "fbjs": "^3.0.1"
       }
     },
-    "fluxscape-editor": {
-      "version": "file:packages/noodl-editor",
-      "requires": {
-        "@babel/core": "^7.19.1",
-        "@babel/preset-react": "^7.18.6",
-        "@electron/remote": "^2.1.2",
-        "@jaames/iro": "^5.5.2",
-        "@microsoft/fetch-event-source": "^2.0.1",
-        "@noodl/git": "file:../noodl-git",
-        "@noodl/noodl-parse-dashboard": "file:../noodl-parse-dashboard",
-        "@noodl/platform": "file:../noodl-platform",
-        "@noodl/platform-electron": "file:../noodl-platform-electron",
-        "@svgr/webpack": "^6.4.0",
-        "@types/checksum": "^0.1.33",
-        "@types/jasmine": "^4.3.0",
-        "@types/jquery": "^3.5.14",
-        "@types/react": "^17.0.50",
-        "@types/react-dom": "^18.0.0",
-        "@types/remarkable": "^2.0.3",
-        "@types/rimraf": "^3.0.2",
-        "@types/split2": "^3.2.1",
-        "@types/string.prototype.matchall": "^4.0.1",
-        "@types/underscore": "^1.11.4",
-        "@types/webpack-env": "^1.18.0",
-        "about-window": "^1.15.2",
-        "algoliasearch": "^4.14.2",
-        "archiver": "^5.3.0",
-        "async": "^3.2.4",
-        "babel-loader": "^8.2.4",
-        "classnames": "^2.3.2",
-        "concurrently": "^7.4.0",
-        "css-loader": "^6.7.1",
-        "diff3": "0.0.4",
-        "dmg-license": "^1.0.11",
-        "electron": "31.3.1",
-        "electron-builder": "^24.9.1",
-        "electron-store": "^8.1.0",
-        "electron-updater": "^6.1.7",
-        "express": "^4.17.3",
-        "file-loader": "^6.2.0",
-        "highlight.js": "^11.5.1",
-        "html-loader": "^3.1.0",
-        "isbinaryfile": "^5.0.0",
-        "md5": "^2.3.0",
-        "md5-file": "^5.0.0",
-        "mixpanel-browser": "^2.45.0",
-        "mkdirp": "0.5.1",
-        "mkdirp-sync": "0.0.2",
-        "monaco-editor": "^0.34.0",
-        "monaco-editor-webpack-plugin": "^7.0.1",
-        "ncp": "^2.0.0",
-        "react": "^17.0.2",
-        "react-dom": "^17.0.0",
-        "react-hot-toast": "^2.4.0",
-        "react-instantsearch-hooks-web": "^6.38.0",
-        "react-json-view": "^1.21.3",
-        "react-rnd": "^10.3.7",
-        "remarkable": "^2.0.1",
-        "rimraf": "^3.0.2",
-        "s3": "git+https://github.com/noodlapp/node-s3-client.git",
-        "sass": "^1.55.0",
-        "sass-loader": "^12.6.0",
-        "string.prototype.matchall": "^4.0.7",
-        "stringify": "^5.2.0",
-        "style-loader": "^3.3.1",
-        "ts-loader": "^9.4.1",
-        "ts-node": "^10.7.0",
-        "typescript": "^4.8.3",
-        "underscore": "^1.13.6",
-        "url-loader": "^4.1.1",
-        "webpack": "^5.74.0",
-        "webpack-cli": "^4.10.0",
-        "webpack-dev-server": "^4.11.1",
-        "webpack-merge": "^5.8.0",
-        "websocket-stream": "^5.5.2",
-        "ws": "^8.9.0"
-      },
-      "dependencies": {
-        "@webpack-cli/configtest": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-          "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
-          "dev": true,
-          "requires": {}
-        },
-        "@webpack-cli/info": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
-          "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
-          "dev": true,
-          "requires": {
-            "envinfo": "^7.7.3"
-          }
-        },
-        "@webpack-cli/serve": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-          "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
-          "dev": true,
-          "requires": {}
-        },
-        "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-          "dev": true
-        },
-        "rechoir": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-          "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-          "dev": true,
-          "requires": {
-            "resolve": "^1.9.0"
-          }
-        },
-        "webpack-cli": {
-          "version": "4.10.0",
-          "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
-          "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
-          "dev": true,
-          "requires": {
-            "@discoveryjs/json-ext": "^0.5.0",
-            "@webpack-cli/configtest": "^1.2.0",
-            "@webpack-cli/info": "^1.5.0",
-            "@webpack-cli/serve": "^1.7.0",
-            "colorette": "^2.0.14",
-            "commander": "^7.0.0",
-            "cross-spawn": "^7.0.3",
-            "fastest-levenshtein": "^1.0.12",
-            "import-local": "^3.0.2",
-            "interpret": "^2.2.0",
-            "rechoir": "^0.7.0",
-            "webpack-merge": "^5.7.3"
-          }
-        }
-      }
-    },
     "focus-lock": {
       "version": "0.8.1",
       "dev": true,
@@ -81145,6 +80983,144 @@
       "version": "2.0.10",
       "dev": true
     },
+    "noodl-editor": {
+      "version": "file:packages/noodl-editor",
+      "requires": {
+        "@babel/core": "^7.19.1",
+        "@babel/preset-react": "^7.18.6",
+        "@electron/remote": "^2.1.1",
+        "@jaames/iro": "^5.5.2",
+        "@microsoft/fetch-event-source": "^2.0.1",
+        "@noodl/git": "file:../noodl-git",
+        "@noodl/noodl-parse-dashboard": "file:../noodl-parse-dashboard",
+        "@noodl/platform": "file:../noodl-platform",
+        "@noodl/platform-electron": "file:../noodl-platform-electron",
+        "@svgr/webpack": "^6.4.0",
+        "@types/checksum": "^0.1.33",
+        "@types/jasmine": "^4.3.0",
+        "@types/jquery": "^3.5.14",
+        "@types/react": "^17.0.50",
+        "@types/react-dom": "^18.0.0",
+        "@types/remarkable": "^2.0.3",
+        "@types/rimraf": "^3.0.2",
+        "@types/split2": "^3.2.1",
+        "@types/string.prototype.matchall": "^4.0.1",
+        "@types/underscore": "^1.11.4",
+        "@types/webpack-env": "^1.18.0",
+        "about-window": "^1.15.2",
+        "algoliasearch": "^4.14.2",
+        "archiver": "^5.3.0",
+        "async": "^3.2.4",
+        "babel-loader": "^8.2.4",
+        "classnames": "^2.3.2",
+        "concurrently": "^7.4.0",
+        "css-loader": "^6.7.1",
+        "diff3": "0.0.4",
+        "dmg-license": "^1.0.11",
+        "electron": "28.1.4",
+        "electron-builder": "^24.9.1",
+        "electron-store": "^8.1.0",
+        "electron-updater": "^6.1.7",
+        "express": "^4.17.3",
+        "file-loader": "^6.2.0",
+        "highlight.js": "^11.5.1",
+        "html-loader": "^3.1.0",
+        "isbinaryfile": "^5.0.0",
+        "md5": "^2.3.0",
+        "md5-file": "^5.0.0",
+        "mixpanel-browser": "^2.45.0",
+        "mkdirp": "0.5.1",
+        "mkdirp-sync": "0.0.2",
+        "monaco-editor": "^0.34.0",
+        "monaco-editor-webpack-plugin": "^7.0.1",
+        "ncp": "^2.0.0",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.0",
+        "react-hot-toast": "^2.4.0",
+        "react-instantsearch-hooks-web": "^6.38.0",
+        "react-json-view": "^1.21.3",
+        "react-rnd": "^10.3.7",
+        "remarkable": "^2.0.1",
+        "rimraf": "^3.0.2",
+        "s3": "git+https://github.com/noodlapp/node-s3-client.git",
+        "sass": "^1.55.0",
+        "sass-loader": "^12.6.0",
+        "string.prototype.matchall": "^4.0.7",
+        "stringify": "^5.2.0",
+        "style-loader": "^3.3.1",
+        "ts-loader": "^9.4.1",
+        "ts-node": "^10.7.0",
+        "typescript": "^4.8.3",
+        "underscore": "^1.13.6",
+        "url-loader": "^4.1.1",
+        "webpack": "^5.74.0",
+        "webpack-cli": "^4.10.0",
+        "webpack-dev-server": "^4.11.1",
+        "webpack-merge": "^5.8.0",
+        "websocket-stream": "^5.5.2",
+        "ws": "^8.9.0"
+      },
+      "dependencies": {
+        "@webpack-cli/configtest": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
+          "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
+          "dev": true,
+          "requires": {}
+        },
+        "@webpack-cli/info": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
+          "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
+          "dev": true,
+          "requires": {
+            "envinfo": "^7.7.3"
+          }
+        },
+        "@webpack-cli/serve": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
+          "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
+          "dev": true,
+          "requires": {}
+        },
+        "commander": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+          "dev": true
+        },
+        "rechoir": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+          "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+          "dev": true,
+          "requires": {
+            "resolve": "^1.9.0"
+          }
+        },
+        "webpack-cli": {
+          "version": "4.10.0",
+          "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
+          "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
+          "dev": true,
+          "requires": {
+            "@discoveryjs/json-ext": "^0.5.0",
+            "@webpack-cli/configtest": "^1.2.0",
+            "@webpack-cli/info": "^1.5.0",
+            "@webpack-cli/serve": "^1.7.0",
+            "colorette": "^2.0.14",
+            "commander": "^7.0.0",
+            "cross-spawn": "^7.0.3",
+            "fastest-levenshtein": "^1.0.12",
+            "import-local": "^3.0.2",
+            "interpret": "^2.2.0",
+            "rechoir": "^0.7.0",
+            "webpack-merge": "^5.7.3"
+          }
+        }
+      }
+    },
     "nopt": {
       "version": "1.0.10",
       "requires": {
@@ -86427,11 +86403,6 @@
     "underscore": {
       "version": "1.13.6"
     },
-    "undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
-    },
     "unfetch": {
       "version": "4.2.0",
       "dev": true

package.json

@@ -2,8 +2,8 @@
   "private": true,
   "name": "@noodl/repo",
   "description": "Low-code for when experience matter",
-  "author": "Fluxscape <contact@fluxcsape.io>",
+  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://fluxscape.io",
+  "homepage": "https://noodl.net",
   "version": "1.0.0",
   "workspaces": [
     "packages/*"
@@ -12,7 +12,7 @@
     "graph": "npx nx graph",
     "ci:prepare:editor": "ts-node ./scripts/ci-editor-prepare.ts",
     "ci:build:viewer": "lerna exec --scope @noodl/noodl-viewer-react -- npm run build",
-    "ci:build:editor": "lerna exec --scope fluxscape-editor -- npm run ci:build",
+    "ci:build:editor": "lerna exec --scope noodl-editor -- npm run ci:build",
     "build:editor": "ts-node ./scripts/build-editor.ts",
     "build:editor:_viewer": "ts-node ./scripts/noodl-editor/build-viewer.ts",
     "build:editor:_editor": "ts-node ./scripts/noodl-editor/build-editor.ts",
@@ -20,7 +20,7 @@
     "build:cloud-runtime": "lerna run build --scope @noodl/cloud-runtime --stream && lerna run build:pack --scope @noodl/cloud-runtime --stream",
     "start:storybook": "lerna exec --scope @noodl/noodl-core-ui -- npm run start",
     "start:viewer": "lerna run start --scope @noodl/noodl-viewer-react --stream",
-    "start:editor": "lerna run start --scope fluxscape-editor --stream",
+    "start:editor": "lerna run start --scope noodl-editor --stream",
     "dev": "ts-node ./scripts/start.ts",
     "start": "ts-node ./scripts/start.ts -- --build-viewer",
     "test:editor": "ts-node ./scripts/test-editor.ts",

packages/noodl-core-ui/src/components/layout/BaseDialog/BaseDialog.module.scss

@@ -9,11 +9,6 @@
   right: 0;
   bottom: 0;
 
-  &.is-hidden {
-    visibility: hidden;
-    pointer-events: none;
-  }
-
   &.has-backdrop {
     background-color: var(--theme-color-bg-1-transparent);
   }

packages/noodl-core-ui/src/components/layout/BaseDialog/BaseDialog.tsx

@@ -42,7 +42,6 @@ export interface BaseDialogProps extends UnsafeStyleProps {
   isVisible?: boolean;
   hasBackdrop?: boolean;
   hasArrow?: boolean;
-  alwaysMounted?: boolean;
 
   children?: Slot;
 
@@ -70,7 +69,6 @@ export function CoreBaseDialog({
   isVisible,
   hasBackdrop,
   hasArrow,
-  alwaysMounted,
 
   children,
 
@@ -263,7 +261,7 @@ export function CoreBaseDialog({
     }
   }, [background]);
 
-  if (!isVisible && !alwaysMounted) return null;
+  if (!isVisible) return null;
 
   return (
     <div
@@ -272,7 +270,6 @@ export function CoreBaseDialog({
         hasBackdrop && css['has-backdrop'],
         isLockingScroll && css['is-locking-scroll'],
         typeof triggerRef === 'undefined' && css['is-centered'],
-        !isVisible && css['is-hidden'],
         css[variant]
       )}
       onClick={onClose}

packages/noodl-core-ui/src/components/popups/Tooltip/Tooltip.tsx

@@ -11,7 +11,7 @@ import css from './Tooltip.module.scss';
 
 export interface TooltipProps extends UnsafeStyleProps {
   content: SingleSlot;
-  fineType?: string | string[];
+  fineType?: string;
   children: Slot;
   showAfterMs?: number;
 
@@ -79,17 +79,9 @@ export function Tooltip({
 
         {fineType && (
           <div className={css['FineType']}>
-            {Array.isArray(fineType) ? (
-              fineType.map((x) => (
-                <Label size={LabelSize.Small} variant={TextType.Secondary}>
-                  {x}
-                </Label>
-              ))
-            ) : (
             <Label size={LabelSize.Small} variant={TextType.Secondary}>
               {fineType}
             </Label>
-            )}
           </div>
         )}
       </BaseDialog>

packages/noodl-editor/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "fluxscape-editor",
+  "name": "noodl-editor",
   "productName": "Fluxscape",
   "description": "Node-Based App Builder for Scalability & Rapid Development, a fork of Noodl",
   "author": "Fluxscape <contact@fluxscape.io>",
   "homepage": "https://fluxscape.io",
-  "version": "1.2.0",
+  "version": "1.0.0",
   "main": "src/main/main.js",
   "scripts": {
     "build": "npx ts-node -P ./tsconfig.build.json ./scripts/build.ts",
@@ -58,7 +58,7 @@
     ]
   },
   "dependencies": {
-    "@electron/remote": "^2.1.2",
+    "@electron/remote": "^2.1.1",
     "@jaames/iro": "^5.5.2",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@noodl/git": "file:../noodl-git",
@@ -114,7 +114,7 @@
     "babel-loader": "^8.2.4",
     "concurrently": "^7.4.0",
     "css-loader": "^6.7.1",
-    "electron": "31.3.1",
+    "electron": "28.1.4",
     "electron-builder": "^24.9.1",
     "file-loader": "^6.2.0",
     "html-loader": "^3.1.0",

packages/noodl-editor/src/assets/images/outline-cloud_done-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM19 18H6c-2.21 0-4-1.79-4-4 0-2.05 1.53-3.76 3.56-3.97l1.07-.11.5-.95C8.08 7.14 9.94 6 12 6c2.62 0 4.88 1.86 5.39 4.43l.3 1.5 1.53.11c1.56.1 2.78 1.41 2.78 2.96 0 1.65-1.35 3-3 3zm-9-3.82l-2.09-2.09L6.5 13.5 10 17l6.01-6.01-1.41-1.41z"/></svg>

packages/noodl-editor/src/assets/images/sharp-add-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>

packages/noodl-editor/src/assets/images/sharp-input-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none"><path d="M0 0h24v24H0V0z"/><path opacity=".87" d="M0 0h24v24H0V0z"/></g><path d="M21 3.01H3c-1.1 0-2 .9-2 2V9h2V4.99h18v14.03H3V15H1v4.01c0 1.1.9 1.98 2 1.98h18c1.1 0 2-.88 2-1.98v-14c0-1.11-.9-2-2-2zM11 16l4-4-4-4v3H1v2h10v3zM23 3.01H1V9h2V4.99h18v14.03H3V15H1v5.99h22V3.01zM11 16l4-4-4-4v3H1v2h10v3z"/></svg>

packages/noodl-editor/src/assets/images/sharp-library_books-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M4 6H2v16h16v-2H4V6zm18-4H6v16h16V2zm-3 9H9V9h10v2zm-4 4H9v-2h6v2zm4-8H9V5h10v2z"/></svg>

packages/noodl-editor/src/assets/images/sharp-list-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none"><path d="M0 0h24v24H0V0z"/><path opacity=".87" d="M0 0h24v24H0V0z"/></g><path d="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7 7v2h14V7H7zm-4 6h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7 7v2h14V7H7z"/></svg>

packages/noodl-editor/src/assets/images/sharp-settings-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19.44 12.99l-.01.02c.04-.33.08-.67.08-1.01 0-.34-.03-.66-.07-.99l.01.02 2.44-1.92-2.43-4.22-2.87 1.16.01.01c-.52-.4-1.09-.74-1.71-1h.01L14.44 2H9.57l-.44 3.07h.01c-.62.26-1.19.6-1.71 1l.01-.01-2.88-1.17-2.44 4.22 2.44 1.92.01-.02c-.04.33-.07.65-.07.99 0 .34.03.68.08 1.01l-.01-.02-2.1 1.65-.33.26 2.43 4.2 2.88-1.15-.02-.04c.53.41 1.1.75 1.73 1.01h-.03L9.58 22h4.85s.03-.18.06-.42l.38-2.65h-.01c.62-.26 1.2-.6 1.73-1.01l-.02.04 2.88 1.15 2.43-4.2s-.14-.12-.33-.26l-2.11-1.66zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/></svg>

packages/noodl-editor/src/editor/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>Fluxscape</title>
+    <title>Noodl</title>
     <link href="../assets/lib/fontawesome/css/font-awesome.min.css" rel="stylesheet" />
     <link href="../assets/css/style.css" rel="stylesheet" />
 

packages/noodl-editor/src/editor/src/ViewerConnection.ts

@@ -6,7 +6,7 @@ import { EventDispatcher } from '../../shared/utils/EventDispatcher';
 import ProjectModules from '../../shared/utils/projectmodules';
 import { NodeLibrary } from './models/nodelibrary';
 import { ProjectModel } from './models/projectmodel';
-import { WarningRef, WarningsModel } from './models/warningsmodel';
+import { WarningsModel } from './models/warningsmodel';
 import DebugInspector from './utils/debuginspector';
 import * as Exporter from './utils/exporter';
 
@@ -112,7 +112,7 @@ export class ViewerConnection extends Model {
     } else if (request.cmd === 'showwarning' && request.type === 'viewer') {
       const content = JSON.parse(request.content);
       if (ProjectModel.instance !== undefined) {
-        const ref: WarningRef = {
+        const ref = {
           component: ProjectModel.instance.getComponentWithName(content.componentName),
           node: ProjectModel.instance.findNodeWithId(content.nodeId),
           key: content.key,
@@ -124,7 +124,7 @@ export class ViewerConnection extends Model {
       }
     } else if (request.cmd === 'clearwarnings' && request.type === 'viewer') {
       const content = JSON.parse(request.content);
-      const ref: WarningRef = {
+      const ref = {
         component: ProjectModel.instance.getComponentWithName(content.componentName),
         node: ProjectModel.instance.findNodeWithId(content.nodeId)
       };

packages/noodl-editor/src/editor/src/constants/Keybindings.ts

@@ -2,11 +2,6 @@ import { Keybinding } from '@noodl-utils/keyboard/Keybinding';
 import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';
 
 export namespace Keybindings {
-  export const SEARCH = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_F);
-
-  export const CLOUD_SERVICE_OPEN_DASHBOARD = new Keybinding(KeyMod.CtrlCmd, KeyMod.Shift, KeyCode.KEY_P);
-  export const CLOUD_SERVICE_OPEN_DASHBOARD_BROWSER = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_P);
-
   export const REFRESH_PREVIEW = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_R);
   export const OPEN_DEVTOOLS = new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_D);
   export const OPEN_CLOUD_DEVTOOLS = new Keybinding(KeyMod.CtrlCmd, KeyMod.Shift, KeyCode.KEY_R);

packages/noodl-editor/src/editor/src/contexts/NodeReferencesContext/NodeReferencesContext.tsx

@@ -1,142 +0,0 @@
-import React, { createContext, useContext, useState, useEffect } from 'react';
-
-import { type ComponentModel } from '@noodl-models/componentmodel';
-import { type NodeGraphNode } from '@noodl-models/nodegraphmodel';
-import { type NodeLibraryNodeType } from '@noodl-models/nodelibrary';
-import { type Slot } from '@noodl-core-ui/types/global';
-import { ProjectModel } from '@noodl-models/projectmodel';
-import { EventDispatcher } from '../../../../shared/utils/EventDispatcher';
-
-export type NodeReference = {
-  type: NodeLibraryNodeType | undefined;
-  displayName: string;
-  referenaces: {
-    displayName: string;
-    node?: NodeGraphNode;
-    component: ComponentModel;
-  }[];
-};
-
-export interface NodeReferencesContext {
-  nodeReferences: NodeReference[];
-}
-
-const NodeReferencesContext = createContext<NodeReferencesContext>({
-  nodeReferences: [],
-});
-
-// Since all the editor code is not written in React we need a way to be able to
-// access this information outside of React too.
-let HACK_nodeReferences: NodeReference[] = [];
-export function HACK_findNodeReference(componentName: string): NodeReference | undefined {
-  return HACK_nodeReferences.find(x => x.type?.fullName === componentName);
-}
-
-
-export interface NodeReferencesContextProps {
-  children: Slot;
-}
-
-export function NodeReferencesContextProvider({ children }: NodeReferencesContextProps) {
-  const [group] = useState({});
-  const [nodeReferences, setNodeReferences] = useState<NodeReference[]>([]);
-
-  useEffect(() => {
-    function updateIndex() {
-      const types: { [key: string]: NodeReference['type'] } = {};
-      const references = new Map<string, NodeReference['referenaces']>();
-
-      function handleComponent(component: ComponentModel) {
-        component.forEachNode((node: NodeGraphNode) => {
-          const name = node.type.name;
-
-          // Add the reference
-          references.set(name, [
-            ...(references.get(name) || []),
-            {
-              displayName: component.displayName || component.name,
-              node,
-              component
-            }
-          ]);
-
-          // Repeater
-          if (name === 'For Each' && node.parameters.template) {
-            const templateComponent = ProjectModel.instance.getComponentWithName(node.parameters.template);
-
-            if (templateComponent) {
-              references.set(templateComponent.fullName, [
-                ...(references.get(templateComponent.fullName) || []),
-                {
-                  displayName: component.displayName || component.name,
-                  node,
-                  component
-                }
-              ]);
-
-              handleComponent(templateComponent);
-            }
-          }
-
-          // Add some metadata for this node if we dont have it yet.
-          if (!types[name]) {
-            types[name] = node.type;
-          }
-        });
-      }
-
-      // Loop all the nodes in the project
-      ProjectModel.instance.forEachComponent(handleComponent);
-
-      // Combine the result to look a little better.
-      const results: NodeReference[] = Array.from(references.keys())
-        .map((key) => ({
-          type: types[key],
-          displayName: types[key]?.displayName || key,
-          referenaces: references.get(key)
-        }))
-        .sort((a, b) => b.referenaces.length - a.referenaces.length);
-
-      HACK_nodeReferences = results;
-      setNodeReferences(results);
-    }
-
-    updateIndex();
-
-    EventDispatcher.instance.on(
-      [
-        'Model.nodeAdded',
-        'Model.nodeRemoved',
-        'Model.componentAdded',
-        'Model.componentRemoved',
-        'Model.componentRenamed'
-      ],
-      updateIndex,
-      group
-    );
-
-    return function () {
-      EventDispatcher.instance.off(group);
-    };
-  }, []);
-
-  return (
-    <NodeReferencesContext.Provider
-      value={{
-        nodeReferences,
-      }}
-    >
-      {children}
-    </NodeReferencesContext.Provider>
-  );
-}
-
-export function useNodeReferencesContext() {
-  const context = useContext(NodeReferencesContext);
-
-  if (context === undefined) {
-    throw new Error('useNodeReferencesContext must be a child of NodeReferencesContextProvider');
-  }
-
-  return context;
-}

packages/noodl-editor/src/editor/src/contexts/NodeReferencesContext/index.ts

@@ -1 +0,0 @@
-export * from './NodeReferencesContext';

packages/noodl-editor/src/editor/src/contexts/PluginContext/commands/cloud-service.ts

@@ -1,72 +0,0 @@
-import { CloudService } from '@noodl-models/CloudServices';
-import { ProjectModel } from '@noodl-models/projectmodel';
-import { setCloudServices } from '@noodl-models/projectmodel.editor';
-
-import { ToastLayer } from '../../../views/ToastLayer';
-
-export type Command = {
-  kind: 'cloud-service';
-  use?: boolean;
-
-  name: string;
-  description?: string;
-  endpoint: string;
-  appId: string;
-  masterKey: string;
-};
-
-export async function execute(command: Command, _event: MessageEvent) {
-  const environment = await getOrCreate(command);
-
-  if (command.use) {
-    setCloudServices(ProjectModel.instance, environment);
-  }
-}
-
-async function getOrCreate(command: Command) {
-  const cloudServices = await CloudService.instance.backend.fetch();
-  const environment = cloudServices.find((c) => c.url === command.endpoint);
-  if (environment) {
-    if (
-      environment.name !== command.name ||
-      environment.description !== command.description ||
-      environment.appId !== command.appId ||
-      environment.masterKey !== command.masterKey
-    ) {
-      await CloudService.instance.backend.update({
-        id: environment.id,
-        url: environment.url,
-
-        // Update the existing environment
-        name: command.name,
-        description: command.description,
-        appId: command.appId,
-        masterKey: command.masterKey
-      });
-
-      ToastLayer.showSuccess(`Cloud service "${command.name}" updated.`);
-    }
-
-    return {
-      id: environment.id,
-      endpoint: environment.url,
-      appId: command.appId
-    };
-  } else {
-    const create = await CloudService.instance.backend.create({
-      name: command.name,
-      description: command.description,
-      appId: command.appId,
-      url: command.endpoint,
-      masterKey: command.masterKey
-    });
-
-    ToastLayer.showSuccess(`Cloud service "${command.name}" added successfully.`);
-
-    return {
-      id: create.id,
-      endpoint: create.url,
-      appId: create.appId
-    };
-  }
-}

packages/noodl-editor/src/editor/src/contexts/PluginContext/iframe.ts

@@ -1,13 +1,11 @@
-import * as CloudService from './commands/cloud-service';
 import * as Notify from './commands/notify';
 import * as UploadAwsS3 from './commands/upload-aws-s3';
 
-type IFrameCommand = Notify.Command | UploadAwsS3.Command | CloudService.Command;
+type IFrameCommand = Notify.Command | UploadAwsS3.Command;
 
 const commands: Record<IFrameCommand['kind'], (command: IFrameCommand, event: MessageEvent) => Promise<void>> = {
   notify: Notify.execute,
-  'upload-aws-s3': UploadAwsS3.execute,
+  'upload-aws-s3': UploadAwsS3.execute
-  'cloud-service': CloudService.execute
 };
 
 export function commandEventHandler(event: MessageEvent) {

packages/noodl-editor/src/editor/src/models/NodeTypeAdapters/CloudFunctionAdapter.ts

@@ -57,13 +57,10 @@ export class CloudFunctionAdapter extends NodeTypeAdapter {
 
     // Collect all cloud function components
     const functionRequestNodes = ProjectModel.instance.getNodesWithType('noodl.cloud.request');
-    const functions = functionRequestNodes
+    const functions = functionRequestNodes.map((r) => {
-      .map((r) => {
       const component = r.owner.owner;
       return component.fullName;
-      })
+    });
-      // Remove all the Cloud Trigger functions
-      .filter((x) => !x.startsWith('/#__cloud__/__noodl_cloud_triggers__'));
 
     ports.push({
       plug: 'input',

packages/noodl-editor/src/editor/src/models/NodeTypeAdapters/RouterNavigateAdapter.ts

@@ -1,5 +1,5 @@
 import { NodeGraphNode } from '@noodl-models/nodegraphmodel';
-import { type Warning, WarningsModel } from '@noodl-models/warningsmodel';
+import { WarningsModel } from '@noodl-models/warningsmodel';
 
 import { ProjectModel } from '../projectmodel';
 import NodeTypeAdapter from './NodeTypeAdapter';
@@ -103,7 +103,7 @@ export class RouterNavigateAdapter extends NodeTypeAdapter {
 
     const hasValidTarget = target && pageComponents.includes(target);
 
-    const warning: Warning =
+    const warning =
       hasValidTarget === false
         ? {
             message: "The target page doesn't belong to the target router",

packages/noodl-editor/src/editor/src/models/VariantModel.ts

@@ -458,11 +458,11 @@ export class VariantModel extends Model {
             }
           );
         } else if (c.type === 'defaultStateTransition') {
-          const state =
+          var state =
             this.getType().visualStates !== undefined
               ? this.getType().visualStates.find((s) => s.name === c.state)
               : undefined;
-          const stateName = state !== undefined ? state.label : c.state;
+          var stateName = state !== undefined ? state.label : c.state;
 
           WarningsModel.instance.setWarning(
             { key: 'variant-dst-conflict-' + this.name + '-' + this.getType().fullName + '-' + c.state },

packages/noodl-editor/src/editor/src/models/nodegraphmodel/NodeGraphNode.ts

@@ -72,7 +72,7 @@ export class NodeGraphNode extends Model {
   metadata?: Record<string, any>;
 
   private _variant: TSFixme;
-  _label: TSFixme;
+  private _label: TSFixme;
   private _type: TSFixme;
   private _ports: TSFixme;
 

packages/noodl-editor/src/editor/src/models/projectmodel.ts

@@ -1167,28 +1167,6 @@ EventDispatcher.instance.on(
   null
 );
 
-NodeLibrary.instance.on('libraryUpdated', () => {
-  const library = NodeLibrary.instance.library;
-
-  // Check if we have any data from the browser
-  if (Object.keys(library?.nodeIndex || {}).length > 0) {
-    const filepath = filesystem.join(ProjectModel.instance._retainedProjectDirectory, 'nodelibrary.json');
-
-    const compactLibrary = {
-      typecasts: library.typecasts,
-      dynamicports: library.dynamicports,
-      nodetypes: library.nodetypes,
-      // NOTE: Let's save the node index for now, most likely this is something we will just ignore.
-      nodeIndex: library.nodeIndex,
-      projectsettings: library.projectsettings
-    };
-
-    filesystem.writeJson(filepath, compactLibrary).then(() => {
-      console.log('saved nodelibrary.json');
-    });
-  }
-});
-
 function saveProject() {
   if (!ProjectModel.instance) return;
 

packages/noodl-editor/src/editor/src/models/warningsmodel.ts

@@ -1,42 +1,9 @@
+import { ComponentModel } from '@noodl-models/componentmodel';
+import { ProjectModel } from '@noodl-models/projectmodel';
 import { toArray } from 'underscore';
-
-import type { ComponentModel } from '@noodl-models/componentmodel';
-
 import Model from '../../../shared/model';
-import type { NodeGraphNode } from './nodegraphmodel';
 import { NodeLibrary } from './nodelibrary';
 
-export type WarningLabel = 'warning' | 'error';
-
-export type Warning =
-  | {
-      type?: string;
-      level?: WarningLabel;
-      message: string;
-      showGlobally?: boolean;
-    }
-  | {
-      type: 'conflict' | 'conflict-source-code';
-      level?: WarningLabel;
-      message: string;
-      showGlobally?: boolean;
-      conflictMetadata: {
-        parameter: string;
-        ours: string;
-        theirs: string;
-      };
-      onDismiss: () => void;
-      onUseTheirs: () => void;
-    };
-
-export type WarningRef = {
-  key?: string;
-  component?: ComponentModel;
-  connection?: TSFixme;
-  node?: NodeGraphNode;
-  isFromViewer?: boolean;
-};
-
 /**
  * The first level of the warnings object is component name
  * Second is the connection / node identifier
@@ -47,7 +14,7 @@ interface Warnings {
     [node_connection_id: string]: {
       [warningKey: string]: {
         ref: TSFixme;
-        warning: Warning;
+        warning: TSFixme;
       };
     };
   };
@@ -57,7 +24,7 @@ export class WarningsModel extends Model {
   public static instance = new WarningsModel();
 
   private warnings: Warnings = {};
-  private notifyChangedScheduled = false;
+  private notifyChangedScheduled: boolean = false;
 
   constructor() {
     super();
@@ -68,12 +35,10 @@ export class WarningsModel extends Model {
     });
   }
 
-  public setWarning(ref: WarningRef, warning: Warning) {
+  public setWarning(ref, warning) {
-    const w = this.getWarningsForRef(ref, warning !== undefined);
+    var w = this.getWarningsForRef(ref, warning !== undefined);
     if (!warning) {
-      if (w) {
+      if (w) delete w[ref.key];
-        delete w[ref.key];
-      }
     } else {
       warning.level = warning.level || 'warning';
       w[ref.key] = { ref: ref, warning: warning };
@@ -82,34 +47,31 @@ export class WarningsModel extends Model {
     this.scheduleNotifyChanged();
   }
 
-  public clearWarningsForRef(ref: WarningRef) {
+  public clearWarningsForRef(ref) {
-    const w = this.getWarningsForRef(ref);
+    var w = this.getWarningsForRef(ref);
     if (!w) return;
 
-    for (const i in w) {
+    for (var i in w) delete w[i];
-      delete w[i];
-    }
 
     this.scheduleNotifyChanged();
   }
 
-  public clearAllWarningsForComponent(component: ComponentModel) {
+  public clearAllWarningsForComponent(component) {
     const warnings = this.warnings[component.name];
+
     if (!warnings) return;
 
-    for (const i in warnings) {
+    for (let i in warnings) delete warnings[i];
-      delete warnings[i];
-    }
 
     this.scheduleNotifyChanged();
   }
 
-  public clearWarningsForRefMatching(matchFn: (ref: TSFixme) => boolean) {
+  public clearWarningsForRefMatching(matchCb) {
     for (const cw of Object.values(this.warnings)) {
       for (const ws of Object.values(cw)) {
         for (const key in ws) {
           const w = ws[key];
-          if (matchFn(w.ref)) {
+          if (matchCb(w.ref)) {
             delete ws[key];
           }
         }
@@ -125,14 +87,15 @@ export class WarningsModel extends Model {
     this.scheduleNotifyChanged();
   }
 
-  public getWarnings(ref: WarningRef) {
+  public getWarnings(ref) {
-    const w = this.getWarningsForRef(ref);
+    var w = this.getWarningsForRef(ref);
     if (!w) return;
+
     if (Object.keys(w).length === 0) return;
 
     // Create short message for hover
-    const messages = [];
+    var messages = [];
-    for (const k in w) {
+    for (var k in w) {
       if (w[k].warning) messages.push(w[k].warning.message);
     }
 
@@ -143,13 +106,13 @@ export class WarningsModel extends Model {
   }
 
   public forEachWarningInComponent(c, callback, args) {
-    const cw = this.warnings[c ? c.name : '/'];
+    var cw = this.warnings[c ? c.name : '/'];
     if (!cw) return;
 
-    for (const ref in cw) {
+    for (var ref in cw) {
-      const ws = cw[ref];
+      var ws = cw[ref];
 
-      for (const w in ws) {
+      for (var w in ws) {
         if (!args || !args.levels || args.levels.indexOf(ws[w].warning.level) !== -1) {
           callback(ws[w]);
         }
@@ -158,7 +121,7 @@ export class WarningsModel extends Model {
   }
 
   public getAllWarningsForComponent(c, args) {
-    const warnings = [];
+    var warnings = [];
     this.forEachWarningInComponent(
       c,
       function (warning) {
@@ -189,15 +152,15 @@ export class WarningsModel extends Model {
   }
 
   public getTotalNumberOfWarnings(args) {
-    let total = 0;
+    var total = 0;
-    for (const key in this.warnings) {
+    for (var key in this.warnings) {
       total += this.getNumberOfWarningsForComponent({ name: key }, args);
     }
     return total;
   }
 
   public getTotalNumberOfWarningsMatching(matchCb) {
-    let total = 0;
+    var total = 0;
     this.forEachWarning((c, ref, key, warning) => {
       if (matchCb(key, ref, warning)) total++;
     });
@@ -205,16 +168,16 @@ export class WarningsModel extends Model {
   }
 
   public forEachWarning(callback: (c: string, ref, key, warning) => void) {
-    const w = this.warnings;
+    var w = this.warnings;
     for (const c in w) {
       // Loop over all components
-      const _w = w[c];
+      var _w = w[c];
       for (const ref in _w) {
         // Loop over all refs
-        const __w = _w[ref];
+        var __w = _w[ref];
         for (const key in __w) {
           // Loop over all keys
-          const warning = __w[key];
+          var warning = __w[key];
 
           callback(c, ref, key, warning);
         }
@@ -232,12 +195,12 @@ export class WarningsModel extends Model {
   //    node: nodeRef,
   //    connection: connectionRef,
   //    key: key of warning as string}
-  private getWarningsForRef(ref: WarningRef, create?) {
+  private getWarningsForRef(ref, create?) {
-    const componentName = ref.component ? ref.component.name : '/';
+    var componentName = ref.component ? ref.component.name : '/';
     if (!this.warnings[componentName]) this.warnings[componentName] = {};
-    const cw = this.warnings[componentName];
+    var cw = this.warnings[componentName];
 
-    let key;
+    var key;
     if (ref.node) key = 'node/' + ref.node.id;
     else if (ref.connection)
       key =
@@ -257,8 +220,7 @@ export class WarningsModel extends Model {
 
   /** Batch changed notifications so listeners don't get peppered */
   private scheduleNotifyChanged() {
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    var _this = this;
-    const _this = this;
 
     if (this.notifyChangedScheduled) return;
     this.notifyChangedScheduled = true;

packages/noodl-editor/src/editor/src/pages/EditorPage/EditorPage.tsx

@@ -1,6 +1,4 @@
 import { NodeGraphContextProvider } from '@noodl-contexts/NodeGraphContext/NodeGraphContext';
-import { NodeReferencesContextProvider } from '@noodl-contexts/NodeReferencesContext';
-import { PluginContextProvider } from '@noodl-contexts/PluginContext';
 import { ProjectDesignTokenContextProvider } from '@noodl-contexts/ProjectDesignTokenContext';
 import { useKeyboardCommands } from '@noodl-hooks/useKeyboardCommands';
 import { useModel } from '@noodl-hooks/useModel';
@@ -45,6 +43,7 @@ import { BaseWindow } from '../../views/windows/BaseWindow';
 import { whatsnewRender } from '../../whats-new';
 import { IRouteProps } from '../AppRoute';
 import { useSetupSettings } from './useSetupSettings';
+import { PluginContextProvider } from '@noodl-contexts/PluginContext';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const ImportOverwritePopupTemplate = require('../../templates/importoverwritepopup.html');
@@ -224,7 +223,6 @@ export function EditorPage({ route }: EditorPageProps) {
 
   return (
     <NodeGraphContextProvider>
-      <NodeReferencesContextProvider>
       <ProjectDesignTokenContextProvider>
         <PluginContextProvider>
           <BaseWindow>
@@ -247,7 +245,6 @@ export function EditorPage({ route }: EditorPageProps) {
           </BaseWindow>
         </PluginContextProvider>
       </ProjectDesignTokenContextProvider>
-      </NodeReferencesContextProvider>
     </NodeGraphContextProvider>
   );
 }

packages/noodl-editor/src/editor/src/router.setup.ts

@@ -1,6 +1,7 @@
 import { AppRegistry } from '@noodl-models/app_registry';
 import { SidebarModel } from '@noodl-models/sidebar';
-import { Keybindings } from '@noodl-constants/Keybindings';
+import { Keybinding } from '@noodl-utils/keyboard/Keybinding';
+import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';
 
 import { IconName } from '@noodl-core-ui/components/common/Icon';
 
@@ -68,7 +69,7 @@ export function installSidePanel({ isLesson }: SetupEditorOptions) {
   SidebarModel.instance.register({
     id: 'search',
     name: 'Search',
-    fineType: Keybindings.SEARCH.label,
+    fineType: new Keybinding(KeyMod.CtrlCmd, KeyCode.KEY_F).label,
     order: 2,
     icon: IconName.Search,
     panel: SearchPanel

packages/noodl-editor/src/editor/src/utils/LocalProjectsModel.ts

@@ -16,7 +16,6 @@ import { projectFromDirectory, unzipIntoDirectory } from '../models/projectmodel
 import FileSystem from './filesystem';
 import { tracker } from './tracker';
 import { guid } from './utils';
-import { getTopLevelWorkingDirectory } from '@noodl/git/src/core/open';
 
 export interface ProjectItem {
   id: string;
@@ -268,15 +267,12 @@ export class LocalProjectsModel extends Model {
     });
   }
 
-  /**
+  isGitProject(project: ProjectModel): boolean {
-   * Check if this project is in a git repository.
+    // TODO: check if there's is git in any parent folder too
-   *
+
-   * @param project 
+    // Check if the git folder exists.
-   * @returns 
+    const gitPath = filesystem.join(project._retainedProjectDirectory, '.git');
-   */
+    return filesystem.exists(gitPath);
-  async isGitProject(project: ProjectModel): Promise<boolean> {
-    const gitPath = await getTopLevelWorkingDirectory(project._retainedProjectDirectory);
-    return gitPath !== null;
   }
 
   setCurrentGlobalGitAuth(projectId: string) {

packages/noodl-editor/src/editor/src/utils/compilation/build/copy.ts

@@ -4,7 +4,7 @@ import { clearFolders } from './cleanup';
 
 export async function copyProjectFilesToFolder(projectPath: string, direntry: string): Promise<void> {
   // TODO: Load something like .noodlignore file list
-  const ignoreFiles = ['.DS_Store', '.gitignore', '.gitattributes', 'project.json', 'Dockerfile', 'nodelibrary.json'];
+  const ignoreFiles = ['.DS_Store', '.gitignore', '.gitattributes', 'project.json', 'Dockerfile'];
 
   // Copy everything from the project folder
   if (!projectPath) {

packages/noodl-editor/src/editor/src/utils/compilation/build/deploy-index.ts

@@ -67,14 +67,6 @@ async function _writeFileToFolder({
   runtimeType
 }: WriteFileToFolderArgs) {
   const fullPath = filesystem.join(getExternalFolderPath(), runtimeType, url);
-
-  if (!filesystem.exists(fullPath)) {
-    // TODO: Save this warning somewhere, usually, this is not an issue though.
-    // This occurred because building in dev mode does not create the source map
-    // files which it expects to copy over.
-    return;
-  }
-
   let content = await filesystem.readFile(fullPath);
   let filename = url;
 

packages/noodl-editor/src/editor/src/utils/compilation/build/processors/html-processor.ts

@@ -41,7 +41,7 @@ export class HtmlProcessor {
       baseUrl = baseUrl + '/';
     }
 
-    const title = parameters.title || settings.htmlTitle || 'Fluxscape Viewer';
+    const title = parameters.title || settings.htmlTitle || 'Noodl Viewer';
     let headCode = settings.headCode || '';
 
     if (parameters.headCode) {

packages/noodl-editor/src/editor/src/utils/forge/template/providers/noodl-docs-template-provider.ts

@@ -6,7 +6,7 @@ import { ITemplateProvider, ProgressCallback, TemplateItem, TemplateListFilter }
  */
 export class NoodlDocsTemplateProvider implements ITemplateProvider {
   get name(): string {
-    return this.getDocsEndpoint() || 'https://docs.fluxscape.io';
+    return 'https://docs.noodl.net';
   }
 
   constructor(private readonly getDocsEndpoint: () => string) {}

packages/noodl-editor/src/editor/src/utils/projectmerger.diff.ts

@@ -11,14 +11,6 @@ export interface ArrayDiff<T> {
   changed: T[];
   unchanged: T[];
 }
-export function createEmptyArrayDiff<T>(): ArrayDiff<T> {
-  return {
-    deleted: [],
-    created: [],
-    changed: [],
-    unchanged: [],
-  }
-}
 
 export interface ProjectDiffItem {
   graph: TSFixme;

packages/noodl-editor/src/editor/src/utils/schemahandler.ts

@@ -13,7 +13,6 @@ export default class SchemaHandler {
   public dbCollections: TSFixme[];
   public systemCollections: TSFixme[];
   public configSchema: TSFixme;
-  public parseServerVersion: string;
 
   constructor() {
     EventDispatcher.instance.on(
@@ -120,20 +119,6 @@ export default class SchemaHandler {
             console.log(e);
           }
         });
-
-        // Get Parse Server Version & Supported features
-        fetch(environment.url + '/serverInfo', {
-          method: 'POST',
-          body: JSON.stringify({
-            "_method": "GET",
-            "_ApplicationId": environment.appId,
-            "_MasterKey": environment.masterKey,
-          })
-        })
-          .then((response) => response.json())
-          .then((json) => {
-            this.parseServerVersion = json.parseServerVersion;
-          });
       });
     });
   }
@@ -144,20 +129,10 @@ export default class SchemaHandler {
         ProjectModel.instance.setMetaData('dbCollections', this.dbCollections);
         ProjectModel.instance.setMetaData('systemCollections', this.systemCollections);
         ProjectModel.instance.setMetaData('dbConfigSchema', this.configSchema);
-
-        const versionNumbers = this.parseServerVersion?.split(".")
-        if (versionNumbers && versionNumbers.length > 0) {
-          // Let's only save the major version number,
-          // since this will be used to determine which verison of the API to use.
-          ProjectModel.instance.setMetaData('dbVersionMajor', versionNumbers[0]);
-        } else {
-          ProjectModel.instance.setMetaData('dbVersionMajor', undefined);
-        }
       } else {
         ProjectModel.instance.setMetaData('dbCollections', undefined);
         ProjectModel.instance.setMetaData('systemCollections', undefined);
         ProjectModel.instance.setMetaData('dbConfigSchema', undefined);
-        ProjectModel.instance.setMetaData('dbVersionMajor', undefined);
       }
     }
   }

packages/noodl-editor/src/editor/src/utils/universal-search.js

@@ -1,32 +1,22 @@
-import type { ComponentModel } from '@noodl-models/componentmodel';
+const { ProjectModel } = require('../models/projectmodel');
-import type { NodeGraphNode } from '@noodl-models/nodegraphmodel';
 
-import { ProjectModel } from '../models/projectmodel';
+function matchStrings(string1, string2) {
-
-export type SearchResult = {
-  componentTarget: ComponentModel;
-  nodeTarget?: NodeGraphNode;
-  type?: string;
-  userLabel?: string;
-  label: string;
-};
-
-function matchStrings(string1: string, string2: string) {
   return string1.toLowerCase().indexOf(string2.toLowerCase()) !== -1;
 }
 
-function searchInNodeRecursive(node: NodeGraphNode, searchTerms: string, component: ComponentModel) {
+function searchInNodeRecursive(node, searchTerms, component) {
-  let results: SearchResult[] = [];
+  var results = [];
-  let matchLabel: string | null = null;
+  var matchLabel = null;
+  var i = 0;
 
   if (node._label !== undefined && matchStrings(node._label, searchTerms)) {
     matchLabel = node.label;
-  } else if (node.id === searchTerms) {
+  } else if (matchStrings(node.id, searchTerms)) {
     matchLabel = node.id;
   } else if (matchStrings(node.type.displayName || node.type.name, searchTerms)) {
     matchLabel = node.label;
   } else {
-    const parameterNames = Object.keys(node.parameters);
+    let parameterNames = Object.keys(node.parameters);
     for (const parameterNameIndex in parameterNames) {
       const parameterName = parameterNames[parameterNameIndex];
 
@@ -35,7 +25,7 @@ function searchInNodeRecursive(node: NodeGraphNode, searchTerms: string, compone
         matchStrings(node.parameters[parameterName], searchTerms)
       ) {
         let displayLabel = parameterName;
-        const connectionPort = node.type.ports?.find((port) => port.name === parameterName);
+        let connectionPort = node.type.ports?.find((port) => port.name === parameterName);
         if (connectionPort) {
           displayLabel = connectionPort.displayName;
         }
@@ -61,9 +51,9 @@ function searchInNodeRecursive(node: NodeGraphNode, searchTerms: string, compone
     }
 
     if (matchLabel === null) {
-      const ports = node.dynamicports;
+      var ports = node.dynamicports;
-      for (let i = 0; i < ports.length; ++i) {
+      for (i = 0; i < ports.length; ++i) {
-        const port = ports[i];
+        var port = ports[i];
         if (matchStrings(port.name, searchTerms)) {
           matchLabel = node.label + ' : ' + port.name;
           break;
@@ -72,9 +62,9 @@ function searchInNodeRecursive(node: NodeGraphNode, searchTerms: string, compone
     }
 
     if (matchLabel === null) {
-      const ports = node.ports;
+      var ports = node.ports;
-      for (let i = 0; i < ports.length; ++i) {
+      for (i = 0; i < ports.length; ++i) {
-        const port = ports[i];
+        var port = ports[i];
         if (matchStrings(port.name, searchTerms)) {
           matchLabel = node.label + ' : ' + port.name;
           break;
@@ -93,17 +83,17 @@ function searchInNodeRecursive(node: NodeGraphNode, searchTerms: string, compone
     });
   }
 
-  for (let i = 0; i < node.children.length; ++i) {
+  for (i = 0; i < node.children.length; ++i) {
-    const child = node.children[i];
+    var child = node.children[i];
-    const childResults = searchInNodeRecursive(child, searchTerms, component);
+    var childResults = searchInNodeRecursive(child, searchTerms, component);
     results = results.concat(childResults);
   }
 
   return results;
 }
 
-function searchInComponent(component: ComponentModel, searchTerms: string) {
+function searchInComponent(component, searchTerms) {
-  let results: SearchResult[] = [];
+  var results = [];
   if (matchStrings(component.displayName, searchTerms)) {
     results.push({
       componentTarget: component,
@@ -112,14 +102,14 @@ function searchInComponent(component: ComponentModel, searchTerms: string) {
     });
   }
 
-  for (let i = 0; i < component.graph.roots.length; ++i) {
+  for (var i = 0; i < component.graph.roots.length; ++i) {
-    const node = component.graph.roots[i];
+    var node = component.graph.roots[i];
-    const nodeResults = searchInNodeRecursive(node, searchTerms, component);
+    var nodeResults = searchInNodeRecursive(node, searchTerms, component);
     results = results.concat(nodeResults);
   }
 
   if (component.graph.commentsModel.comments) {
-    for (let i = 0; i < component.graph.commentsModel.comments.length; ++i) {
+    for (var i = 0; i < component.graph.commentsModel.comments.length; ++i) {
       const comment = component.graph.commentsModel.comments[i];
       if (matchStrings(comment.text, searchTerms)) {
         results.push({
@@ -142,17 +132,17 @@ function searchInComponent(component: ComponentModel, searchTerms: string) {
   }
 }
 
-export function performSearch(searchTerms: string) {
+export function performSearch(searchTerms) {
-  const results: ReturnType<typeof searchInComponent>[] = [];
+  var results = [];
-  const root = ProjectModel.instance.getRootNode();
+  var root = ProjectModel.instance.getRootNode();
   if (root === undefined) return;
 
-  const components = ProjectModel.instance.components;
+  var components = ProjectModel.instance.components;
 
-  for (let i = 0; i < components.length; ++i) {
+  for (var i = 0; i < components.length; ++i) {
-    const component = components[i];
+    var component = components[i];
 
-    const componentResults = searchInComponent(component, searchTerms);
+    var componentResults = searchInComponent(component, searchTerms);
     if (componentResults !== null) {
       //limit the label length (it can search in markdown, css, etc)
       for (const result of componentResults.results) {

packages/noodl-editor/src/editor/src/views/Clippy/Clippy.tsx

@@ -211,7 +211,7 @@ export default function Clippy() {
     aiAssistantModel.removeActivity(id);
   }
 
-  const initialPlaceholder = isInputOpen ? 'Select (or type) a command below' : 'Ask FluxScape AI';
+  const initialPlaceholder = isInputOpen ? 'Select (or type) a command below' : 'Ask Noodl AI';
   const isPromptInWrongOrder = Boolean(!selectedOption) && Boolean(secondInputValue);
   const isFullBeta = ['full-beta', 'enterprise'].includes(version);
   const isLimitedBeta = false; // TODO: version === 'limited-beta';
@@ -412,8 +412,8 @@ export default function Clippy() {
               <Text hasBottomSpacing>4. Click the "Verify API Key" button</Text>
 
               <Text hasBottomSpacing>
-                If you dont have an API key with GPT-4 access, you can set the FluxScape AI to use the Limited Beta in
+                If you dont have an API key with GPT-4 access, you can set the Noodl AI to use the Limited Beta in the
-                the editor settings.
+                editor settings.
               </Text>
               <PrimaryButton
                 size={PrimaryButtonSize.Small}
@@ -597,8 +597,8 @@ export default function Clippy() {
               </Label>
 
               <Text hasBottomSpacing size={TextSize.Medium}>
-                You are running the limited beta of FluxScape AI. If features fewer commands and a less capable AI. Get
+                You are running the limited beta of Noodl AI. If features fewer commands and a less capable AI. Get full
-                full beta access by bringing your own GPT-4 API key.
+                beta access by bringing your own GPT-4 API key.
               </Text>
 
               <PrimaryButton

packages/noodl-editor/src/editor/src/views/DeployPopup/DeployPopup.tsx

@@ -1,7 +1,5 @@
-import React, { RefObject } from 'react';
+import { usePluginContext } from '@noodl-contexts/PluginContext';
-import { platform } from '@noodl/platform';
+import React, { RefObject, useEffect, useRef } from 'react';
-
-import { ProjectModel } from '@noodl-models/projectmodel';
 
 import { ActivityIndicator } from '@noodl-core-ui/components/common/ActivityIndicator';
 import { BaseDialog } from '@noodl-core-ui/components/layout/BaseDialog';
@@ -56,7 +54,6 @@ export function DeployPopup(props: DeployPopupProps) {
         onClose={props.onClose}
         hasArrow
         isLockingScroll
-        alwaysMounted
       >
         <DeployPopupChild />
       </BaseDialog>
@@ -65,21 +62,6 @@ export function DeployPopup(props: DeployPopupProps) {
 }
 
 function FluxscapeDeployTab() {
-  const params = {
+  // Preview URL:  'http://192.168.0.33:8574/'
-    version: platform.getVersion()
+  return <iframe src="https://portal.fluxscape.io" style={{ width: "100%", height: "50vh", borderStyle: "none" }} />;
-  };
-
-  const projectId = ProjectModel.instance.id;
-  if (projectId) {
-    params['projectId'] = projectId;
-  }
-
-  const urlParams = new URLSearchParams(params);
-
-  return (
-    <iframe
-      src={`https://portal.fluxscape.io/?${urlParams.toString()}`}
-      style={{ width: '100%', height: '50vh', borderStyle: 'none' }}
-    />
-  );
 }

packages/noodl-editor/src/editor/src/views/panels/CloudServicePanel/CloudServiceCard/CloudServiceCard.tsx

@@ -1,16 +1,13 @@
 import classNames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';
 
-import { Keybindings } from '@noodl-constants/Keybindings';
 import { Environment } from '@noodl-models/CloudServices';
 import ParseDashboardServer from '@noodl-utils/parsedashboardserver';
 
 import { Icon, IconName, IconSize } from '@noodl-core-ui/components/common/Icon';
 import { IconButton, IconButtonState, IconButtonVariant } from '@noodl-core-ui/components/inputs/IconButton';
 import { PrimaryButton, PrimaryButtonSize, PrimaryButtonVariant } from '@noodl-core-ui/components/inputs/PrimaryButton';
-import { DialogRenderDirection } from '@noodl-core-ui/components/layout/BaseDialog';
 import { Collapsible } from '@noodl-core-ui/components/layout/Collapsible';
-import { Tooltip } from '@noodl-core-ui/components/popups/Tooltip';
 import { Label, LabelSpacingSize } from '@noodl-core-ui/components/typography/Label';
 import { Text, TextType } from '@noodl-core-ui/components/typography/Text';
 
@@ -121,21 +118,12 @@ export function CloudServiceCard({
           </div>
 
           {isEditorEnvironment && (
-            <Tooltip
-              content="Open the Parse Dashboard"
-              fineType={[
-                `In Window: ${Keybindings.CLOUD_SERVICE_OPEN_DASHBOARD.label}`,
-                `In Browser: ${Keybindings.CLOUD_SERVICE_OPEN_DASHBOARD_BROWSER.label}`
-              ]}
-              renderDirection={DialogRenderDirection.Below}
-            >
             <PrimaryButton
               label="Open dashboard"
               size={PrimaryButtonSize.Small}
               onClick={onDashboardClicked}
               isGrowing
             />
-            </Tooltip>
           )}
         </div>
       </div>

packages/noodl-editor/src/editor/src/views/panels/CloudServicePanel/CloudServicePanel.tsx

@@ -6,6 +6,8 @@ import { CloudService } from '@noodl-models/CloudServices';
 import { ActivityIndicator } from '@noodl-core-ui/components/common/ActivityIndicator';
 import { IconName, IconSize } from '@noodl-core-ui/components/common/Icon';
 import { IconButton } from '@noodl-core-ui/components/inputs/IconButton';
+import { PrimaryButton } from '@noodl-core-ui/components/inputs/PrimaryButton';
+import { Box } from '@noodl-core-ui/components/layout/Box';
 import { ConditionalContainer } from '@noodl-core-ui/components/layout/ConditionalContainer';
 import { Container } from '@noodl-core-ui/components/layout/Container';
 import { VStack } from '@noodl-core-ui/components/layout/Stack';

packages/noodl-editor/src/editor/src/views/panels/EditorSettingsPanel/sections/OpenAiSection.tsx

@@ -44,7 +44,7 @@ export function OpenAiSection() {
   }
 
   return (
-    <CollapsableSection title="FluxScape AI (Beta)">
+    <CollapsableSection title="Noodl AI (Beta)">
       <Box hasXSpacing>
         <VStack>
           <PropertyPanelRow label="Version" isChanged={false}>
@@ -66,7 +66,7 @@ export function OpenAiSection() {
 
           {enabledState === 'disabled' && (
             <Box hasYSpacing>
-              <Text>FluxScape AI is currently disabled.</Text>
+              <Text>Noodl AI is currently disabled.</Text>
             </Box>
           )}
 
@@ -157,16 +157,16 @@ export function OpenAiSection() {
             UNSAFE_style={{ borderRadius: '2px', background: 'var(--theme-color-bg-3)' }}
           >
             <Title size={TitleSize.Medium} hasBottomSpacing>
-              FluxScape AI docs
+              Noodl AI docs
             </Title>
-            <Text hasBottomSpacing>See setup instructions and guides for how to use FluxScape AI on our docs.</Text>
+            <Text hasBottomSpacing>See setup instructions and guides for how to use Noodl AI on our docs.</Text>
             <PrimaryButton
               variant={PrimaryButtonVariant.Muted}
               size={PrimaryButtonSize.Small}
               isGrowing
               label="Open docs"
               onClick={() => {
-                platform.openExternal('https://docs.fluxscape.io/docs/getting-started/noodl-ai');
+                platform.openExternal('https://docs.noodl.net/#/docs/getting-started/noodl-ai/');
               }}
             />
           </Box>

packages/noodl-editor/src/editor/src/views/panels/NodeReferencesPanel/NodeReferencesPanel.tsx

@@ -1,12 +1,14 @@
 import { NodeGraphContextTmp } from '@noodl-contexts/NodeGraphContext/NodeGraphContext';
-import { type NodeReference, useNodeReferencesContext } from '@noodl-contexts/NodeReferencesContext';
 import { useFocusRefOnPanelActive } from '@noodl-hooks/useFocusRefOnPanelActive';
 import { useNodeLibraryLoaded } from '@noodl-hooks/useNodeLibraryLoaded';
-import React, { useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 import { INodeColorScheme } from '@noodl-types/nodeTypes';
-import { NodeLibrary } from '@noodl-models/nodelibrary';
+import { ComponentModel } from '@noodl-models/componentmodel';
+import { NodeGraphNode } from '@noodl-models/nodegraphmodel';
+import { NodeLibrary, NodeLibraryNodeType } from '@noodl-models/nodelibrary';
 import { BasicNodeType } from '@noodl-models/nodelibrary/BasicNodeType';
+import { ProjectModel } from '@noodl-models/projectmodel';
 
 import { EditorNode } from '@noodl-core-ui/components/common/EditorNode';
 import { IconName, IconSize } from '@noodl-core-ui/components/common/Icon';
@@ -24,17 +26,113 @@ import { Section, SectionVariant } from '@noodl-core-ui/components/sidebar/Secti
 import { Label } from '@noodl-core-ui/components/typography/Label';
 
 import { NodeReferencesPanel_ID } from '.';
+import { EventDispatcher } from '../../../../../shared/utils/EventDispatcher';
+
+type ResultItem = {
+  type: NodeLibraryNodeType;
+  displayName: string;
+  referenaces: {
+    displayName: string;
+    node?: NodeGraphNode;
+    component: ComponentModel;
+  }[];
+};
+
+function useNodeReferences() {
+  const [group] = useState({});
+  const [result, setResult] = useState<ResultItem[]>([]);
+
+  useEffect(() => {
+    function updateIndex() {
+      const types: { [key: string]: ResultItem['type'] } = {};
+      const references = new Map<string, ResultItem['referenaces']>();
+
+      function handleComponent(component: ComponentModel) {
+        component.forEachNode((node: NodeGraphNode) => {
+          const name = node.type.name;
+
+          // Add the reference
+          references.set(name, [
+            ...(references.get(name) || []),
+            {
+              displayName: component.displayName || component.name,
+              node,
+              component
+            }
+          ]);
+
+          // Repeater
+          if (name === 'For Each' && node.parameters.template) {
+            const templateComponent = ProjectModel.instance.getComponentWithName(node.parameters.template);
+
+            if (templateComponent) {
+              references.set(templateComponent.fullName, [
+                ...(references.get(templateComponent.fullName) || []),
+                {
+                  displayName: component.displayName || component.name,
+                  node,
+                  component
+                }
+              ]);
+
+              handleComponent(templateComponent);
+            }
+          }
+
+          // Add some metadata for this node if we dont have it yet.
+          if (!types[name]) {
+            types[name] = node.type;
+          }
+        });
+      }
+
+      // Loop all the nodes in the project
+      ProjectModel.instance.forEachComponent(handleComponent);
+
+      // Combine the result to look a little better.
+      const results: ResultItem[] = Array.from(references.keys())
+        .map((key) => ({
+          type: types[key],
+          displayName: types[key]?.displayName || key,
+          referenaces: references.get(key)
+        }))
+        .sort((a, b) => b.referenaces.length - a.referenaces.length);
+
+      setResult(results);
+    }
+
+    updateIndex();
+
+    EventDispatcher.instance.on(
+      [
+        'Model.nodeAdded',
+        'Model.nodeRemoved',
+        'Model.componentAdded',
+        'Model.componentRemoved',
+        'Model.componentRenamed'
+      ],
+      updateIndex,
+      group
+    );
+
+    return function () {
+      EventDispatcher.instance.off(group);
+    };
+  }, []);
+
+  return [result];
+}
 
 export function NodeReferencesPanel() {
   const [searchTerm, setSearchTerm] = useState('');
   const [includeCoreNodes, setIncludeCoreNodes] = useState(false);
   const inputRef = useRef(null);
-  const { nodeReferences } = useNodeReferencesContext();
+  const [result] = useNodeReferences();
   const nodeLibraryLoaded = useNodeLibraryLoaded();
 
   useFocusRefOnPanelActive(inputRef, NodeReferencesPanel_ID);
 
-  function searchFilter(x: NodeReference) {
+  function searchFilter(x: ResultItem) {
     if (x.displayName.toLowerCase().includes(searchTerm)) {
       return true;
     }
@@ -46,7 +144,7 @@ export function NodeReferencesPanel() {
     return false;
   }
 
-  let filteredResult = nodeReferences.filter(searchFilter);
+  let filteredResult = result.filter(searchFilter);
   if (!includeCoreNodes) {
     filteredResult = filteredResult.filter((x) => x.displayName.startsWith('/'));
   }
@@ -87,7 +185,7 @@ export function NodeReferencesPanel() {
 }
 
 interface ItemProps {
-  entry: NodeReference;
+  entry: ResultItem;
 }
 
 function Item({ entry }: ItemProps) {
@@ -147,8 +245,8 @@ function Item({ entry }: ItemProps) {
 }
 
 interface ItemReferenceProps {
-  entry: NodeReference;
+  entry: ResultItem;
-  referenace: NodeReference['referenaces'][0];
+  referenace: ResultItem['referenaces'][0];
   colors: INodeColorScheme;
 }
 

packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/VersionControlPanel.tsx

@@ -199,7 +199,6 @@ function BaseVersionControlPanel() {
 
 export function VersionControlPanel() {
   const [git, setGit] = useState<Git>(null);
-  const [state, setState] = useState<'loading' | 'loaded' | 'not-git'>('loading');
 
   async function createGit() {
     const gitClient = new Git(mergeProject);
@@ -207,18 +206,12 @@ export function VersionControlPanel() {
     setGit(gitClient);
   }
 
+  const isGitProject = git === null ? LocalProjectsModel.instance.isGitProject(ProjectModel.instance) : true;
   useEffect(() => {
-    LocalProjectsModel.instance
-      .isGitProject(ProjectModel.instance)
-      .then(async (isGitProject) => {
     if (isGitProject) {
-          await createGit();
+      createGit();
-          setState('loaded');
-        } else {
-          setState('not-git');
     }
-      });
+  }, [isGitProject]);
-  }, []);
 
   async function setupGit() {
     const gitClient = new Git(mergeProject);
@@ -227,7 +220,7 @@ export function VersionControlPanel() {
     setGit(gitClient);
   }
 
-  if (git === null && state === 'not-git') {
+  if (git === null && !isGitProject) {
     return (
       <BasePanel isFill title="Version Control">
         <Box hasXSpacing hasYSpacing>

packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/CommitChangesDiff.tsx

@@ -6,13 +6,11 @@ import { Commit } from '@noodl/git/src/core/models/snapshot';
 import { FileChange } from '@noodl/git/src/core/models/status';
 import { revRange } from '@noodl/git/src/core/rev-list';
 
-import { ProjectModel } from '@noodl-models/projectmodel';
 import { applyPatches } from '@noodl-models/ProjectPatches/applypatches';
 import { mergeProject } from '@noodl-utils/projectmerger';
 import { ProjectDiff, diffProject } from '@noodl-utils/projectmerger.diff';
 
 import { useVersionControlContext } from '../context';
-import { getProjectFilePath } from '../context/DiffUtils';
 import { DiffList } from './DiffList';
 
 //Kind:
@@ -126,10 +124,7 @@ async function getMergeDiff(repositoryPath: string, commit: Commit, refToDiffTo:
 }
 
 async function getProjectFile(commit: Commit) {
-  const projectFilePath = getProjectFilePath(commit.repositoryDir, ProjectModel.instance._retainedProjectDirectory);
+  const projectContent = JSON.parse(await commit.getFileAsString('project.json'));
-
-  const projectContentRaw = await commit.getFileAsString(projectFilePath);
-  const projectContent = JSON.parse(projectContentRaw);
   applyPatches(projectContent);
   return projectContent;
 }

packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/components/DiffList.tsx

@@ -61,7 +61,7 @@ export function DiffList({ diff, fileChanges, componentDiffTitle, actions, commi
   const [imageDiff, setImageDiff] = useState<IImageDiff>(null);
 
   const components = diff?.components ? getChangedComponents(diff.components) : [];
-  const files = (fileChanges || [])?.filter((f) => !f.path.endsWith('project.json')) || [];
+  const files = (fileChanges || [])?.filter((f) => f.path !== 'project.json') || [];
   const settings = diff?.settings ? getChangedObjectProperties(diff.settings) : [];
   const colorStyles = diff?.styles.colors ? getChangedObjectProperties(diff.styles.colors) : [];
   const textStyles = diff?.styles.text ? getChangedObjectProperties(diff.styles.text) : [];

packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/context/DiffUtils.ts

@@ -1,22 +1,19 @@
-import path from 'path';
-import { getCommit } from '@noodl/git/src/core/logs';
-import { FileStatusKind } from '@noodl/git/src/core/models/status';
-
-import { FeedbackType } from '@noodl-constants/FeedbackType';
-import { applyPatches } from '@noodl-models/ProjectPatches/applypatches';
 import {
   ProjectDiff,
   ProjectDiffItem,
   ProjectBasicDiffItem,
   ArrayDiff,
-  diffProject,
+  diffProject
-  createEmptyArrayDiff
 } from '@noodl-utils/projectmerger.diff';
 
+import { ProjectModel } from '../../../../models/projectmodel';
+
+import { applyPatches } from '@noodl-models/ProjectPatches/applypatches';
+import { FileStatusKind } from '@noodl/git/src/core/models/status';
 import { IconName } from '@noodl-core-ui/components/common/Icon';
 import { ListItemProps } from '@noodl-core-ui/components/layout/ListItem';
-
+import { FeedbackType } from '@noodl-constants/FeedbackType';
-import { ProjectModel } from '../../../../models/projectmodel';
+import { getCommit } from '@noodl/git/src/core/logs';
 
 export interface ProjectLocalDiff extends ProjectDiff{
   baseProject: TSFixme; //Project model as an object from raw json
@@ -87,22 +84,9 @@ export function getFileStatusIconProps(status: FileStatusKind): Partial<ListItem
   }
 }
 
-export function getProjectFilePath(repositoryPath: string, projectPath: string) {
+export async function doLocalDiff(repositoryPath: string, headCommitId: string): Promise<ProjectLocalDiff> {
-  const relativePath = path.relative(repositoryPath, projectPath);
+  const baseCommit = await getCommit(repositoryPath, headCommitId);
-  const projectFilePath = path.join(relativePath, 'project.json').replaceAll('\\', '/');
+  const baseProjectJson = await baseCommit.getFileAsString('project.json');
-  return projectFilePath;
-}
-
-export async function doLocalDiff(
-  repositoryPath: string,
-  projectPath: string,
-  headCommitId: string
-): Promise<ProjectLocalDiff> {
-  const projectFilePath = getProjectFilePath(repositoryPath, projectPath);
-
-  try {
-    const baseCommit = await getCommit(projectPath, headCommitId);
-    const baseProjectJson = await baseCommit.getFileAsString(projectFilePath);
   const baseProject = JSON.parse(baseProjectJson);
   applyPatches(baseProject);
 
@@ -113,23 +97,4 @@ export async function doLocalDiff(
     baseProject,
     commitShaDiffedTo: headCommitId
   };
-  } catch (error) {
-    if (error.toString().includes('exists on disk, but not in')) {
-      console.warn('project.json does not exist in this commit.');
-    }
-
-    // Return empty state
-    return {
-      baseProject: {},
-      commitShaDiffedTo: headCommitId,
-      components: createEmptyArrayDiff(),
-      variants: createEmptyArrayDiff(),
-      settings: createEmptyArrayDiff(),
-      styles: {
-        colors: createEmptyArrayDiff(),
-        text: createEmptyArrayDiff()
-      },
-      cloudservices: createEmptyArrayDiff()
-    };
-  }
 }

packages/noodl-editor/src/editor/src/views/panels/VersionControlPanel/context/index.tsx

@@ -8,7 +8,6 @@ import { Slot } from '@noodl-core-ui/types/global';
 import { doLocalDiff, ProjectLocalDiff } from './DiffUtils';
 import { useVersionControlFetch } from './fetch.context';
 import { BranchStatus, IVersionControlContext } from './types';
-import { ProjectModel } from '@noodl-models/projectmodel';
 
 const VersionControlContext = createContext<IVersionControlContext>({
   git: null,
@@ -58,8 +57,7 @@ export function VersionControlProvider({ git, children }: { git: Git; children:
     (async () => {
       const currentCommitSha = await git.getHeadCommitId();
       if (currentCommitSha) {
-        const projectPath = ProjectModel.instance._retainedProjectDirectory;
+        const diff = await doLocalDiff(git.repositoryPath, currentCommitSha);
-        const diff = await doLocalDiff(git.repositoryPath, projectPath, currentCommitSha);
         setLocalDiff(diff);
       }
     })();

packages/noodl-editor/src/editor/src/views/panels/componentspanel/ComponentsPanel.ts

@@ -17,11 +17,9 @@ import { EventDispatcher } from '../../../../../shared/utils/EventDispatcher';
 import View from '../../../../../shared/view';
 import { NodeGraphEditor } from '../../nodegrapheditor';
 import * as NewPopupLayer from '../../PopupLayer/index';
-import { type PopupMenuItem } from '../../PopupLayer/index';
 import { ToastLayer } from '../../ToastLayer/ToastLayer';
 import { ComponentsPanelFolder } from './ComponentsPanelFolder';
 import { ComponentTemplates } from './ComponentTemplates';
-import { HACK_findNodeReference } from '@noodl-contexts/NodeReferencesContext';
 
 const PopupLayer = require('@noodl-views/popuplayer');
 const ComponentsPanelTemplate = require('../../../templates/componentspanel.html');
@@ -963,7 +961,7 @@ export class ComponentsPanelView extends View {
       forRuntimeType: this.getRuntimeType()
     });
 
-    let items: PopupMenuItem[] = templates.map((t) => ({
+    let items: TSFixme[] = templates.map((t) => ({
       icon: IconName.Plus,
       label: t.label,
       onClick: () => {
@@ -989,10 +987,6 @@ export class ComponentsPanelView extends View {
       });
     }
 
-    // Find references
-    const nodeReference = HACK_findNodeReference(scope.comp.name);
-    const nodeReferencesText = `Used in ~${nodeReference?.referenaces?.length || 0} places`;
-
     items = items.concat([
       {
         icon: IconName.Pencil,
@@ -1017,9 +1011,6 @@ export class ComponentsPanelView extends View {
           _this.onDeleteClicked(scope, el);
           evt.stopPropagation();
         }
-      },
-      {
-        label: nodeReferencesText
       }
     ]);
 
@@ -1119,16 +1110,6 @@ export class ComponentsPanelView extends View {
       }
     ]);
 
-    if (scope.canBecomeRoot) {
-      // Find references
-      const nodeReference = HACK_findNodeReference(scope.folder.component.name);
-      const nodeReferencesText = `Used in ~${nodeReference?.referenaces?.length || 0} places`;
-
-      items = items.concat([{
-        label: nodeReferencesText
-      }]);
-    }
-
     const menu = new NewPopupLayer.PopupMenu({
       items: items
     });

packages/noodl-editor/src/editor/src/views/panels/propertyeditor/components/AiChat/AiChat.tsx

@@ -182,7 +182,7 @@ function AiNodeChat({ context, onUpdated }: AiNodeChatProps) {
       footer={
         version === 'disabled' ? (
           <Center>
-            <Text textType={TextType.Shy}>FluxScape AI is currently disabled.</Text>
+            <Text textType={TextType.Shy}>Noodl AI is currently disabled.</Text>
           </Center>
         ) : (
           <>

packages/noodl-editor/src/editor/src/views/panels/search-panel/search-panel.tsx

@@ -6,7 +6,7 @@ import classNames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';
 
 import { KeyCode, KeyMod } from '@noodl-utils/keyboard/KeyCode';
-import { performSearch, SearchResult } from '@noodl-utils/universal-search';
+import { performSearch } from '@noodl-utils/universal-search';
 
 import { SearchInput } from '@noodl-core-ui/components/inputs/SearchInput';
 import { Container } from '@noodl-core-ui/components/layout/Container';
@@ -19,7 +19,7 @@ import css from './search-panel.module.scss';
 
 export function SearchPanel() {
   const [searchTerm, setSearchTerm] = useState('');
-  const [searchResults, setSearchResults] = useState<ReturnType<typeof performSearch>>([]);
+  const [searchResults, setSearchResults] = useState([]);
   const inputRef = useRef<HTMLInputElement>(null);
 
   // TODO: Not same context
@@ -54,7 +54,7 @@ export function SearchPanel() {
     }
   }, [debouncedSearchTerm]);
 
-  function onSearchItemClicked(searchResult: SearchResult) {
+  function onSearchItemClicked(searchResult) {
     if (searchResult.type === 'Component') {
       NodeGraphContextTmp.switchToComponent(searchResult.componentTarget, {
         breadcrumbs: false,
@@ -85,7 +85,29 @@ export function SearchPanel() {
 
       <div className={css.SearchResults}>
         {searchResults.map((component) => (
-          <SearchItem key={component.componentId} component={component} onSearchItemClicked={onSearchItemClicked} />
+          <Section
+            title={`${component.componentName} (${component.results.length} result${
+              component.results.length > 1 ? 's' : ''
+            })`}
+            key={component.componentId}
+            variant={SectionVariant.Panel}
+          >
+            {component.results.map((result, index) => (
+              <div
+                className={classNames(
+                  css.SearchResultItem
+                  // lastActiveComponentId === result.componentTarget.id && css['is-active']
+                )}
+                key={index}
+                onClick={() => onSearchItemClicked(result)}
+              >
+                <Label variant={TextType.Proud}>
+                  {result.userLabel ? result.type + ' - ' + result.userLabel : result.type}
+                </Label>
+                <Text>{result.label}</Text>
+              </div>
+            ))}
+          </Section>
         ))}
         {searchResults.length === 0 && debouncedSearchTerm.length > 0 && (
           <Container hasXSpacing hasYSpacing>
@@ -96,39 +118,3 @@ export function SearchPanel() {
     </BasePanel>
   );
 }
-
-type SearchItemProps = {
-  component: ReturnType<typeof performSearch>[0];
-  onSearchItemClicked: (item: SearchResult) => void;
-};
-
-function SearchItem({ component, onSearchItemClicked }: SearchItemProps) {
-  const resultCountText = `${component.results.length} result${component.results.length > 1 ? 's' : ''}`;
-  let titleText = `${component.componentName} (${resultCountText})`;
-
-  // We expect there to always be at least one result, to get the full component name.
-  const isInCloudFunctions = component.results[0].componentTarget.name.startsWith('/#__cloud__/');
-  if (isInCloudFunctions) {
-    titleText += ' (Cloud Function)';
-  }
-
-  return (
-    <Section title={titleText} variant={SectionVariant.Panel}>
-      {component.results.map((result, index) => (
-        <div
-          key={index}
-          className={classNames(
-            css.SearchResultItem
-            // lastActiveComponentId === result.componentTarget.id && css['is-active']
-          )}
-          onClick={() => onSearchItemClicked(result)}
-        >
-          <Label variant={TextType.Proud}>
-            {result.userLabel ? result.type + ' - ' + result.userLabel : result.type}
-          </Label>
-          <Text>{result.label}</Text>
-        </div>
-      ))}
-    </Section>
-  );
-}

packages/noodl-editor/src/frames/viewer-frame/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Fluxscape Viewer</title>
+    <title>Noodl Viewer</title>
     <link href="../../assets/lib/fontawesome/css/font-awesome.min.css" rel="stylesheet">
     <link href="assets/style.css" rel="stylesheet">
     <script type="text/javascript" src="../../assets/lib/jquery-min.js"></script>

packages/noodl-editor/src/main/src/web-server.js

@@ -67,7 +67,7 @@ function startServer(app, projectGetSettings, projectGetInfo, projectGetComponen
         ProjectModules.instance.injectIntoHtml(info.projectDirectory, data, '/', function (injected) {
           projectGetSettings((settings) => {
             settings = settings || {};
-            injected = injected.replace('{{#title#}}', settings.htmlTitle || 'Fluxscape Viewer');
+            injected = injected.replace('{{#title#}}', settings.htmlTitle || 'Noodl Viewer');
             injected = injected.replace('{{#customHeadCode#}}', settings.headCode || '');
 
             response.writeHead(200, {

packages/noodl-git/package.json

@@ -3,8 +3,8 @@
   "version": "2.7.0",
   "main": "src/index.ts",
   "description": "",
-  "author": "Fluxscape <contact@fluxscape.io>",
+  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://fluxscape.io",
+  "homepage": "https://noodl.net",
   "dependencies": {
     "desktop-trampoline": "https://github.com/desktop/desktop-trampoline/archive/refs/tags/v0.9.8.tar.gz",
     "dugite": "^1.106.0",

packages/noodl-git/src/core/open.ts

@@ -22,11 +22,7 @@ export async function open(basePath: string): Promise<string> {
   //   console.log("VCS error when opening project: " + e);
   // }
 
-
+  return basePath;
-  // Find the relative git repository path
-  const repositoryPath = await getTopLevelWorkingDirectory(basePath);
-
-  return repositoryPath;
 }
 
 /**

packages/noodl-platform-electron/package.json

@@ -3,8 +3,8 @@
   "version": "2.7.0",
   "main": "src/index.ts",
   "description": "Cross platform implementation of platform specific features.",
-  "author": "Fluxscape <contact@fluxscape.io>",
+  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://fluxscape.io",
+  "homepage": "https://noodl.net",
   "dependencies": {
     "@noodl/platform": "file:../noodl-platform",
     "@noodl/platform-node": "file:../noodl-platform-node"

packages/noodl-platform-node/package.json

@@ -3,8 +3,8 @@
   "version": "2.7.0",
   "main": "src/index.ts",
   "description": "Cross platform implementation of platform specific features.",
-  "author": "Fluxscape <contact@fluxscape.io>",
+  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://fluxscape.io",
+  "homepage": "https://noodl.net",
   "scripts": {
     "test": "jest",
     "test:coverage": "jest --coverage"

packages/noodl-platform/package.json

@@ -3,6 +3,6 @@
   "version": "2.7.0",
   "main": "src/index.ts",
   "description": "Cross platform implementation of platform specific features.",
-  "author": "Fluxscape <contact@fluxscape.io>",
+  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://fluxscape.io"
+  "homepage": "https://noodl.net"
 }

packages/noodl-runtime/src/api/cloudstore.js

@@ -32,15 +32,12 @@ class CloudStore {
 
   _initCloudServices() {
     _collections = undefined; // clear collection cache, so it's refetched
-
     const cloudServices = NoodlRuntime.instance.getMetaData('cloudservices');
+
     if (cloudServices) {
       this.appId = cloudServices.appId;
       this.endpoint = cloudServices.endpoint;
     }
-
-    const dbVersionMajor = NoodlRuntime.instance.getMetaData('dbVersionMajor');
-    this.dbVersionMajor = dbVersionMajor;
   }
 
   on() {
@@ -73,9 +70,8 @@ class CloudStore {
       xhr.open(options.method || 'GET', this.endpoint + path, true);
 
       xhr.setRequestHeader('X-Parse-Application-Id', this.appId);
-      if (typeof _noodl_cloudservices !== 'undefined') {
+      if (typeof _noodl_cloudservices !== 'undefined')
         xhr.setRequestHeader('X-Parse-Master-Key', _noodl_cloudservices.masterKey);
-      }
 
       // Check for current users
       var _cu = localStorage['Parse/' + this.appId + '/currentUser'];
@@ -172,10 +168,13 @@ class CloudStore {
       return;
     }
 
+    if (options.where) args.push('match=' + encodeURIComponent(JSON.stringify(options.where)));
     if (options.limit) args.push('limit=' + options.limit);
     if (options.skip) args.push('skip=' + options.skip);
 
-    const grouping = {};
+    const grouping = {
+      objectId: null
+    };
 
     Object.keys(options.group).forEach((k) => {
       const _g = {};
@@ -189,20 +188,7 @@ class CloudStore {
       grouping[k] = _g;
     });
 
-    // I don't know which version the API was changed, lets just say above 4 for now.
-    if (this.dbVersionMajor && this.dbVersionMajor > 4) {
-      grouping._id = null;
-
-      if (options.where) args.push('$match=' + encodeURIComponent(JSON.stringify(options.where)));
-
-      args.push('$group=' + JSON.stringify(grouping));
-    } else {
-      grouping.objectId = null;
-
-      if (options.where) args.push('match=' + encodeURIComponent(JSON.stringify(options.where)));
-
     args.push('group=' + JSON.stringify(grouping));
-    }
 
     this._makeRequest('/aggregate/' + options.collection + (args.length > 0 ? '?' + args.join('&') : ''), {
       success: function (response) {
@@ -258,34 +244,11 @@ class CloudStore {
     });
   }
 
-  /**
-   *
-   * @param {{
-   *    objectId: string;
-   *    collection: string;
-   *    keys?: string[] | string;
-   *    include?: string[] | string;
-   *    excludeKeys?: string[] | string;
-   *    success: (data: unknown) => void;
-   *    error: (error: unknown) => void;
-   * }} options
-   */
   fetch(options) {
     const args = [];
 
-    if (options.include) {
+    if (options.include)
       args.push('include=' + (Array.isArray(options.include) ? options.include.join(',') : options.include));
-    }
-
-    if (options.keys) {
-      args.push('keys=' + (Array.isArray(options.keys) ? options.keys.join(',') : options.keys));
-    }
-
-    if (options.excludeKeys) {
-      args.push(
-        'excludeKeys=' + (Array.isArray(options.excludeKeys) ? options.excludeKeys.join(',') : options.excludeKeys)
-      );
-    }
 
     this._makeRequest(
       '/classes/' + options.collection + '/' + options.objectId + (args.length > 0 ? '?' + args.join('&') : ''),
@@ -457,8 +420,6 @@ class CloudStore {
    *    file: {
    *      name: string;
    *    }
-   *    success: (data: unknown) => void;
-   *    error: (error: unknown) => void;
    * }} options
    */
   deleteFile(options) {
@@ -471,15 +432,8 @@ class CloudStore {
 }
 
 function _isArrayOfObjects(a) {
-  if (!Array.isArray(a)) {
+  if (!Array.isArray(a)) return false;
-    return false;
+  for (var i = 0; i < a.length; i++) if (typeof a[i] !== 'object' || a[i] === null) return false;
-  }
-
-  for (let i = 0; i < a.length; i++) {
-    if (typeof a[i] !== 'object' || a[i] === null) {
-      return false;
-    }
-  }
 
   return true;
 }
@@ -551,104 +505,66 @@ function _serializeObject(data, collectionName, modelScope) {
   return data;
 }
 
-/**
- *
- * @param {unknown} data
- * @param {string} type
- * @param {*} modelScope
- * @returns
- */
 function _deserializeJSON(data, type, modelScope) {
-  if (data === undefined) return undefined;
+  if (data === undefined) return;
   if (data === null) return null;
 
   if (type === 'Relation' && data.__type === 'Relation') {
     return undefined; // Ignore relation fields
-  }
+  } else if (type === 'Pointer' && data.__type === 'Pointer') {
-
     // This is a pointer type, resolve into id
-  if (type === 'Pointer' && data.__type === 'Pointer') {
     return data.objectId;
-  }
+  } else if (type === 'Date' && data.__type === 'Date') {
-
-  if (type === 'Date' && data.__type === 'Date') {
     return new Date(data.iso);
-  }
+  } else if (type === 'Date' && typeof data === 'string') {
-
-  if (type === 'Date' && typeof data === 'string') {
     return new Date(data);
-  }
+  } else if (type === 'File' && data.__type === 'File') {
-
-  if (type === 'File' && data.__type === 'File') {
     return new CloudFile(data);
-  }
+  } else if (type === 'GeoPoint' && data.__type === 'GeoPoint') {
-
-  if (type === 'GeoPoint' && data.__type === 'GeoPoint') {
     return {
       latitude: data.latitude,
       longitude: data.longitude
     };
-  }
+  } else if (_isArrayOfObjects(data)) {
-
+    var a = [];
-  if (_isArrayOfObjects(data)) {
+    for (var i = 0; i < data.length; i++) {
-    const a = [];
-    for (let i = 0; i < data.length; i++) {
       a.push(_deserializeJSON(data[i], undefined, modelScope));
     }
-    const c = Collection.get();
+    var c = Collection.get();
     c.set(a);
     return c;
-  }
+  } else if (Array.isArray(data)) return data;
-
-  // An array with mixed types
-  if (Array.isArray(data)) {
-    return data;
-  }
-
   // This is an array with mixed data, just return it
-  if (data && data.__type === 'Object' && data.className !== undefined && data.objectId !== undefined) {
+  else if (data && data.__type === 'Object' && data.className !== undefined && data.objectId !== undefined) {
     const _data = Object.assign({}, data);
     delete _data.className;
     delete _data.__type;
     return _fromJSON(_data, data.className, modelScope);
+  } else if (typeof data === 'object' && data !== null) {
+    var m = (modelScope || Model).get();
+    for (var key in data) {
+      m.set(key, _deserializeJSON(data[key], undefined, modelScope));
     }
-
+    return m;
-  if (typeof data === 'object' && data !== null) {
+  } else return data;
-    // Try to get the model by id, if it is defined, otherwise we create a new unique id.
-    const model = (modelScope || Model).get(data.id);
-    for (const key in data) {
-      const nestedValue = _deserializeJSON(data[key], undefined, modelScope);
-      model.set(key, nestedValue);
-    }
-    return model;
-  }
-
-  return data;
 }
 
 function _fromJSON(item, collectionName, modelScope) {
-  const modelStore = modelScope || Model;
+  const m = (modelScope || Model).get(item.objectId);
+  m._class = collectionName;
 
-  // Try to get the model by the object id (record) or id, otherwise we create a new unique id.
+  if (collectionName !== undefined && CloudStore._collections[collectionName] !== undefined)
-  const model = modelStore.get(item.objectId || item.id);
+    var schema = CloudStore._collections[collectionName].schema;
-  model._class = collectionName;
 
-  let schema = undefined;
+  for (var key in item) {
-  if (collectionName !== undefined && CloudStore._collections[collectionName] !== undefined) {
+    if (key === 'objectId' || key === 'ACL') continue;
-    schema = CloudStore._collections[collectionName].schema;
+
+    var _type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
+
+    m.set(key, _deserializeJSON(item[key], _type, modelScope));
   }
 
-  for (const key in item) {
+  return m;
-    if (key === 'objectId' || key === 'ACL') {
-      continue;
-    }
-
-    const _type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
-    const nestedValue = _deserializeJSON(item[key], _type, modelScope);
-    model.set(key, nestedValue);
-  }
-
-  return model;
 }
 
 CloudStore._fromJSON = _fromJSON;

packages/noodl-runtime/src/api/queryutils.js

@@ -40,7 +40,8 @@ function convertVisualFilter(query, options) {
     if (query.operator === 'exist') {
         _res[query.property] = { $exists: true };
         return _res;
-    } else if (query.operator === 'not exist') {
+    }
+    else if (query.operator === 'not exist') {
         _res[query.property] = { $exists: false };
         return _res;
     }
@@ -79,6 +80,7 @@ function convertVisualFilter(query, options) {
       cond = { $regex: value, $options: 'i' };
     }
 
+
     _res[query.property] = cond;
 
     return _res;
@@ -161,22 +163,10 @@ function _value(v) {
   return v;
 }
 
-/**
- *
- * @param {Record<string, unknown>} filter
- * @param {{
- *   collectionName?: string;
- *   modelScope?: unknown;
- *   error: (error: string) => void;
- * }} options
- * @returns
- */
 function convertFilterOp(filter, options) {
   const keys = Object.keys(filter);
   if (keys.length === 0) return {};
-  if (keys.length !== 1) {
+  if (keys.length !== 1) return options.error('Filter must only have one key found ' + keys.join(','));
-    return options.error('Filter must only have one key found ' + keys.join(','));
-  }
 
   const res = {};
   const key = keys[0];
@@ -189,27 +179,18 @@ function convertFilterOp(filter, options) {
   } else if (filter['idContainedIn'] !== undefined) {
     res['objectId'] = { $in: filter['idContainedIn'] };
   } else if (filter['relatedTo'] !== undefined) {
-    const modelId = filter['relatedTo']['id'];
+    var modelId = filter['relatedTo']['id'];
-    if (modelId === undefined) {
+    if (modelId === undefined) return options.error('Must provide id in relatedTo filter');
-      return options.error('Must provide id in relatedTo filter');
-    }
 
-    const relationKey = filter['relatedTo']['key'];
+    var relationKey = filter['relatedTo']['key'];
-    if (relationKey === undefined) {
+    if (relationKey === undefined) return options.error('Must provide key in relatedTo filter');
-      return options.error('Must provide key in relatedTo filter');
-    }
-
-    const className = filter['relatedTo']['className'] || (options.modelScope || Model).get(modelId)?._class;
-    if (typeof className === 'undefined') {
-      // Either the pointer is loaded as an object or we allow passing in the className.
-      return options.error('Must preload the Pointer or include className');
-    }
 
+    var m = (options.modelScope || Model).get(modelId);
     res['$relatedTo'] = {
       object: {
         __type: 'Pointer',
         objectId: modelId,
-        className
+        className: m._class
       },
       key: relationKey
     };
@@ -227,14 +208,13 @@ function convertFilterOp(filter, options) {
     else if (opAndValue['containedIn'] !== undefined) res[key] = { $in: opAndValue['containedIn'] };
     else if (opAndValue['notContainedIn'] !== undefined) res[key] = { $nin: opAndValue['notContainedIn'] };
     else if (opAndValue['pointsTo'] !== undefined) {
-      let schema = null;
+      var m = (options.modelScope || Model).get(opAndValue['pointsTo']);
-      if (CloudStore._collections[options.collectionName]) {
+      if (CloudStore._collections[options.collectionName])
-        schema = CloudStore._collections[options.collectionName].schema;
+        var schema = CloudStore._collections[options.collectionName].schema;
-      }
 
-      const targetClass =
+      var targetClass =
         schema && schema.properties && schema.properties[key] ? schema.properties[key].targetClass : undefined;
-      const type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
+      var type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
 
       if (type === 'Relation') {
         res[key] = {
@@ -243,13 +223,13 @@ function convertFilterOp(filter, options) {
           className: targetClass
         };
       } else {
-        if (Array.isArray(opAndValue['pointsTo'])) {
+        if (Array.isArray(opAndValue['pointsTo']))
           res[key] = {
             $in: opAndValue['pointsTo'].map((v) => {
               return { __type: 'Pointer', objectId: v, className: targetClass };
             })
           };
-        } else {
+        else
           res[key] = {
             $eq: {
               __type: 'Pointer',
@@ -258,7 +238,6 @@ function convertFilterOp(filter, options) {
             }
           };
       }
-      }
     } else if (opAndValue['matchesRegex'] !== undefined) {
       res[key] = {
         $regex: opAndValue['matchesRegex'],
@@ -283,9 +262,9 @@ function convertFilterOp(filter, options) {
       var _v = opAndValue['nearSphere'];
       res[key] = {
         $nearSphere: {
-          __type: 'GeoPoint',
+          __type: "GeoPoint",
           latitude: _v.latitude,
-          longitude: _v.longitude
+          longitude: _v.longitude,
         },
         $maxDistanceInMiles:_v.$maxDistanceInMiles,
         $maxDistanceInKilometers:_v.maxDistanceInKilometers,
@@ -295,8 +274,8 @@ function convertFilterOp(filter, options) {
       var _v = opAndValue['withinBox'];
       res[key] = {
         $within:{
-          $box: _v.map((gp) => ({
+          $box: _v.map(gp => ({
-            __type: 'GeoPoint',
+            __type:"GeoPoint",
             latitude:gp.latitude,
             longitude:gp.longitude
           }))
@@ -306,14 +285,15 @@ function convertFilterOp(filter, options) {
       var _v = opAndValue['withinPolygon'];
       res[key] = {
         $geoWithin:{
-          $polygon: _v.map((gp) => ({
+          $polygon: _v.map(gp => ({
-            __type: 'GeoPoint',
+            __type:"GeoPoint",
             latitude:gp.latitude,
             longitude:gp.longitude
           }))
         }
       };
     }
+
   } else {
     options.error('Unrecognized filter keys ' + keys.join(','));
   }

packages/noodl-runtime/src/api/records.js

@@ -12,7 +12,6 @@ function createRecordsAPI(modelScope) {
 
   return {
     async query(className, query, options) {
-      if (typeof className === 'undefined') throw new Error("'className' is undefined");
       return new Promise((resolve, reject) => {
         cloudstore().query({
           collection: className,
@@ -40,7 +39,6 @@ function createRecordsAPI(modelScope) {
     },
 
     async count(className, query) {
-      if (typeof className === 'undefined') throw new Error("'className' is undefined");
       return new Promise((resolve, reject) => {
         cloudstore().count({
           collection: className,
@@ -62,7 +60,6 @@ function createRecordsAPI(modelScope) {
     },
 
     async distinct(className, property, query) {
-      if (typeof className === 'undefined') throw new Error("'className' is undefined");
       return new Promise((resolve, reject) => {
         cloudstore().distinct({
           collection: className,
@@ -85,7 +82,6 @@ function createRecordsAPI(modelScope) {
     },
 
     async aggregate(className, group, query) {
-      if (typeof className === 'undefined') throw new Error("'className' is undefined");
       return new Promise((resolve, reject) => {
         cloudstore().aggregate({
           collection: className,
@@ -107,35 +103,19 @@ function createRecordsAPI(modelScope) {
       });
     },
 
-    /**
-     *
-     * @param {string | { getId(): string; }} objectOrId
-     * @param {{
-     *    className: string;
-     *    keys?: string[] | string;
-     *    include?: string[] | string;
-     *    excludeKeys?: string[] | string;
-     * }} options
-     * @returns {Promise<unknown>}
-     */
     async fetch(objectOrId, options) {
-      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
       if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
       const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;
 
       return new Promise((resolve, reject) => {
-        if (!className) {
+        if (!className) return reject('No class name specified');
-          return reject('No class name specified');
-        }
 
         cloudstore().fetch({
           collection: className,
           objectId: objectOrId,
-          keys: options?.keys,
+          include: options ? options.include : undefined,
-          include: options?.include,
-          excludeKeys: options?.excludeKeys,
           success: function (response) {
-            const record = cloudstore()._fromJSON(response, className);
+            var record = cloudstore()._fromJSON(response, className);
             resolve(record);
           },
           error: function (err) {
@@ -146,7 +126,6 @@ function createRecordsAPI(modelScope) {
     },
 
     async increment(objectOrId, properties, options) {
-      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
       if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
       const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;
 
@@ -170,7 +149,6 @@ function createRecordsAPI(modelScope) {
     },
 
     async save(objectOrId, properties, options) {
-      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
       if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
       const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;
 
@@ -201,7 +179,6 @@ function createRecordsAPI(modelScope) {
     },
 
     async create(className, properties, options) {
-      if (typeof className === 'undefined') throw new Error("'className' is undefined");
       return new Promise((resolve, reject) => {
         cloudstore().create({
           collection: className,
@@ -220,7 +197,6 @@ function createRecordsAPI(modelScope) {
     },
 
     async delete(objectOrId, options) {
-      if (typeof objectOrId === 'undefined') return Promise.reject(new Error("'objectOrId' is undefined."));
       if (typeof objectOrId !== 'string') objectOrId = objectOrId.getId();
       const className = (options ? options.className : undefined) || (modelScope || Model).get(objectOrId)._class;
 
@@ -289,7 +265,7 @@ function createRecordsAPI(modelScope) {
             resolve();
           },
           error: (err) => {
-            reject(Error(err || 'Failed to add relation.'));
+            reject(Error(rr || 'Failed to add relation.'));
           }
         });
       });

packages/noodl-runtime/src/collection.js

@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-var Model = require('./model');
+var Model = require("./model");
 
 // Get and set proxy
 /*const proxies = {}
@@ -221,48 +221,48 @@ Collection.prototype.toJSON = function() {
 }*/
 
 // ----
-Object.defineProperty(Array.prototype, 'items', {
+Object.defineProperty(Array.prototype, "items", {
   enumerable: false,
   get() {
     return this;
   },
   set(data) {
     this.set(data);
-  }
+  },
 });
-Object.defineProperty(Array.prototype, 'each', {
+Object.defineProperty(Array.prototype, "each", {
   enumerable: false,
   writable: false,
-  value: Array.prototype.forEach
+  value: Array.prototype.forEach,
 });
-Object.defineProperty(Array.prototype, 'size', {
+Object.defineProperty(Array.prototype, "size", {
   enumerable: false,
   writable: false,
   value: function () {
     return this.length;
-  }
+  },
 });
-Object.defineProperty(Array.prototype, 'get', {
+Object.defineProperty(Array.prototype, "get", {
   enumerable: false,
   writable: false,
   value: function (index) {
     return this[index];
-  }
+  },
 });
-Object.defineProperty(Array.prototype, 'getId', {
+Object.defineProperty(Array.prototype, "getId", {
   enumerable: false,
   writable: false,
   value: function () {
     return this._id;
-  }
+  },
 });
-Object.defineProperty(Array.prototype, 'id', {
+Object.defineProperty(Array.prototype, "id", {
   enumerable: false,
   get() {
     return this.getId();
-  }
+  },
 });
-Object.defineProperty(Array.prototype, 'set', {
+Object.defineProperty(Array.prototype, "set", {
   enumerable: false,
   writable: false,
   value: function (src) {
@@ -323,10 +323,10 @@ Object.defineProperty(Array.prototype, 'set', {
     for (i = aItems.length; i < bItems.length; i++) {
       this.add(bItems[i]);
     }
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'notify', {
+Object.defineProperty(Array.prototype, "notify", {
   enumerable: false,
   writable: false,
   value: async function (event, args) {
@@ -337,80 +337,80 @@ Object.defineProperty(Array.prototype, 'notify', {
     for (var i = 0; i < l.length; i++) {
       await l[i](args);
     }
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'contains', {
+Object.defineProperty(Array.prototype, "contains", {
   enumerable: false,
   writable: false,
   value: function (item) {
     return this.indexOf(item) !== -1;
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'add', {
+Object.defineProperty(Array.prototype, "add", {
   enumerable: false,
   writable: false,
   value: async function (item) {
     if (this.contains(item)) return; // Already contains item
 
     this.items.push(item);
-    await this.notify('add', { item: item, index: this.items.length - 1 });
+    await this.notify("add", { item: item, index: this.items.length - 1 });
-    await this.notify('change');
+    await this.notify("change");
-    await item.notify('add', { collection: this });
+    await item.notify("add", { collection: this });
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'remove', {
+Object.defineProperty(Array.prototype, "remove", {
   enumerable: false,
   writable: false,
   value: function (item) {
     var idx = this.items.indexOf(item);
     if (idx !== -1) this.removeAtIndex(idx);
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'addAtIndex', {
+Object.defineProperty(Array.prototype, "addAtIndex", {
   enumerable: false,
   writable: false,
   value: async function (item, index) {
     if (this.contains(item)) return; // Already contains item
 
     this.items.splice(index, 0, item);
-    await this.notify('add', { item: item, index: index });
+    await this.notify("add", { item: item, index: index });
-    await this.notify('change');
+    await this.notify("change");
-    await item.notify('add', { collection: this, index: index });
+    await item.notify("add", { collection: this, index: index });
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'removeAtIndex', {
+Object.defineProperty(Array.prototype, "removeAtIndex", {
   enumerable: false,
   writable: false,
   value: async function (idx) {
     var item = this.items[idx];
     this.items.splice(idx, 1);
-    await this.notify('remove', { item: item, index: idx });
+    await this.notify("remove", { item: item, index: idx });
-    await this.notify('change');
+    await this.notify("change");
-    await item.notify('remove', { collection: this });
+    await item.notify("remove", { collection: this });
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'on', {
+Object.defineProperty(Array.prototype, "on", {
   enumerable: false,
   writable: false,
   value: function (event, listener) {
     if (!this._listeners)
-      Object.defineProperty(this, '_listeners', {
+      Object.defineProperty(this, "_listeners", {
         enumerable: false,
         writable: false,
-        value: {}
+        value: {},
       });
     if (!this._listeners[event]) this._listeners[event] = [];
     this._listeners[event].push(listener);
-  }
+  },
 });
 
-Object.defineProperty(Array.prototype, 'off', {
+Object.defineProperty(Array.prototype, "off", {
   enumerable: false,
   writable: false,
   value: function (event, listener) {
@@ -418,20 +418,20 @@ Object.defineProperty(Array.prototype, 'off', {
     if (!this._listeners[event]) return;
     var idx = this._listeners[event].indexOf(listener);
     if (idx !== -1) this._listeners[event].splice(idx, 1);
-  }
+  },
 });
 
 class Collection extends Array {}
 
-const collections = (Collection._collections = {});
+var collections = (Collection._collections = {});
 
 Collection.create = function (items) {
   const name = Model.guid();
   collections[name] = new Collection();
-  Object.defineProperty(collections[name], '_id', {
+  Object.defineProperty(collections[name], "_id", {
     enumerable: false,
     writable: false,
-    value: name
+    value: name,
   });
   if (items) {
     collections[name].set(items);
@@ -439,18 +439,14 @@ Collection.create = function (items) {
   return collections[name];
 };
 
-/**
- * @param {string} name
- * @returns {Collection}
- */
 Collection.get = function (name) {
   if (name === undefined) name = Model.guid();
   if (!collections[name]) {
     collections[name] = new Collection();
-    Object.defineProperty(collections[name], '_id', {
+    Object.defineProperty(collections[name], "_id", {
       enumerable: false,
       writable: false,
-      value: name
+      value: name,
     });
   }
 

packages/noodl-runtime/src/model.js

@@ -35,11 +35,6 @@ const _modelProxyHandler = {
   }
 };
 
-/**
- *
- * @param {*} id
- * @returns {Model}
- */
 Model.get = function (id) {
   if (id === undefined) id = Model.guid();
   if (!models[id]) {
@@ -127,22 +122,13 @@ Model.prototype.fill = function (value = null) {
   }
 };
 
-/**
- * @param {string} name
- * @param {unknown} value
- * @param {{
- *  resolve?: boolean;
- *  forceChange?: boolean;
- *  silent?: boolean;
- * }} args
- */
 Model.prototype.set = function (name, value, args) {
   if (args && args.resolve && name.indexOf('.') !== -1) {
     // We should resolve path references
-    const path = name.split('.');
+    var path = name.split('.');
-    let model = this;
+    var model = this;
-    for (let i = 0; i < path.length - 1; i++) {
+    for (var i = 0; i < path.length - 1; i++) {
-      const v = model.get(path[i]);
+      var v = model.get(path[i]);
       if (Model.instanceOf(v)) model = v;
       else return; // Path resolve failed
     }
@@ -152,35 +138,24 @@ Model.prototype.set = function (name, value, args) {
 
   const forceChange = args && args.forceChange;
 
-  const oldValue = this.data[name];
+  var oldValue = this.data[name];
   this.data[name] = value;
-
+  (forceChange || oldValue !== value) &&
-  if ((forceChange || oldValue !== value) && (!args || !args.silent)) {
+    (!args || !args.silent) &&
     this.notify('change', { name: name, value: value, old: oldValue });
-  }
 };
 
-/**
- * @returns {string}
- */
 Model.prototype.getId = function () {
   return this.id;
 };
 
-/**
- * @param {string} name
- * @param {{
- *  resolve?: boolean;
- * }} args
- * @returns {unknown}
- */
 Model.prototype.get = function (name, args) {
   if (args && args.resolve && name.indexOf('.') !== -1) {
     // We should resolve path references
-    const path = name.split('.');
+    var path = name.split('.');
-    let model = this;
+    var model = this;
-    for (let i = 0; i < path.length - 1; i++) {
+    for (var i = 0; i < path.length - 1; i++) {
-      const v = model.get(path[i]);
+      var v = model.get(path[i]);
       if (Model.instanceOf(v)) model = v;
       else return; // Path resolve failed
     }

packages/noodl-runtime/src/nodecontext.js

@@ -230,7 +230,7 @@ NodeContext.prototype.deregisterComponentModel = function (componentModel) {
 
 NodeContext.prototype.fetchComponentBundle = async function (name) {
   const fetchBundle = async (name) => {
-    let baseUrl = Noodl.Env['BaseUrl'] || '/';
+    let baseUrl = Noodl.Env["BaseUrl"] || '/';
     let bundleUrl = `${baseUrl}noodl_bundles/${name}.json`;
 
     const response = await fetch(bundleUrl);
@@ -455,15 +455,6 @@ NodeContext.prototype.setPopupCallbacks = function ({ onShow, onClose }) {
   this.onClosePopup = onClose;
 };
 
-/**
- * @param {string} popupComponent
- * @param {Record<string, unknown>} params
- * @param {{
- *  senderNode?: unknown;
- *  onClosePopup?: (action?: string, results: object) => void;
- * }} args
- * @returns
- */
 NodeContext.prototype.showPopup = async function (popupComponent, params, args) {
   if (!this.onShowPopup) return;
 

packages/noodl-runtime/src/nodes/std-library/data/dbcollectionnode2.js

@@ -28,7 +28,6 @@ var DbCollectionNode = {
       _this.scheduleAfterInputsHaveUpdated(function () {
         _this.flagOutputDirty('count');
         _this.flagOutputDirty('firstItemId');
-        _this.flagOutputDirty('isEmpty');
         collectionChangedScheduled = false;
       });
     };
@@ -67,7 +66,6 @@ var DbCollectionNode = {
 
         _this.flagOutputDirty('count');
         _this.flagOutputDirty('firstItemId');
-        _this.flagOutputDirty('isEmpty');
       }
 
       if (args.type === 'create') {
@@ -93,7 +91,6 @@ var DbCollectionNode = {
 
             _this.flagOutputDirty('count');
             _this.flagOutputDirty('firstItemId');
-            _this.flagOutputDirty('isEmpty');
           } else if (matchesQuery && !_this._internal.collection.contains(m)) {
             // It's not part of the result collection but now matches they query, add it and resort
             _addModelAtCorrectIndex(m);
@@ -109,7 +106,6 @@ var DbCollectionNode = {
 
           _this.flagOutputDirty('count');
           _this.flagOutputDirty('firstItemId');
-          _this.flagOutputDirty('isEmpty');
         }
       }
     };
@@ -157,17 +153,6 @@ var DbCollectionNode = {
         }
       }
     },
-    isEmpty: {
-      type: 'boolean',
-      displayName: 'Is Empty',
-      group: 'General',
-      getter: function () {
-        if (this._internal.collection) {
-          return this._internal.collection.size() === 0;
-        }
-        return true;
-      }
-    },
     count: {
       type: 'number',
       displayName: 'Count',
@@ -204,7 +189,6 @@ var DbCollectionNode = {
     setCollection: function (collection) {
       this.bindCollection(collection);
       this.flagOutputDirty('firstItemId');
-      this.flagOutputDirty('isEmpty');
       this.flagOutputDirty('items');
       this.flagOutputDirty('count');
     },
@@ -285,7 +269,8 @@ var DbCollectionNode = {
           }
           if(count !== undefined) {
             this._internal.storageSettings.storageTotalCount = count;
-            if (this.hasOutput('storageTotalCount')) this.flagOutputDirty('storageTotalCount');
+            if(this.hasOutput('storageTotalCount')) 
+              this.flagOutputDirty('storageTotalCount');
           }
           this.setCollection(_c);
           this.sendSignalOnOutput('fetched');

packages/noodl-runtime/src/nodes/std-library/data/dbmodelnode2.js

@@ -2,10 +2,10 @@
 
 const { Node, EdgeTriggeredInput } = require('../../../../noodl-runtime');
 
-const Model = require('../../../model');
+var Model = require('../../../model');
 const CloudStore = require('../../../api/cloudstore');
 
-const ModelNodeDefinition = {
+var ModelNodeDefinition = {
   name: 'DbModel2',
   docs: 'https://docs.noodl.net/nodes/data/cloud-data/record',
   displayNodeName: 'Record',
@@ -21,11 +21,11 @@ const ModelNodeDefinition = {
     }
   ],
   initialize: function () {
-    const internal = this._internal;
+    var internal = this._internal;
     internal.inputValues = {};
     internal.relationModelIds = {};
 
-    const _this = this;
+    var _this = this;
     this._internal.onModelChangedCallback = function (args) {
       if (_this.isInputConnected('fetch')) return;
 
@@ -109,18 +109,13 @@ const ModelNodeDefinition = {
       displayName: 'Id',
       group: 'General',
       set: function (value) {
-        if (value instanceof Model) {
+        if (value instanceof Model) value = value.getId();
         // Can be passed as model as well
-          value = value.getId();
+        else if (typeof value === 'object') value = Model.create(value).getId(); // If this is an js object, dereference it
-        } else if (typeof value === 'object') {
-          // If this is an js object, dereference it
-          value = Model.create(value).getId();
-        }
 
         this._internal.modelId = value; // Wait to fetch data
-        if (this.isInputConnected('fetch') === false) {
+        if (this.isInputConnected('fetch') === false) this.setModelID(value);
-          this.setModelID(value);
+        else {
-        } else {
           this.flagOutputDirty('id');
         }
       }
@@ -143,10 +138,9 @@ const ModelNodeDefinition = {
       this.setModel(model);
     },
     setModel: function (model) {
-      if (this._internal.model) {
+      if (this._internal.model)
         // Remove old listener if existing
         this._internal.model.off('change', this._internal.onModelChangedCallback);
-      }
 
       this._internal.model = model;
       this.flagOutputDirty('id');
@@ -154,9 +148,7 @@ const ModelNodeDefinition = {
 
       // We have a new model, mark all outputs as dirty
       for (var key in model.data) {
-        if (this.hasOutput('prop-' + key)) {
+        if (this.hasOutput('prop-' + key)) this.flagOutputDirty('prop-' + key);
-          this.flagOutputDirty('prop-' + key);
-        }
       }
       this.sendSignalOnOutput('fetched');
     },
@@ -192,7 +184,7 @@ const ModelNodeDefinition = {
       }
     },
     scheduleFetch: function () {
-      const _this = this;
+      var _this = this;
       const internal = this._internal;
 
       this.scheduleOnce('Fetch', function () {
@@ -207,13 +199,12 @@ const ModelNodeDefinition = {
           collection: internal.collectionId,
           objectId: internal.modelId, // Get the objectId part of the model id
           success: function (response) {
-            const model = cloudstore._fromJSON(response, internal.collectionId);
+            var model = cloudstore._fromJSON(response, internal.collectionId);
             if (internal.model !== model) {
               // Check if we need to change model
-              if (internal.model) {
+              if (internal.model)
                 // Remove old listener if existing
                 internal.model.off('change', internal.onModelChangedCallback);
-              }
 
               internal.model = model;
               model.on('change', internal.onModelChangedCallback);
@@ -222,10 +213,8 @@ const ModelNodeDefinition = {
 
             delete response.objectId;
 
-            for (const key in response) {
+            for (var key in response) {
-              if (_this.hasOutput('prop-' + key)) {
+              if (_this.hasOutput('prop-' + key)) _this.flagOutputDirty('prop-' + key);
-                _this.flagOutputDirty('prop-' + key);
-              }
             }
 
             _this.sendSignalOnOutput('fetched');
@@ -237,6 +226,7 @@ const ModelNodeDefinition = {
       });
     },
     scheduleStore: function () {
+      var _this = this;
       var internal = this._internal;
       if (!internal.model) return;
 
@@ -257,6 +247,8 @@ const ModelNodeDefinition = {
         });
     },
     registerInputIfNeeded: function (name) {
+      var _this = this;
+
       if (this.hasInput(name)) {
         return;
       }
@@ -336,7 +328,8 @@ function updatePorts(nodeId, parameters, editorConnection, graphModel) {
         var p = props[key];
         if (ports.find((_p) => _p.name === key)) continue;
 
-        if (p.type !== 'Relation') {
+        if (p.type === 'Relation') {
+        } else {
           // Other schema type ports
           const _typeMap = {
             String: 'string',
@@ -380,16 +373,16 @@ module.exports = {
     function _managePortsForNode(node) {
       updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
 
-      node.on('parameterUpdated', function () {
+      node.on('parameterUpdated', function (event) {
         updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
       });
 
-      graphModel.on('metadataChanged.dbCollections', function () {
+      graphModel.on('metadataChanged.dbCollections', function (data) {
         CloudStore.invalidateCollections();
         updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
       });
 
-      graphModel.on('metadataChanged.systemCollections', function () {
+      graphModel.on('metadataChanged.systemCollections', function (data) {
         CloudStore.invalidateCollections();
         updatePorts(node.id, node.parameters, context.editorConnection, graphModel);
       });

packages/noodl-runtime/src/nodes/std-library/data/setdbmodelpropertiesnode.js

@@ -75,10 +75,10 @@ var SetDbModelPropertiedNodeDefinition = {
             _this.setError('Missing Record Id');
             return;
           }
+          var model = internal.model;
 
-          const model = internal.model;
+          for (var i in internal.inputValues) {
-          for (const key in internal.inputValues) {
+            model.set(i, internal.inputValues[i], { resolve: true });
-            model.set(key, internal.inputValues[key], { resolve: true });
           }
 
           CloudStore.forScope(_this.nodeScope.modelScope).save({

packages/noodl-runtime/src/nodes/std-library/datetostring.js

@@ -31,6 +31,8 @@ const DateToStringNode = {
 
         this._internal.currentInput = _value;
         this._format();
+        this.flagOutputDirty('currentValue');
+        this.sendSignalOnOutput('inputChanged');
       }
     }
   },
@@ -47,23 +49,16 @@ const DateToStringNode = {
       type: 'signal',
       displayName: 'Date Changed',
       group: 'Signals'
-    },
-    onError: {
-      type: 'signal',
-      displayName: 'Invalid Date',
-      group: 'Signals'
     }
   },
   methods: {
     _format() {
-      try {
       const t = this._internal.currentInput;
       const format = this._internal.formatString;
       const date = ('0' + t.getDate()).slice(-2);
       const month = ('0' + (t.getMonth() + 1)).slice(-2);
       const monthShort = new Intl.DateTimeFormat('en-US', { month: 'short' }).format(t);
       const year = t.getFullYear();
-        const yearShort = year.toString().substring(2);
       const hours = ('0' + t.getHours()).slice(-2);
       const minutes = ('0' + t.getMinutes()).slice(-2);
       const seconds = ('0' + t.getSeconds()).slice(-2);
@@ -73,19 +68,9 @@ const DateToStringNode = {
         .replace(/\{month\}/g, month)
         .replace(/\{monthShort\}/g, monthShort)
         .replace(/\{year\}/g, year)
-          .replace(/\{yearShort\}/g, yearShort)
         .replace(/\{hours\}/g, hours)
         .replace(/\{minutes\}/g, minutes)
         .replace(/\{seconds\}/g, seconds);
-      } catch (error) {
-        // Set the output to be blank, makes it easier to handle.
-        this._internal.dateString = '';
-        this.flagOutputDirty('onError');
-      }
-
-      // Flag that the value have changed
-      this.flagOutputDirty('currentValue');
-      this.sendSignalOnOutput('inputChanged');
     }
   }
 };

packages/noodl-runtime/src/nodes/std-library/stringformat.js

@@ -2,8 +2,6 @@ const StringFormatDefinition = {
   name: 'String Format',
   docs: 'https://docs.noodl.net/nodes/string-manipulation/string-format',
   category: 'String Manipulation',
-  usePortAsLabel: 'format',
-  portLabelTruncationMode: 'length',
   initialize() {
     const internal = this._internal;
     internal.format = '';

packages/noodl-types/package.json

@@ -3,6 +3,6 @@
   "version": "2.7.0",
   "main": "src/index.d.ts",
   "description": "",
-  "author": "Fluxscape <contact@fluxscape.io>",
+  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://fluxscape.io"
+  "homepage": "https://noodl.net"
 }

packages/noodl-viewer-cloud/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@noodl/cloud-runtime",
-  "author": "Fluxscape <contact@fluxscape.io>",
+  "author": "Noodl <info@noodl.net>",
-  "homepage": "https://fluxscape.io",
+  "homepage": "https://noodl.net",
   "version": "0.6.3",
   "license": "MIT",
   "main": "dist/main.js",

packages/noodl-viewer-cloud/static/viewer/global.d.ts.keep

@@ -74,59 +74,6 @@ declare namespace Noodl {
    */
   const Object: any;
 
-  type RecordQuery<T> =
-    {
-      lessThan: T
-    } |
-    {
-      lessThanOrEqualTo: T
-    } |
-    {
-      greaterThan: T
-    } |
-    {
-      greaterThanOrEqualTo: T
-    } |
-    {
-      equalTo: T
-    } |
-    {
-      notEqualTo: T
-    } |
-    {
-      containedIn: T
-    } |
-    {
-      notContainedIn : T
-    } |
-    {
-      exists: T
-    } |
-    {
-      matchesRegex: T
-    } |
-    {
-      text: T
-    } |
-    {
-      idEqualTo: T
-    } |
-    {
-      idContainedIn: T
-    } |
-    {
-      pointsTo: T
-    } |
-    {
-      relatedTo: T
-    };
-
-  type RecordQueryField<T> = T extends RecordQuery<any> ?
-    { [K in keyof T]: { [P in K]: T[P] } & Partial<Record<Exclude<keyof T, K>, never>> }[keyof T]
-    : never;
-
-  type RecordSortKey<T extends string> = (`${T}` | `-${T}`)[];
-
   interface RecordsApi {
     /**
      * This is an async function that will query the database using the query
@@ -168,17 +115,15 @@ declare namespace Noodl {
      *  })
      * ```
      */
-    query<TClassName extends RecordClassName>(
+    query(
-      className: TClassName,
+      className: RecordClassName,
-      query?:
+      query?: any,
-        RecordQueryField<{ [K in keyof DatabaseSchema[TClassName]]: RecordQuery<any> }> |
-        { and: RecordQueryField<{ [K in keyof DatabaseSchema[TClassName]]: RecordQuery<any> }>[] },
       options?: {
         limit?: number;
         skip?: number;
-        sort?: string | RecordSortKey<keyof DatabaseSchema[TClassName]>;
+        sort?: string[];
-        include?: string | (keyof DatabaseSchema[TClassName])[];
+        include?: any;
-        select?: string | (keyof DatabaseSchema[TClassName])[];
+        select?: any;
       }
     ): Promise<any>;
 
@@ -227,9 +172,6 @@ declare namespace Noodl {
       objectOrId: string | { getId(): string; },
       options?: {
         className?: RecordClassName;
-        keys?: string[] | string;
-        include?: string[] | string;
-        excludeKeys?: string[] | string;
       }
     ): Promise<any>;
 

packages/noodl-viewer-cloud/webpack-configs/webpack.viewer.dev.js

@@ -1,8 +1,8 @@
-const { merge } = require('webpack-merge');
+const { merge } = require("webpack-merge");
-const common = require('./webpack.viewer.common.js');
+const common = require("./webpack.viewer.common.js");
 
 module.exports = merge(common, {
-  mode: 'development',
+  mode: "development",
-  devtool: 'inline-source-map',
+  devtool: "inline-source-map",
-  watch: true
+  watch: true,
 });

packages/noodl-viewer-cloud/webpack-configs/webpack.viewer.prod.js

@@ -2,6 +2,5 @@ const { merge } = require('webpack-merge');
 const common = require('./webpack.viewer.common.js');
 
 module.exports = merge(common, {
-  mode: 'production',
+  mode: 'production'
-  devtool: 'source-map'
 });

packages/noodl-viewer-react/src/api/navigation.js

@@ -2,18 +2,12 @@ const { RouterHandler } = require('../nodes/navigation/router-handler');
 const NoodlRuntime = require('@noodl/runtime');
 
 const navigation = {
-  /**
-   * This is set by "packages/noodl-viewer-react/src/noodl-js-api.js"
-   * @type {NoodlRuntime}
-   */
-  _noodlRuntime: undefined,
-
   async showPopup(componentPath, params) {
     return new Promise((resolve) => {
       navigation._noodlRuntime.context.showPopup(componentPath, params, {
         onClosePopup: (action, results) => {
           resolve({
-            action: action?.replace('closeAction-', ''),
+            action: action.replace('closeAction-', ''),
             parameters: results
           });
         }

packages/noodl-viewer-react/src/components/controls/Button/Button.tsx

@@ -8,8 +8,6 @@ export interface ButtonProps extends Noodl.ReactProps {
   enabled: boolean;
   buttonType: 'button' | 'submit';
 
-  attrs: React.Attributes;
-
   textStyle: Noodl.TextStyle;
 
   useLabel: boolean;
@@ -98,7 +96,6 @@ export function Button(props: ButtonProps) {
 
   return (
     <button
-      {...props.attrs}
       className={className}
       disabled={!props.enabled}
       {...Utils.controlEvents(props)}

packages/noodl-viewer-react/src/components/controls/Checkbox/Checkbox.tsx

@@ -9,8 +9,6 @@ export interface CheckboxProps extends Noodl.ReactProps {
   enabled: boolean;
   checked: boolean;
 
-  attrs: React.Attributes;
-
   useLabel: boolean;
   label: string;
   labelSpacing: string;
@@ -49,7 +47,6 @@ export function Checkbox(props: CheckboxProps) {
   Layout.align(style, props);
 
   const inputProps = {
-    ...props.attrs,
     id: props.id,
     className: [props.className, 'ndl-controls-checkbox-2'].join(' '),
     disabled: !props.enabled,

packages/noodl-viewer-react/src/components/controls/RadioButton/RadioButton.tsx

@@ -10,8 +10,6 @@ export interface RadioButtonProps extends Noodl.ReactProps {
   enabled: boolean;
   value: string;
 
-  attrs: React.Attributes;
-
   useLabel: boolean;
   label: string;
   labelSpacing: string;
@@ -49,7 +47,6 @@ export function RadioButton(props: RadioButtonProps) {
   props.checkedChanged && props.checkedChanged(radioButtonGroup ? radioButtonGroup.selected === props.value : false);
 
   const inputProps = {
-    ...props.attrs,
     id: props.id,
     disabled: !props.enabled,
     className: [props.className, 'ndl-controls-radio-2'].join(' '),

packages/noodl-viewer-react/src/components/controls/Select/Select.tsx

@@ -12,8 +12,6 @@ export interface SelectProps extends Noodl.ReactProps {
   textStyle: Noodl.TextStyle;
   items: TSFixme;
 
-  attrs: React.Attributes;
-
   placeholder: string;
   placeholderOpacity: string;
 
@@ -83,7 +81,6 @@ export function Select(props: SelectProps) {
   }
 
   const inputProps = {
-    ...props.attrs,
     id: props.id,
     className: props.className,
     style: {

packages/noodl-viewer-react/src/components/controls/Slider/Slider.tsx

@@ -2,15 +2,13 @@ import React, { useEffect, useState } from 'react';
 
 import Layout from '../../../layout';
 import Utils from '../../../nodes/controls/utils';
-import { Noodl } from '../../../types';
+import { Noodl, Slot } from '../../../types';
 
 export interface SliderProps extends Noodl.ReactProps {
   _nodeId: string;
   id: string;
   enabled: boolean;
 
-  attrs: React.Attributes;
-
   value: number;
   min: number;
   max: number;
@@ -26,6 +24,8 @@ export interface SliderProps extends Noodl.ReactProps {
 
   onClick: () => void;
   updateOutputValue: (value: number) => void;
+
+  children: Slot;
 }
 
 function _styleTemplate(_class: string, props: SliderProps) {
@@ -105,7 +105,6 @@ export function Slider(props: SliderProps) {
   const className = `ndl-controls-range2 ${instanceClassId} ${props.className ? props.className : ''} `;
 
   const inputProps: React.InputHTMLAttributes<HTMLInputElement> = {
-    ...props.attrs,
     id: props.id,
     style: {
       width: '100%',
@@ -171,7 +170,9 @@ export function Slider(props: SliderProps) {
   return (
     <div style={divStyle}>
       <div style={trackStyle} />
-      <div style={thumbStyle} />
+      <div style={thumbStyle}>
+        {props.children}
+      </div>
       <input
         className={className}
         {...Utils.controlEvents(props)}

packages/noodl-viewer-react/src/components/controls/TextInput/TextInput.tsx

@@ -17,8 +17,6 @@ export interface TextInputProps extends Noodl.ReactProps {
   type: 'text' | 'textArea' | 'email' | 'number' | 'password' | 'url';
   textStyle: Noodl.TextStyle;
 
-  attrs: React.Attributes;
-
   enabled: boolean;
 
   placeholder: string;
@@ -151,7 +149,6 @@ export class TextInput extends React.Component<TextInputProps, State> {
     inputStyles.color = props.noodlNode.context.styles.resolveColor(inputStyles.color);
 
     const inputProps = {
-      ...props.attrs,
       id: props.id,
       value: this.state.value,
       ...Utils.controlEvents(props),

packages/noodl-viewer-react/src/components/visual/Columns/Columns.tsx

@@ -7,8 +7,6 @@ export interface ColumnsProps extends Noodl.ReactProps {
   marginX: string;
   marginY: string;
 
-  attrs: React.Attributes;
-
   justifyContent: 'flex-start' | 'flex-end' | 'center';
   direction: 'row' | 'column';
   minWidth: string;
@@ -117,10 +115,7 @@ export function Columns(props: ColumnsProps) {
 
   // ForEachCompoent breaks the layout but is needed to send onMount/onUnmount
   if (!Array.isArray(props.children)) {
-    // @ts-expect-error props.children.type is any
+    children = [props.children];
-    if (props.children.type !== ForEachComponent) {
-      children = [props.children]
-    }
   } else {
     children = props.children.filter((child) => child.type !== ForEachComponent);
     forEachComponent = props.children.find((child) => child.type === ForEachComponent);
@@ -128,11 +123,9 @@ export function Columns(props: ColumnsProps) {
 
   return (
     <div
-      {...props.attrs}
       className={['columns-container', props.className].join(' ')}
       ref={containerRef}
       style={{
-        visibility: containerWidth === null ? "hidden" : "visible",
         marginTop: parseFloat(props.marginY) * -1,
         marginLeft: parseFloat(props.marginX) * -1,
         display: 'flex',

packages/noodl-viewer-react/src/components/visual/Group/Group.tsx

@@ -19,8 +19,6 @@ BScroll.use(Slide);
 export interface GroupProps extends Noodl.ReactProps {
   as?: keyof JSX.IntrinsicElements | React.ComponentType<unknown>;
 
-  attrs: React.Attributes;
-
   scrollSnapEnabled: boolean;
   showScrollbar: boolean;
   scrollEnabled: boolean;
@@ -273,7 +271,6 @@ export class Group extends React.Component<GroupProps> {
       <Component
         // @ts-expect-error Lets hope that the type passed here is always static!
         className={props.className}
-        {...props.attrs}
         {...props.dom}
         {...PointerListeners(props)}
         style={style}

packages/noodl-viewer-react/src/components/visual/Image/Image.tsx

@@ -10,7 +10,6 @@ export interface ImageProps extends Noodl.ReactProps {
     src: string;
     onLoad?: () => void;
   };
-  attrs: React.Attributes;
 }
 
 export function Image(props: ImageProps) {
@@ -31,5 +30,5 @@ export function Image(props: ImageProps) {
     }
   }
 
-  return <img {...props.attrs} className={props.className} {...props.dom} {...PointerListeners(props)} style={style} />;
+  return <img className={props.className} {...props.dom} {...PointerListeners(props)} style={style} />;
 }

packages/noodl-viewer-react/src/components/visual/Text/Text.tsx

@@ -7,8 +7,6 @@ import { Noodl } from '../../../types';
 export interface TextProps extends Noodl.ReactProps {
   as?: keyof JSX.IntrinsicElements | React.ComponentType<unknown>;
 
-  attrs: React.Attributes;
-
   textStyle: Noodl.TextStyle;
   text: string;
 
@@ -50,7 +48,6 @@ export function Text(props: TextProps) {
   return (
     <Component
       className={['ndl-visual-text', props.className].join(' ')}
-      {...props.attrs}
       {...props.dom}
       {...PointerListeners(props)}
       style={style}

packages/noodl-viewer-react/src/nodes-deprecated/std-library/data/variablenode.js

@@ -1,9 +1,10 @@
 'use strict';
 
 const { Node } = require('@noodl/runtime');
-const Model = require('@noodl/runtime/src/model');
 
-const VariableNodeDefinition = {
+var Model = require('@noodl/runtime/src/model');
+
+var VariableNodeDefinition = {
   name: 'Variable',
   docs: 'https://docs.noodl.net/nodes/data/variable',
   category: 'Data',

packages/noodl-viewer-react/src/nodes/controls/button.ts

@@ -30,24 +30,11 @@ const ButtonNode = {
     ]
   },
   initialize() {
-    this.props.attrs = {};
     this.props.layout = 'row'; //Used to tell child nodes what layout to expect
   },
   getReactComponent() {
     return Button;
   },
-  inputs: {
-    testId: {
-      index: 100009,
-      displayName: 'Test ID Attribute',
-      group: 'Advanced HTML',
-      type: 'string',
-      set(value) {
-        this.props.attrs["data-testid"] = value;
-        this.forceUpdate();
-      }
-    }
-  },
   inputCss: {
     backgroundColor: {
       index: 100,

packages/noodl-viewer-react/src/nodes/controls/checkbox.ts

@@ -31,7 +31,6 @@ const CheckBoxNode = {
     ]
   },
   initialize() {
-    this.props.attrs = {};
     this.props.sizeMode = 'explicit';
     this.props.id = 'input-' + guid();
     this.props.checked = this._internal.checked = false;
@@ -95,16 +94,6 @@ const CheckBoxNode = {
         this.flagOutputDirty('checked');
         this._updateVisualState();
       }
-    },
-    testId: {
-      index: 100009,
-      displayName: 'Test ID Attribute',
-      group: 'Advanced HTML',
-      type: 'string',
-      set(value) {
-        this.props.attrs["data-testid"] = value;
-        this.forceUpdate();
-      }
     }
   },
   inputCss: {

packages/noodl-viewer-react/src/nodes/controls/options.ts

@@ -31,7 +31,6 @@ const OptionsNode = {
     ]
   },
   initialize: function () {
-    this.props.attrs = {};
     this._itemsChanged = () => {
       this.forceUpdate();
     };
@@ -91,16 +90,6 @@ const OptionsNode = {
           this.flagOutputDirty('value');
         }
       }
-    },
-    testId: {
-      index: 100009,
-      displayName: 'Test ID Attribute',
-      group: 'Advanced HTML',
-      type: 'string',
-      set(value) {
-        this.props.attrs["data-testid"] = value;
-        this.forceUpdate();
-      }
     }
   },
   inputProps: {

packages/noodl-viewer-react/src/nodes/controls/radiobutton.ts

@@ -31,7 +31,6 @@ const RadioButtonNode = {
     ]
   },
   initialize() {
-    this.props.attrs = {};
     this.props.sizeMode = 'explicit';
     this.props.id = 'input-' + guid();
 
@@ -62,16 +61,6 @@ const RadioButtonNode = {
       set(value) {
         this.setStyle({ backgroundColor: value }, 'fill');
       }
-    },
-    testId: {
-      index: 100009,
-      displayName: 'Test ID Attribute',
-      group: 'Advanced HTML',
-      type: 'string',
-      set(value) {
-        this.props.attrs["data-testid"] = value;
-        this.forceUpdate();
-      }
     }
   },
   inputProps: {

packages/noodl-viewer-react/src/nodes/controls/slider.ts

@@ -11,7 +11,6 @@ const RangeNode = {
   name: 'net.noodl.controls.range',
   displayNodeName: 'Slider',
   docs: 'https://docs.noodl.net/nodes/ui-controls/slider',
-  allowChildren: false,
   noodlNodeAsProp: true,
   connectionPanel: {
     groupPriority: [
@@ -27,7 +26,6 @@ const RangeNode = {
     ]
   },
   initialize() {
-    this.props.attrs = {};
     this.props.sizeMode = 'contentHeight';
     this.props.id = 'input-' + guid();
 
@@ -68,16 +66,6 @@ const RangeNode = {
       set(value) {
         this._setInputValue(value);
       }
-    },
-    testId: {
-      index: 100009,
-      displayName: 'Test ID Attribute',
-      group: 'Advanced HTML',
-      type: 'string',
-      set(value) {
-        this.props.attrs["data-testid"] = value;
-        this.forceUpdate();
-      }
     }
   },
   outputs: {