fix(runtime): Close Popup node with no actions causing error

https://github.com/fluxscape/fluxscape/pull/78

package-lock.json

@@ -48981,7 +48981,7 @@
     },
     "packages/noodl-editor": {
       "name": "fluxscape-editor",
-      "version": "1.2.0",
+      "version": "1.1.0",
       "dependencies": {
         "@electron/remote": "^2.1.2",
         "@jaames/iro": "^5.5.2",

packages/noodl-editor/package.json

@@ -4,7 +4,7 @@
   "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.1.0",
   "main": "src/main/main.js",
   "scripts": {
     "build": "npx ts-node -P ./tsconfig.build.json ./scripts/build.ts",

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/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/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/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/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,5 +1,4 @@
 import React, { RefObject } from 'react';
-import { platform } from '@noodl/platform';
 
 import { ProjectModel } from '@noodl-models/projectmodel';
 
@@ -65,9 +64,7 @@ export function DeployPopup(props: DeployPopupProps) {
 }
 
 function FluxscapeDeployTab() {
-  const params = {
+  const params = {};
-    version: platform.getVersion()
-  };
 
   const projectId = ProjectModel.instance.id;
   if (projectId) {

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/componentspanel/ComponentsPanel.ts

@@ -991,7 +991,7 @@ export class ComponentsPanelView extends View {
 
     // Find references
     const nodeReference = HACK_findNodeReference(scope.comp.name);
-    const nodeReferencesText = `Used in ~${nodeReference?.referenaces?.length || 0} places`;
+    const nodeReferencesText = `Used in ${nodeReference?.referenaces?.length || 0} places`;
 
     items = items.concat([
       {
@@ -1122,7 +1122,7 @@ 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`;
+      const nodeReferencesText = `Used in ${nodeReference?.referenaces?.length || 0} places`;
 
       items = items.concat([{
         label: nodeReferencesText

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

@@ -5,8 +5,10 @@ import { useSidePanelKeyboardCommands } from '@noodl-hooks/useKeyboardCommands';
 import classNames from 'classnames';
 import React, { useEffect, useRef, useState } from 'react';
 
+import { ComponentModel } from '@noodl-models/componentmodel';
+import { NodeGraphNode } from '@noodl-models/nodegraphmodel';
 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 +21,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 +56,7 @@ export function SearchPanel() {
     }
   }, [debouncedSearchTerm]);
 
-  function onSearchItemClicked(searchResult: SearchResult) {
+  function onSearchItemClicked(searchResult: SearchResultItem) {
     if (searchResult.type === 'Component') {
       NodeGraphContextTmp.switchToComponent(searchResult.componentTarget, {
         breadcrumbs: false,
@@ -97,9 +99,21 @@ export function SearchPanel() {
   );
 }
 
+type SearchResultItem = {
+  componentTarget: ComponentModel;
+  label: string;
+  nodeTarget: NodeGraphNode;
+  type: string;
+  userLabel: string;
+};
+
 type SearchItemProps = {
-  component: ReturnType<typeof performSearch>[0];
+  component: {
-  onSearchItemClicked: (item: SearchResult) => void;
+    componentName: string;
+    componentId: string;
+    results: SearchResultItem[];
+  };
+  onSearchItemClicked: (item: SearchResultItem) => void;
 };
 
 function SearchItem({ component, onSearchItemClicked }: SearchItemProps) {
@@ -116,11 +130,11 @@ function SearchItem({ component, onSearchItemClicked }: SearchItemProps) {
     <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']
           )}
+          key={index}
           onClick={() => onSearchItemClicked(result)}
         >
           <Label variant={TextType.Proud}>

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

@@ -263,9 +263,7 @@ 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
@@ -277,16 +275,6 @@ class CloudStore {
       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('&') : ''),
       {
@@ -471,15 +459,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,86 +532,54 @@ 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
-  // 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();
-  if (typeof data === 'object' && data !== null) {
+    for (var key in data) {
-    // Try to get the model by id, if it is defined, otherwise we create a new unique id.
+      m.set(key, _deserializeJSON(data[key], undefined, modelScope));
-    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 m;
-  }
+  } else return data;
-
-  return data;
 }
 
 function _fromJSON(item, collectionName, modelScope) {
   const modelStore = modelScope || Model;
 
-  // Try to get the model by the object id (record) or id, otherwise we create a new unique id.
+  const model = modelStore.get(item.objectId);
-  const model = modelStore.get(item.objectId || item.id);
   model._class = collectionName;
 
   let schema = undefined;
@@ -644,8 +593,7 @@ function _fromJSON(item, collectionName, modelScope) {
     }
 
     const _type = schema && schema.properties && schema.properties[key] ? schema.properties[key].type : undefined;
-    const nestedValue = _deserializeJSON(item[key], _type, modelScope);
+    model.set(key, _deserializeJSON(item[key], _type, modelScope));
-    model.set(key, nestedValue);
   }
 
   return model;

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

@@ -112,9 +112,7 @@ function createRecordsAPI(modelScope) {
      * @param {string | { getId(): string; }} objectOrId
      * @param {{
      *    className: string;
-     *    keys?: string[] | string;
      *    include?: string[] | string;
-     *    excludeKeys?: string[] | string;
      * }} options
      * @returns {Promise<unknown>}
      */
@@ -131,9 +129,7 @@ function createRecordsAPI(modelScope) {
         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);
             resolve(record);

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-viewer-cloud/static/viewer/global.d.ts.keep

@@ -227,9 +227,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-react/src/api/navigation.js

@@ -2,18 +2,17 @@ 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, {
+        senderNode: this.nodeScope.componentOwner,
+        /**
+         * @param {string | undefined} action
+         * @param {*} results
+         */
         onClosePopup: (action, results) => {
           resolve({
-            action: action?.replace('closeAction-', ''),
+            action: (action || '').replace('closeAction-', ''),
             parameters: results
           });
         }

packages/noodl-viewer-react/src/nodes/navigation/closepopup.js

@@ -40,8 +40,8 @@ const ClosePopupNode = {
       this._internal.closeCallback = cb;
     },
     scheduleClose: function () {
-      const _this = this;
+      var _this = this;
-      const internal = this._internal;
+      var internal = this._internal;
       if (!internal.hasScheduledClose) {
         internal.hasScheduledClose = true;
         this.scheduleAfterInputsHaveUpdated(function () {
@@ -113,8 +113,9 @@ module.exports = {
         var closeActions = node.parameters['closeActions'];
         if (closeActions) {
           closeActions = closeActions ? closeActions.split(',') : undefined;
-          for (const i in closeActions) {
+          for (var i in closeActions) {
-            const p = closeActions[i];
+            var p = closeActions[i];
+
             ports.push({
               type: 'signal',
               plug: 'input',

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

@@ -3,17 +3,6 @@ const CloudStore = require('@noodl/runtime/src/api/cloudstore');
 
 ('use strict');
 
-/**
- * @param {string} path
- * @param {{
- *  endpoint: string;
- *  method: string;
- *  appId: string;
- *  content: any;
- *  success: (json: object) => void;
- *  error: (json: object | undefined) => void;
- * }} options
- */
 function _makeRequest(path, options) {
   var xhr = new XMLHttpRequest();
 
@@ -26,9 +15,7 @@ function _makeRequest(path, options) {
 
       if (xhr.status === 200 || xhr.status === 201) {
         options.success(json);
-      } else {
+      } else options.error(json);
-        options.error(json);
-      }
     }
   };
 
@@ -204,7 +191,7 @@ var CloudFunctionNode = {
           this.sendSignalOnOutput('success');
         },
         error: (e) => {
-          const error = typeof e === 'string' ? e : e?.error || 'Failed running cloud function.';
+          const error = typeof e === 'string' ? e : e.error || 'Failed running cloud function.';
           this._internal.lastCallResult = {
             status: 'failure',
             error

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

@@ -1,24 +1,20 @@
 'use strict';
 
+const { Node } = require('@noodl/runtime');
+
 const Model = require('@noodl/runtime/src/model');
 const Collection = require('@noodl/runtime/src/collection');
 
-const SetVariableNodeDefinition = {
+var SetVariableNodeDefinition = {
   name: 'Set Variable',
   docs: 'https://docs.noodl.net/nodes/data/variable/set-variable',
   category: 'Data',
   usePortAsLabel: 'name',
   color: 'data',
   initialize: function () {
-    const internal = this._internal;
+    var internal = this._internal;
-    internal.variablesModel = Model.get('--ndl--global-variables');
-  },
-  getInspectInfo() {
-    if (this._internal.name) {
-      return this._internal.variablesModel.get(this._internal.name);
-    }
 
-    return '[No value set]';
+    internal.variablesModel = Model.get('--ndl--global-variables');
   },
   outputs: {
     done: {
@@ -78,22 +74,17 @@ const SetVariableNodeDefinition = {
       if (this.hasScheduledStore) return;
       this.hasScheduledStore = true;
 
-      const internal = this._internal;
+      var internal = this._internal;
       this.scheduleAfterInputsHaveUpdated(function () {
         this.hasScheduledStore = false;
 
-        let value = internal.setWith === 'emptyString' ? '' : internal.value;
+        var value = internal.setWith === 'emptyString' ? '' : internal.value;
-
-        // Can set arrays with "id" or array
-        if (internal.setWith === 'object' && typeof value === 'string') value = Model.get(value);
-
-        // Can set arrays with "id" or array
-        if (internal.setWith === 'array' && typeof value === 'string') value = Collection.get(value);
 
+        if (internal.setWith === 'object' && typeof value === 'string') value = Model.get(value); // Can set arrays with "id" or array
+        if (internal.setWith === 'array' && typeof value === 'string') value = Collection.get(value); // Can set arrays with "id" or array
         if (internal.setWith === 'boolean') value = !!value;
 
-        // use forceChange to always trigger Variable nodes to send the value on
+        //use forceChange to always trigger Variable nodes to send the value on their output, even if it's the same value twice
-        // their output, even if it's the same value twice
         internal.variablesModel.set(internal.name, value, {
           forceChange: true
         });
@@ -105,11 +96,10 @@ const SetVariableNodeDefinition = {
         return;
       }
 
-      if (name === 'value') {
+      if (name === 'value')
         this.registerInput(name, {
           set: this.setValue.bind(this)
         });
-      }
     }
   }
 };

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

@@ -274,9 +274,6 @@ declare namespace Noodl {
       objectOrId: string | { getId(): string; },
       options?: {
         className?: RecordClassName;
-        keys?: string[] | string;
-        include?: string[] | string;
-        excludeKeys?: string[] | string;
       }
     ): Promise<any>;