From 63c1be323963a393776bb16291a698419f6ce182 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Wed, 19 Jan 2022 10:47:11 -0800
Subject: [PATCH 01/54] export: Fix node header key typo.  `Notes` header was
 not being exported poroperly.

---
 build/app/view/netcreate/export-logic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/app/view/netcreate/export-logic.js b/build/app/view/netcreate/export-logic.js
index 12a6efb03..b775dd9cf 100644
--- a/build/app/view/netcreate/export-logic.js
+++ b/build/app/view/netcreate/export-logic.js
@@ -35,7 +35,7 @@ const NODEKEY_LABELS = {
   'label': 'Label',
   'attributes:Node_Type': 'Attributes:Node_Type',
   'attributes:Extra Info': 'Attributes:Extra Info',
-  'attributes:Nodes': 'Attributes:Notes',
+  'attributes:Notes': 'Attributes:Notes',
   'degrees': 'Degrees',
   'meta:created': 'Meta:Created',
   'meta:updated': 'Meta:Updated'

From 69a181ed4b9536cc9d98b28d26ebbb35961e7f81 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 10:17:50 -0800
Subject: [PATCH 02/54] toml: Add `IsAdmin` to settings so NodeSelector and
 More can use it to hide/enable features.

---
 build/app/settings.js                                | 6 ++++++
 build/app/view/netcreate/components/NodeSelector.jsx | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/app/settings.js b/build/app/settings.js
index 49e56d607..3576ef4f2 100644
--- a/build/app/settings.js
+++ b/build/app/settings.js
@@ -63,6 +63,12 @@ let RELOAD_TIMER = null;
 /*/ MOD.CurrentTime = () => {
       return DATE.toDateString();
     };
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/
+/*/ MOD.IsAdmin = () => {
+      return (MOD.EJSProp('client').ip === '127.0.0.1') ||
+        location.href.includes('admin=true');
+    }
 
 /// SERVER-PROVIDED PROPERTIES ////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/build/app/view/netcreate/components/NodeSelector.jsx b/build/app/view/netcreate/components/NodeSelector.jsx
index 3c26815f7..eb07fff87 100644
--- a/build/app/view/netcreate/components/NodeSelector.jsx
+++ b/build/app/view/netcreate/components/NodeSelector.jsx
@@ -132,7 +132,7 @@ const SETTINGS     = require('settings');
 
 const thisIdentifier = 'nodeSelector';   // SELECTION identifier
 
-const isLocalHost  = (SETTINGS.EJSProp('client').ip === '127.0.0.1') || (location.href.includes('admin=true'));
+const isAdmin  = SETTINGS.IsAdmin();
 
 var   UDATA        = null;
 
@@ -1045,8 +1045,8 @@ class NodeSelector extends UNISYS.Component {
             <FormGroup row className="text-left" style={{
               padding: '10px 5px', margin: '0 -4px', backgroundColor: '#c5e0ef' }}
               hidden={
-                !isLocalHost ||
                 this.state.isLocked || (this.state.formData.id === '') || nodePrompts.delete.hidden}
+                !isAdmin ||
             >
               <Col sm={6}>
                 <FormText>Re-link edges to this Node ID (leave blank to delete edge)</FormText>

From 3fd630821bd3e2a392ecba7d7a1a31d386c2c43c Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 10:51:11 -0800
Subject: [PATCH 03/54] toml: Add Template, template-logic, and show on More
 panel.

---
 build/app/view/netcreate/components/More.jsx  |  12 +
 .../view/netcreate/components/Template.jsx    | 272 +++++++
 build/app/view/netcreate/template-logic.js    | 669 ++++++++++++++++++
 3 files changed, 953 insertions(+)
 create mode 100644 build/app/view/netcreate/components/Template.jsx
 create mode 100644 build/app/view/netcreate/template-logic.js

diff --git a/build/app/view/netcreate/components/More.jsx b/build/app/view/netcreate/components/More.jsx
index d04087471..55dbf68de 100644
--- a/build/app/view/netcreate/components/More.jsx
+++ b/build/app/view/netcreate/components/More.jsx
@@ -23,6 +23,7 @@ const classnames = require('classnames');
 const Help = require('./Help');
 const Vocabulary = require('./Vocabulary');
 const ImportExport = require('./ImportExport');
+const Template = require('./Template');
 
 const UNISYS   = require('unisys/client');
 
@@ -109,6 +110,14 @@ class More extends UNISYS.Component {
                   Import / Export
                 </NavLink>
               </NavItem>
+              <NavItem>
+                <NavLink
+                  className={classnames({ active: activeTab === '4' })}
+                  onClick={() => { this.toggleTab('4') }}
+                >
+                  Edit Template
+                </NavLink>
+              </NavItem>
             </Nav>
           </div>
           <TabContent activeTab={activeTab} style={{
@@ -124,6 +133,9 @@ class More extends UNISYS.Component {
             <TabPane tabId="3">
               {activeTab==="3" && <ImportExport /> }
             </TabPane>
+            <TabPane tabId="4">
+              {activeTab==="4" && <Template /> }
+            </TabPane>
           </TabContent>
         </div>
       </div>
diff --git a/build/app/view/netcreate/components/Template.jsx b/build/app/view/netcreate/components/Template.jsx
new file mode 100644
index 000000000..18bdfc3ab
--- /dev/null
+++ b/build/app/view/netcreate/components/Template.jsx
@@ -0,0 +1,272 @@
+/*//////////////////////////////// ABOUT \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*\
+
+  Template Editor View
+
+  Displays a variety of tools to edit templates:
+  * Edit Node Types
+  * Edit Edge Types
+  * Edit Current Template
+  * Download Current Template
+  * Create New Template
+  * Import Template from File
+
+  This is displayed on the More.jsx component/panel but can be moved
+  anywhere.
+
+
+  ##  BACKGROUND
+
+      Template data is loaded by `server-database` DB.InitializeDatabase call.
+
+
+\*\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ * //////////////////////////////////////*/
+
+var DBG = false;
+var UDATA = null;
+
+/// LIBRARIES /////////////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+const React = require('react');
+const ReactStrap = require('reactstrap');
+const { Button } = ReactStrap;
+import { JSONEditor } from '@json-editor/json-editor';
+const UNISYS = require('unisys/client');
+const TEMPLATE_LOGIC = require("../template-logic");
+
+/// CONSTANTS /////////////////////////////////////////////////////////////////
+
+let EDITOR; // json-editor object
+
+/// REACT COMPONENT ///////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+class Template extends UNISYS.Component {
+  constructor (props) {
+    super(props);
+    this.state = {
+      isEditing: false,
+      editScope: undefined, // root, nodeTypeOptions, edgeTypeOptions
+      tomlfile: undefined,
+      tomlfileStatus: '',
+      tomlfileErrors: undefined
+    };
+    this.loadEditor = this.loadEditor.bind(this);
+    this.onNewTemplate = this.onNewTemplate.bind(this);
+    this.onCurrentTemplateLoad = this.onCurrentTemplateLoad.bind(this);
+    this.onEditNodeTypes = this.onEditNodeTypes.bind(this);
+    this.onEditEdgeTypes = this.onEditEdgeTypes.bind(this);
+    this.onTOMLfileSelect = this.onTOMLfileSelect.bind(this);
+    this.onDownloadTemplate = this.onDownloadTemplate.bind(this);
+    this.onSaveEdit = this.onSaveEdit.bind(this);
+    this.onCancelEdit = this.onCancelEdit.bind(this);
+
+    UDATA = UNISYS.NewDataLink(this);
+  } // constructor
+
+  componentDidMount() { }
+
+  componentWillUnmount() {
+    if (EDITOR) EDITOR.destroy();
+  }
+
+  /// METHODS /////////////////////////////////////////////////////////////////
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  /**
+   * Load JSON Editor
+   * -- If schema is not defined, the default schema is used
+   * -- If startval is not defined, an empty template created from the default
+   *    schema is used.
+   * @param {object} parms { schema, startval }
+   */
+  loadEditor(parms) {
+    const el = document.getElementById('editor');
+    const schema = (parms && parms.schema) || TEMPLATE_LOGIC.SCHEMA.root;
+    const startval = parms && parms.startval;
+
+    const options = {
+      theme: 'bootstrap4', // spectre, bootstrap3, tailwind, html
+      disable_edit_json: true, // set to false for debugging
+      disable_properties: true, // set to false for debugging
+      schema
+      // iconlib: 'fontawesome5', // fontawesome is not currently loaded
+    };
+    if (startval) options.startval = startval; // only add startval if its defined, otherwise you end up with an empty template
+    if (EDITOR) EDITOR.destroy(); // clear any existing editor
+    EDITOR = new JSONEditor(el, options);
+
+    this.setState({ isEditing: true });
+  }
+
+  /// UI EVENT HANDLERS /////////////////////////////////////////////////////////
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  onNewTemplate() {
+    this.setState({
+      editScope: 'root'
+    });
+    this.loadEditor(); // new blank template with default schema
+  }
+
+  onCurrentTemplateLoad(e) {
+    UDATA.LocalCall('EDIT_CURRENT_TEMPLATE') // nc-logic
+      .then(result => {
+        console.error('template is', result);
+        this.setState({
+          editScope: 'root'
+        });
+        this.loadEditor({ startval: result.template });
+      })
+  }
+
+  onEditNodeTypes() {
+    UDATA.LocalCall('EDIT_CURRENT_TEMPLATE') // nc-logic
+      .then(result => {
+        console.error('template is', result);
+        const schemaNodeTypeOptions = TEMPLATE_LOGIC.SCHEMA.nodeTypeOptions;
+        console.error('schema is', schemaNodeTypeOptions)
+        this.setState({
+          editScope: 'nodeTypeOptions'
+        });
+        this.loadEditor(
+          {
+            schema: schemaNodeTypeOptions,
+            startval: result.template.nodeDefs.type.options
+          });
+      })
+  }
+
+  onEditEdgeTypes() {
+    UDATA.LocalCall('EDIT_CURRENT_TEMPLATE') // nc-logic
+      .then(result => {
+        const schemaEdgeTypeOptions = TEMPLATE_LOGIC.SCHEMA.edgeTypeOptions;
+        console.error('schema is', schemaEdgeTypeOptions)
+        this.setState({
+          editScope: 'edgeTypeOptions'
+        });
+        this.loadEditor({
+          schema: schemaEdgeTypeOptions,
+          startval: result.template.edgeDefs.type.options
+        });
+      })
+  }
+
+  onTOMLfileSelect(e) {
+    const tomlfile = e.target.files[0];
+    UDATA.LocalCall('VALIDATE_TOMLFILE', { tomlfile }) // nc-logic
+      .then(result => {
+        console.error('result', result, 'tomlfile', tomlfile, 'templateJSON', result.templateJSON);
+        if (result.isValid) {
+          this.setState({
+            editScope: 'root'
+          });
+          this.loadEditor({
+            schema: TEMPLATE_LOGIC.SCHEMA.root,
+            startval: result.templateJSON
+          });
+        } else {
+          const errorMsg = 'Missing keys: ' + result.missingKeys.join(', ');
+          this.setState({
+            tomlfile: undefined,
+            tomlfileStatus: "Invalid template file!!!",
+            tomlfileErrors: errorMsg
+          });
+        }
+      });
+  }
+
+  onDownloadTemplate() {
+    TEMPLATE_LOGIC.DownloadTemplate();
+  }
+
+  onSaveEdit() {
+    const templateJSON = EDITOR.getValue(); // could be a snippet
+    const { editScope } = this.state;
+    const template = TEMPLATE_LOGIC.UpdateTemplate(templateJSON, editScope);
+    TEMPLATE_LOGIC.SaveTemplateToFile(template)
+      .then(result => {
+        if (!result.OK) {
+          alert(result.info);
+        } else {
+          this.setState({ isEditing: false })
+        }
+      });
+  }
+
+  onCancelEdit() {
+    this.setState({ isEditing: false });
+  }
+
+
+  /// REACT LIFECYCLE METHODS ///////////////////////////////////////////////////
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+  render() {
+    const {
+      isEditing,
+      tomlfile,
+      tomlfileStatus,
+      tomlfileErrors
+    } = this.state;
+    const importDisabled = tomlfile === undefined;
+    return (
+      <div
+        style={{
+          backgroundColor: 'rgba(240,240,240,0.95)',
+          padding: '10px 20px'
+        }}
+      >
+        <div hidden={isEditing}>
+          <div style={{
+            display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)',
+            columnGap: '10px', rowGap: '5px'
+          }}>
+            {/* TYPE OPTIONS */}
+            <Button size="sm" onClick={this.onEditNodeTypes}>
+              Edit Node Types
+            </Button>
+            <Button size="sm" onClick={this.onEditEdgeTypes}>
+              Edit Edge Types
+            </Button>
+            {/* CURRENT TEMPLATE */}
+            <Button size="sm" onClick={this.onCurrentTemplateLoad}>
+              Edit Current Template
+            </Button>
+            <Button size="sm" onClick={this.onDownloadTemplate}>
+              Download Current Template
+            </Button>
+            {/* NEW TEMPLATE */}
+            <Button size="sm" onClick={this.onNewTemplate}>
+              New Template
+            </Button>
+            <div>
+              <i className="small text-muted">Import template (replace existing)</i><br/>
+              <label>
+                <input type="file" accept="text/toml" id="tomlfileInput" onChange={this.onTOMLfileSelect}/>
+                &nbsp;<i>{tomlfileStatus}</i><br />
+                {tomlfileErrors && <span style={{ color: "red" }}>{tomlfileErrors}</span>}
+              </label><br />
+            </div>
+          </div>
+        </div>
+        <hr />
+        <div>
+          <Button
+            onClick={this.onCancelEdit}
+            hidden={!isEditing} size="sm" outline
+          >Cancel</Button>
+          &nbsp;
+          <Button
+            onClick={this.onSaveEdit}
+            hidden={!isEditing} size="sm" color="primary"
+          >Save Changes</Button>
+        </div>
+        <hr />
+        <div id="editor" hidden={!isEditing}></div>
+      </div>
+    );
+  }
+
+} // class Help
+
+
+/// EXPORT REACT COMPONENT ////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+module.exports = Template;
diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
new file mode 100644
index 000000000..f66b9f195
--- /dev/null
+++ b/build/app/view/netcreate/template-logic.js
@@ -0,0 +1,669 @@
+/*//////////////////////////////// ABOUT \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*\
+
+  Template Logic
+
+  The default schema is defined here.
+
+
+  ##  BACKGROUND
+
+      Template data is loaded by `server-database` DB.InitializeDatabase call.
+
+      \*\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ * //////////////////////////////////////*/
+
+const DBG = false;
+
+/// LIBRARIES /////////////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+const UNISYS = require("unisys/client");
+const TOML = require("@iarna/toml");
+const DATASTORE = require("system/datastore");
+
+/// INITIALIZE MODULE /////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+var MOD = UNISYS.NewModule(module.id);
+var UDATA = UNISYS.NewDataLink(MOD);
+
+/// CONSTANTS /////////////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+const SCHEMA_NODETYPEOPTIONS = {
+  type: 'array',
+  title: 'Node Types',
+  format: 'table',
+  items: {
+    type: 'object',
+    properties: {
+      'id': {
+        type: 'string'
+      },
+      'label': {
+        type: 'string'
+      },
+      'color': {
+        type: 'string',
+        format: 'color'
+      }
+    }
+  }
+};
+const SCHEMA_EDGETYPEOPTIONS = {
+  type: 'array',
+  format: 'table',
+  items: {
+    type: 'object',
+    properties: {
+      'id': {
+        type: 'string'
+      },
+      'label': {
+        type: 'string'
+      },
+      'color': { // currently unused
+        type: 'string',
+        format: 'color'
+      }
+    }
+  }
+}
+const SCHEMA = {
+  title: 'NetCreate Template',
+  type: 'object',
+  properties: {
+    "name": {
+      type: 'string',
+      description: 'Template Name',
+      default: 'Untitled Template'
+    },
+    "description": {
+      type: 'string',
+      description: 'Short description of the project, e.g. "This is based on the Secret Histories of Prokopios"',
+      default: 'No Description'
+    },
+    "citation": {
+      type: 'object',
+      description: 'Citation meta data',
+      properties: {
+        "text": {
+          type: 'string',
+          description: 'Bibliographic reference',
+          options: {
+            inputAttributes: { placeholder: 'Untitled Network' }
+          }
+        },
+        "hidden": {
+          type: 'boolean',
+          format: 'checkbox',
+          default: false
+        }
+      }
+    },
+    "requireLogin": {
+      type: 'boolean',
+      format: 'checkbox',
+      default: false
+    },
+    "hideDeleteNodeButton": {
+      // Normally, only admins can delete nodes.  You're an admin if:
+      // -- is localhost (e.g. IP is 127.0.0.71)
+      // -- or has `?admin=true` GET parameter
+      // This will force hide the delete button even if you're an admin
+      type: 'boolean',
+      description: 'Always hide Node delete button, even for admins.',
+      default: false
+    },
+    "duplicateWarning": {
+      type: 'string',
+      description: 'Warning message to display if user is trying to create a node that already exists.',
+      default: 'You’re entering a duplicate node.  Do you want to View the Existing node, or Continue creating?'
+    },
+    "nodeIsLockedMessage": {
+      type: 'string',
+      description: 'Warning message to display if user is trying to edit a node that someone is already editing.',
+      default: 'This node is currently being edited by someone else, please try again later.'
+    },
+    "edgeIsLockedMessage": {
+      type: 'string',
+      description: 'Warning message to display if user is trying to edit an edge that someone is already editing.',
+      default: 'This edge is currently being edited by someone else, please try again later.'
+    },
+    "nodeDefaultTransparency": {
+      type: 'number',
+      description: 'Default transparency for nodes.',
+      default: 0.1
+    },
+    "edgeDefaultTransparency": {
+      type: 'number',
+      description: 'Default transparency for edges.',
+      default: 0.3
+    },
+    "nodeDefs": {
+      properties: {
+        "id": {
+          type: 'object',
+          description: 'System-generated unique id number',
+          properties: {
+            "type": {
+              type: 'number',
+              // not editable
+              options: { hidden: true },
+              description: '"id" data type',
+              default: 'number'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Id'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'ID'
+            },
+            "help": {
+              type: 'string',
+              // not editable
+              options: { hidden: true },
+              description: 'Help text to display on the Node Editor form',
+              default: 'System-generated unique id number'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "id" value in tooltip on graph',
+              default: true
+            }
+          }
+        },
+        "label": {
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              // not editable
+              options: { hidden: true },
+              description: '"label" data type',
+              default: 'string'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'label'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Label'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Display name of the node'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "label" value in tooltip on graph',
+              default: true
+            }
+          }
+        },
+        "type": {
+          type: 'object',
+          description: 'Enumerated node types',
+          properties: {
+            "type": {
+              type: 'string',
+              // not editable
+              options: { hidden: true },
+              description: 'node "type" data type',
+              default: 'select'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Type'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'NodeType' // matches Gephi
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Multiple people are a "Group"'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "type" value in tooltip on graph',
+              default: true
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            },
+            "options": SCHEMA_NODETYPEOPTIONS
+          }
+        },
+        "notes": { // Signficance
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              description: '"notes" data type',
+              default: 'string'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Significance'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Notes'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Display name of the node'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "notes" value in tooltip on graph',
+              default: true
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            }
+          }
+        },
+        "info": { // Info/Number
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              description: '"info" data type',
+              default: 'number'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Number'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Info'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Some number comparison'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "info" value in tooltip on graph',
+              default: true
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            }
+          }
+        },
+        "degrees": { // Weight
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              description: '"degrees" data type',
+              default: 'number'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Degrees'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Weight'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Number of edges connected to this node'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "degrees" value in tooltip on graph',
+              default: true
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            }
+          }
+        },
+        "updated": { // HACK setting.  Only used in d3-simplenetgraph tooltip.  Does not define a new data field.
+          type: 'object',
+          description: 'System-generated date.  This setting only used to show/hide tooltip in graph',
+          properties: {
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Id'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "id" value in tooltip on graph',
+              default: true
+            }
+          }
+        }
+      }
+    },
+    "edgeDefs": {
+      properties: {
+        "id": {
+          type: 'object',
+          description: 'System-generated unique id number',
+          properties: {
+            "type": {
+              type: 'number',
+              // not editable
+              options: { hidden: true },
+              description: '"id" data type',
+              default: 'number'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Id'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'ID'
+            },
+            "help": {
+              type: 'string',
+              // not editable
+              options: { hidden: true },
+              description: 'Help text to display on the Node Editor form',
+              default: 'System-generated unique id number'
+            },
+          }
+        },
+        "source": {
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              // not editable
+              options: { hidden: true },
+              description: '"source" data type',
+              default: 'number'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Source'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Source'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Edge source node'
+            }
+          }
+        },
+        "target": {
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              // not editable
+              options: { hidden: true },
+              description: '"target" data type',
+              default: 'number'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Target'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Target'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Edge target node'
+            }
+          }
+        },
+        "type": {
+          type: 'object',
+          description: 'Enumerated edge types',
+          properties: {
+            "type": {
+              type: 'string',
+              // not editable
+              options: { hidden: true },
+              description: 'edge "type" data type',
+              default: 'select'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Type'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'EdgeType' // matches Gephi?
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Type of edge connection'
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            },
+            "options": SCHEMA_EDGETYPEOPTIONS
+          }
+        },
+        "notes": { // Signficance
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              description: '"notes" data type',
+              default: 'string'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Significance'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Notes'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Significance of the connection'
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            }
+          }
+        },
+        "info": { // Info/Number/Date
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              description: '"info" data type',
+              default: 'number'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Date'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Date'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: '"YYYY-MM-DD" format"'
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            }
+          }
+        },
+        "citation": { // Signficance
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              description: '"citation" data type',
+              default: 'string'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Citation'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use when exporting',
+              default: 'Citation'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Source Book.Chapter (e.g. "Part 2 06.03")'
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
+            }
+          }
+        },
+      }
+    }
+  }
+}
+
+/// UTILITIES /////////////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/// UNISYS LIFECYCLE HOOKS ////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+///////////////////////////////////////////////////////////////////////////////
+/// MODULE METHODS ////////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+///
+
+/*/ Update TEMPLATE AppState
+    `templateSnippet` can be the whole template object, or just the node types or
+    edge types.
+/*/
+MOD.UpdateTemplate = (templateSnippet, editScope) => {
+  let TEMPLATE = UDATA.AppState('TEMPLATE');
+  if (editScope === 'root') TEMPLATE = templateSnippet;
+  if (editScope === 'nodeTypeOptions') TEMPLATE.nodeDefs.type.options = templateSnippet;
+  if (editScope === 'edgeTypeOptions') TEMPLATE.edgeDefs.type.options = templateSnippet;
+  UDATA.SetAppState("TEMPLATE", TEMPLATE);
+  return TEMPLATE;
+}
+
+/*/ Save template file to disk
+    in case we do not necessarily want to autosave template data
+    This calls: datastore > server > server-database
+/*/
+MOD.SaveTemplateToFile = template => {
+  return DATASTORE.SaveTemplateFile(template);
+}
+
+/*/ Download template to local file
+/*/
+MOD.DownloadTemplate = () => {
+  DATASTORE.GetTemplateTOMLFileName() // datastore > server > server-database
+    .then(data => {
+      const filename = data.filename;
+      const TEMPLATE = UDATA.AppState('TEMPLATE');
+      const toml = TOML.stringify(TEMPLATE);
+      const link = document.createElement('a');
+      const blob = new Blob(["\ufeff", toml]);
+      const url = URL.createObjectURL(blob);
+      link.href = url;
+      link.download = filename;
+      document.body.appendChild(link); // Required for FF
+      link.click();
+      document.body.removeChild(link);
+    });
+}
+
+
+
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/// EXPORTs  //////////////////////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+///
+MOD.SCHEMA = {
+  root: SCHEMA,
+  nodeTypeOptions: SCHEMA_NODETYPEOPTIONS,
+  edgeTypeOptions: SCHEMA_EDGETYPEOPTIONS
+};
+
+
+
+/// EXPORT CLASS DEFINITION ///////////////////////////////////////////////////
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+module.exports = MOD;

From 3a3c67453bf9809459a5bc8851cb5c098945a3d2 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 10:51:32 -0800
Subject: [PATCH 04/54] toml: Only show Template editor for admins.

---
 build/app/view/netcreate/components/More.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/app/view/netcreate/components/More.jsx b/build/app/view/netcreate/components/More.jsx
index 55dbf68de..0d33df49f 100644
--- a/build/app/view/netcreate/components/More.jsx
+++ b/build/app/view/netcreate/components/More.jsx
@@ -20,6 +20,7 @@ const React        = require('react');
 const ReactStrap   = require('reactstrap');
 const { TabContent, TabPane, Nav, NavItem, NavLink, Row, Col, Button } = ReactStrap;
 const classnames = require('classnames');
+const SETTINGS = require('settings');
 const Help = require('./Help');
 const Vocabulary = require('./Vocabulary');
 const ImportExport = require('./ImportExport');
@@ -63,7 +64,7 @@ class More extends UNISYS.Component {
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   render() {
     const { activeTab } = this.state;
-
+    const ISADMIN = SETTINGS.IsAdmin();
     return (
       <div className="help"
         style={{
@@ -112,6 +113,7 @@ class More extends UNISYS.Component {
               </NavItem>
               <NavItem>
                 <NavLink
+                  hidden={!ISADMIN}
                   className={classnames({ active: activeTab === '4' })}
                   onClick={() => { this.toggleTab('4') }}
                 >

From acf70fc910e694b68c6f441b96ba6a08796ee87a Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 10:52:21 -0800
Subject: [PATCH 05/54] toml: Add json-editor.

---
 build/package-lock.json | 15 +++++++++++++++
 build/package.json      |  1 +
 2 files changed, 16 insertions(+)

diff --git a/build/package-lock.json b/build/package-lock.json
index 4f1897e60..effc827c2 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -1931,6 +1931,21 @@
         }
       }
     },
+    "@json-editor/json-editor": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@json-editor/json-editor/-/json-editor-2.6.1.tgz",
+      "integrity": "sha512-8jH0n+BLO/jqBCZ3XXaes3NYzvQ+6KfO1p79MsIsTClIi5AvSvEzg3EWk4lsMWrUAFRwcM/CaififsoYDXMdMw==",
+      "requires": {
+        "core-js": "^3.12.1"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.20.3",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
+          "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="
+        }
+      }
+    },
     "@mdx-js/loader": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/@mdx-js/loader/-/loader-1.6.16.tgz",
diff --git a/build/package.json b/build/package.json
index ffd0016da..31b7411f0 100644
--- a/build/package.json
+++ b/build/package.json
@@ -47,6 +47,7 @@
     "tracer": "^0.9.1"
   },
   "dependencies": {
+    "@json-editor/json-editor": "^2.6.1",
     "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.3.1",
     "classnames": "^2.2.6",

From 07a9dd828a12255121a1bedb4589952343442d54 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 10:52:37 -0800
Subject: [PATCH 06/54] toml: Add TOML file support.

---
 build/package-lock.json | 5 +++++
 build/package.json      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/build/package-lock.json b/build/package-lock.json
index effc827c2..8db747959 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -1681,6 +1681,11 @@
       "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==",
       "dev": true
     },
+    "@iarna/toml": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
+      "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+    },
     "@icons/material": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
diff --git a/build/package.json b/build/package.json
index 31b7411f0..b6efe76a8 100644
--- a/build/package.json
+++ b/build/package.json
@@ -47,6 +47,7 @@
     "tracer": "^0.9.1"
   },
   "dependencies": {
+    "@iarna/toml": "^2.2.5",
     "@json-editor/json-editor": "^2.6.1",
     "babel-polyfill": "^6.26.0",
     "bootstrap": "^4.3.1",

From b94776a20420e3ebfe2e08e00417e686490fdaf8 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 10:59:23 -0800
Subject: [PATCH 07/54] toml: Lint/doc.

---
 build/app/system/datastore.js       | 4 ++--
 build/app/unisys/server-database.js | 2 +-
 build/app/unisys/server.js          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/app/system/datastore.js b/build/app/system/datastore.js
index 3cd506996..952ec43d4 100644
--- a/build/app/system/datastore.js
+++ b/build/app/system/datastore.js
@@ -156,12 +156,12 @@ DSTOR.PromiseJSONFile = function(jsonFile) {
 /*/
 DSTOR.PromiseD3Data = function() {
   // UDATA.Call() returns a promise
-  return UDATA.Call("SRV_DBGET", {});
+  return UDATA.Call("SRV_DBGET", {}); // server.js
 };
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ API: (WIP) write database from d3data-formatted object
 /*/
-DSTOR.OverwriteDataPromise = function(d3data) {
+DSTOR.OverwriteDataPromise = function (d3data) {
   return new Promise((resolve, reject) => {
     UDATA.Call("SRV_DBSET", d3data).then(res => {
       if (res.OK) {
diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 79ad01dd0..de10f5557 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -166,7 +166,7 @@ DB.PKT_GetDatabase = function(pkt) {
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ API: reset database from scratch
 /*/
-DB.PKT_SetDatabase = function(pkt) {
+DB.PKT_SetDatabase = function (pkt) {
   if (DBG) console.log(PR, `PKT_SetDatabase`);
   let { nodes = [], edges = [] } = pkt.Data();
   if (!nodes.length) console.log(PR, "WARNING: empty nodes array");
diff --git a/build/app/unisys/server.js b/build/app/unisys/server.js
index 4c4258440..1025eb63e 100644
--- a/build/app/unisys/server.js
+++ b/build/app/unisys/server.js
@@ -28,7 +28,7 @@ var UNISYS = {};
 /*/ Initialize() is called by brunch-server.js to define the default UNISYS
     network values, so it can embed them in the index.ejs file for webapps
     override = { port }
-/*/ UNISYS.InitializeNetwork = ( override ) => {
+/*/ UNISYS.InitializeNetwork = override => {
       UDB.InitializeDatabase(override);
       return UNET.InitializeNetwork(override);
     };
@@ -58,7 +58,7 @@ var UNISYS = {};
         return UDB.PKT_GetDatabase(pkt);
       });
 
-      UNET.HandleMessage('SRV_DBSET',function(pkt) {
+      UNET.HandleMessage('SRV_DBSET', function (pkt) {
         if (DBG) console.log(PR,sprint_message(pkt));
         return UDB.PKT_SetDatabase(pkt);
       });

From db5f2ba36db06ed2fed2d174ca8d9a009b4ef9a6 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 11:04:11 -0800
Subject: [PATCH 08/54] toml: Pull out LoadTemplate as its own function so it
 can be re-used.

---
 build/app/unisys/server-database.js | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index de10f5557..b49fd52f8 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -126,22 +126,8 @@ DB.InitializeDatabase = function (options = {}) {
     console.log(PR,`DATABASE LOADED! m_max_nodeID '${m_max_nodeID}', m_max_edgeID '${m_max_edgeID}'`);
     m_db.saveDatabase();
 
-    // LOAD TEMPLATE  - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    let templatePath = RUNTIMEPATH + NC_CONFIG.dataset + ".template";
-    FS.ensureDirSync(PATH.dirname(templatePath));
-    // Does the template exist?
-    if (!FS.existsSync(templatePath)) {
-      console.log(PR, `NO EXISTING TEMPLATE ${templatePath}, so cloning default template...`);
-      FS.copySync(TEMPLATEPATH+'_default.template', templatePath);
-    }
-    console.log(PR, `LOADING TEMPLATE ${templatePath}`);
-    // Now load it
-    TEMPLATE = FS.readJsonSync(templatePath);
+    m_LoadTemplate();
 
-    // Call complete callback
-    if (typeof m_options.onLoadComplete === 'function') {
-      m_options.onLoadComplete();
-    }
   } // end f_DatabaseInitialize
 
   // UTILITY FUNCTION
@@ -152,6 +138,24 @@ DB.InitializeDatabase = function (options = {}) {
   }
 }; // InitializeDatabase()
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/// utility function for loading template
+function m_LoadTemplate() {
+    // ORIG JSON TEMPLATE
+    //
+    // // LOAD TEMPLATE  - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // let templatePath = RUNTIMEPATH + NC_CONFIG.dataset + ".template";
+    // FS.ensureDirSync(PATH.dirname(templatePath));
+    // // Does the template exist?
+    // if (!FS.existsSync(templatePath)) {
+    //   console.log(PR, `NO EXISTING TEMPLATE ${templatePath}, so cloning default template...`);
+    //   FS.copySync(TEMPLATEPATH+'_default.template', templatePath);
+    // }
+    // console.log(PR, `LOADING TEMPLATE ${templatePath}`);
+    // // Now load it
+    // TEMPLATE = FS.readJsonSync(templatePath);
+    // console.log('### JSON TEMPLATE is', JSON.stringify(FS.readJsonSync(templatePath)))
+}
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ API: load database
     note: InitializeDatabase() was already called on system initialization
     to populate the NODES and EDGES structures.

From 9b030b2f47fa1d5d1816f3e2e0da32ad7ffbf369 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 11:25:27 -0800
Subject: [PATCH 09/54] toml: Load TOML template.

---
 build/app/unisys/server-database.js | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index b49fd52f8..7aa442c46 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -11,6 +11,7 @@ const DBG = false;
 const Loki = require("lokijs");
 const PATH = require("path");
 const FS = require("fs-extra");
+const TOML = require("@iarna/toml");
 
 /// CONSTANTS /////////////////////////////////////////////////////////////////
 /// = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@@ -20,6 +21,7 @@ const PROMPTS = require("../system/util/prompts");
 const PR = PROMPTS.Pad("ServerDB");
 const RUNTIMEPATH = './runtime/';
 const TEMPLATEPATH = './app/assets/templates/';
+const TEMPLATE_EXT = '.template.toml'
 const DB_CLONEMASTER = "blank.loki";
 const NC_CONFIG = require("../assets/netcreate-config");
 
@@ -154,6 +156,27 @@ function m_LoadTemplate() {
     // // Now load it
     // TEMPLATE = FS.readJsonSync(templatePath);
     // console.log('### JSON TEMPLATE is', JSON.stringify(FS.readJsonSync(templatePath)))
+
+    // LOAD TOML TEMPLATE  - - - - - - - - - - - - - - - - - - - - - - - - - -
+    const templateFilePath = m_GetTemplateTOMLFilePath();
+    FS.ensureDirSync(PATH.dirname(templateFilePath));
+    // Does the template exist?  If not, clone default.
+    if (!FS.existsSync(templateFilePath)) {
+      console.log(PR, `NO EXISTING TEMPLATE ${templateFilePath}, so cloning default template...`);
+      FS.copySync(TEMPLATEPATH+'_default'+TEMPLATE_EXT, templateFilePath);
+    }
+    // Now load it
+    const templateFile = FS.readFile(templateFilePath, 'utf8', (err, data) => {
+      if (err) throw err;
+      // Read TOML
+      const json = TOML.parse(data);
+      TEMPLATE = json;
+      console.log(PR, 'Template loaded', templateFilePath);
+      // Call complete callback
+      if (typeof m_options.onLoadComplete === 'function') {
+        m_options.onLoadComplete();
+      }
+    });
 }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ API: load database
@@ -516,6 +539,18 @@ DB.WriteTemplateJSON = function (filePath) {
   }
 };
 
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ called by Template Editor and DB.WriteTemplateTOML
+/*/
+function m_GetTemplateTOMLFileName() {
+  return NC_CONFIG.dataset + TEMPLATE_EXT;
+}
+function m_GetTemplateTOMLFilePath() {
+  return RUNTIMEPATH + m_GetTemplateTOMLFileName();
+}
+DB.GetTemplateTOMLFileName = () => {
+  return { filename: m_GetTemplateTOMLFileName() };
+}
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /// utility function for cleaning nodes with numeric id property
 function m_CleanObjID(prompt, obj) {

From 1b9ed384816b7be515d1341c5331c1f563a4c205 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 11:26:38 -0800
Subject: [PATCH 10/54] toml: Save TOML template file to disk.

---
 build/app/system/datastore.js       | 14 ++++++++++++++
 build/app/unisys/server-database.js | 28 ++++++++++++++++++++++++++++
 build/app/unisys/server.js          |  9 +++++++++
 3 files changed, 51 insertions(+)

diff --git a/build/app/system/datastore.js b/build/app/system/datastore.js
index 952ec43d4..397267f1a 100644
--- a/build/app/system/datastore.js
+++ b/build/app/system/datastore.js
@@ -159,6 +159,20 @@ DSTOR.PromiseD3Data = function() {
   return UDATA.Call("SRV_DBGET", {}); // server.js
 };
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ API: Write Template file to Server
+/*/
+DSTOR.SaveTemplateFile = template => {
+  // UDATA.Call() returns a promise
+  return UDATA.Call("SRV_TEMPLATESAVE", {template}); // server.js
+};
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ API: Get Template File Path.
+    Called by template-logic when downloading template file.
+/*/
+DSTOR.GetTemplateTOMLFileName = () => {
+  return UDATA.Call("SRV_GET_TEMPLATETOML_FILENAME");
+}
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ API: (WIP) write database from d3data-formatted object
 /*/
 DSTOR.OverwriteDataPromise = function (d3data) {
diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 7aa442c46..a3ed1302c 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -551,6 +551,34 @@ function m_GetTemplateTOMLFilePath() {
 DB.GetTemplateTOMLFileName = () => {
   return { filename: m_GetTemplateTOMLFileName() };
 }
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ called by Template Editor to save TOML template changes to disk.
+/*/
+DB.WriteTemplateTOML = (pkt) => {
+  const templateFilePath = m_GetTemplateTOMLFilePath();
+  FS.ensureDirSync(PATH.dirname(templateFilePath));
+  // Does the template exist?  If so, rename the old version with curren timestamp.
+  if (FS.existsSync(templateFilePath)) {
+    const timestamp = new Date().toISOString()
+      .replace(/:/g, '.');
+    const backupFilePath = RUNTIMEPATH + NC_CONFIG.dataset + '_' + timestamp + TEMPLATE_EXT;
+    FS.copySync(templateFilePath, backupFilePath);
+    console.log(PR, 'Backed up template to', backupFilePath);
+  }
+  const toml = TOML.stringify(pkt.data.template);
+  return FS.outputFile(templateFilePath, toml)
+    .then(data => {
+      console.log(PR, 'Saved template to', templateFilePath)
+      // reload template
+      m_LoadTemplate();
+      return { OK: true, info: templateFilePath }
+    })
+    .catch(err => {
+      console.log(PR, 'Failed trying to save', templateFilePath, err);
+      return { OK: false, info: 'Failed trying to save', templateFilePath }
+    });
+}
+
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /// utility function for cleaning nodes with numeric id property
 function m_CleanObjID(prompt, obj) {
diff --git a/build/app/unisys/server.js b/build/app/unisys/server.js
index 1025eb63e..034ac1c75 100644
--- a/build/app/unisys/server.js
+++ b/build/app/unisys/server.js
@@ -63,6 +63,15 @@ var UNISYS = {};
         return UDB.PKT_SetDatabase(pkt);
       });
 
+      UNET.HandleMessage('SRV_TEMPLATESAVE', pkt => { // server-database
+        if (DBG) console.log(PR, sprint_message(pkt));
+        return UDB.WriteTemplateTOML(pkt);
+      });
+
+      UNET.HandleMessage('SRV_GET_TEMPLATETOML_FILENAME', () => {
+        return UDB.GetTemplateTOMLFileName();
+      })
+
       // receives a packet from a client
       UNET.HandleMessage('SRV_DBUPDATE',function(pkt) {
         if (DBG) console.log(PR,sprint_message(pkt));

From f443d2a4d85c6642a7b8a2742cfb08618e6f5e6f Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 11:27:23 -0800
Subject: [PATCH 11/54] toml: Note WriteTemplateJSON is now deprecated.

---
 build/app/unisys/server-database.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index a3ed1302c..a2698c444 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -524,7 +524,8 @@ DB.WriteDbJSON = function (filePath) {
   );
 };
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/*/ called by brunch to generate an up-to-date Template file to path.
+/*/ DEPRECATED.  Replaced by WriteTemplateTOML
+    called by brunch to generate an up-to-date Template file to path.
     creates the path if it doesn't exist
 /*/
 DB.WriteTemplateJSON = function (filePath) {

From c4af6728019a261b92a046f53142cf5baf021f58 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 11:28:48 -0800
Subject: [PATCH 12/54] toml: Lint.

---
 build/app/view/netcreate/components/SaveEditsDialog.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/app/view/netcreate/components/SaveEditsDialog.jsx b/build/app/view/netcreate/components/SaveEditsDialog.jsx
index a964d9036..be5d46f4d 100644
--- a/build/app/view/netcreate/components/SaveEditsDialog.jsx
+++ b/build/app/view/netcreate/components/SaveEditsDialog.jsx
@@ -7,13 +7,13 @@
   with two options:
   * Edit the existing ndoe
   * Continue adding the new node
-  
+
   The dialog is displayed next to the node label so that the user can make
   a decision.
-  
+
   We allow duplicate nodes because there might be places/people with the
   same name.
-  
+
   ## PROPS
       nodeID
 
@@ -73,7 +73,7 @@ class SaveChangesDialog extends UNISYS.Component {
 
   handleCancel () {
     event.preventDefault();
-    
+
   }
 
   /// REACT LIFECYCLE METHODS ///////////////////////////////////////////////////

From 7c4b7b0207850f214364ebd5aba7ffb6633f9797 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 11:51:03 -0800
Subject: [PATCH 13/54] toml: Lint/doc.

---
 build/app/view/netcreate/nc-logic.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index 4767859a3..3a3deb7ca 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -157,6 +157,8 @@ const TEMPLATE_URL = `templates/${DATASET}.json`;
 /*/
 MOD.Hook("LOADASSETS", () => {
   if (UNISYS.IsStandaloneMode()) {
+    // STANDALONE MODE
+    // Load read-only database from exported db file.
 
     const USE_CACHE = false;
     if (USE_CACHE) {
@@ -201,7 +203,7 @@ MOD.Hook("LOADASSETS", () => {
       })();
     });
   }
-  // if got this far...
+
   // NOT STANDALONE MODE so load data into D3DATA
   let p1 = DATASTORE.PromiseD3Data()
   .then(data => {
@@ -384,7 +386,6 @@ MOD.Hook("INITIALIZE", () => {
       }
     }
   }); // StateChange SELECTION
-
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ User has clicked on a suggestion from the AutoCopmlete suggestion list.
       The source node should be loaded in NodeSelector.

From ba884598c7ad93c3de46effb71d08ca93e2d644a Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 11:53:08 -0800
Subject: [PATCH 14/54] toml: Validate toml template.  Convert from JSON.

---
 .../view/netcreate/components/Template.jsx    |   3 +-
 build/app/view/netcreate/nc-logic.js          | 168 +++++++++---------
 2 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/build/app/view/netcreate/components/Template.jsx b/build/app/view/netcreate/components/Template.jsx
index 18bdfc3ab..8b85e8aec 100644
--- a/build/app/view/netcreate/components/Template.jsx
+++ b/build/app/view/netcreate/components/Template.jsx
@@ -152,7 +152,6 @@ class Template extends UNISYS.Component {
     const tomlfile = e.target.files[0];
     UDATA.LocalCall('VALIDATE_TOMLFILE', { tomlfile }) // nc-logic
       .then(result => {
-        console.error('result', result, 'tomlfile', tomlfile, 'templateJSON', result.templateJSON);
         if (result.isValid) {
           this.setState({
             editScope: 'root'
@@ -162,7 +161,7 @@ class Template extends UNISYS.Component {
             startval: result.templateJSON
           });
         } else {
-          const errorMsg = 'Missing keys: ' + result.missingKeys.join(', ');
+          const errorMsg = result.error;
           this.setState({
             tomlfile: undefined,
             tomlfileStatus: "Invalid template file!!!",
diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index 3a3deb7ca..42848036d 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -148,7 +148,8 @@ const DEFAULT_SOURCE_COLOR = "#FFa500";
 const TARGET_COLOR = "#FF0000";
 
 const DATASET = window.NC_CONFIG.dataset || "netcreate";
-const TEMPLATE_URL = `templates/${DATASET}.json`;
+const TEMPLATE_URL = `templates/${DATASET}.toml`;
+
 
 /// UNISYS LIFECYCLE HOOKS ////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -227,89 +228,8 @@ MOD.Hook("LOADASSETS", () => {
 // eslint-disable-next-line complexity
 MOD.Hook("CONFIGURE", () => {
   // Process Node, NodeColorMap and Edge options
-
-  // Validate the template file
-  try {
-    // nodePrompts
-    let nodePrompts = TEMPLATE.nodePrompts;
-    if (nodePrompts === undefined) {
-      throw "Missing `nodePrompts` nodePrompts=" + nodePrompts;
-    }
-    if (nodePrompts.label === undefined)
-      throw "Missing `nodePrompts.label` label=" + nodePrompts.label;
-    if (nodePrompts.type === undefined)
-      throw "Missing `nodePrompts.type` type= " + nodePrompts.type;
-    if (
-      nodePrompts.type.options === undefined ||
-      !Array.isArray(nodePrompts.type.options)
-    ) {
-      throw "Missing or bad `nodePrompts.type.options` options=" +
-        nodePrompts.type.options;
-    }
-    if (nodePrompts.notes === undefined)
-      throw "Missing `nodePrompts.notes` notes=" + nodePrompts.notes;
-    if (nodePrompts.info === undefined)
-      throw "Missing `nodePrompts.info` info=" + nodePrompts.info;
-
-    // edgePrompts
-    let edgePrompts = TEMPLATE.edgePrompts;
-    if (edgePrompts === undefined)
-      throw "Missing `edgePrompts` edgePrompts=" + edgePrompts;
-    if (edgePrompts.source === undefined)
-      throw "Missing `edgePrompts.source` source=" + edgePrompts.source;
-    if (edgePrompts.type === undefined)
-      throw "Missing `edgePrompts.type` type= " + edgePrompts.type;
-    if (
-      edgePrompts.type.options === undefined ||
-      !Array.isArray(edgePrompts.type.options)
-    ) {
-      throw "Missing or bad `edgePrompts.type.options` options=" +
-        edgePrompts.type.options;
-    }
-    if (edgePrompts.target === undefined)
-      throw "Missing `edgePrompts.target` label=" + edgePrompts.target;
-    if (edgePrompts.notes === undefined)
-      throw "Missing `edgePrompts.notes` notes=" + edgePrompts.notes;
-    if (edgePrompts.info === undefined)
-      throw "Missing `edgePrompts.info` info=" + edgePrompts.info;
-    if (edgePrompts.citation === undefined)
-      throw "Missing `edgePrompts.citation` info=" + edgePrompts.citation;
-    if (edgePrompts.category === undefined)
-      throw "Missing `edgePrompts.category` info=" + edgePrompts.category;
-  } catch (error) {
-    console.error(
-      PR + "Error loading template `",
-      TEMPLATE_URL,
-      "`::::",
-      error
-    );
-  }
-
-  // REVIEW: Load ColorMap in d3?  or elsewhere?  does it need its own state?
-  // Joshua added Edges in here ... it should either be renamed or kept separate
-  // but this was a proof of concept. Probably they should be kept separate in case
-  // someone ever chooses to use the same label twice, but ...
-  try {
-    let nodeColorMap = {};
-    TEMPLATE.nodePrompts.type.options.forEach(o => {
-      nodeColorMap[o.label] = o.color;
-    });
-
-    let defaultEdgeColor = TEMPLATE.edgePrompts.color || "#999" ; //for backwards compatability
-    TEMPLATE.edgePrompts.type.options.forEach(o => {
-      nodeColorMap[o.label] = o.color || defaultEdgeColor;
-    });
-
-    UDATA.SetAppState("NODECOLORMAP", nodeColorMap);
-  } catch (error) {
-    console.error(
-      PR,
-      "received bad TEMPLATE node options.  ERROR:",
-      error,
-      ". DATA:",
-      TEMPLATE
-    );
-  }
+  m_ValidateTemplate();
+  m_UpdateColorMap();
 }); // end CONFIGURE HOOK
 
 /// UNISYS LIFECYCLE HOOKS ////////////////////////////////////////////////////
@@ -687,6 +607,7 @@ MOD.Hook("INITIALIZE", () => {
     EXPORT.ExportEdges();
   });
 
+  UDATA.HandleMessage("VALIDATE_TOMLFILE", EXPORT.ValidateTOMLFile);
 }); // end UNISYS_INIT
 
 
@@ -811,6 +732,85 @@ MOD.SetAllObjs = m_SetAllObjs; // Expose for filter-logic.js
 
 /// NODE HELPERS //////////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/*/ Validate Template File
+/*/
+function m_ValidateTemplate() {
+  try {
+    // nodeDefs
+    let nodeDefs = TEMPLATE.nodeDefs;
+    if (nodeDefs === undefined) {
+      throw "Missing `nodeDefs` nodeDefs=" + nodeDefs;
+    }
+    if (nodeDefs.label === undefined) throw "Missing `nodeDefs.label` label=" + nodeDefs.label;
+    if (nodeDefs.type === undefined) throw "Missing `nodeDefs.type` type= " + nodeDefs.type;
+    if (
+      nodeDefs.type.options === undefined ||
+      !Array.isArray(nodeDefs.type.options)
+    ) {
+      throw "Missing or bad `nodeDefs.type.options` options=" +
+        nodeDefs.type.options;
+    }
+    if (nodeDefs.notes === undefined) throw "Missing `nodeDefs.notes` notes=" + nodeDefs.notes;
+    if (nodeDefs.info === undefined) throw "Missing `nodeDefs.info` info=" + nodeDefs.info;
+
+    // edgeDefs
+    let edgeDefs = TEMPLATE.edgeDefs;
+    if (edgeDefs === undefined) throw "Missing `edgeDefs` edgeDefs=" + edgeDefs;
+    if (edgeDefs.source === undefined) throw "Missing `edgeDefs.source` source=" + edgeDefs.source;
+    if (edgeDefs.type === undefined) throw "Missing `edgeDefs.type` type= " + edgeDefs.type;
+    if (
+      edgeDefs.type.options === undefined ||
+      !Array.isArray(edgeDefs.type.options)
+    ) {
+      throw "Missing or bad `edgeDefs.type.options` options=" +
+        edgeDefs.type.options;
+    }
+    if (edgeDefs.target === undefined) throw "Missing `edgeDefs.target` label=" + edgeDefs.target;
+    if (edgeDefs.notes === undefined) throw "Missing `edgeDefs.notes` notes=" + edgeDefs.notes;
+    if (edgeDefs.info === undefined) throw "Missing `edgeDefs.info` info=" + edgeDefs.info;
+    if (edgeDefs.citation === undefined) throw "Missing `edgeDefs.citation` info=" + edgeDefs.citation;
+    if (edgeDefs.category === undefined) throw "Missing `edgeDefs.category` info=" + edgeDefs.category;
+  } catch (error) {
+    console.error(
+      PR + "Error loading template `",
+      TEMPLATE_URL,
+      "`::::",
+      error
+    );
+  }
+}
+
+/*/ Update ColorMap
+/*/
+function m_UpdateColorMap() {
+  // REVIEW: Load ColorMap in d3?  or elsewhere?  does it need its own state?
+  // Joshua added Edges in here ... it should either be renamed or kept separate
+  // but this was a proof of concept. Probably they should be kept separate in case
+  // someone ever chooses to use the same label twice, but ...
+  try {
+    let nodeColorMap = {};
+    TEMPLATE.nodeDefs.type.options.forEach(o => {
+      nodeColorMap[o.label] = o.color;
+    });
+
+    let defaultEdgeColor = TEMPLATE.edgeDefs.color || "#999" ; //for backwards compatability
+    TEMPLATE.edgeDefs.type.options.forEach(o => {
+      nodeColorMap[o.label] = o.color || defaultEdgeColor;
+    });
+
+    UDATA.SetAppState("NODECOLORMAP", nodeColorMap);
+  } catch (error) {
+    console.error(
+      PR,
+      "received bad TEMPLATE node options.  ERROR:",
+      error,
+      ". DATA:",
+      TEMPLATE
+    );
+  }
+}
+
 /*/ Return array of nodes that DON'T match del_me object keys/values
 /*/
 function m_DeleteMatchingNodesByProp(del_me = {}) {

From fb3c4edc808f6fb07d95e58b37e137688cf3041d Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 12:00:36 -0800
Subject: [PATCH 15/54] toml: Convert JSON template fields to updated TOML
 fields.

---
 .../view/netcreate/components/EdgeEditor.jsx  | 72 ++++++++++---------
 .../view/netcreate/components/EdgeTable.jsx   | 44 ++++++------
 .../view/netcreate/components/NetGraph.jsx    |  4 +-
 .../netcreate/components/NodeSelector.jsx     | 62 +++++++++-------
 .../view/netcreate/components/NodeTable.jsx   | 28 ++++----
 .../netcreate/components/SaveEditsDialog.jsx  |  4 +-
 .../netcreate/components/d3-simplenetgraph.js | 32 ++++-----
 7 files changed, 130 insertions(+), 116 deletions(-)

diff --git a/build/app/view/netcreate/components/EdgeEditor.jsx b/build/app/view/netcreate/components/EdgeEditor.jsx
index ebce9c2cc..15e9eeca7 100644
--- a/build/app/view/netcreate/components/EdgeEditor.jsx
+++ b/build/app/view/netcreate/components/EdgeEditor.jsx
@@ -208,9 +208,11 @@ var   UDATA    = null;
 class EdgeEditor extends UNISYS.Component {
     constructor (props) {
       super(props);
+      const TEMPLATE = this.AppState('TEMPLATE');
       this.state = {
-        edgePrompts:    this.AppState('TEMPLATE').edgePrompts,
-        citationPrompts:   this.AppState('TEMPLATE').citationPrompts,
+        edgeDefs: TEMPLATE.edgeDefs,
+        citation: TEMPLATE.citation,
+        edgeIsLockedMessage: TEMPLATE.edgeIsLockedMessage,
         formData: {                 // Holds the state of the form fields
           sourceId:     '',
           targetId:     '',
@@ -358,7 +360,7 @@ class EdgeEditor extends UNISYS.Component {
   }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     setTemplate (data) {
-      this.setState({ edgePrompts: data.edgePrompts });
+      this.setState({ edgeDefs: data.edgeDefs });
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ populate formdata from D3DATA
@@ -886,16 +888,16 @@ class EdgeEditor extends UNISYS.Component {
 /*/
 /*/ render () {
       const { edgeID, parentNodeLabel, parentNodeIsLocked } = this.props;
-      const { formData, sourceNode, targetNode, edgePrompts} = this.state;
-      let {citationPrompts} = this.state;
-      if (edgePrompts.category === undefined) { // for backwards compatability
-        edgePrompts.category = {};
-        edgePrompts.category.label = "";
-        edgePrompts.category.hidden = true;
+      const { formData, sourceNode, targetNode, edgeDefs, edgeIsLockedMessage} = this.state;
+      let {citation} = this.state;
+      if (edgeDefs.category === undefined) { // for backwards compatability
+        edgeDefs.category = {};
+        edgeDefs.category.label = "";
+        edgeDefs.category.hidden = true;
       }
-      if (citationPrompts === undefined) { // if citationPrompts were left out, simply make them hidden
-        citationPrompts = {};
-        citationPrompts.hidden = true;
+      if (citation === undefined) { // if citation were left out, simply make them hidden
+        citation = {};
+        citation.hidden = true;
       }
       const me = <span style={{ color: "rgba(0,0,0,0.2)", fontStyle: "italic" }}>this node</span>;
       // special override to allow editing an edge that has the same parent node for both source and target
@@ -934,8 +936,8 @@ class EdgeEditor extends UNISYS.Component {
                 <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="source" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {edgePrompts.source.label}
-                    <span className="tooltiptext">{this.helpText(edgePrompts.source)}</span>
+                    {edgeDefs.source.displayLabel}
+                    <span className="tooltiptext">{this.helpText(edgeDefs.source)}</span>
                   </Label>
                 </Col>
                 <Col sm={9}>
@@ -956,12 +958,12 @@ class EdgeEditor extends UNISYS.Component {
                   >Change Source</Button>
                 </Col>
               </FormGroup>
-              <FormGroup row hidden={edgePrompts.type.hidden}>
+              <FormGroup row hidden={edgeDefs.type.hidden}>
                 <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="relationship" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {edgePrompts.type.label}
-                    <span className="tooltiptext">{this.helpText(edgePrompts.type)}</span>
+                    {edgeDefs.type.displayLabel}
+                    <span className="tooltiptext">{this.helpText(edgeDefs.type)}</span>
                   </Label>
                 </Col>
                 <Col sm={9}>
@@ -970,7 +972,7 @@ class EdgeEditor extends UNISYS.Component {
                     onChange={this.onRelationshipChange}
                     disabled={!this.state.isEditable}
                     >
-                    {edgePrompts.type.options.map( (option,i) => (
+                    {edgeDefs.type.options.map( (option,i) => (
                       <option id={option.id} key={option.id}>{option.label}</option>
                     ))}
                   </Input>
@@ -980,8 +982,8 @@ class EdgeEditor extends UNISYS.Component {
                 <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="nodeLabel" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {edgePrompts.target.label}
-                    <span className="tooltiptext">{this.helpText(edgePrompts.target)}</span>
+                    {edgeDefs.target.displayLabel}
+                    <span className="tooltiptext">{this.helpText(edgeDefs.target)}</span>
                   </Label>
                 </Col>
                 <Col sm={9}>
@@ -1010,12 +1012,12 @@ class EdgeEditor extends UNISYS.Component {
                   >&uarr;&darr;</Button>
                 </Col>
               </FormGroup>
-              <FormGroup row hidden={edgePrompts.category.hidden}>
+              <FormGroup row hidden={edgeDefs.category.hidden}>
                 <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="category" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {edgePrompts.category.label}
-                    <span className="tooltiptext">{this.helpText(edgePrompts.category)}</span>
+                    {edgeDefs.category.displayLabel}
+                    <span className="tooltiptext">{this.helpText(edgeDefs.category)}</span>
                   </Label>
                 </Col>
                 <Col sm={9}>
@@ -1025,12 +1027,12 @@ class EdgeEditor extends UNISYS.Component {
                     readOnly={!this.state.isEditable}
                   />
                 </Col>
-              </FormGroup><FormGroup row hidden={edgePrompts.citation.hidden}>
+              </FormGroup><FormGroup row hidden={edgeDefs.citation.hidden}>
                 <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="citation" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {edgePrompts.citation.label}
-                    <span className="tooltiptext">{this.helpText(edgePrompts.citation)}</span>
+                    {edgeDefs.citation.displayLabel}
+                    <span className="tooltiptext">{this.helpText(edgeDefs.citation)}</span>
                   </Label>
                 </Col>
                 <Col sm={9}>
@@ -1041,12 +1043,12 @@ class EdgeEditor extends UNISYS.Component {
                   />
                 </Col>
               </FormGroup>
-              <FormGroup row hidden={edgePrompts.notes.hidden}>
+              <FormGroup row hidden={edgeDefs.notes.hidden}>
                 <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="notes" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {edgePrompts.notes.label}
-                    <span className="tooltiptext">{this.helpText(edgePrompts.notes)}</span>
+                    {edgeDefs.notes.displayLabel}
+                    <span className="tooltiptext">{this.helpText(edgeDefs.notes)}</span>
                   </Label>
                 </Col>
                 <Col sm={9}>
@@ -1059,12 +1061,12 @@ class EdgeEditor extends UNISYS.Component {
                   {this.markdownDisplay(this.state.formData.notes||'')}
                 </Col>
               </FormGroup>
-              <FormGroup row hidden={edgePrompts.info.hidden}>
+              <FormGroup row hidden={edgeDefs.info.hidden}>
                 <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="info" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {edgePrompts.info.label}
-                    <span className="tooltiptext">{this.helpText(edgePrompts.info)}</span>
+                    {edgeDefs.info.displayLabel}
+                    <span className="tooltiptext">{this.helpText(edgeDefs.info)}</span>
                   </Label>
                 </Col>
                 <Col sm={9}>
@@ -1078,7 +1080,7 @@ class EdgeEditor extends UNISYS.Component {
               <div id="citationWindow" hidden={this.state.hideModal} className="modal-content">
                 <span className="close" onClick={this.onCloseCiteClick}>&times;</span>
                 <p><em>Copy the text below:</em><br/><br/>
-                  NetCreate {this.AppState('TEMPLATE').name} network, Edge: {this.state.formData.label} (ID {this.state.formData.id}), from "{sourceNode.label}" to "{targetNode.label}". {citationPrompts.citation}. Last accessed at {this.dateFormatted()}.</p>
+                  NetCreate {this.AppState('TEMPLATE').name} network, Edge: {this.state.formData.label} (ID {this.state.formData.id}), from "{sourceNode.label}" to "{targetNode.label}". {citation.text}. Last accessed at {this.dateFormatted()}.</p>
               </div><br/>
               <FormGroup className="text-right" style={{paddingRight:'5px'}}>
                 <Button className="small float-left btn btn-outline-light" size="sm"
@@ -1086,7 +1088,7 @@ class EdgeEditor extends UNISYS.Component {
                  onClick={this.onDeleteButtonClick}
                 >Delete</Button>&nbsp;
                 <Button outline size="sm"
-                hidden={ citationPrompts.hidden}
+                hidden={ citation.hidden}
                 onClick={this.onCiteButtonClick}
               >Cite Edge</Button>&nbsp;&nbsp;
               <Button outline size="sm"
@@ -1101,7 +1103,7 @@ class EdgeEditor extends UNISYS.Component {
                   hidden={!this.state.isEditable}
                   disabled={ !(this.state.isEditable && this.state.hasValidTarget) }
                 >Save</Button>
-                <p hidden={!this.state.dbIsLocked} className="small text-danger">{edgePrompts.edgeIsLockedMessage}</p>
+                <p hidden={!this.state.dbIsLocked} className="small text-danger">{edgeIsLockedMessage}</p>
               </FormGroup>
             </Form>
           </div>
diff --git a/build/app/view/netcreate/components/EdgeTable.jsx b/build/app/view/netcreate/components/EdgeTable.jsx
index d3ee33067..d977ea007 100644
--- a/build/app/view/netcreate/components/EdgeTable.jsx
+++ b/build/app/view/netcreate/components/EdgeTable.jsx
@@ -52,7 +52,7 @@ class EdgeTable extends UNISYS.Component {
       super(props);
 
       this.state = {
-        edgePrompts:  this.AppState('TEMPLATE').edgePrompts,
+        edgeDefs:  this.AppState('TEMPLATE').edgeDefs,
         edges:        [],
         filteredEdges: [],
         isExpanded:   true,
@@ -164,7 +164,7 @@ class EdgeTable extends UNISYS.Component {
 
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   OnTemplateUpdate(data) {
-    this.setState({edgePrompts: data.edgePrompts});
+    this.setState({edgeDefs: data.edgeDefs});
   }
 
 
@@ -376,12 +376,12 @@ class EdgeTable extends UNISYS.Component {
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/
 /*/ render () {
-      let { edgePrompts } = this.state;
+      let { edgeDefs } = this.state;
 
-      if (edgePrompts.category === undefined) { // for backwards compatability
-        edgePrompts.category = {};
-        edgePrompts.category.label = "";
-        edgePrompts.category.hidden = true;
+      if (edgeDefs.category === undefined) { // for backwards compatability
+        edgeDefs.category = {};
+        edgeDefs.category.label = "";
+        edgeDefs.category.hidden = true;
       }
 
       const { tableHeight } = this.props;
@@ -429,26 +429,26 @@ class EdgeTable extends UNISYS.Component {
                 <th hidden={!DBG}>Src ID</th>
                 <th  width="10%"><Button size="sm"
                       onClick={()=>this.setSortKey("source")}
-                    >{edgePrompts.source.label} {this.sortSymbol("source")}</Button></th>
+                    >{edgeDefs.source.displayLabel} {this.sortSymbol("source")}</Button></th>
                 <th width="10%"><Button size="sm"
                       onClick={()=>this.setSortKey("Relationship")}
-                    >{edgePrompts.type.label} {this.sortSymbol("Relationship")}</Button></th>
+                    >{edgeDefs.type.displayLabel} {this.sortSymbol("Relationship")}</Button></th>
                 <th hidden={!DBG}>Target ID</th>
                 <th width="10%"><Button size="sm"
                       onClick={()=>this.setSortKey("target")}
-                    >{edgePrompts.target.label} {this.sortSymbol("target")}</Button></th>
-                <th width="8%" hidden={edgePrompts.category.hidden}><Button size="sm"
+                    >{edgeDefs.target.displayLabel} {this.sortSymbol("target")}</Button></th>
+                <th width="8%" hidden={edgeDefs.category.hidden}><Button size="sm"
                       onClick={()=>this.setSortKey("Category")}
-                    >{edgePrompts.category.label} {this.sortSymbol("Category")}</Button></th>
-                <th width="10%" hidden={edgePrompts.citation.hidden}><Button size="sm"
+                    >{edgeDefs.category.displayLabel} {this.sortSymbol("Category")}</Button></th>
+                <th width="10%" hidden={edgeDefs.citation.hidden}><Button size="sm"
                       onClick={()=>this.setSortKey("Citations")}
-                    >{edgePrompts.citation.label} {this.sortSymbol("Citations")}</Button></th>
-                <th width="20%" hidden={edgePrompts.notes.hidden}><Button size="sm"
+                    >{edgeDefs.citation.displayLabel} {this.sortSymbol("Citations")}</Button></th>
+                <th width="20%" hidden={edgeDefs.notes.hidden}><Button size="sm"
                       onClick={()=>this.setSortKey("Notes")}
-                    >{edgePrompts.notes.label} {this.sortSymbol("Notes")}</Button></th>
-                <th  width="10%"hidden={edgePrompts.info.hidden}><Button size="sm"
+                    >{edgeDefs.notes.displayLabel} {this.sortSymbol("Notes")}</Button></th>
+                <th  width="10%"hidden={edgeDefs.info.hidden}><Button size="sm"
                       onClick={()=>this.setSortKey("Info")}
-                    >{edgePrompts.info.label} {this.sortSymbol("Info")}</Button></th>
+                    >{edgeDefs.info.displayLabel} {this.sortSymbol("Info")}</Button></th>
                 <th  width="10%"hidden={!isLocalHost}><Button size="sm"
                       onClick={()=>this.setSortKey("Updated")}
                     >Updated {this.sortSymbol("Updated")}</Button></th>
@@ -476,12 +476,12 @@ class EdgeTable extends UNISYS.Component {
                 <td hidden={!DBG}>{edge.target.id}</td>
                 <td><a href="#" onClick={(e)=>this.selectNode(edge.target.id,e)}
                     >{edge.target.label || edge.target}</a></td>
-                <td hidden={edgePrompts.category.hidden}>{edge.attributes["Category"]}</td>
-                <td hidden={edgePrompts.citation.hidden}>{edge.attributes["Citations"]}</td>
-                <td hidden={edgePrompts.notes.hidden}>
+                <td hidden={edgeDefs.category.hidden}>{edge.attributes["Category"]}</td>
+                <td hidden={edgeDefs.citation.hidden}>{edge.attributes["Citations"]}</td>
+                <td hidden={edgeDefs.notes.hidden}>
                   {edge.attributes["Notes"] ? <MarkdownNote text={edge.attributes["Notes"]} /> : "" }
                 </td>
-                <td hidden={edgePrompts.info.hidden}>{edge.attributes["Info"]}</td>
+                <td hidden={edgeDefs.info.hidden}>{edge.attributes["Info"]}</td>
                 <td hidden={!isLocalHost}>{this.displayUpdated(edge)}</td>
               </tr>
             ))}
diff --git a/build/app/view/netcreate/components/NetGraph.jsx b/build/app/view/netcreate/components/NetGraph.jsx
index 3ec14be02..4404d24d2 100644
--- a/build/app/view/netcreate/components/NetGraph.jsx
+++ b/build/app/view/netcreate/components/NetGraph.jsx
@@ -78,7 +78,7 @@ class NetGraph extends UNISYS.Component {
 /*/ componentDidMount () {
       // D3NetGraph Constructor
       let el = ReactDOM.findDOMNode(this);
-      let d3NetGraph = new D3NetGraph(el, this.AppState('TEMPLATE').nodePrompts);
+      let d3NetGraph = new D3NetGraph(el, this.AppState('TEMPLATE').nodeDefs);
       this.setState({ d3NetGraph });
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -93,7 +93,7 @@ class NetGraph extends UNISYS.Component {
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/
 /*/ render() {
-      let nodeTypes = this.AppState('TEMPLATE').nodePrompts.type.options;
+      let nodeTypes = this.AppState('TEMPLATE').nodeDefs.type.options;
       return (
         <div style={{ height: '100%' }}>
           <div style={{ margin: '10px 0 0 10px' }}>
diff --git a/build/app/view/netcreate/components/NodeSelector.jsx b/build/app/view/netcreate/components/NodeSelector.jsx
index eb07fff87..aa795c153 100644
--- a/build/app/view/netcreate/components/NodeSelector.jsx
+++ b/build/app/view/netcreate/components/NodeSelector.jsx
@@ -142,9 +142,13 @@ var   UDATA        = null;
 class NodeSelector extends UNISYS.Component {
     constructor (props) {
       super(props);
+      const TEMPLATE = this.AppState('TEMPLATE');
       this.state = {
-        nodePrompts:   this.AppState('TEMPLATE').nodePrompts,
-        citationPrompts:   this.AppState('TEMPLATE').citationPrompts,
+        nodeDefs: TEMPLATE.nodeDefs,
+        citation: TEMPLATE.citation,
+        duplicateWarning: TEMPLATE.duplicateWarning,
+        nodeIsLockedMessage: TEMPLATE.nodeIsLockedMessage,
+        hideDeleteNodeButton: TEMPLATE.hideDeleteNodeButton,
         formData: {
             label:     '',
             type:      '',
@@ -380,7 +384,7 @@ class NodeSelector extends UNISYS.Component {
 
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     setTemplate (data) {
-      this.setState({ nodePrompts: data.nodePrompts });
+      this.setState({ nodeDefs: data.nodeDefs });
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ Return a new unique ID
@@ -916,11 +920,16 @@ class NodeSelector extends UNISYS.Component {
 /// REACT LIFECYCLE ///////////////////////////////////////////////////////////
 /*/ REACT calls this to receive the component layout and data sources
 /*/ render () {
-      let { nodePrompts, citationPrompts } = this.state;
-      if(citationPrompts==undefined)
+      let { nodeDefs,
+        citation,
+        duplicateWarning,
+        nodeIsLockedMessage,
+        hideDeleteNodeButton
+      } = this.state;
+      if(citation==undefined)
       {
-          citationPrompts = {};
-          citationPrompts.hidden = true;
+          citation = {};
+          citation.hidden = true;
       }
         return (
         <div>
@@ -937,8 +946,8 @@ class NodeSelector extends UNISYS.Component {
               <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="nodeLabel" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {nodePrompts.label.label}
-                    <span className="tooltiptext">{this.helpText(nodePrompts.label)}</span>
+                    {nodeDefs.label.displayLabel}
+                    <span className="tooltiptext">{this.helpText(nodeDefs.label)}</span>
                   </Label>
               </Col>
               <Col sm={9}>
@@ -951,7 +960,7 @@ class NodeSelector extends UNISYS.Component {
               </Col>
               <div hidden={!this.state.isDuplicateNodeLabel}
                 style={{ width: '200px', height: '150px', backgroundColor: '#B8EDFF', position: 'fixed', left: '350px', zIndex: '1000', padding: '10px' }}>
-                <p className="text-danger small">{nodePrompts.label.duplicateWarning}</p>
+                <p className="text-danger small">{duplicateWarning}</p>
                 <Button size="sm" onClick={this.onEditOriginal}>View Existing</Button>
                 <Button outline size="sm" onClick={this.onCloseDuplicateDialog}>Continue</Button>
               </div>
@@ -959,12 +968,12 @@ class NodeSelector extends UNISYS.Component {
             <div style={{position:'absolute',left:'300px',maxWidth:'300px'}}>
               <NodeDetail/>
             </div>
-            <FormGroup row hidden={nodePrompts.type.hidden}>
+            <FormGroup row hidden={nodeDefs.type.hidden}>
               <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="type" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {nodePrompts.type.label}
-                    <span className="tooltiptext">{this.helpText(nodePrompts.type)}</span>
+                    {nodeDefs.type.displayLabel}
+                    <span className="tooltiptext">{this.helpText(nodeDefs.type)}</span>
                   </Label>
               </Col>
               <Col sm={9}>
@@ -973,18 +982,18 @@ class NodeSelector extends UNISYS.Component {
                   onChange={this.onTypeChange}
                   disabled={!this.state.isEditable}
                   >
-                  {nodePrompts.type.options.map( (option,i) => (
+                  {nodeDefs.type.options.map( (option,i) => (
                     <option id={option.id} key={option.id}>{option.label}</option>
                   ))}
                 </Input>
               </Col>
             </FormGroup>
-            <FormGroup row hidden={nodePrompts.notes.hidden}>
+            <FormGroup row hidden={nodeDefs.notes.hidden}>
               <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="notes" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {nodePrompts.notes.label}
-                    <span className="tooltiptext">{this.helpText(nodePrompts.notes)}</span>
+                    {nodeDefs.notes.displayLabel}
+                    <span className="tooltiptext">{this.helpText(nodeDefs.notes)}</span>
                   </Label>
               </Col>
               <Col sm={9}>
@@ -997,12 +1006,12 @@ class NodeSelector extends UNISYS.Component {
                   {this.markdownDisplay(this.state.formData.notes||'')}
               </Col>
             </FormGroup>
-            <FormGroup row hidden={nodePrompts.info.hidden}>
+            <FormGroup row hidden={nodeDefs.info.hidden}>
               <Col sm={3} style={{hyphens: 'auto'}} className="pr-0">
                   <Label for="info" className="tooltipAnchor small text-muted">
                     <div className="badge">?</div>
-                    {nodePrompts.info.label}
-                    <span className="tooltiptext">{this.helpText(nodePrompts.info)}</span>
+                    {nodeDefs.info.displayLabel}
+                    <span className="tooltiptext">{this.helpText(nodeDefs.info)}</span>
                   </Label>
               </Col>
               <Col sm={9}>
@@ -1016,19 +1025,19 @@ class NodeSelector extends UNISYS.Component {
               <div id="citationWindow" hidden={this.state.hideModal} className="modal-content">
                 <span className="close" onClick={this.onCloseCiteClick}>&times;</span>
                 <p><em>Copy the text below:</em><br/><br/>
-                  NetCreate {this.AppState('TEMPLATE').name} network, Node: {this.state.formData.label} (ID {this.state.formData.id}). {citationPrompts.citation}. Last accessed at {this.dateFormatted()}.</p>
+                  NetCreate {this.AppState('TEMPLATE').name} network, Node: {this.state.formData.label} (ID {this.state.formData.id}). {citation.text}. Last accessed at {this.dateFormatted()}.</p>
               </div><br/>
             <FormGroup className="text-right" style={{ paddingRight: '5px' }}>
               <Button outline size="sm"
-                hidden={ citationPrompts.hidden || (this.state.formData.id==='') }
+                hidden={ citation.hidden || (this.state.formData.id==='') }
                 onClick={this.onCiteButtonClick}
               >Cite Node</Button>&nbsp;&nbsp;
               <Button outline size="sm"
                 hidden={this.state.isLocked || this.state.isEditable || (this.state.formData.id==='') }
                 onClick={this.onEditButtonClick}
               >Edit Node</Button>
-              <p hidden={!this.state.dbIsLocked} className="small text-danger">{nodePrompts.label.sourceNodeIsLockedMessage}<br/>
-              <span hidden={!isLocalHost} >If you are absolutely sure this is an error, you can force the unlock:
+              <p hidden={!this.state.dbIsLocked} className="small text-danger">{nodeIsLockedMessage}<br/>
+              <span hidden={!isAdmin} >If you are absolutely sure this is an error, you can force the unlock:
               <Button className="small btn btn-outline-light" size="sm"
                   onClick={this.onForceUnlock}
                 >Force Unlock</Button></span>
@@ -1045,8 +1054,11 @@ class NodeSelector extends UNISYS.Component {
             <FormGroup row className="text-left" style={{
               padding: '10px 5px', margin: '0 -4px', backgroundColor: '#c5e0ef' }}
               hidden={
-                this.state.isLocked || (this.state.formData.id === '') || nodePrompts.delete.hidden}
                 !isAdmin ||
+                this.state.isLocked ||
+                (this.state.formData.id === '') ||
+                hideDeleteNodeButton
+              }
             >
               <Col sm={6}>
                 <FormText>Re-link edges to this Node ID (leave blank to delete edge)</FormText>
diff --git a/build/app/view/netcreate/components/NodeTable.jsx b/build/app/view/netcreate/components/NodeTable.jsx
index 538f73f91..4cb4c5e39 100644
--- a/build/app/view/netcreate/components/NodeTable.jsx
+++ b/build/app/view/netcreate/components/NodeTable.jsx
@@ -49,7 +49,7 @@ class NodeTable extends UNISYS.Component {
     super(props);
 
     this.state = {
-      nodePrompts: this.AppState('TEMPLATE').nodePrompts,
+      nodeDefs: this.AppState('TEMPLATE').nodeDefs,
       nodes: [],
       filteredNodes: [],
       isExpanded: true,
@@ -160,7 +160,7 @@ class NodeTable extends UNISYS.Component {
 
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   OnTemplateUpdate(data) {
-    this.setState({nodePrompts: data.nodePrompts});
+    this.setState({nodeDefs: data.nodeDefs});
   }
 
 /// UTILITIES /////////////////////////////////////////////////////////////////
@@ -331,7 +331,7 @@ class NodeTable extends UNISYS.Component {
 /*/
 render() {
   if (this.state.nodes === undefined) return "";
-  const { nodePrompts } = this.state;
+  const { nodeDefs } = this.state;
   const { tableHeight } = this.props;
   const styles = `thead, tbody { font-size: 0.8em }
                   .table {
@@ -370,22 +370,22 @@ render() {
             <th width="4%" hidden={!DBG}>ID</th>
             <th width="4%"><Button size="sm"
                   onClick={() => this.setSortKey("edgeCount")}
-                >{nodePrompts.degrees.label} {this.sortSymbol("edgeCount")}</Button></th>
+                >{nodeDefs.degrees.displayLabel} {this.sortSymbol("edgeCount")}</Button></th>
             <th width="15%"><Button size="sm"
                   onClick={()=>this.setSortKey("label")}
-                >{nodePrompts.label.label} {this.sortSymbol("label")}</Button></th>
-            <th width="10%"hidden={nodePrompts.type.hidden}>
+                >{nodeDefs.label.displayLabel} {this.sortSymbol("label")}</Button></th>
+            <th width="10%"hidden={nodeDefs.type.hidden}>
                 <Button size="sm"
                   onClick={()=>this.setSortKey("type")}
-                >{nodePrompts.type.label} {this.sortSymbol("type")}</Button></th>
-            <th width="20%"hidden={nodePrompts.info.hidden}>
+                >{nodeDefs.type.displayLabel} {this.sortSymbol("type")}</Button></th>
+            <th width="20%"hidden={nodeDefs.info.hidden}>
                 <Button size="sm"
                   onClick={()=>this.setSortKey("info")}
-                >{nodePrompts.info.label} {this.sortSymbol("info")}</Button></th>
-            <th width="30%" hidden={nodePrompts.notes.hidden}>
+                >{nodeDefs.info.displayLabel} {this.sortSymbol("info")}</Button></th>
+            <th width="30%" hidden={nodeDefs.notes.hidden}>
                 <Button size="sm"
                   onClick={()=>this.setSortKey("notes")}
-                >{nodePrompts.notes.label} {this.sortSymbol("notes")}</Button></th>
+                >{nodeDefs.notes.displayLabel} {this.sortSymbol("notes")}</Button></th>
             <th  width="10%"hidden={!isLocalHost}><Button size="sm"
                   onClick={()=>this.setSortKey("Updated")}
                 >Updated {this.sortSymbol("Updated")}</Button></th>
@@ -407,9 +407,9 @@ render() {
             <td>{node.degrees}</td>
             <td><a href="#" onClick={(e)=>this.selectNode(node.id,e)}
                 >{node.label}</a></td>
-            <td hidden={nodePrompts.type.hidden}>{node.attributes["Node_Type"]}</td>
-            <td hidden={nodePrompts.info.hidden}>{node.attributes["Extra Info"]}</td>
-            <td hidden={nodePrompts.notes.hidden}>
+            <td hidden={nodeDefs.type.hidden}>{node.attributes["Node_Type"]}</td>
+            <td hidden={nodeDefs.info.hidden}>{node.attributes["Extra Info"]}</td>
+            <td hidden={nodeDefs.notes.hidden}>
               {node.attributes["Notes"] ? <MarkdownNote text={node.attributes["Notes"]} /> : "" }
             </td>
             <td hidden={!isLocalHost}>{this.displayUpdated(node)}</td>
diff --git a/build/app/view/netcreate/components/SaveEditsDialog.jsx b/build/app/view/netcreate/components/SaveEditsDialog.jsx
index be5d46f4d..cac90dff5 100644
--- a/build/app/view/netcreate/components/SaveEditsDialog.jsx
+++ b/build/app/view/netcreate/components/SaveEditsDialog.jsx
@@ -48,7 +48,7 @@ class SaveChangesDialog extends UNISYS.Component {
     super(props);
 
     this.state = {
-      nodePrompts: this.AppState('TEMPLATE').nodePrompts,
+      nodeDefs: this.AppState('TEMPLATE').nodeDefs,
     }
 
     this.handleEdit = this.handleEdit.bind(this);
@@ -95,7 +95,7 @@ class SaveChangesDialog extends UNISYS.Component {
   /*/
   /*/
   render() {
-    let { nodePrompts } = this.state;
+    let { nodeDefs } = this.state;
     return (
       <Modal>
         <ModalBody>You've made changes to the Node.  Are you sure you want to </ModalBody>
diff --git a/build/app/view/netcreate/components/d3-simplenetgraph.js b/build/app/view/netcreate/components/d3-simplenetgraph.js
index c4efdb188..76b6163bc 100644
--- a/build/app/view/netcreate/components/d3-simplenetgraph.js
+++ b/build/app/view/netcreate/components/d3-simplenetgraph.js
@@ -93,7 +93,7 @@ let m_forceProperties = {   // values for all forces
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 class D3NetGraph {
 
-    constructor ( rootElement, nodePrompts ) {
+    constructor ( rootElement, nodeDefs ) {
 
       this.rootElement  = rootElement;
       this.d3svg        = {};
@@ -107,7 +107,7 @@ class D3NetGraph {
       this.defaultSize  = 5;
 
       // To handled tooltips
-      this.nodePrompts = nodePrompts;
+      this.nodeDefs = nodeDefs;
 
       /// Initialize UNISYS DATA LINK for REACT
       UDATA = UNISYS.NewDataLink(this);
@@ -520,32 +520,32 @@ class D3NetGraph {
 tooltipForNode(d)
 {
     let titleText =  "";
-    if(this.nodePrompts.label.includeInGraphTooltip != undefined)
+    if(this.nodeDefs.label.includeInGraphTooltip != undefined)
     {
         // Add Label
-          if(this.nodePrompts.label.includeInGraphTooltip)
-            titleText += this.nodePrompts.label.label + ": " + d.label + "\n";
+          if(this.nodeDefs.label.includeInGraphTooltip)
+            titleText += this.nodeDefs.label.displayLabel + ": " + d.label + "\n";
         // Add type
-          if(this.nodePrompts.type.includeInGraphTooltip)
-            titleText += this.nodePrompts.type.label + ": " + d.attributes.Node_Type + "\n";
+          if(this.nodeDefs.type.includeInGraphTooltip)
+            titleText += this.nodeDefs.type.displayLabel + ": " + d.attributes.Node_Type + "\n";
         // Add degrees
-          if(this.nodePrompts.degrees.includeInGraphTooltip)
-            titleText += this.nodePrompts.degrees.label + ": " + d.weight + "\n";
+          if(this.nodeDefs.degrees.includeInGraphTooltip)
+            titleText += this.nodeDefs.degrees.displayLabel + ": " + d.weight + "\n";
         // Add notes
-          if(this.nodePrompts.notes.includeInGraphTooltip)
-            titleText += this.nodePrompts.notes.label + ": " + d.attributes.Notes + "\n";
+          if(this.nodeDefs.notes.includeInGraphTooltip)
+            titleText += this.nodeDefs.notes.displayLabel + ": " + d.attributes.Notes + "\n";
         // Add info
-          if(this.nodePrompts.info.includeInGraphTooltip)
-            titleText += this.nodePrompts.info.label + ": " + d.attributes["Extra Info"] + "\n";
+          if(this.nodeDefs.info.includeInGraphTooltip)
+            titleText += this.nodeDefs.info.displayLabel + ": " + d.attributes["Extra Info"] + "\n";
         // Add updated info
-          if(this.nodePrompts.updated.includeInGraphTooltip)
-            titleText += this.nodePrompts.updated.label + ": " + this.displayUpdated(d);
+          if(this.nodeDefs.updated.includeInGraphTooltip)
+            titleText += this.nodeDefs.updated.displayLabel + ": " + this.displayUpdated(d);
     }
     else
     {
 
        // For backwards compatability
-       titleText += this.nodePrompts.label.label + ": " + d.label + "\n";
+       titleText += this.nodeDefs.displayLabel.label + ": " + d.label + "\n";
 
     }
     return titleText;

From af27e9f49313b42dda5e0c890d21dbc7dc938d9e Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 12:02:03 -0800
Subject: [PATCH 16/54] toml: Validate TOML file when importing file.  (Does
 not check fields, just makes sure file can be read as TOML)

---
 build/app/view/netcreate/export-logic.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/build/app/view/netcreate/export-logic.js b/build/app/view/netcreate/export-logic.js
index b775dd9cf..aba717722 100644
--- a/build/app/view/netcreate/export-logic.js
+++ b/build/app/view/netcreate/export-logic.js
@@ -9,6 +9,7 @@ const DBG = false;
 /// LIBRARIES /////////////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 const UNISYS = require("unisys/client");
+const TOML = require("@iarna/toml");
 
 /// INITIALIZE MODULE /////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -265,6 +266,24 @@ MOD.ExportEdges = () => {
   link.click();
   document.body.removeChild(link);
 }
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ Used when importing a TOML file
+    Makes sure TOML file is readable.
+    Returns JSON
+/*/
+MOD.ValidateTOMLFile = async data => {
+  const { tomlfile } = data;
+  try {
+    let tomlText = await tomlfile.text();
+    const json = TOML.parse(tomlText);
+    const isValid = true;
+    return {isValid, templateJSON: json};
+  }
+  catch (err) {
+    return { isValid: false, error: err };
+  }
+}
+
 /// EXPORT CLASS DEFINITION ///////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 module.exports = MOD;

From 2ebb03c3a58fdaf02dab79d2aaf179f4cfcca392 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 12:04:46 -0800
Subject: [PATCH 17/54] toml: Convert JSON to TOML in Filters.  Also fix bug
 where default transparencies were being ignored/not properly restored.

---
 build/app/view/netcreate/filter-logic.js | 32 ++++++++++++++----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/build/app/view/netcreate/filter-logic.js b/build/app/view/netcreate/filter-logic.js
index c951a9c31..8529ac6c6 100644
--- a/build/app/view/netcreate/filter-logic.js
+++ b/build/app/view/netcreate/filter-logic.js
@@ -60,7 +60,7 @@
         You can define two "Label" filters, for example.
         The only reason you can't do it right now is because the filter template
         is reading directly from the _default.template file.  You can easily
-        insert another filter into the mix programmatically.  So
+        insert another filter into the mix programmatically.
 
 
 
@@ -94,6 +94,10 @@ const NCLOGIC = require("./nc-logic");
 var TEMPLATE = null; // template definition for prompts
 var FDATA_RESTORE; // pristine FDATA for clearing
 
+let NODE_DEFAULT_TRANSPARENCY;
+let EDGE_DEFAULT_TRANSPARENCY;
+
+
 /// CONSTANTS /////////////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 const DATASET = window.NC_CONFIG.dataset || "netcreate";
@@ -170,26 +174,27 @@ MOD.Hook("INITIALIZE", () => {
 
 /**
  * Loads filters from template file
- * NOTE: Setting transparency defaults here, which we shouldn't be
  */
 function m_ImportFilters() {
   TEMPLATE = UDATA.AppState("TEMPLATE");
 
-  let nodePrompts = TEMPLATE.nodePrompts;
-  let edgePrompts = TEMPLATE.edgePrompts;
+  const nodeDefs = TEMPLATE.nodeDefs;
+  const edgeDefs = TEMPLATE.edgeDefs;
+  NODE_DEFAULT_TRANSPARENCY = TEMPLATE.nodeDefaultTransparency;
+  EDGE_DEFAULT_TRANSPARENCY = TEMPLATE.edgeDefaultTransparency;
 
   let fdata = {
     nodes: {
       group: "nodes", // this needs to be passed to StringFilter
       label: "Node Filters",
-      filters: m_ImportPrompts(nodePrompts),
-      transparency: isNaN(nodePrompts.defaultTransparency)?0.2:nodePrompts.defaultTransparency // default to barely visible for backwards compatibility
+      filters: m_ImportPrompts(nodeDefs),
+      transparency: 0.2 // Default transparency form for Highlight should be 0.2, not template default which is usu 1.0
     },
     edges: {
       group: "edges", // this needs to be passed to StringFilter
       label: "Edge Filters",
-      filters: m_ImportPrompts(edgePrompts),
-      transparency: isNaN(edgePrompts.defaultTransparency)?0.2:edgePrompts.defaultTransparency // default to barely visible for backwards compatibility
+      filters: m_ImportPrompts(edgeDefs),
+      transparency: 0.05 // Default transparency form for Highlight should be 0.05, not template default which is usu 0.3
     }
   };
 
@@ -235,7 +240,7 @@ function m_ImportPrompts(prompts) {
       id: counter++,
       key: key,
       type: prompt.type,
-      keylabel: prompt.label,
+      keylabel: prompt.displayLabel,
       operator: operator,
       value: ''
     };
@@ -449,7 +454,7 @@ function m_NodeIsFiltered(node, filters, transparency, filterAction) {
   // 2. Decide based on filterAction
   if (filterAction === FILTER.ACTION.FILTER) {
     // not using highlight, so restore transparency
-    node.filteredTransparency = 1.0; // opaque, not tranparent
+    node.filteredTransparency = NODE_DEFAULT_TRANSPARENCY; // opaque, not transparent
     if (keepNode) return true;
     return false; // remove from array
   } else {
@@ -457,7 +462,7 @@ function m_NodeIsFiltered(node, filters, transparency, filterAction) {
     if (!keepNode) {
       node.filteredTransparency = transparency; // set the transparency value ... right now it is inefficient to set this at the node / edge level, but that's more flexible
     } else {
-      node.filteredTransparency = 1.0; // opaque
+      node.filteredTransparency = NODE_DEFAULT_TRANSPARENCY; // opaque
     }
     return true; // don't filter out
   }
@@ -564,8 +569,9 @@ function m_EdgeIsFiltered(edge, filters, transparency, filterAction, FILTEREDD3D
 
   // 3. Decide how to filter based on filterAction
   if (filterAction === FILTER.ACTION.FILTER) {
+    // FILTER!
     // not using highlight, so restore transparency
-    edge.filteredTransparency = 1.0; // opaque
+    edge.filteredTransparency = EDGE_DEFAULT_TRANSPARENCY; // opaque
     if (keepEdge) return true; // keep in array
     return false; // remove from array
   } else {
@@ -573,7 +579,7 @@ function m_EdgeIsFiltered(edge, filters, transparency, filterAction, FILTEREDD3D
     if (!keepEdge) {
       edge.filteredTransparency = transparency; // set the transparency value ... right now it is inefficient to set this at the node / edge level, but that's more flexible
     } else {
-      edge.filteredTransparency = 1.0; // opaque
+      edge.filteredTransparency = EDGE_DEFAULT_TRANSPARENCY; // opaque
     }
     return true; // always keep in array
   }

From 6bf9154513a87ae0b9ffb3d978d25daed04e2fd2 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 20:53:13 -0800
Subject: [PATCH 18/54] toml: Fall back to and migrate JSON template if
 available if no TOML template.  Otherwise, fall back to
 _default.template.toml.

---
 build/app/unisys/server-database.js        | 190 +++++++++++++++++----
 build/app/view/netcreate/template-logic.js |  31 +++-
 2 files changed, 185 insertions(+), 36 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index a2698c444..aebc1eb10 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -141,43 +141,164 @@ DB.InitializeDatabase = function (options = {}) {
 }; // InitializeDatabase()
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /// utility function for loading template
-function m_LoadTemplate() {
-    // ORIG JSON TEMPLATE
-    //
-    // // LOAD TEMPLATE  - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // let templatePath = RUNTIMEPATH + NC_CONFIG.dataset + ".template";
-    // FS.ensureDirSync(PATH.dirname(templatePath));
-    // // Does the template exist?
-    // if (!FS.existsSync(templatePath)) {
-    //   console.log(PR, `NO EXISTING TEMPLATE ${templatePath}, so cloning default template...`);
-    //   FS.copySync(TEMPLATEPATH+'_default.template', templatePath);
-    // }
-    // console.log(PR, `LOADING TEMPLATE ${templatePath}`);
-    // // Now load it
-    // TEMPLATE = FS.readJsonSync(templatePath);
-    // console.log('### JSON TEMPLATE is', JSON.stringify(FS.readJsonSync(templatePath)))
-
-    // LOAD TOML TEMPLATE  - - - - - - - - - - - - - - - - - - - - - - - - - -
-    const templateFilePath = m_GetTemplateTOMLFilePath();
-    FS.ensureDirSync(PATH.dirname(templateFilePath));
-    // Does the template exist?  If not, clone default.
-    if (!FS.existsSync(templateFilePath)) {
-      console.log(PR, `NO EXISTING TEMPLATE ${templateFilePath}, so cloning default template...`);
-      FS.copySync(TEMPLATEPATH+'_default'+TEMPLATE_EXT, templateFilePath);
+
+function m_MigrateJSONtoTOML(JSONtemplate) {
+  console.log(PR, 'Converting JSON to TOML...');
+  const jt = JSONtemplate;
+  const TOMLtemplate = {
+    name: jt.name,
+    description: jt.description,
+    requireLogin: jt.requireLogin,
+    hideDeleteNodeButton: jt.nodePrompts && jt.nodePrompts.delete && jt.nodePrompts.delete.hidden,
+    duplicateWarning: jt.nodePrompts && jt.nodePrompts.label && jt.nodePrompts.label.duplicateWarning,
+    nodeIsLockedMessage: jt.nodePrompts && jt.nodePrompts.label && jt.nodePrompts.label.sourceNodeIsLockedMessage,
+    edgeIsLockedMessage: jt.edgePrompts && jt.edgePrompts.edgeIsLockedMessage,
+    nodeDefaultTransparency: jt.nodePrompts && jt.nodePrompts.defaultTransparency,
+    edgeDefaultTransparency: jt.edgePrompts && jt.edgePrompts.defaultTransparency,
+    citation: {
+      text: jt.citationPrompts && jt.citationPrompts.citation,
+      hidden: jt.citationPrompts && jt.citationPrompts.hidden
     }
-    // Now load it
-    const templateFile = FS.readFile(templateFilePath, 'utf8', (err, data) => {
-      if (err) throw err;
-      // Read TOML
-      const json = TOML.parse(data);
-      TEMPLATE = json;
-      console.log(PR, 'Template loaded', templateFilePath);
-      // Call complete callback
-      if (typeof m_options.onLoadComplete === 'function') {
-        m_options.onLoadComplete();
-      }
+  }
+  // convert nodePrompts
+  const nodeDefs = {};
+  // 1. Add id
+  nodeDefs.id = {
+    type: 'number',
+    displayLabel: 'id',
+    exportLabel: 'ID',
+    help: 'System-generated unique id number'
+  };
+  // 2. Add fields
+  Object.keys(JSONtemplate.nodePrompts).forEach(k => {
+    const field = JSONtemplate.nodePrompts[k];
+    nodeDefs[k] = {
+      type: field.type || 'string', // default to 'string'
+      displayLabel: field.label,
+      exportLabel: field.label,
+      help: field.help,
+      includeInGraphTooltip: field.includeInGraphTooltip || true, // default to show tool tip
+      hidden: field.hidden || false // default to not hidden
+    }
+    if (k === 'type') {
+      // special handling for type options
+      const options = field.options.map(o => {
+        return {
+          id: o.id,
+          label: o.label,
+          color: o.color
+        }
+      })
+      nodeDefs[k].options = options;
+    }
+  })
+  // 3. remove `delete` -- mapped to hideDeleteNodeButton
+  Reflect.deleteProperty(nodeDefs, 'delete');
+  // 4. Add other built-ins
+  nodeDefs.updated = {
+    displayLabel: 'Last Updated',
+    exportLabel: 'Last Updated',
+    help: 'Date and time of last update',
+    options: { hidden: true }, // hidden from json-editor
+    includeInGraphTooltip: true // default to show tool tip
+  }
+  nodeDefs.created = {
+    displayLabel: 'Created',
+    exportLabel: 'Created',
+    help: 'Date and time node was created',
+    options: { hidden: true }, // hidden from json-editor
+    includeInGraphTooltip: true // default to show tool tip
+  }
+
+  // convert edgePrompts
+  const edgeDefs = {};
+  // 1. Add id
+  edgeDefs.id = {
+    type: 'number',
+    displayLabel: 'id',
+    exportLabel: 'ID',
+    help: 'System-generated unique id number'
+  };
+  // 2. Add fields
+  Object.keys(JSONtemplate.edgePrompts).forEach(k => {
+    const field = JSONtemplate.edgePrompts[k];
+    edgeDefs[k] = {
+      type: field.type || 'string', // default to 'string'
+      displayLabel: field.label,
+      exportLabel: field.label,
+      help: field.help,
+      hidden: field.hidden || false // default to not hidden
+    }
+    if (k === 'type') {
+      // special handling for type options
+      const options = field.options.map(o => {
+        return {
+          id: o.id,
+          label: o.label,
+          color: o.color
+        }
+      })
+      edgeDefs[k].options = options;
+    }
+  })
+
+  TOMLtemplate.nodeDefs = nodeDefs;
+  TOMLtemplate.edgeDefs = edgeDefs;
+  console.error('Imported TOML TEMPLATE', TOMLtemplate)
+
+  return TOMLtemplate;
+}
+
+function m_LoadJSONTemplate(templatePath) {
+  // ORIG JSON TEMPLATE ca version 1.3
+  console.log(PR, `LOADING JSON TEMPLATE ${templatePath}`);
+  const JSONTEMPLATE = FS.readJsonSync(templatePath);
+
+  // CONVERT to TOML
+  TEMPLATE = m_MigrateJSONtoTOML(JSONTEMPLATE);
+  // Save it
+  DB.WriteTemplateTOML({ data: { template: TEMPLATE } })
+    .then(() => {
+      // Load it
+      const templateFilePath = m_GetTemplateTOMLFilePath();
+      m_LoadTOMLTemplate(templateFilePath);
     });
 }
+
+function m_LoadTOMLTemplate(templateFilePath) {
+  const templateFile = FS.readFile(templateFilePath, 'utf8', (err, data) => {
+    if (err) throw err;
+    // Read TOML
+    const json = TOML.parse(data);
+    TEMPLATE = json;
+    console.log(PR, 'Template loaded', templateFilePath);
+  });
+}
+
+function m_LoadTemplate() {
+
+  // LOAD TOML TEMPLATE  - - - - - - - - - - - - - - - - - - - - - - - - - -
+  const TOMLtemplateFilePath = m_GetTemplateTOMLFilePath();
+  FS.ensureDirSync(PATH.dirname(TOMLtemplateFilePath));
+  // Does the TOML template exist?
+  if (FS.existsSync(TOMLtemplateFilePath)) {
+    // If TOML exists, load it
+    m_LoadTOMLTemplate(TOMLtemplateFilePath);
+  } else {
+    // Try falling back to JSON template
+    const JSONTemplatePath = RUNTIMEPATH + NC_CONFIG.dataset + ".template";
+    // Does the JSON template exist?
+    if (FS.existsSync(JSONTemplatePath)) {
+      m_LoadJSONTemplate(JSONTemplatePath);
+    } else {
+      // Else, no existing template, clone _default.template.toml
+      console.log(PR, `NO EXISTING TEMPLATE ${TOMLtemplateFilePath}, so cloning default template...`);
+      FS.copySync(TEMPLATEPATH + '_default' + TEMPLATE_EXT, TOMLtemplateFilePath);
+      // then load it
+      m_LoadTOMLTemplate(TOMLtemplateFilePath);
+    }
+  }
+}
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ API: load database
     note: InitializeDatabase() was already called on system initialization
@@ -554,6 +675,7 @@ DB.GetTemplateTOMLFileName = () => {
 }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ called by Template Editor to save TOML template changes to disk.
+    parm {object} pkt.data.template
 /*/
 DB.WriteTemplateTOML = (pkt) => {
   const templateFilePath = m_GetTemplateTOMLFilePath();
diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index f66b9f195..bc73ab68d 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -360,6 +360,28 @@ const SCHEMA = {
             }
           }
         },
+        "created": { // HACK setting.  Only used in d3-simplenetgraph tooltip.  Does not define a new data field.
+          type: 'object',
+          description: 'System-generated date.  This setting only used to show/hide tooltip in graph',
+          properties: {
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Created'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use for exported csv file field name',
+              default: 'Created'
+            },
+            "includeInGraphTooltip": {
+              type: 'boolean',
+              format: 'checkbox',
+              description: 'Show "created" value in tooltip on graph',
+              default: true
+            }
+          }
+        },
         "updated": { // HACK setting.  Only used in d3-simplenetgraph tooltip.  Does not define a new data field.
           type: 'object',
           description: 'System-generated date.  This setting only used to show/hide tooltip in graph',
@@ -367,12 +389,17 @@ const SCHEMA = {
             "displayLabel": {
               type: 'string',
               description: 'Label to use for system display',
-              default: 'Id'
+              default: 'Updated'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use for exported csv file field name',
+              default: 'Updated'
             },
             "includeInGraphTooltip": {
               type: 'boolean',
               format: 'checkbox',
-              description: 'Show "id" value in tooltip on graph',
+              description: 'Show "updated" value in tooltip on graph',
               default: true
             }
           }

From 955707272c5add265543a38767eeb541d4372ba8 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 20:54:11 -0800
Subject: [PATCH 19/54] toml: lint/doc

---
 build/app/view/netcreate/export-logic.js | 2 +-
 build/app/view/netcreate/nc-logic.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/app/view/netcreate/export-logic.js b/build/app/view/netcreate/export-logic.js
index aba717722..85c4c8b18 100644
--- a/build/app/view/netcreate/export-logic.js
+++ b/build/app/view/netcreate/export-logic.js
@@ -1,6 +1,6 @@
 /*//////////////////////////////// ABOUT \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\*\
 
-  * Export Logic
+  * Import / Export Logic
 
 \*\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ * //////////////////////////////////////*/
 
diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index 42848036d..2380443b7 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -794,7 +794,7 @@ function m_UpdateColorMap() {
       nodeColorMap[o.label] = o.color;
     });
 
-    let defaultEdgeColor = TEMPLATE.edgeDefs.color || "#999" ; //for backwards compatability
+    let defaultEdgeColor = TEMPLATE.edgeDefs.color || "#999"; //for backwards compatability
     TEMPLATE.edgeDefs.type.options.forEach(o => {
       nodeColorMap[o.label] = o.color || defaultEdgeColor;
     });

From 32a02c892f7a4befa8a2e878698d7915f86235ee Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 20:54:55 -0800
Subject: [PATCH 20/54] toml: Update TEMPLATE value in nc-logic if AppState
 changed.

---
 build/app/view/netcreate/nc-logic.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index 2380443b7..357df0843 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -307,6 +307,15 @@ MOD.Hook("INITIALIZE", () => {
     }
   }); // StateChange SELECTION
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
+  /*/ TEMPLATE has been edited
+  /*/
+  UDATA.OnAppStateChange("TEMPLATE", stateChange => {
+    if (DBG) console.log(PR, 'TEMPLATE state change', stateChange)
+    TEMPLATE = stateChange;
+    m_UpdateColorMap();
+  });
+
+    /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ User has clicked on a suggestion from the AutoCopmlete suggestion list.
       The source node should be loaded in NodeSelector.
 

From fa621b22a8e513c0d553f2b2f804e375ed62fd56 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 20:56:45 -0800
Subject: [PATCH 21/54] toml: Return curren template when EDIT_CURRENT_TEMPLATE
 is received.

---
 build/app/view/netcreate/nc-logic.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index 357df0843..0efb6194c 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -617,6 +617,11 @@ MOD.Hook("INITIALIZE", () => {
   });
 
   UDATA.HandleMessage("VALIDATE_TOMLFILE", EXPORT.ValidateTOMLFile);
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  UDATA.HandleMessage("EDIT_CURRENT_TEMPLATE", () => {
+    return { template: TEMPLATE }
+  })
+
 }); // end UNISYS_INIT
 
 

From 55a30cdaeff3cf0e74744d02596f0eda4594aabe Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 20:57:43 -0800
Subject: [PATCH 22/54] toml: Update descriptions for `exportLabel`.  Clarify
 that it's for a csv header.

---
 build/app/view/netcreate/template-logic.js | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index bc73ab68d..7956c3497 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -157,7 +157,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'ID'
             },
             "help": {
@@ -193,7 +193,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Label'
             },
             "help": {
@@ -227,7 +227,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'NodeType' // matches Gephi
             },
             "help": {
@@ -265,7 +265,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Notes'
             },
             "help": {
@@ -302,7 +302,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Info'
             },
             "help": {
@@ -339,7 +339,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Weight'
             },
             "help": {
@@ -426,7 +426,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'ID'
             },
             "help": {
@@ -456,7 +456,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Source'
             },
             "help": {
@@ -484,7 +484,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Target'
             },
             "help": {
@@ -512,7 +512,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'EdgeType' // matches Gephi?
             },
             "help": {
@@ -544,7 +544,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Notes'
             },
             "help": {
@@ -575,7 +575,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Date'
             },
             "help": {
@@ -606,7 +606,7 @@ const SCHEMA = {
             },
             "exportLabel": {
               type: 'string',
-              description: 'Label to use when exporting',
+              description: 'Label to use for exported csv file field name',
               default: 'Citation'
             },
             "help": {

From 89202f89453bb0d8d197a45bad82a6e53e520820 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 21:55:22 -0800
Subject: [PATCH 23/54] toml: lint/doc

---
 build/app/unisys/server-database.js                | 3 +++
 build/app/view/netcreate/components/EdgeEditor.jsx | 2 +-
 build/app/view/netcreate/components/Template.jsx   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index aebc1eb10..6691070bc 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -142,6 +142,9 @@ DB.InitializeDatabase = function (options = {}) {
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /// utility function for loading template
 
+
+/*/ Converts a version 1.3 JSON template to a version 1.4 TOML template
+/*/
 function m_MigrateJSONtoTOML(JSONtemplate) {
   console.log(PR, 'Converting JSON to TOML...');
   const jt = JSONtemplate;
diff --git a/build/app/view/netcreate/components/EdgeEditor.jsx b/build/app/view/netcreate/components/EdgeEditor.jsx
index 15e9eeca7..262625e68 100644
--- a/build/app/view/netcreate/components/EdgeEditor.jsx
+++ b/build/app/view/netcreate/components/EdgeEditor.jsx
@@ -359,7 +359,7 @@ class EdgeEditor extends UNISYS.Component {
       });
   }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    setTemplate (data) {
+  setTemplate(data) {
       this.setState({ edgeDefs: data.edgeDefs });
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/build/app/view/netcreate/components/Template.jsx b/build/app/view/netcreate/components/Template.jsx
index 8b85e8aec..246ab5767 100644
--- a/build/app/view/netcreate/components/Template.jsx
+++ b/build/app/view/netcreate/components/Template.jsx
@@ -236,7 +236,7 @@ class Template extends UNISYS.Component {
               New Template
             </Button>
             <div>
-              <i className="small text-muted">Import template (replace existing)</i><br/>
+              <i className="small text-muted">Import TOML template (replace existing)</i><br/>
               <label>
                 <input type="file" accept="text/toml" id="tomlfileInput" onChange={this.onTOMLfileSelect}/>
                 &nbsp;<i>{tomlfileStatus}</i><br />

From 3bde1e00422b6b5676f52996d85cb0ccdfdd553e Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 21:55:43 -0800
Subject: [PATCH 24/54] toml: Remove deprecated fields during migration.

---
 build/app/unisys/server-database.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 6691070bc..20897662e 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -195,8 +195,10 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
       nodeDefs[k].options = options;
     }
   })
-  // 3. remove `delete` -- mapped to hideDeleteNodeButton
-  Reflect.deleteProperty(nodeDefs, 'delete');
+  // 3. remove deprecated fields
+  Reflect.deleteProperty(nodeDefs, 'delete'); // `delete` -- mapped to hideDeleteNodeButton
+  Reflect.deleteProperty(nodeDefs, 'defaultTransparency'); // `nodeDefaultTransparency` -- moved to root
+
   // 4. Add other built-ins
   nodeDefs.updated = {
     displayLabel: 'Last Updated',
@@ -244,10 +246,13 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
       edgeDefs[k].options = options;
     }
   })
+  // 3. remove deprecated fields
+  Reflect.deleteProperty(edgeDefs, 'edgeIsLockedMessage'); // `edgeIsLockedMessage` -- moved to root
+  Reflect.deleteProperty(edgeDefs, 'defaultTransparency'); // `edgeDefaultTransparency` -- moved to root
 
   TOMLtemplate.nodeDefs = nodeDefs;
   TOMLtemplate.edgeDefs = edgeDefs;
-  console.error('Imported TOML TEMPLATE', TOMLtemplate)
+  if (DBG) console.log(PR, 'Imported TOML TEMPLATE', TOMLtemplate)
 
   return TOMLtemplate;
 }

From 64667a0ebc6b8993541bb4b973bdae365534ec83 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 22:00:18 -0800
Subject: [PATCH 25/54] toml: Add `category` to edge schema.

---
 build/app/view/netcreate/template-logic.js | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index 7956c3497..d47cba93d 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -621,6 +621,37 @@ const SCHEMA = {
             }
           }
         },
+        "category": { // Signficance
+          type: 'object',
+          description: 'Display name of the node',
+          properties: {
+            "type": {
+              type: 'string',
+              description: '"category" data type',
+              default: 'string'
+            },
+            "displayLabel": {
+              type: 'string',
+              description: 'Label to use for system display',
+              default: 'Category'
+            },
+            "exportLabel": {
+              type: 'string',
+              description: 'Label to use for exported csv file field name',
+              default: 'Category'
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Category (deprecated)'
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: true
+            }
+          }
+        },
       }
     }
   }

From 4d54c1dd291329fd0aa19e445df09b02edd2b69a Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Mon, 24 Jan 2022 23:00:20 -0800
Subject: [PATCH 26/54] toml: Add `id` to node/edge import AFTER importing
 fields to overwrite any errant `id` field in JSON templates.

---
 build/app/unisys/server-database.js | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 20897662e..17964fadb 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -165,14 +165,7 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
   }
   // convert nodePrompts
   const nodeDefs = {};
-  // 1. Add id
-  nodeDefs.id = {
-    type: 'number',
-    displayLabel: 'id',
-    exportLabel: 'ID',
-    help: 'System-generated unique id number'
-  };
-  // 2. Add fields
+  // 1. Add fields
   Object.keys(JSONtemplate.nodePrompts).forEach(k => {
     const field = JSONtemplate.nodePrompts[k];
     nodeDefs[k] = {
@@ -195,6 +188,13 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
       nodeDefs[k].options = options;
     }
   })
+  // 2. Add id -- clobbers any existing id
+  nodeDefs.id = {
+    type: 'number',
+    displayLabel: 'id',
+    exportLabel: 'ID',
+    help: 'System-generated unique id number'
+  };
   // 3. remove deprecated fields
   Reflect.deleteProperty(nodeDefs, 'delete'); // `delete` -- mapped to hideDeleteNodeButton
   Reflect.deleteProperty(nodeDefs, 'defaultTransparency'); // `nodeDefaultTransparency` -- moved to root
@@ -217,14 +217,7 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
 
   // convert edgePrompts
   const edgeDefs = {};
-  // 1. Add id
-  edgeDefs.id = {
-    type: 'number',
-    displayLabel: 'id',
-    exportLabel: 'ID',
-    help: 'System-generated unique id number'
-  };
-  // 2. Add fields
+  // 1. Add fields
   Object.keys(JSONtemplate.edgePrompts).forEach(k => {
     const field = JSONtemplate.edgePrompts[k];
     edgeDefs[k] = {
@@ -246,6 +239,13 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
       edgeDefs[k].options = options;
     }
   })
+  // 2. Add id
+  edgeDefs.id = { // will clobber any existing id
+    type: 'number',
+    displayLabel: 'id',
+    exportLabel: 'ID',
+    help: 'System-generated unique id number'
+  };
   // 3. remove deprecated fields
   Reflect.deleteProperty(edgeDefs, 'edgeIsLockedMessage'); // `edgeIsLockedMessage` -- moved to root
   Reflect.deleteProperty(edgeDefs, 'defaultTransparency'); // `edgeDefaultTransparency` -- moved to root

From ae3fd33f6a23f777bc3c8ab56ee2342a1490396f Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 10:12:55 -0800
Subject: [PATCH 27/54] toml: Simplify node type options by removing `id`.  It
 was not used anyway.

---
 build/app/unisys/server-database.js                  | 2 --
 build/app/view/netcreate/components/EdgeEditor.jsx   | 4 ++--
 build/app/view/netcreate/components/NodeSelector.jsx | 4 ++--
 build/app/view/netcreate/template-logic.js           | 6 ------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 17964fadb..1e6fca6a3 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -180,7 +180,6 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
       // special handling for type options
       const options = field.options.map(o => {
         return {
-          id: o.id,
           label: o.label,
           color: o.color
         }
@@ -231,7 +230,6 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
       // special handling for type options
       const options = field.options.map(o => {
         return {
-          id: o.id,
           label: o.label,
           color: o.color
         }
diff --git a/build/app/view/netcreate/components/EdgeEditor.jsx b/build/app/view/netcreate/components/EdgeEditor.jsx
index 262625e68..ec7010d83 100644
--- a/build/app/view/netcreate/components/EdgeEditor.jsx
+++ b/build/app/view/netcreate/components/EdgeEditor.jsx
@@ -972,8 +972,8 @@ class EdgeEditor extends UNISYS.Component {
                     onChange={this.onRelationshipChange}
                     disabled={!this.state.isEditable}
                     >
-                    {edgeDefs.type.options.map( (option,i) => (
-                      <option id={option.id} key={option.id}>{option.label}</option>
+                    {edgeDefs.type.options.map( option => (
+                      <option key={option.label}>{option.label}</option>
                     ))}
                   </Input>
                 </Col>
diff --git a/build/app/view/netcreate/components/NodeSelector.jsx b/build/app/view/netcreate/components/NodeSelector.jsx
index aa795c153..58b36bfda 100644
--- a/build/app/view/netcreate/components/NodeSelector.jsx
+++ b/build/app/view/netcreate/components/NodeSelector.jsx
@@ -982,8 +982,8 @@ class NodeSelector extends UNISYS.Component {
                   onChange={this.onTypeChange}
                   disabled={!this.state.isEditable}
                   >
-                  {nodeDefs.type.options.map( (option,i) => (
-                    <option id={option.id} key={option.id}>{option.label}</option>
+                  {nodeDefs.type.options.map( option => (
+                    <option key={option.label}>{option.label}</option>
                   ))}
                 </Input>
               </Col>
diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index d47cba93d..a94cecf44 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -34,9 +34,6 @@ const SCHEMA_NODETYPEOPTIONS = {
   items: {
     type: 'object',
     properties: {
-      'id': {
-        type: 'string'
-      },
       'label': {
         type: 'string'
       },
@@ -53,9 +50,6 @@ const SCHEMA_EDGETYPEOPTIONS = {
   items: {
     type: 'object',
     properties: {
-      'id': {
-        type: 'string'
-      },
       'label': {
         type: 'string'
       },

From 0b545556a70b44cceb797126d58a1d05f30a0546 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 10:13:41 -0800
Subject: [PATCH 28/54] toml: Add `_default.template.toml`

---
 .../assets/templates/_default.template.toml   | 167 ++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 build/app/assets/templates/_default.template.toml

diff --git a/build/app/assets/templates/_default.template.toml b/build/app/assets/templates/_default.template.toml
new file mode 100644
index 000000000..cd12e8c8a
--- /dev/null
+++ b/build/app/assets/templates/_default.template.toml
@@ -0,0 +1,167 @@
+name = "Untitled"
+description = "Default empty template"
+requireLogin = true
+hideDeleteNodeButton = false
+duplicateWarning = "You’re entering a duplicate node.  Do you want to View the Existing node, or Continue creating?"
+nodeIsLockedMessage = "This node is currently being edited by someone else, please try again later."
+edgeIsLockedMessage = "This edge is currently being edited by someone else, please try again later."
+nodeDefaultTransparency = 1
+edgeDefaultTransparency = 0.3
+
+[citation]
+text = "No citation set"
+hidden = false
+
+[nodeDefs.id]
+type = "number"
+displayLabel = "id"
+exportLabel = "ID"
+help = "System-generated unique id number"
+
+[nodeDefs.label]
+type = "string"
+displayLabel = "label"
+exportLabel = "Label"
+help = "Display name of the node"
+includeInGraphTooltip = true
+
+[nodeDefs.type]
+type = "select"
+displayLabel = "Type"
+exportLabel = "Type"
+help = "Multiple people are a 'Group'"
+includeInGraphTooltip = true
+hidden = false
+
+[[nodeDefs.type.options]]
+label = ""
+color = "#eeeeee"
+
+[[nodeDefs.type.options]]
+label = "Person"
+color = "#00fbff"
+
+[[nodeDefs.type.options]]
+label = "Group"
+color = "#3399ff"
+
+[[nodeDefs.type.options]]
+label = "Place"
+color = "#00ff00"
+
+[[nodeDefs.type.options]]
+label = "Thing"
+color = "#009999"
+
+[[nodeDefs.type.options]]
+label = "Event"
+color = "#ff0000"
+
+[nodeDefs.notes]
+type = "string"
+displayLabel = "Significance"
+exportLabel = "Notes"
+help = "Add some details"
+includeInGraphTooltip = true
+hidden = false
+
+[nodeDefs.info]
+type = "number"
+displayLabel = "Number"
+exportLabel = "Info"
+help = "Some number comparison"
+includeInGraphTooltip = true
+hidden = false
+
+[nodeDefs.degrees]
+type = "number"
+displayLabel = "Degrees"
+exportLabel = "Degrees"
+help = "Number of edges"
+includeInGraphTooltip = true
+hidden = false
+
+[nodeDefs.created]
+displayLabel = "Created"
+exportLabel = "Created"
+includeInGraphTooltip = true
+
+[nodeDefs.updated]
+displayLabel = "Last Updated"
+exportLabel = "Last Updated"
+includeInGraphTooltip = true
+
+[edgeDefs.id]
+type = "number"
+displayLabel = "id"
+exportLabel = "ID"
+help = "System-generated unique id number"
+
+[edgeDefs.source]
+type = "node"
+displayLabel = "Source"
+exportLabel = "Source"
+help = ""
+hidden = false
+
+[edgeDefs.target]
+type = "node"
+displayLabel = "Target"
+exportLabel = "Target"
+help = ""
+hidden = false
+
+[edgeDefs.type]
+type = "select"
+displayLabel = "Type"
+exportLabel = "Type"
+help = ""
+hidden = false
+
+[[edgeDefs.type.options]]
+label = ""
+color = "#c2c2c2"
+
+[[edgeDefs.type.options]]
+label = "you've got, a \"friend\""
+color = "#0dbd00"
+
+[[edgeDefs.type.options]]
+label = "has unfriendly interaction with"
+color = "#ff0000"
+
+[[edgeDefs.type.options]]
+label = "is a member of"
+color = "#9ebeff"
+
+[[edgeDefs.type.options]]
+label = "visits"
+color = "#ffae00"
+
+[edgeDefs.notes]
+type = "string"
+displayLabel = "Significatnce"
+exportLabel = "Significatnce"
+help = ""
+hidden = false
+
+[edgeDefs.info]
+type = "number"
+displayLabel = "Date"
+exportLabel = "Date"
+help = "'YYYY-MM-DD' format"
+hidden = false
+
+[edgeDefs.citation]
+type = "string"
+displayLabel = "Citation"
+exportLabel = "Citation"
+help = "Source Book.Chapter (Part 2 06.03)"
+hidden = false
+
+[edgeDefs.category]
+type = "string"
+displayLabel = "Category"
+exportLabel = "Category"
+help = "Category?"
+hidden = false

From 32ee3e68b5a88832cb045075c1dd48631ed8a379 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 11:08:38 -0800
Subject: [PATCH 29/54] toml: Set default template and schema
 nodeDefaultTransparency to 1.0.

---
 build/app/assets/templates/_default.template.toml | 2 +-
 build/app/view/netcreate/template-logic.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/app/assets/templates/_default.template.toml b/build/app/assets/templates/_default.template.toml
index cd12e8c8a..6d0c0a5a2 100644
--- a/build/app/assets/templates/_default.template.toml
+++ b/build/app/assets/templates/_default.template.toml
@@ -5,7 +5,7 @@ hideDeleteNodeButton = false
 duplicateWarning = "You’re entering a duplicate node.  Do you want to View the Existing node, or Continue creating?"
 nodeIsLockedMessage = "This node is currently being edited by someone else, please try again later."
 edgeIsLockedMessage = "This edge is currently being edited by someone else, please try again later."
-nodeDefaultTransparency = 1
+nodeDefaultTransparency = 1.0
 edgeDefaultTransparency = 0.3
 
 [citation]
diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index a94cecf44..092e4e4a6 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -124,7 +124,7 @@ const SCHEMA = {
     "nodeDefaultTransparency": {
       type: 'number',
       description: 'Default transparency for nodes.',
-      default: 0.1
+      default: 1.0
     },
     "edgeDefaultTransparency": {
       type: 'number',

From 4c1252465bbd94d6489072e95fd3967ec5d73b71 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 11:09:06 -0800
Subject: [PATCH 30/54] toml: Disallow hiding id, label, source, and target
 fields.

---
 build/app/view/netcreate/template-logic.js | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index 092e4e4a6..9d0891c27 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -166,6 +166,13 @@ const SCHEMA = {
               format: 'checkbox',
               description: 'Show "id" value in tooltip on graph',
               default: true
+            },
+            "hidden": {
+              type: 'boolean',
+              // not editable
+              options: { hidden: true },
+              format: 'checkbox',
+              default: false
             }
           }
         },
@@ -200,6 +207,13 @@ const SCHEMA = {
               format: 'checkbox',
               description: 'Show "label" value in tooltip on graph',
               default: true
+            },
+            "hidden": {
+              type: 'boolean',
+              // not editable
+              options: { hidden: true },
+              format: 'checkbox',
+              default: false
             }
           }
         },
@@ -430,6 +444,13 @@ const SCHEMA = {
               description: 'Help text to display on the Node Editor form',
               default: 'System-generated unique id number'
             },
+            "hidden": {
+              type: 'boolean',
+              // not editable
+              options: { hidden: true },
+              format: 'checkbox',
+              default: false
+            }
           }
         },
         "source": {
@@ -457,6 +478,13 @@ const SCHEMA = {
               type: 'string',
               description: 'Help text to display on the Node Editor form',
               default: 'Edge source node'
+            },
+            "hidden": {
+              type: 'boolean',
+              // not editable
+              options: { hidden: true },
+              format: 'checkbox',
+              default: false
             }
           }
         },
@@ -485,6 +513,13 @@ const SCHEMA = {
               type: 'string',
               description: 'Help text to display on the Node Editor form',
               default: 'Edge target node'
+            },
+            "hidden": {
+              type: 'boolean',
+              // not editable
+              options: { hidden: true },
+              format: 'checkbox',
+              default: false
             }
           }
         },

From de7140d78ca711ae929f5e4dbad5ee7b43e691c4 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 11:38:43 -0800
Subject: [PATCH 31/54] toml: Add `searchColor` and `sourceColor` to template.

---
 .../assets/templates/_default.template.toml   |  2 ++
 build/app/view/netcreate/nc-logic.js          | 21 ++++++++-----------
 build/app/view/netcreate/template-logic.js    | 12 +++++++++++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/build/app/assets/templates/_default.template.toml b/build/app/assets/templates/_default.template.toml
index 6d0c0a5a2..0e8d1bf39 100644
--- a/build/app/assets/templates/_default.template.toml
+++ b/build/app/assets/templates/_default.template.toml
@@ -7,6 +7,8 @@ nodeIsLockedMessage = "This node is currently being edited by someone else, plea
 edgeIsLockedMessage = "This edge is currently being edited by someone else, please try again later."
 nodeDefaultTransparency = 1.0
 edgeDefaultTransparency = 0.3
+searchColor = "#FFFF00"
+sourceColor = "#FFa500"
 
 [citation]
 text = "No citation set"
diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index 0efb6194c..d578ae9a8 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -290,19 +290,18 @@ MOD.Hook("INITIALIZE", () => {
     // NODE LIST UPDATE
     if (nodes !== undefined) {
       if (nodes.length > 0) {
-        let color = TEMPLATE.searchColor != undefined? TEMPLATE.searchColor : DEFAULT_SEARCH_COLOR;
+        const color = TEMPLATE.searchColor || DEFAULT_SEARCH_COLOR;
         nodes.forEach(node => m_MarkNodeById(node.id, color));
       } else {
         m_UnMarkAllNodes();
       }
     }
     // SEARCH LABEL UPDATE
-    if(D3DATA.nodes.length < 150) // JD to speedup processing for large sets
-    {
+    if (D3DATA.nodes.length < 150) { // JD to speedup processing for large sets
       if (searchLabel === "") {
         m_UnStrokeAllNodes();
       } else if (searchLabel !== undefined) {
-         m_SetStrokeColorThatMatch(searchLabel, TEMPLATE.searchColor != undefined? TEMPLATE.searchColor : DEFAULT_SEARCH_COLOR);
+         m_SetStrokeColorThatMatch(searchLabel, TEMPLATE.searchColor || DEFAULT_SEARCH_COLOR);
       }
     }
   }); // StateChange SELECTION
@@ -415,8 +414,8 @@ MOD.Hook("INITIALIZE", () => {
 
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ SOURCE_HILITE updates the currently rolled-over node name in a list of
-      selections.  The hilite can be selected via either the label or
-      the node id.
+      node name selections when using AutoComplete.
+      The hilite can be selected via either the label or the node id.
   /*/
  /* ORIGINAL INQUIRIUM CODE
   UDATA.HandleMessage("SOURCE_HILITE", function(data) {
@@ -437,18 +436,16 @@ MOD.Hook("INITIALIZE", () => {
     let { nodeLabel, nodeID, color } = data;
     if (nodeLabel) {
       // Only mark nodes if something is selected
-      if(D3DATA.nodes.length < 250) // JD to speedup processing for large
-      {
+      if (D3DATA.nodes.length < 250) { // JD to speedup processing for large
         m_UnMarkAllNodes();
-        m_MarkNodeByLabel(nodeLabel, TEMPLATE.sourceColor != undefined? TEMPLATE.sourceColor : DEFAULT_SOURCE_COLOR);
+        m_MarkNodeByLabel(nodeLabel, TEMPLATE.sourceColor || DEFAULT_SOURCE_COLOR);
       }
     }
     if (nodeID) {
       // Only mark nodes if something is selected
-      if(D3DATA.nodes.length < 250) // JD to speedup processing for large
-      {
+      if (D3DATA.nodes.length < 250) { // JD to speedup processing for large
         m_UnMarkAllNodes();
-        m_MarkNodeById(nodeID, TEMPLATE.sourceColor != undefined? TEMPLATE.sourceColor : DEFAULT_SOURCE_COLOR);
+        m_MarkNodeById(nodeID, TEMPLATE.sourceColor || DEFAULT_SOURCE_COLOR);
       }
     }
 
diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index 9d0891c27..03cbea16a 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -131,6 +131,18 @@ const SCHEMA = {
       description: 'Default transparency for edges.',
       default: 0.3
     },
+    "searchColor": {
+      type: 'string',
+      description: 'Outline color of nodes selected via search.',
+      default: '#008800',
+      format: 'color'
+    },
+    "sourceColor": {
+      type: 'string',
+      description: 'Outline color of node highlighted during auto complete.',
+      default: '#FFa500',
+      format: 'color'
+    },
     "nodeDefs": {
       properties: {
         "id": {

From f2245d90f60782e663c7de4bedffad343421070b Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 13:22:36 -0800
Subject: [PATCH 32/54] toml: Flesh out 'created' and 'updated' fields.  Remove
 bad options.

---
 .../assets/templates/_default.template.toml   |  6 ++++++
 build/app/unisys/server-database.js           |  4 ++--
 build/app/view/netcreate/template-logic.js    | 20 +++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/build/app/assets/templates/_default.template.toml b/build/app/assets/templates/_default.template.toml
index 0e8d1bf39..fff50452e 100644
--- a/build/app/assets/templates/_default.template.toml
+++ b/build/app/assets/templates/_default.template.toml
@@ -84,14 +84,20 @@ includeInGraphTooltip = true
 hidden = false
 
 [nodeDefs.created]
+type = "string"
 displayLabel = "Created"
 exportLabel = "Created"
+help = "Date and time node was created"
 includeInGraphTooltip = true
+hidden = false
 
 [nodeDefs.updated]
+type = "string"
 displayLabel = "Last Updated"
 exportLabel = "Last Updated"
+help = "Date and time node was last modified"
 includeInGraphTooltip = true
+hidden = false
 
 [edgeDefs.id]
 type = "number"
diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 1e6fca6a3..7f731556e 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -158,6 +158,8 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
     edgeIsLockedMessage: jt.edgePrompts && jt.edgePrompts.edgeIsLockedMessage,
     nodeDefaultTransparency: jt.nodePrompts && jt.nodePrompts.defaultTransparency,
     edgeDefaultTransparency: jt.edgePrompts && jt.edgePrompts.defaultTransparency,
+    searchColor: jt.searchColor,
+    sourceColor: jt.sourceColor,
     citation: {
       text: jt.citationPrompts && jt.citationPrompts.citation,
       hidden: jt.citationPrompts && jt.citationPrompts.hidden
@@ -203,14 +205,12 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
     displayLabel: 'Last Updated',
     exportLabel: 'Last Updated',
     help: 'Date and time of last update',
-    options: { hidden: true }, // hidden from json-editor
     includeInGraphTooltip: true // default to show tool tip
   }
   nodeDefs.created = {
     displayLabel: 'Created',
     exportLabel: 'Created',
     help: 'Date and time node was created',
-    options: { hidden: true }, // hidden from json-editor
     includeInGraphTooltip: true // default to show tool tip
   }
 
diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index 03cbea16a..dfc9b8f6a 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -399,6 +399,16 @@ const SCHEMA = {
               format: 'checkbox',
               description: 'Show "created" value in tooltip on graph',
               default: true
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Date and time node was created'
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
             }
           }
         },
@@ -421,6 +431,16 @@ const SCHEMA = {
               format: 'checkbox',
               description: 'Show "updated" value in tooltip on graph',
               default: true
+            },
+            "help": {
+              type: 'string',
+              description: 'Help text to display on the Node Editor form',
+              default: 'Date and time node was last modified'
+            },
+            "hidden": {
+              type: 'boolean',
+              format: 'checkbox',
+              default: false
             }
           }
         }

From 87624a5c4caa46e0549ab3ccd18d753094a26e19 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 16:31:13 -0800
Subject: [PATCH 33/54] toml: Remove second template load after JSON
 conversion.

---
 build/app/unisys/server-database.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 7f731556e..d05cf35f1 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -265,9 +265,7 @@ function m_LoadJSONTemplate(templatePath) {
   // Save it
   DB.WriteTemplateTOML({ data: { template: TEMPLATE } })
     .then(() => {
-      // Load it
-      const templateFilePath = m_GetTemplateTOMLFilePath();
-      m_LoadTOMLTemplate(templateFilePath);
+      console.log(PR, '...converted JSON template saved!');
     });
 }
 
@@ -682,6 +680,7 @@ DB.GetTemplateTOMLFileName = () => {
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ called by Template Editor to save TOML template changes to disk.
     parm {object} pkt.data.template
+    Loads the template after saving!
 /*/
 DB.WriteTemplateTOML = (pkt) => {
   const templateFilePath = m_GetTemplateTOMLFilePath();

From 06b5c6953cebd2d11aaa8c102898ce5de49ffb86 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 16:51:33 -0800
Subject: [PATCH 34/54] toml: lint

---
 build/app/unisys/server-database.js        | 24 ++++++++++++----------
 build/app/view/netcreate/template-logic.js |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index d05cf35f1..380431a6e 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -145,24 +145,26 @@ DB.InitializeDatabase = function (options = {}) {
 
 /*/ Converts a version 1.3 JSON template to a version 1.4 TOML template
 /*/
+// eslint-disable-next-line complexity
 function m_MigrateJSONtoTOML(JSONtemplate) {
   console.log(PR, 'Converting JSON to TOML...');
   const jt = JSONtemplate;
   const TOMLtemplate = {
     name: jt.name,
     description: jt.description,
-    requireLogin: jt.requireLogin,
-    hideDeleteNodeButton: jt.nodePrompts && jt.nodePrompts.delete && jt.nodePrompts.delete.hidden,
-    duplicateWarning: jt.nodePrompts && jt.nodePrompts.label && jt.nodePrompts.label.duplicateWarning,
-    nodeIsLockedMessage: jt.nodePrompts && jt.nodePrompts.label && jt.nodePrompts.label.sourceNodeIsLockedMessage,
-    edgeIsLockedMessage: jt.edgePrompts && jt.edgePrompts.edgeIsLockedMessage,
-    nodeDefaultTransparency: jt.nodePrompts && jt.nodePrompts.defaultTransparency,
-    edgeDefaultTransparency: jt.edgePrompts && jt.edgePrompts.defaultTransparency,
-    searchColor: jt.searchColor,
-    sourceColor: jt.sourceColor,
+    requireLogin: jt.requireLogin || false,
+    // REVIEW: These really ought to load the default values from the schema.
+    hideDeleteNodeButton: (jt.nodePrompts && jt.nodePrompts.delete && jt.nodePrompts.delete.hidden) || false,
+    duplicateWarning: (jt.nodePrompts && jt.nodePrompts.label && jt.nodePrompts.label.duplicateWarning) || 'Warning: Duplicate',
+    nodeIsLockedMessage: (jt.nodePrompts && jt.nodePrompts.label && jt.nodePrompts.label.sourceNodeIsLockedMessage) || 'Node is locked',
+    edgeIsLockedMessage: (jt.edgePrompts && jt.edgePrompts.edgeIsLockedMessage) || "Edge is locked",
+    nodeDefaultTransparency: (jt.nodePrompts && jt.nodePrompts.defaultTransparency) || 1.0,
+    edgeDefaultTransparency: (jt.edgePrompts && jt.edgePrompts.defaultTransparency) || 0.3,
+    searchColor: jt.searchColor || '#008800',
+    sourceColor: jt.sourceColor || '#FFa500',
     citation: {
-      text: jt.citationPrompts && jt.citationPrompts.citation,
-      hidden: jt.citationPrompts && jt.citationPrompts.hidden
+      text: (jt.citationPrompts && jt.citationPrompts.citation) || jt.name,
+      hidden: (jt.citationPrompts && jt.citationPrompts.hidden) || true
     }
   }
   // convert nodePrompts
diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index dfc9b8f6a..8cd620487 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -9,7 +9,7 @@
 
       Template data is loaded by `server-database` DB.InitializeDatabase call.
 
-      \*\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ * //////////////////////////////////////*/
+\*\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ * //////////////////////////////////////*/
 
 const DBG = false;
 

From 4055d5dfcdb5ffdf309359fa69ac9c3c6b480477 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 16:52:43 -0800
Subject: [PATCH 35/54] toml: Update editor options to allow users to add
 missing properties but no non-schema properties.

---
 build/app/view/netcreate/components/Template.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/app/view/netcreate/components/Template.jsx b/build/app/view/netcreate/components/Template.jsx
index 246ab5767..0cac13cdf 100644
--- a/build/app/view/netcreate/components/Template.jsx
+++ b/build/app/view/netcreate/components/Template.jsx
@@ -84,8 +84,10 @@ class Template extends UNISYS.Component {
 
     const options = {
       theme: 'bootstrap4', // spectre, bootstrap3, tailwind, html
-      disable_edit_json: true, // set to false for debugging
-      disable_properties: true, // set to false for debugging
+      disable_edit_json: true, // set to false allow direct viewing/editing of json for debugging
+      disable_properties: false, // needed to allow user to add missing properties
+      object_layout: 'table', // 'grid', 'grid-strict', 'categories'
+      no_additional_properties: true, // prevent users from adding new non-schema properties
       schema
       // iconlib: 'fontawesome5', // fontawesome is not currently loaded
     };

From f4cf266858cb9c939abc4a7e96e713f86c9cf7e0 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 17:09:20 -0800
Subject: [PATCH 36/54] toml: lint/doc

---
 build/app/unisys/server-database.js | 36 ++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 380431a6e..7d1369753 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -141,8 +141,6 @@ DB.InitializeDatabase = function (options = {}) {
 }; // InitializeDatabase()
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /// utility function for loading template
-
-
 /*/ Converts a version 1.3 JSON template to a version 1.4 TOML template
 /*/
 // eslint-disable-next-line complexity
@@ -256,21 +254,25 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
 
   return TOMLtemplate;
 }
-
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ Loads an original circa version 1.3 JSON template
+    and converts it to a TOML template
+/*/
 function m_LoadJSONTemplate(templatePath) {
-  // ORIG JSON TEMPLATE ca version 1.3
+  // 1. Load JSON
   console.log(PR, `LOADING JSON TEMPLATE ${templatePath}`);
   const JSONTEMPLATE = FS.readJsonSync(templatePath);
-
-  // CONVERT to TOML
+  // 2. Convert to TOML
   TEMPLATE = m_MigrateJSONtoTOML(JSONTEMPLATE);
-  // Save it
+  // 3. Save it (and load)
   DB.WriteTemplateTOML({ data: { template: TEMPLATE } })
     .then(() => {
       console.log(PR, '...converted JSON template saved!');
     });
 }
-
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ Loads a *.template.toml file from the server.
+/*/
 function m_LoadTOMLTemplate(templateFilePath) {
   const templateFile = FS.readFile(templateFilePath, 'utf8', (err, data) => {
     if (err) throw err;
@@ -280,24 +282,30 @@ function m_LoadTOMLTemplate(templateFilePath) {
     console.log(PR, 'Template loaded', templateFilePath);
   });
 }
-
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ Load Template
+    1. Tries to load a TOML template
+    2. If it can't be found, tries to load the JSON template and convert it
+    3. If that fails, clone the default TOML template and load it
+    Called by
+    * DB.InitializeDatabase
+    * DB.WriteTemplateTOML
+/*/
 function m_LoadTemplate() {
-
-  // LOAD TOML TEMPLATE  - - - - - - - - - - - - - - - - - - - - - - - - - -
   const TOMLtemplateFilePath = m_GetTemplateTOMLFilePath();
   FS.ensureDirSync(PATH.dirname(TOMLtemplateFilePath));
   // Does the TOML template exist?
   if (FS.existsSync(TOMLtemplateFilePath)) {
-    // If TOML exists, load it
+    // 1. If TOML exists, load it
     m_LoadTOMLTemplate(TOMLtemplateFilePath);
   } else {
-    // Try falling back to JSON template
+    // 2/ Try falling back to JSON template
     const JSONTemplatePath = RUNTIMEPATH + NC_CONFIG.dataset + ".template";
     // Does the JSON template exist?
     if (FS.existsSync(JSONTemplatePath)) {
       m_LoadJSONTemplate(JSONTemplatePath);
     } else {
-      // Else, no existing template, clone _default.template.toml
+      // 3. Else, no existing template, clone _default.template.toml
       console.log(PR, `NO EXISTING TEMPLATE ${TOMLtemplateFilePath}, so cloning default template...`);
       FS.copySync(TEMPLATEPATH + '_default' + TEMPLATE_EXT, TOMLtemplateFilePath);
       // then load it

From b93360467f11de446aff3fe8576d0df736d9ec76 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 18:08:32 -0800
Subject: [PATCH 37/54] toml: Add note to readme to run `./nc.js` on first run
 to create `net-create.config` file.

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 30ee93c8a..a9daff393 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,9 @@ The Wiki has [detailed instructions](https://github.com/netcreateorg/netcreate-2
 
 This will get NetCreate installed and ready to run. It may take some time for the `npm ci` command to finish installing, so be patient!
 
+The first time you run Net.Create, you also need to create a `net-create.config` file.  This will tell Net.Create which dataset to open and which ports to use.  We have a script that can do this for you.  Run:
+* `./nc.js --dataset=demo` -- where `demo` will be the name of the dataset you want to use.
+
 ## QUICK OPERATION GUIDE
 
 Once you have NetCreate installed, make sure you are in the `netcreate-2018/build` directory. From there, you can execute **scripts** through the `npm` tool that is installed as part of NodeJS. 

From e01151f1f0cb3cb81730a8410f724bf6e0dd65aa Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Tue, 25 Jan 2022 18:08:48 -0800
Subject: [PATCH 38/54] toml: Default template should not require login.

---
 build/app/assets/templates/_default.template.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/app/assets/templates/_default.template.toml b/build/app/assets/templates/_default.template.toml
index fff50452e..328b22102 100644
--- a/build/app/assets/templates/_default.template.toml
+++ b/build/app/assets/templates/_default.template.toml
@@ -1,6 +1,6 @@
 name = "Untitled"
 description = "Default empty template"
-requireLogin = true
+requireLogin = false
 hideDeleteNodeButton = false
 duplicateWarning = "You’re entering a duplicate node.  Do you want to View the Existing node, or Continue creating?"
 nodeIsLockedMessage = "This node is currently being edited by someone else, please try again later."

From 46011519cc500f84e439e00d463e4d349c2a3fee Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Wed, 26 Jan 2022 16:04:31 -0800
Subject: [PATCH 39/54] toml: lint

---
 .../app/view/netcreate/components/EdgeEditor.jsx | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/build/app/view/netcreate/components/EdgeEditor.jsx b/build/app/view/netcreate/components/EdgeEditor.jsx
index ec7010d83..5a99a8503 100644
--- a/build/app/view/netcreate/components/EdgeEditor.jsx
+++ b/build/app/view/netcreate/components/EdgeEditor.jsx
@@ -293,15 +293,11 @@ class EdgeEditor extends UNISYS.Component {
       UDATA.HandleMessage('EDGE_EDIT',(data) => {
         this.handleEdgeEdit(data);
       });
-
-
-        /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        UDATA.HandleMessage('EDGE_CLOSE',(data) => {
-          if (this.state.isExpanded)
-            this.setState({ isExpanded: false });
-        });
-
-
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+      UDATA.HandleMessage('EDGE_CLOSE',(data) => {
+        if (this.state.isExpanded) this.setState({ isExpanded: false });
+      });
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       // Template handler
       this.OnAppStateChange('TEMPLATE', this.setTemplate);
 
@@ -680,7 +676,7 @@ class EdgeEditor extends UNISYS.Component {
 
   } // onCiteButtonClick
 
-    onCloseCiteClick (event) {
+  onCloseCiteClick (event) {
     event.preventDefault();
 
     this.setState({ hideModal: true });

From baa5a4959f29e01635d8e77d70eb0793f84bb0ce Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Wed, 26 Jan 2022 17:01:06 -0800
Subject: [PATCH 40/54] toml: Disable Template when Node / Edge being edited
 and vice versa.

---
 .../view/netcreate/components/EdgeEditor.jsx  |  96 ++++++++-----
 .../netcreate/components/NodeSelector.jsx     | 134 ++++++++++++------
 .../view/netcreate/components/Template.jsx    |  87 +++++++++---
 build/app/view/netcreate/nc-logic.js          |  36 ++++-
 4 files changed, 248 insertions(+), 105 deletions(-)

diff --git a/build/app/view/netcreate/components/EdgeEditor.jsx b/build/app/view/netcreate/components/EdgeEditor.jsx
index 5a99a8503..b459c417a 100644
--- a/build/app/view/netcreate/components/EdgeEditor.jsx
+++ b/build/app/view/netcreate/components/EdgeEditor.jsx
@@ -61,6 +61,10 @@
                       to be displayed.  This is only checked when
                       the user clicks "Edit".
 
+      disableEdit     Template is being edited, disable "Edit Edge" button
+
+      isBeingEdited   The form fields are active and text can be changed.
+
 
   ## TECHNICAL DESCRIPTION
 
@@ -240,7 +244,8 @@ class EdgeEditor extends UNISYS.Component {
         },
         isLocked:        true,       // User has not logged in, don't allow edge edit
         dbIsLocked:      false,      // Server Database is locked because someone else is editing
-        isEditable:      false,      // Form is in an edtiable state
+        disableEdit: false,          // Template is being edited, disable "Edit Edge" button
+        isBeingEdited: false,        // Form is in an editable state
         isExpanded:      false,      // Show EdgeEditor Component in Summary view vs Expanded view
         sourceIsEditable:false,      // Source ndoe field is only editable when source is not parent
         hasValidSource:  false,      // Used by SwapSourceAndTarget and the Change Source button
@@ -253,6 +258,8 @@ class EdgeEditor extends UNISYS.Component {
       /// Initialize UNISYS DATA LINK for REACT
       UDATA = UNISYS.NewDataLink(this);
 
+      this.setTemplate = this.setTemplate.bind(this);
+      this.updateEditState = this.updateEditState.bind(this);
       this.handleSelection        = this.handleSelection.bind(this);
       this.handleEdgeSelection    = this.handleEdgeSelection.bind(this);
       this.handleEdgeEdit         = this.handleEdgeEdit.bind(this);
@@ -300,6 +307,7 @@ class EdgeEditor extends UNISYS.Component {
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       // Template handler
       this.OnAppStateChange('TEMPLATE', this.setTemplate);
+      this.OnAppStateChange('OPENEDITORS', this.updateEditState);
 
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   /*/ Prevent editing if server is disconnected.
@@ -343,7 +351,7 @@ class EdgeEditor extends UNISYS.Component {
             notes:     '',
             id:        ''
         },
-        isEditable:           false,
+        isBeingEdited:        false,
         isExpanded:           false,      // Summary view vs Expanded view
         dbIsLocked:           false,
         sourceIsEditable:     false,      // Source ndoe field is only editable when source is not parent
@@ -355,10 +363,19 @@ class EdgeEditor extends UNISYS.Component {
       });
   }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  setTemplate(data) {
+    setTemplate(data) {
       this.setState({ edgeDefs: data.edgeDefs });
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ Disable Edge Edit if a Template is being edited
+/*/
+    updateEditState() {
+      let disableEdit = false;
+      const openEditors = UDATA.AppState("OPENEDITORS").editors;
+      if (openEditors.includes('template')) disableEdit = true;
+      this.setState({ disableEdit });
+    }
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ populate formdata from D3DATA
 /*/ loadSourceAndTarget () {
       if (DBG) console.log('EdgeEditor.loadSourceAndTarget!')
@@ -410,7 +427,7 @@ class EdgeEditor extends UNISYS.Component {
         this.setState({
           isExpanded:           true,
           targetIsEditable:     true,
-          isEditable:           true
+          isBeingEdited:        true
         }, () => {
             // AUTOCOMPLETE mode needs to be set AFTER the edit state has already been set
             // otherwise, the <AutoComplete> component may not have even been defined in the collapsed view.
@@ -480,7 +497,7 @@ class EdgeEditor extends UNISYS.Component {
       // If we're not currently being edited, then if edges have been updated, update self
       if (data.edges !== undefined) {
         let updatedEdge = data.edges.find((edge) => { return edge.id === this.state.formData.id; });
-        if (!this.state.isEditable && updatedEdge !== undefined) {
+        if (!this.state.isBeingEdited && updatedEdge !== undefined) {
           if (DBG) console.log('EdgeEditor: Updating edges with', updatedEdge);
           this.loadSourceAndTarget();
           return;
@@ -490,7 +507,7 @@ class EdgeEditor extends UNISYS.Component {
       // We're being edited, and the updated node is either our source or target
       // Technically we probably ought to also check to make sure we're the current
       // activeAutoCompleteId, but we wouldn't be editable if we weren't.
-      if (this.state.isEditable && data.nodes && data.nodes.length > 0) {
+      if (this.state.isBeingEdited && data.nodes && data.nodes.length > 0) {
         // A node was selected, so load it
 
           let node = data.nodes[0];
@@ -596,14 +613,16 @@ class EdgeEditor extends UNISYS.Component {
         this.setState({ isExpanded: false });
 
         // If we were editing, then revert and exit
-        if (this.state.isEditable) {
+        if (this.state.isBeingEdited) {
           const D3DATA = this.AppState('D3DATA');
 
-          this.setState({ isEditable: false, targetIsEditable: false });
+          this.setState({ isBeingEdited: false, targetIsEditable: false });
           // Return focus of autocomplete to Search field.
           this.AppCall('AUTOCOMPLETE_SELECT', { id: 'search' });
           // Tell parent node to exit out of edge edit mode
           this.AppCall('EDGEEDIT_UNLOCK', { edgeID: this.props.edgeID });
+          // Deregister as an open editor
+          UDATA.LocalCall("DEREGISTER_OPENEDITOR", { type: 'edge' });
 
           // Cancel edit existing or cancel edit new?
           let originalEdge = D3DATA.edges.filter(edge => parseInt(edge.id) === this.props.edgeID)[0];
@@ -645,6 +664,7 @@ class EdgeEditor extends UNISYS.Component {
 /*/ onDeleteButtonClick () {
       this.clearForm();
       this.AppCall('AUTOCOMPLETE_SELECT', { id: 'search' });
+      if (this.state.isBeingEdited) UDATA.LocalCall("DEREGISTER_OPENEDITOR", { type: 'edge' }); // Deregister as an open editor (in case the editor was open)
       this.AppCall('EDGEEDIT_UNLOCK', { edgeID: this.props.edgeID }); // inform NodeSelector
       this.AppCall('DB_UPDATE',{edgeID:this.props.edgeID});
     }
@@ -696,7 +716,7 @@ class EdgeEditor extends UNISYS.Component {
 /*/
 /*/ requestEdit() {
       let edgeID = this.state.formData.id;
-      if (edgeID && edgeID!=='' && !isNaN(edgeID) && (typeof edgeID ==="number") && !this.state.isEditable) {
+      if (edgeID && edgeID!=='' && !isNaN(edgeID) && (typeof edgeID ==="number") && !this.state.isBeingEdited) {
         this.NetCall('SRV_DBLOCKEDGE', { edgeID: edgeID })
           .then((data) => {
             if (data.NOP) {
@@ -710,11 +730,13 @@ class EdgeEditor extends UNISYS.Component {
               if (DBG) console.log(`SERVER SAYS: lock success! you can edit Edge ${data.edgeID}`);
               if (DBG) console.log(`SERVER SAYS: unlock the edge after successful DBUPDATE`);
               this.setState({
-                isEditable: true,
+                isBeingEdited: true,
                 isExpanded: true,
                 dbIsLocked: false
               });
               this.AppCall('EDGEEDIT_LOCK', { edgeID: this.props.edgeID }); // inform NodeSelector
+              // Register as an open editor
+              UDATA.LocalCall("REGISTER_OPENEDITOR", { type: 'edge' });
             }
           });
       }
@@ -852,10 +874,12 @@ class EdgeEditor extends UNISYS.Component {
         }
       }
 
+      // Deregister as an open editor
+      UDATA.LocalCall("DEREGISTER_OPENEDITOR", { type: 'edge' });
       this.AppCall('EDGEEDIT_UNLOCK', { edgeID: this.props.edgeID }); // inform NodeSelector
       // pass currentAutoComplete back to nodeselector
       this.AppCall('AUTOCOMPLETE_SELECT',{id:'search'});
-      this.setState({ isEditable: false, sourceIsEditable: false, targetIsEditable: false });
+      this.setState({ isBeingEdited: false, sourceIsEditable: false, targetIsEditable: false });
       this.AppCall('DB_UPDATE', { edge })
         .then(() => {
           this.NetCall('SRV_DBUNLOCKEDGE', { edgeID: edge.id })
@@ -884,7 +908,7 @@ class EdgeEditor extends UNISYS.Component {
 /*/
 /*/ render () {
       const { edgeID, parentNodeLabel, parentNodeIsLocked } = this.props;
-      const { formData, sourceNode, targetNode, edgeDefs, edgeIsLockedMessage} = this.state;
+      const { formData, sourceNode, targetNode, edgeDefs, edgeIsLockedMessage, disableEdit} = this.state;
       let {citation} = this.state;
       if (edgeDefs.category === undefined) { // for backwards compatability
         edgeDefs.category = {};
@@ -940,13 +964,13 @@ class EdgeEditor extends UNISYS.Component {
                   <AutoComplete
                     identifier={'edge'+edgeID+'source'}
                     disabledValue={sourceNode.label}
-                    inactiveMode={parentNodeLabel===sourceNode.label ? 'static' : this.state.isEditable ? 'disabled' : 'link'}
+                    inactiveMode={parentNodeLabel===sourceNode.label ? 'static' : this.state.isBeingEdited ? 'disabled' : 'link'}
                     linkID={sourceNode.id}
                     shouldIgnoreSelection={!this.state.sourceIsEditable}
                     placeholder={this.state.placeholder}
                   />
                   <Button outline size="sm" className="float-right"
-                    hidden={ !(this.state.isEditable &&
+                    hidden={ !(this.state.isBeingEdited &&
                                this.state.hasValidSource &&
                                (sourceNode.label!==this.props.parentNodeLabel)) }
                     onClick={this.onChangeSource}
@@ -966,7 +990,7 @@ class EdgeEditor extends UNISYS.Component {
                   <Input type="select" name="relationship"
                     value={formData.relationship}
                     onChange={this.onRelationshipChange}
-                    disabled={!this.state.isEditable}
+                    disabled={!this.state.isBeingEdited}
                     >
                     {edgeDefs.type.options.map( option => (
                       <option key={option.label}>{option.label}</option>
@@ -986,13 +1010,13 @@ class EdgeEditor extends UNISYS.Component {
                   <AutoComplete
                     identifier={'edge'+edgeID+'target'}
                     disabledValue={targetNode.label}
-                    inactiveMode={ ( parentNodeLabel===targetNode.label && !sameSourceAndTarget ) ? 'static' : this.state.isEditable ? 'disabled' : 'link'}
+                    inactiveMode={ ( parentNodeLabel===targetNode.label && !sameSourceAndTarget ) ? 'static' : this.state.isBeingEdited ? 'disabled' : 'link'}
                     linkID={targetNode.id}
                     shouldIgnoreSelection={!this.state.targetIsEditable}
                     placeholder={this.state.placeholder}
                   />
                   <Button outline size="sm" className="float-right"
-                    hidden={ !(this.state.isEditable &&
+                    hidden={ !(this.state.isBeingEdited &&
                                this.state.hasValidTarget &&
                                ( (targetNode.label !== this.props.parentNodeLabel) ||
                                  sameSourceAndTarget )
@@ -1002,7 +1026,7 @@ class EdgeEditor extends UNISYS.Component {
                     title="Select a different target node"
                   >Change Target</Button>
                   <Button outline size="sm" className="float-right" style={{marginRight:'5px'}}
-                    hidden={!(this.state.isEditable && this.state.hasValidTarget)}
+                    hidden={!(this.state.isBeingEdited && this.state.hasValidTarget)}
                     onClick={this.onSwapSourceAndTarget}
                     title="Swap 'Source' and 'Target' nodes"
                   >&uarr;&darr;</Button>
@@ -1020,7 +1044,7 @@ class EdgeEditor extends UNISYS.Component {
                   <Input type="text" name="category"
                     value={formData.category}
                     onChange={this.onCategoryChange}
-                    readOnly={!this.state.isEditable}
+                    readOnly={!this.state.isBeingEdited}
                   />
                 </Col>
               </FormGroup><FormGroup row hidden={edgeDefs.citation.hidden}>
@@ -1035,7 +1059,7 @@ class EdgeEditor extends UNISYS.Component {
                   <Input type="text" name="citation"
                     value={formData.citation}
                     onChange={this.onCitationChange}
-                    readOnly={!this.state.isEditable}
+                    readOnly={!this.state.isBeingEdited}
                   />
                 </Col>
               </FormGroup>
@@ -1049,10 +1073,10 @@ class EdgeEditor extends UNISYS.Component {
                 </Col>
                 <Col sm={9}>
                   <Input type="textarea" name="notes"
-                    style={{display: this.state.isEditable ? 'block' : 'none'}}
+                    style={{display: this.state.isBeingEdited ? 'block' : 'none'}}
                     value={formData.notes}
                     onChange={this.onNotesChange}
-                    readOnly={!this.state.isEditable}
+                    readOnly={!this.state.isBeingEdited}
                   />
                   {this.markdownDisplay(this.state.formData.notes||'')}
                 </Col>
@@ -1069,7 +1093,7 @@ class EdgeEditor extends UNISYS.Component {
                   <Input type="text" name="info"
                     value={formData.info}
                     onChange={this.onInfoChange}
-                    readOnly={!this.state.isEditable}
+                    readOnly={!this.state.isBeingEdited}
                   />
                 </Col>
               </FormGroup>
@@ -1087,17 +1111,18 @@ class EdgeEditor extends UNISYS.Component {
                 hidden={ citation.hidden}
                 onClick={this.onCiteButtonClick}
               >Cite Edge</Button>&nbsp;&nbsp;
-              <Button outline size="sm"
-                  hidden={this.state.isLocked || this.state.isEditable || parentNodeIsLocked}
+                <Button outline size="sm"
+                  disabled={disableEdit}
+                  hidden={this.state.isLocked || this.state.isBeingEdited || parentNodeIsLocked}
                   onClick={this.onEditButtonClick}
-                >{this.state.isEditable ? "Add New Edge" : "Edit Edge"}</Button>&nbsp;
+                >{this.state.isBeingEdited ? "Add New Edge" : "Edit Edge"}</Button>&nbsp;
                 <Button size="sm"
-                  outline={this.state.isEditable}
+                  outline={this.state.isBeingEdited}
                   onClick={this.onEdgeClick}
-                >{this.state.isEditable?'Cancel':'Close'}</Button>&nbsp;
+                >{this.state.isBeingEdited?'Cancel':'Close'}</Button>&nbsp;
                 <Button color="primary" size="sm"
-                  hidden={!this.state.isEditable}
-                  disabled={ !(this.state.isEditable && this.state.hasValidTarget) }
+                  hidden={!this.state.isBeingEdited}
+                  disabled={ !(this.state.isBeingEdited && this.state.hasValidTarget) }
                 >Save</Button>
                 <p hidden={!this.state.dbIsLocked} className="small text-danger">{edgeIsLockedMessage}</p>
               </FormGroup>
@@ -1113,20 +1138,20 @@ class EdgeEditor extends UNISYS.Component {
       if (DBG) console.log('EdgeEditor.componentDidMount!');
       this.loadSourceAndTarget();
       this.onStateChange_SESSION(this.AppState('SESSION'));
-
+      this.updateEditState();
       window.addEventListener("beforeunload", this.checkUnload);
       window.addEventListener("unload", this.doUnload);
     }
 
     checkUnload(e) {
-      if (this.state.isEditable) {
+      if (this.state.isBeingEdited) {
         (e || window.event).returnValue = null;
         return null;
       }
     }
 
     doUnload(e) {
-      if (this.state.isEditable) {
+      if (this.state.isBeingEdited) {
         this.NetCall('SRV_DBUNLOCKEDGE', { edgeID: this.state.formData.id })
       }
     }
@@ -1135,7 +1160,7 @@ class EdgeEditor extends UNISYS.Component {
 /*/ Release the lock if we're unmounting
 /*/ componentWillUnmount() {
       if (DBG) console.log('EdgeEditor.componentWillUnMount!');
-      if (this.state.isEditable) {
+      if (this.state.isBeingEdited) {
         this.NetCall('SRV_DBUNLOCKEDGE', { edgeID: this.state.formData.id })
           .then((data) => {
             if (data.NOP) {
@@ -1151,6 +1176,7 @@ class EdgeEditor extends UNISYS.Component {
       this.AppStateChangeOff('SESSION', this.onStateChange_SESSION);
       this.AppStateChangeOff('SELECTION', this.handleSelection);
       this.AppStateChangeOff('TEMPLATE', this.setTemplate);
+      this.AppStateChangeOff('OPENEDITORS', this.updateEditState);
     }
 
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1166,7 +1192,7 @@ class EdgeEditor extends UNISYS.Component {
 
 
     markdownDisplay (text) {
-      if (!this.state.isEditable) {
+      if (!this.state.isBeingEdited) {
         return mdReact({
           onIterate: this.markdownIterate,
           markdownOptions: { typographer: true, linkify: true },
diff --git a/build/app/view/netcreate/components/NodeSelector.jsx b/build/app/view/netcreate/components/NodeSelector.jsx
index 58b36bfda..23ac86d71 100644
--- a/build/app/view/netcreate/components/NodeSelector.jsx
+++ b/build/app/view/netcreate/components/NodeSelector.jsx
@@ -39,7 +39,9 @@
       isLocked        Nodes can be selected for viewing, but editing
                       cannot be enabled.
 
-      isEditable      The form fields are active and can be edited.
+      disableEdit     Template is being edited, disable "Edit Node" button
+
+      isBeingEdited   The form fields are active and text can be changed.
 
 
     Delete Button
@@ -161,7 +163,8 @@ class NodeSelector extends UNISYS.Component {
         isLocked:       true,
         edgesAreLocked: false,
         dbIsLocked: false,
-        isEditable:    false,
+        disableEdit: false,
+        isBeingEdited: false,
         isValid:       false,
         isDuplicateNodeLabel: false,
         duplicateNodeID:   '',
@@ -172,6 +175,8 @@ class NodeSelector extends UNISYS.Component {
       // Bind functions to this component's object context
       this.clearForm                             = this.clearForm.bind(this);
       this.setTemplate = this.setTemplate.bind(this);
+      this.updateEditState = this.updateEditState.bind(this);
+      this.releaseOpenEditor = this.releaseOpenEditor.bind(this);
       this.getNewNodeID                          = this.getNewNodeID.bind(this);
       this.handleSelection                       = this.handleSelection.bind(this);
       this.onStateChange_SEARCH                  = this.onStateChange_SEARCH.bind(this);
@@ -217,7 +222,8 @@ class NodeSelector extends UNISYS.Component {
       this.OnAppStateChange('SEARCH', this.onStateChange_SEARCH);
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       // Handle Template updates
-      this.OnAppStateChange('TEMPLATE',this.setTemplate);
+      this.OnAppStateChange('TEMPLATE', this.setTemplate);
+      this.OnAppStateChange('OPENEDITORS', this.updateEditState);
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   /*/ If someone on the network updates a node or edge, SOURCE_UPDATE is broadcast.
       We catch it here and update the selection if the node we're displaying matches
@@ -244,7 +250,7 @@ class NodeSelector extends UNISYS.Component {
       Ignore the request if we're already editing a node.
   /*/
       UDATA.HandleMessage("NODE_EDIT", (data) => {
-        if ( (data.nodeID!==undefined) && (typeof data.nodeID==="number") && !this.state.isEditable && !this.state.isLocked ) {
+        if ( (data.nodeID!==undefined) && (typeof data.nodeID==="number") && !this.state.isBeingEdited && !this.state.isLocked ) {
           this.requestEditNode(data.nodeID);
         } else {
           console.error("NodeSelector.NODE_EDIT called with bad data.nodeID:", data.nodeID);
@@ -360,7 +366,8 @@ class NodeSelector extends UNISYS.Component {
 /// UTILITIES /////////////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ Clear the form with optional label
-/*/ clearForm ( label='' ) {
+/*/ clearForm(label = '') {
+      this.releaseOpenEditor();
       this.setState({
         formData: {
             label,
@@ -372,7 +379,7 @@ class NodeSelector extends UNISYS.Component {
         },
         edges: [],
         dbIsLocked: false,
-        isEditable:      false,
+        isBeingEdited: false,
         isValid:         false,
         isDuplicateNodeLabel: false,
         duplicateNodeID:   '',
@@ -387,6 +394,24 @@ class NodeSelector extends UNISYS.Component {
       this.setState({ nodeDefs: data.nodeDefs });
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ Disable Node Edit if a Template is being edited
+/*/
+    updateEditState() {
+      let disableEdit = false;
+      const openEditors = UDATA.AppState("OPENEDITORS").editors;
+      if (openEditors.includes('template')) disableEdit = true;
+      this.setState({ disableEdit });
+    }
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/ Deregister as an open editor
+    Remove 'node' from OPENEDITORS
+/*/
+    releaseOpenEditor() {
+      // NOTE: We only deregister if we're currently actively editing
+      //       otherwise we might inadvertently deregister
+      if (this.state.isBeingEdited) UDATA.LocalCall("DEREGISTER_OPENEDITOR", { type: 'node' });
+    }
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ Return a new unique ID
     REVIEW: Should this be in nc-logic?
     ANSWER: YES. There shouldn't be ANY data-synthesis code in a component!
@@ -430,7 +455,7 @@ class NodeSelector extends UNISYS.Component {
       if ( (activeAutoCompleteId!==thisIdentifier) &&
            (activeAutoCompleteId!=='search')          ) return;
 
-      if (!this.state.isEditable && !this.state.edgesAreLocked) {
+      if (!this.state.isBeingEdited && !this.state.edgesAreLocked) {
         if (data.nodes && data.nodes.length>0) {
 
           // A node was selected, so load it
@@ -562,6 +587,7 @@ class NodeSelector extends UNISYS.Component {
       node.attributes["Extra Info"] = newNode.attributes["Extra Info"] || '';
       node.attributes["Notes"]      = newNode.attributes["Notes"]      || '';
       // Copy to form
+      this.releaseOpenEditor();
       this.setState({
         formData: {
           label:     node.label,
@@ -572,7 +598,7 @@ class NodeSelector extends UNISYS.Component {
           isNewNode: false
         },
         dbIsLocked: false,
-        isEditable: false,
+        isBeingEdited: false,
         isDuplicateNodeLabel: false,
         hideModal: true
       });
@@ -661,20 +687,20 @@ class NodeSelector extends UNISYS.Component {
       // HACK: call server to retrieve an unused node ID
       // FIXME: this kind of data manipulation should not be in a GUI component
       DATASTORE.PromiseNewNodeID()
-      .then((newNodeID)=>{
-        this.setState({
-          formData: {
-              label:     label,
-              type:      '',
-              info:      '',
-              notes:     '',
-              id:        newNodeID,
-              isNewNode: true
-          },
-          edges: [],
-          isEditable:      true,
-          isValid:         false
-        });
+        .then((newNodeID) => {
+          this.setState({
+            formData: {
+                label:     label,
+                type:      '',
+                info:      '',
+                notes:     '',
+                id:        newNodeID,
+                isNewNode: true
+            },
+            edges: [],
+            isBeingEdited: true,
+            isValid:         false
+          });
 
         this.validateForm();
       });
@@ -783,7 +809,6 @@ class NodeSelector extends UNISYS.Component {
   /*/
   /*/
   editNode() {
-    this.setState({ isEditable: true });
     // Add ID if one isn't already defined
     let formData = this.state.formData;
     if (formData.id==='') {
@@ -794,8 +819,14 @@ class NodeSelector extends UNISYS.Component {
       // might be displayed
       // this.AppCall('SOURCE_SEARCH', { searchString: formData.label }); // JD removed because I think it is redundant and slowing things down?
     });
-    this.setState({ formData });
+    this.setState({
+      formData,
+      isBeingEdited: true
+    });
     this.validateForm();
+
+    // Register as an open editor
+    UDATA.LocalCall("REGISTER_OPENEDITOR", { type: 'node' });
   } // editNode
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/
@@ -828,15 +859,16 @@ class NodeSelector extends UNISYS.Component {
 /*/
 /*/ onCancelButtonClick () {
       // If we were editing, then revert and exit
-      if (this.state.isEditable) {
+      if (this.state.isBeingEdited) {
         let originalNode = this.AppState('D3DATA').nodes.filter( node => { return node.id === this.state.formData.id; } )[0];
         if (originalNode===undefined) {
           // user abandoned editing a new node that was never saved
           this.clearForm();
         } else {
           // restore original node
-          this.loadFormFromNode( originalNode );
-          this.setState({ isEditable: false });
+          this.loadFormFromNode(originalNode);
+          this.releaseOpenEditor();
+          this.setState({ isBeingEdited: false });
           // unlock
           this.NetCall('SRV_DBUNLOCKNODE', { nodeID: this.state.formData.id })
             .then((data) => {
@@ -858,8 +890,9 @@ class NodeSelector extends UNISYS.Component {
     event.preventDefault();
     let duplicateNodeID = parseInt(this.state.duplicateNodeID);
     this.clearForm();
+    this.releaseOpenEditor();
     this.setState({
-      isEditable: false,
+      isBeingEdited: false,
       isDuplicateNodeLabel: false
     }, () => {
         // Wait for the edit state to clear, then open up the original node
@@ -889,7 +922,8 @@ class NodeSelector extends UNISYS.Component {
           'Notes'      : formData.notes
         }
       };
-      this.setState({ isEditable: false });
+      this.releaseOpenEditor();
+      this.setState({ isBeingEdited: false });
       // clear AutoComplete form
       this.AppCall('AUTOCOMPLETE_SELECT',{id:'search'})
       .then(()=>{
@@ -920,12 +954,14 @@ class NodeSelector extends UNISYS.Component {
 /// REACT LIFECYCLE ///////////////////////////////////////////////////////////
 /*/ REACT calls this to receive the component layout and data sources
 /*/ render () {
-      let { nodeDefs,
-        citation,
+      const {
+        nodeDefs,
         duplicateWarning,
         nodeIsLockedMessage,
-        hideDeleteNodeButton
+        hideDeleteNodeButton,
+        disableEdit
       } = this.state;
+      let { citation } = this.state;
       if(citation==undefined)
       {
           citation = {};
@@ -935,7 +971,8 @@ class NodeSelector extends UNISYS.Component {
         <div>
           <FormGroup className="text-right" style={{marginTop:'-20px',paddingRight:'5px'}}>
             <Button outline size="sm"
-              hidden={this.state.isLocked || this.state.isEditable}
+              disabled={disableEdit}
+              hidden={this.state.isLocked || this.state.isBeingEdited}
               onClick={this.onNewNodeButtonClick}
             >{"Add New Node"}</Button>
           </FormGroup>
@@ -955,7 +992,7 @@ class NodeSelector extends UNISYS.Component {
                   identifier={thisIdentifier}
                   disabledValue={this.state.formData.label}
                   inactiveMode={'disabled'}
-                  shouldIgnoreSelection={this.state.isEditable}
+                  shouldIgnoreSelection={this.state.isBeingEdited}
                 />
               </Col>
               <div hidden={!this.state.isDuplicateNodeLabel}
@@ -980,7 +1017,7 @@ class NodeSelector extends UNISYS.Component {
                 <Input type="select" name="type" id="typeSelect"
                   value={this.state.formData.type||''}
                   onChange={this.onTypeChange}
-                  disabled={!this.state.isEditable}
+                  disabled={!this.state.isBeingEdited}
                   >
                   {nodeDefs.type.options.map( option => (
                     <option key={option.label}>{option.label}</option>
@@ -998,10 +1035,10 @@ class NodeSelector extends UNISYS.Component {
               </Col>
               <Col sm={9}>
                 <Input type="textarea" name="note" id="notesText"
-                  style={{display: this.state.isEditable ? 'block' : 'none'}}
+                  style={{display: this.state.isBeingEdited ? 'block' : 'none'}}
                   value={this.state.formData.notes||''}
                   onChange={this.onNotesChange}
-                  readOnly={!this.state.isEditable}
+                  readOnly={!this.state.isBeingEdited}
                   />
                   {this.markdownDisplay(this.state.formData.notes||'')}
               </Col>
@@ -1018,7 +1055,7 @@ class NodeSelector extends UNISYS.Component {
                 <Input type="text" name="info" id="info"
                   value={this.state.formData.info||''}
                   onChange={this.onInfoChange}
-                  readOnly={!this.state.isEditable}
+                  readOnly={!this.state.isBeingEdited}
                   />
               </Col>
             </FormGroup>
@@ -1033,7 +1070,8 @@ class NodeSelector extends UNISYS.Component {
                 onClick={this.onCiteButtonClick}
               >Cite Node</Button>&nbsp;&nbsp;
               <Button outline size="sm"
-                hidden={this.state.isLocked || this.state.isEditable || (this.state.formData.id==='') }
+                disabled={disableEdit}
+                hidden={this.state.isLocked || this.state.isBeingEdited || (this.state.formData.id==='') }
                 onClick={this.onEditButtonClick}
               >Edit Node</Button>
               <p hidden={!this.state.dbIsLocked} className="small text-danger">{nodeIsLockedMessage}<br/>
@@ -1043,12 +1081,12 @@ class NodeSelector extends UNISYS.Component {
                 >Force Unlock</Button></span>
               </p>
               <Button outline size="sm"
-                hidden={!this.state.isEditable}
+                hidden={!this.state.isBeingEdited}
                 onClick={this.onCancelButtonClick}
-              >{this.state.isEditable?'Cancel':'Close'}</Button>&nbsp;
+              >{this.state.isBeingEdited?'Cancel':'Close'}</Button>&nbsp;
               <Button color="primary" size="sm"
                 disabled={!this.state.isValid}
-                hidden={!this.state.isEditable}
+                hidden={!this.state.isBeingEdited}
               >Save</Button>
             </FormGroup>
             <FormGroup row className="text-left" style={{
@@ -1092,7 +1130,8 @@ class NodeSelector extends UNISYS.Component {
             ))}
             <FormGroup className="text-right">
               <Button outline size="sm"
-                hidden={this.state.isLocked || this.state.formData.id===''||this.state.isEditable}
+                disabled={disableEdit}
+                hidden={this.state.isLocked || this.state.formData.id===''||this.state.isBeingEdited}
                 onClick={this.onAddNewEdgeButtonClick}
               >Add New Edge</Button>
             </FormGroup>
@@ -1122,7 +1161,7 @@ helpText(obj)
 /*/
 markdownDisplay (text){
 
-  if(!this.state.isEditable)
+  if(!this.state.isBeingEdited)
       return mdReact({onIterate: this.markdownIterate,  markdownOptions:{ typographer: true, linkify: true}, plugins: [mdplugins.emoji]
     })(text);
 }
@@ -1150,7 +1189,7 @@ markdownIterate(Tag, props, children, level){
 
     checkUnload(e)
     {
-        if(this.state.isEditable)
+        if(this.state.isBeingEdited)
         {
           (e || window.event).returnValue = null;
           return null;
@@ -1159,7 +1198,7 @@ markdownIterate(Tag, props, children, level){
 
     doUnload(e)
     {
-          if(this.state.isEditable)
+          if(this.state.isBeingEdited)
           {
               this.NetCall('SRV_DBUNLOCKNODE', { nodeID: this.state.formData.id });
           }
@@ -1169,7 +1208,7 @@ markdownIterate(Tag, props, children, level){
 /*/ Release the lock if we're unmounting
 /*/ componentWillUnmount() {
       if (DBG) console.log('NodeEditor.componentWillUnMount!');
-      if (this.state.isEditable) {
+      if (this.state.isBeingEdited) {
         this.NetCall('SRV_DBUNLOCKNODE', { nodeID: this.state.formData.id })
           .then((data) => {
             if (data.NOP) {
@@ -1186,6 +1225,7 @@ markdownIterate(Tag, props, children, level){
       this.AppStateChangeOff('SELECTION', this.handleSelection);
       this.AppStateChangeOff('SEARCH', this.onStateChange_SEARCH);
       this.AppStateChangeOff('TEMPLATE', this.setTemplate);
+      this.AppStateChangeOff('OPENEDITORS', this.updateEditState);
     }
 
 } // class NodeSelector
diff --git a/build/app/view/netcreate/components/Template.jsx b/build/app/view/netcreate/components/Template.jsx
index 0cac13cdf..a89041463 100644
--- a/build/app/view/netcreate/components/Template.jsx
+++ b/build/app/view/netcreate/components/Template.jsx
@@ -43,13 +43,16 @@ class Template extends UNISYS.Component {
   constructor (props) {
     super(props);
     this.state = {
-      isEditing: false,
+      disableEdit: false,
+      isBeingEdited: false,
       editScope: undefined, // root, nodeTypeOptions, edgeTypeOptions
       tomlfile: undefined,
       tomlfileStatus: '',
       tomlfileErrors: undefined
     };
     this.loadEditor = this.loadEditor.bind(this);
+    this.updateEditState = this.updateEditState.bind(this);
+    this.releaseOpenEditor = this.releaseOpenEditor.bind(this);
     this.onNewTemplate = this.onNewTemplate.bind(this);
     this.onCurrentTemplateLoad = this.onCurrentTemplateLoad.bind(this);
     this.onEditNodeTypes = this.onEditNodeTypes.bind(this);
@@ -60,9 +63,13 @@ class Template extends UNISYS.Component {
     this.onCancelEdit = this.onCancelEdit.bind(this);
 
     UDATA = UNISYS.NewDataLink(this);
+    UDATA.OnAppStateChange("OPENEDITORS", this.updateEditState);
+
   } // constructor
 
-  componentDidMount() { }
+  componentDidMount() {
+    this.updateEditState();
+  }
 
   componentWillUnmount() {
     if (EDITOR) EDITOR.destroy();
@@ -95,11 +102,29 @@ class Template extends UNISYS.Component {
     if (EDITOR) EDITOR.destroy(); // clear any existing editor
     EDITOR = new JSONEditor(el, options);
 
-    this.setState({ isEditing: true });
+    this.setState({ isBeingEdited: true });
+
+    // Update OPENEDITORS
+    UDATA.LocalCall("REGISTER_OPENEDITOR", { type: 'template' });
   }
 
   /// UI EVENT HANDLERS /////////////////////////////////////////////////////////
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  updateEditState() {
+    let disableEdit = false;
+    const openEditors = UDATA.AppState("OPENEDITORS").editors;
+    if (openEditors.includes('node') ||
+      openEditors.includes('edge')) {
+      disableEdit = true;
+    }
+    this.setState({ disableEdit });
+  }
+
+  releaseOpenEditor() {
+    // Remove 'template' from OPENEDITORS
+    UDATA.LocalCall("DEREGISTER_OPENEDITOR", { type: 'template' });
+  }
+
   onNewTemplate() {
     this.setState({
       editScope: 'root'
@@ -150,7 +175,7 @@ class Template extends UNISYS.Component {
       })
   }
 
-  onTOMLfileSelect(e) {
+  onTOMLfileSelect(e) { // import
     const tomlfile = e.target.files[0];
     UDATA.LocalCall('VALIDATE_TOMLFILE', { tomlfile }) // nc-logic
       .then(result => {
@@ -186,13 +211,15 @@ class Template extends UNISYS.Component {
         if (!result.OK) {
           alert(result.info);
         } else {
-          this.setState({ isEditing: false })
+          this.setState({ isBeingEdited: false })
         }
       });
+    this.releaseOpenEditor();
   }
 
   onCancelEdit() {
-    this.setState({ isEditing: false });
+    this.setState({ isBeingEdited: false });
+    this.releaseOpenEditor();
   }
 
 
@@ -201,20 +228,26 @@ class Template extends UNISYS.Component {
 
   render() {
     const {
-      isEditing,
+      disableEdit,
+      isBeingEdited,
       tomlfile,
       tomlfileStatus,
       tomlfileErrors
     } = this.state;
-    const importDisabled = tomlfile === undefined;
-    return (
-      <div
-        style={{
-          backgroundColor: 'rgba(240,240,240,0.95)',
-          padding: '10px 20px'
-        }}
-      >
-        <div hidden={isEditing}>
+    let jsx;
+    if (disableEdit) {
+      // Node or Edge is being edited, show disabled message
+      jsx = (
+        <div>
+          <p>Please finish editing the node or edge.</p>
+          <p>Templates cannot be edited while a node or edge
+            is being edited.  </p>
+        </div>
+      )
+    } else {
+      // OK to Edit, show edit buttons
+      jsx = (
+        <div hidden={isBeingEdited}>
           <div style={{
             display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)',
             columnGap: '10px', rowGap: '5px'
@@ -246,21 +279,31 @@ class Template extends UNISYS.Component {
               </label><br />
             </div>
           </div>
+          <hr />
         </div>
-        <hr />
-        <div>
+      )
+    }
+    return (
+      <div
+        style={{
+          backgroundColor: 'rgba(240,240,240,0.95)',
+          padding: '10px 20px'
+        }}
+      >
+        {jsx}
+        <div hidden={!isBeingEdited} >
           <Button
             onClick={this.onCancelEdit}
-            hidden={!isEditing} size="sm" outline
+            size="sm" outline
           >Cancel</Button>
           &nbsp;
           <Button
             onClick={this.onSaveEdit}
-            hidden={!isEditing} size="sm" color="primary"
+            size="sm" color="primary"
           >Save Changes</Button>
+          <hr />
         </div>
-        <hr />
-        <div id="editor" hidden={!isEditing}></div>
+        <div id="editor" hidden={!isBeingEdited}></div>
       </div>
     );
   }
diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index d578ae9a8..52b14187e 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -128,6 +128,19 @@ var UDATA = UNISYS.NewDataLink(MOD);
     * nodes: all nodes (not all may be actually changed)
     * edges: all edges (not all may be actually changed)
 
+
+    OPENEDITORS
+
+    Used to coordinate Template editing vs Node/Edge editing.  Since Nodes and
+    Edges should not be edited while the Template is being edited, any editor
+    that is opened registers as an OPENEDITOR and will check on the status of
+    existing open editors.
+
+    * When a Template editor is open, "Node Edit", "Edge Edit", and "Add New Edge"
+      buttons are all disabled.
+    * When "Node Edit", "Edge Edit", or "Add New Edge" has been triggered,
+      the Template buttons on the Template panel are all disabled.
+
 \*\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -/*/
 var D3DATA = null; // see above for description
 var TEMPLATE = null; // template definition for prompts
@@ -305,6 +318,7 @@ MOD.Hook("INITIALIZE", () => {
       }
     }
   }); // StateChange SELECTION
+
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ TEMPLATE has been edited
   /*/
@@ -314,7 +328,27 @@ MOD.Hook("INITIALIZE", () => {
     m_UpdateColorMap();
   });
 
-    /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
+  /*/ OPENEDITORS is an array of all the editors (node, edge, template) that are
+      currently open.  Used to coordinate template vs node/edge editing
+      because nodes and edges should not be edited while the template
+      is being edited.
+  /*/
+  UDATA.SetAppState("OPENEDITORS", { editors: [] });
+
+  UDATA.HandleMessage("REGISTER_OPENEDITOR", data => {
+    let openEditors = UDATA.AppState("OPENEDITORS").editors;
+    openEditors.push(data.type);
+    UDATA.SetAppState("OPENEDITORS", { editors: openEditors });
+  });
+  UDATA.HandleMessage("DEREGISTER_OPENEDITOR", data => {
+    let openEditors = UDATA.AppState("OPENEDITORS").editors;
+    const i = openEditors.findIndex(e => e === data.type);
+    if (i>-1) openEditors.splice(i, 1);
+    UDATA.SetAppState("OPENEDITORS", { editors: openEditors });
+  });
+
+  /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ User has clicked on a suggestion from the AutoCopmlete suggestion list.
       The source node should be loaded in NodeSelector.
 

From 065e7b83fb8007eca6d89fadc810e37b47b4c99b Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:10:31 -0800
Subject: [PATCH 41/54] flatten: Migrate old attribute data to flattened
 node/edge object properties.

---
 build/app/view/netcreate/nc-logic.js | 55 +++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 13 deletions(-)

diff --git a/build/app/view/netcreate/nc-logic.js b/build/app/view/netcreate/nc-logic.js
index 52b14187e..f58558869 100644
--- a/build/app/view/netcreate/nc-logic.js
+++ b/build/app/view/netcreate/nc-logic.js
@@ -201,7 +201,7 @@ MOD.Hook("LOADASSETS", () => {
       (async () => {
         let p1 = await DATASTORE.PromiseJSONFile("data/" + dataset + "-db.json")
           .then(data => {
-            m_ConvertData(data);
+            m_MigrateData(data);
             m_RecalculateAllEdgeWeights(data);
             UDATA.SetAppState("D3DATA", data);
             // Save off local reference because we don't have D3DATA AppStateChange handler
@@ -222,7 +222,7 @@ MOD.Hook("LOADASSETS", () => {
   let p1 = DATASTORE.PromiseD3Data()
   .then(data => {
     if (DBG) console.log(PR, "DATASTORE returned data", data);
-    m_ConvertData(data.d3data);
+    m_MigrateData(data.d3data);
     m_RecalculateAllEdgeWeights(data.d3data);
     UDATA.SetAppState("D3DATA", data.d3data);
     UDATA.SetAppState("TEMPLATE", data.template);
@@ -483,7 +483,7 @@ MOD.Hook("INITIALIZE", () => {
       }
     }
 
-    // NOTE: State is updated in the "MaryNodeBy*" functions above.
+    // NOTE: State is updated in the "MarkNodeBy*" functions above.
   });
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inside hook
   /*/ SOURCE_UPDATE is called when the properties of a node has changed
@@ -1001,25 +1001,54 @@ function u_EscapeRegexChars(string) {
 }
 MOD.EscapeRegexChars = u_EscapeRegexChars; // Expose for filter-logic.js
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/*/ Convert all IDs to integers
-    Node and Edge IDs should be integers.
-    This isn't a problem with newly created datasets as the network-generated IDs
-    are integers.  However, with older data sets, the IDs may have been strings.
-    e.g. exports from Gephi will have string IDs.
-    This mismatch is a problem when looking up nodes by ID.
-      `data` is passed by reference
-      This modifies `data`
-      data = { nodes: [], edges: [] }
+/*/ Migrate Data from older formats
+
+    1. Convert all IDs to integers
+        Node and Edge IDs should be integers.
+        This isn't a problem with newly created datasets as the network-generated IDs
+        are integers.  However, with older data sets, the IDs may have been strings.
+        e.g. exports from Gephi will have string IDs.
+        This mismatch is a problem when looking up nodes by ID.
+          `data` is passed by reference
+          This modifies `data`
+          data = { nodes: [], edges: [] }
+    2. Convert 'attributes' from pre v1.4 datasets
+        NODES
+          attributes.Node_type => type
+          attributes[Extra Info] => info
+          attributes.Notes => notes
+        EDGES
+          attributes.Relationship => type
+          attributes.Info => info
+          attributes.Citations = citation
+          attributes.Notes => notes
+    3. Remove the old `attributes` key
 /*/
-function m_ConvertData(data) {
+function m_MigrateData(data) {
   data.nodes.forEach(node => {
     node.id = parseInt(node.id);
+    if (node.attributes) { // don't clobber if value is already set
+      node.type = node.type || node.attributes.Node_Type;
+      node.info = node.info || node.attributes["Extra Info"];
+      node.notes = node.notes || node.attributes.Notes;
+      // clear it
+      Reflect.deleteProperty(node, 'attributes');
+    }
   });
   data.edges.forEach(edge => {
     edge.id = parseInt(edge.id);
     // before D3 processing, edge.source and edge.target are ids
     edge.source = parseInt(edge.source);
     edge.target = parseInt(edge.target);
+    if (edge.attributes) { // don't clobber if value is already set
+      edge.type = edge.type || edge.attributes.Relationship;
+      edge.info = edge.info || edge.attributes.Info;
+      edge.citation = edge.citation || edge.attributes.Citations;
+      edge.notes = edge.notes || edge.attributes.Notes;
+      edge.category = edge.category || edge.attributes.Category;
+      // clear it
+      Reflect.deleteProperty(edge, 'attributes');
+    }
   });
 }
 

From 51ede11e23f7af4726806d04253f7ce3ca8ff3b3 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:13:57 -0800
Subject: [PATCH 42/54] flatten: Graph flattened data.

---
 .../netcreate/components/d3-simplenetgraph.js     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/build/app/view/netcreate/components/d3-simplenetgraph.js b/build/app/view/netcreate/components/d3-simplenetgraph.js
index 76b6163bc..72e60e822 100644
--- a/build/app/view/netcreate/components/d3-simplenetgraph.js
+++ b/build/app/view/netcreate/components/d3-simplenetgraph.js
@@ -348,7 +348,7 @@ class D3NetGraph {
           // less human-readable.
           // The problem with this approach though is that any changes
           // to the label text will result in a failed color lookup!
-          return COLORMAP[d.attributes["Node_Type"]];
+           return COLORMAP[d.type];
         })
         .style("opacity", d => {
           return d.filteredTransparency
@@ -424,8 +424,7 @@ class D3NetGraph {
             return undefined // don't set stroke width
           })
           .attr("fill", (d) => {
-            // REVIEW: Using label match.  Should we use id instead?
-            return COLORMAP[d.attributes["Node_Type"]];
+            return COLORMAP[d.type];
           })
           .attr("r", (d) => {
             // this "r" is necessary to resize after a link is added
@@ -526,17 +525,17 @@ tooltipForNode(d)
           if(this.nodeDefs.label.includeInGraphTooltip)
             titleText += this.nodeDefs.label.displayLabel + ": " + d.label + "\n";
         // Add type
-          if(this.nodeDefs.type.includeInGraphTooltip)
-            titleText += this.nodeDefs.type.displayLabel + ": " + d.attributes.Node_Type + "\n";
+          if (this.nodeDefs.type.includeInGraphTooltip)
+            titleText += this.nodeDefs.type.displayLabel + ": " + d.type + "\n";
         // Add degrees
           if(this.nodeDefs.degrees.includeInGraphTooltip)
             titleText += this.nodeDefs.degrees.displayLabel + ": " + d.weight + "\n";
         // Add notes
           if(this.nodeDefs.notes.includeInGraphTooltip)
-            titleText += this.nodeDefs.notes.displayLabel + ": " + d.attributes.Notes + "\n";
+            titleText += this.nodeDefs.notes.displayLabel + ": " + d.notes + "\n";
         // Add info
           if(this.nodeDefs.info.includeInGraphTooltip)
-            titleText += this.nodeDefs.info.displayLabel + ": " + d.attributes["Extra Info"] + "\n";
+            titleText += this.nodeDefs.info.displayLabel + ": " + d.info + "\n";
         // Add updated info
           if(this.nodeDefs.updated.includeInGraphTooltip)
             titleText += this.nodeDefs.updated.displayLabel + ": " + this.displayUpdated(d);
@@ -639,7 +638,7 @@ _UpdateLinkStrokeWidth(edge) {
 
 _UpdateLinkStrokeColor(edge) {
   let COLORMAP = UDATA.AppState('NODECOLORMAP');
-  let color = COLORMAP[edge.attributes.Relationship]
+  let color = COLORMAP[edge.type]
   return color;
 }
 

From fe7a78986d597c9ced63a88232f84dbddcbd0caa Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:18:28 -0800
Subject: [PATCH 43/54] flatten: Display flattened nodes

---
 .../view/netcreate/components/NodeDetail.jsx  |  8 +++---
 .../netcreate/components/NodeSelector.jsx     | 27 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/build/app/view/netcreate/components/NodeDetail.jsx b/build/app/view/netcreate/components/NodeDetail.jsx
index 3bf14315b..7ffcb1b30 100644
--- a/build/app/view/netcreate/components/NodeDetail.jsx
+++ b/build/app/view/netcreate/components/NodeDetail.jsx
@@ -63,10 +63,10 @@ class NodeDetail extends UNISYS.Component {
       let node = hilitedNode || {};
       node.attributes = node.attributes || {};    // validate attributes
       this.setState({
-        label : node.label,
-        type  : node.attributes["Node_Type"],     // HACK This needs to be updated when
-        info  : node.attributes["Extra Info"],    // the data format is updated
-        notes : node.attributes["Notes"]          // These were bad keys from Fusion Tables.
+        label: node.label,
+        type: node.type,
+        info: node.info,
+        notes: node.notes
       });
     } // handleSelection
 
diff --git a/build/app/view/netcreate/components/NodeSelector.jsx b/build/app/view/netcreate/components/NodeSelector.jsx
index 23ac86d71..1884f06a6 100644
--- a/build/app/view/netcreate/components/NodeSelector.jsx
+++ b/build/app/view/netcreate/components/NodeSelector.jsx
@@ -582,18 +582,19 @@ class NodeSelector extends UNISYS.Component {
       if (isNaN(newNode.id)) { newNode.id = parseInt(newNode.id); }
       //
       node.label                    = newNode.label || '';
-      node.id                       = newNode.id    || '';
-      node.attributes["Node_Type"]  = newNode.attributes["Node_Type"]  || '';
-      node.attributes["Extra Info"] = newNode.attributes["Extra Info"] || '';
-      node.attributes["Notes"]      = newNode.attributes["Notes"]      || '';
+      node.id                       = newNode.id || '';
+      node.type = newNode.type;
+      node.info = newNode.info;
+      node.notes = newNode.notes;
+
       // Copy to form
       this.releaseOpenEditor();
       this.setState({
         formData: {
-          label:     node.label,
-          type:      node.attributes["Node_Type"],     // HACK This needs to be updated when
-          info:      node.attributes["Extra Info"],    // the data format is updated
-          notes:     node.attributes["Notes"],         // These were bad keys from Fusion Tables.
+          label: node.label,
+          type:      node.type,
+          info:      node.info,
+          notes:     node.notes,
           id:        node.id,
           isNewNode: false
         },
@@ -915,12 +916,10 @@ class NodeSelector extends UNISYS.Component {
       let formData = this.state.formData;
       let node = {
         label : formData.label?formData.label:'',
-        id    : formData.id,
-        attributes: {
-          'Node_Type'  : formData.type,
-          'Extra Info' : formData.info,
-          'Notes'      : formData.notes
-        }
+        id: formData.id,
+        type: formData.type,
+        info: formData.info,
+        notes: formData.notes
       };
       this.releaseOpenEditor();
       this.setState({ isBeingEdited: false });

From 4b877add8ce1e33c7a7d801115ff022ad7da1716 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:21:36 -0800
Subject: [PATCH 44/54] flatten: Display flattened edge data

---
 .../view/netcreate/components/EdgeEditor.jsx  | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/build/app/view/netcreate/components/EdgeEditor.jsx b/build/app/view/netcreate/components/EdgeEditor.jsx
index b459c417a..c4e96ecbd 100644
--- a/build/app/view/netcreate/components/EdgeEditor.jsx
+++ b/build/app/view/netcreate/components/EdgeEditor.jsx
@@ -220,7 +220,7 @@ class EdgeEditor extends UNISYS.Component {
         formData: {                 // Holds the state of the form fields
           sourceId:     '',
           targetId:     '',
-          relationship: '',
+          type: '',
           info:         '',
           notes:        '',
           citation:     '',
@@ -329,7 +329,7 @@ class EdgeEditor extends UNISYS.Component {
         formData: {
           sourceId:     '',
           targetId:     '',
-          relationship: '',
+          type: '',
           info:         '',
           notes:        '',
           citation:     '',
@@ -415,13 +415,11 @@ class EdgeEditor extends UNISYS.Component {
           source: parseInt(sourceNodes[0].id),  // REVIEW: d3data 'source' is id, rename this to 'sourceId'?
                                       // though after d3 processes, source does become an object.
           target: undefined,
-          attributes: {
-            Relationship: '',
-            Info: '',
-            Citations: '',
-            Category: '',
-            Notes: ''
-          }
+          type: '',
+          notes: '',
+          info: '',
+          citation: '',
+          category: ''
         }
         // Expand this EdgeEditor and set it to Edit mode.
         this.setState({
@@ -466,11 +464,11 @@ class EdgeEditor extends UNISYS.Component {
           id:           parseInt(edge.id) || '',
           sourceId:     edge.source,
           targetId:     edge.target,
-          relationship: edge.attributes["Relationship"] || '',   // Make sure there's valid data
-          info:         edge.attributes["Info"] || '',
-          citation:     edge.attributes["Citations"] || '',
-          category:     edge.attributes["Category"] || '',
-          notes:        edge.attributes["Notes"] || '',
+          type: edge.type || '',   // Make sure there's valid data
+          info: edge.info || '',
+          citation: edge.citation || '',
+          category: edge.category || '',
+          notes: edge.notes || '',
           isNewEdge:    false
         },
         sourceNode: sourceNode,
@@ -796,7 +794,7 @@ class EdgeEditor extends UNISYS.Component {
 /*/
 /*/ onRelationshipChange (event) {
       let formData = this.state.formData;
-      formData.relationship = event.target.value;
+      formData.type = event.target.value;
       this.setState({formData: formData});
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -840,13 +838,11 @@ class EdgeEditor extends UNISYS.Component {
         source:         this.state.sourceNode.id,   // REVIEW: d3data 'source' is id, rename this to 'sourceId'?
                                                     // though after d3 processes, source does become an object.
         target:         this.state.targetNode.id,   // REVIEW: d3data 'target' is id, rename this to 'targetId'?
-        attributes: {
-          Relationship: formData.relationship,
-          Info:         formData.info,
-          Citations:    formData.citation,
-          Category:     formData.category,
-          Notes:        formData.notes
-        }
+        type: formData.type,
+        info: formData.info,
+        citation: formData.citation,
+        category: formData.category,
+        notes: formData.notes
       }
       if (DBG) console.group('EdgeEntry.onSubmit submitting',edge)
 
@@ -937,7 +933,7 @@ class EdgeEditor extends UNISYS.Component {
               style={{ backgroundColor: "#a9d3ff", borderColor: 'transparent', width: '100%', marginBottom: '3px', textAlign: "left", overflow: "hidden" }}
               onClick={this.onEdgeClick}
             >{parentNodeLabel === sourceNode.label ? me : sourceNode.label}
-              &nbsp;<span title={formData.relationship}>&#x2794;</span>&nbsp;
+              &nbsp;<span title={formData.type}>&#x2794;</span>&nbsp;
               {parentNodeLabel === targetNode.label ? me : targetNode.label}
             </Button>
           </div>
@@ -988,7 +984,7 @@ class EdgeEditor extends UNISYS.Component {
                 </Col>
                 <Col sm={9}>
                   <Input type="select" name="relationship"
-                    value={formData.relationship}
+                    value={formData.type}
                     onChange={this.onRelationshipChange}
                     disabled={!this.state.isBeingEdited}
                     >

From 910b77b22435b16547b15b5e174cc84873f24960 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:25:17 -0800
Subject: [PATCH 45/54] flatten: Display flattened Node Table data.

---
 .../view/netcreate/components/NodeTable.jsx   | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/build/app/view/netcreate/components/NodeTable.jsx b/build/app/view/netcreate/components/NodeTable.jsx
index 4cb4c5e39..7af43cbbe 100644
--- a/build/app/view/netcreate/components/NodeTable.jsx
+++ b/build/app/view/netcreate/components/NodeTable.jsx
@@ -206,7 +206,7 @@ class NodeTable extends UNISYS.Component {
       return 0;
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/*/
+/*/ DEPRECATED -- 'attributes' is no longer being used
 /*/ sortByAttribute (nodes, key) {
       if (nodes) {
         return nodes.sort( (a,b) => {
@@ -219,7 +219,20 @@ class NodeTable extends UNISYS.Component {
       }
       return 0;
     }
-
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/
+/*/ sortByKey (nodes, key) {
+      if (nodes) {
+        return nodes.sort( (a,b) => {
+          let akey = a[key],
+              bkey = b[key];
+          if (akey<bkey) return -1*Number(this.sortDirection);
+          if (akey>bkey) return 1*Number(this.sortDirection);
+          return 0;
+        });
+      }
+      return 0;
+    }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/
 /*/ sortByUpdated(nodes) {
@@ -247,15 +260,15 @@ class NodeTable extends UNISYS.Component {
           return this.sortByEdgeCount(nodes);
           break;
         case 'type':
-          return this.sortByAttribute(nodes, 'Node_Type');
+          return this.sortByKey(nodes, 'type');
           break;
         case 'notes':
-          return this.sortByAttribute(nodes, 'Notes');
+          return this.sortByKey(nodes, 'notes');
           break;
         case 'info':
-          return this.sortByAttribute(nodes, 'Extra Info');
+          return this.sortByKey(nodes, 'info');
           break;
-        case 'Updated':
+        case 'updated':
           return this.sortByUpdated(nodes);
           break;
         case 'label':
@@ -387,8 +400,8 @@ render() {
                   onClick={()=>this.setSortKey("notes")}
                 >{nodeDefs.notes.displayLabel} {this.sortSymbol("notes")}</Button></th>
             <th  width="10%"hidden={!isLocalHost}><Button size="sm"
-                  onClick={()=>this.setSortKey("Updated")}
-                >Updated {this.sortSymbol("Updated")}</Button></th>
+                  onClick={()=>this.setSortKey("updated")}
+                >Updated {this.sortSymbol("updated")}</Button></th>
           </tr>
         </thead>
         <tbody style={{maxHeight: tableHeight}}>
@@ -407,10 +420,10 @@ render() {
             <td>{node.degrees}</td>
             <td><a href="#" onClick={(e)=>this.selectNode(node.id,e)}
                 >{node.label}</a></td>
-            <td hidden={nodeDefs.type.hidden}>{node.attributes["Node_Type"]}</td>
-            <td hidden={nodeDefs.info.hidden}>{node.attributes["Extra Info"]}</td>
+            <td hidden={nodeDefs.type.hidden}>{node.type}</td>
+            <td hidden={nodeDefs.info.hidden}>{node.info}</td>
             <td hidden={nodeDefs.notes.hidden}>
-              {node.attributes["Notes"] ? <MarkdownNote text={node.attributes["Notes"]} /> : "" }
+              {node.notes ? <MarkdownNote text={node.notes} /> : "" }
             </td>
             <td hidden={!isLocalHost}>{this.displayUpdated(node)}</td>
           </tr>

From e47999b4ffe72a9566bd9211f8e258ef35472d03 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:26:55 -0800
Subject: [PATCH 46/54] flatten: Display flattened Edge Table data

---
 .../view/netcreate/components/EdgeTable.jsx   | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/build/app/view/netcreate/components/EdgeTable.jsx b/build/app/view/netcreate/components/EdgeTable.jsx
index d977ea007..b5943de85 100644
--- a/build/app/view/netcreate/components/EdgeTable.jsx
+++ b/build/app/view/netcreate/components/EdgeTable.jsx
@@ -210,7 +210,7 @@ class EdgeTable extends UNISYS.Component {
       return undefined;
     }
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/*/
+/*/ DEPRECATED -- 'attributes' is no longer being used
 /*/ sortByAttribute (edges, key) {
       if (edges) {
         return edges.sort( (a,b) => {
@@ -230,9 +230,30 @@ class EdgeTable extends UNISYS.Component {
       }
       return undefined;
     }
-
-    /// ---
-    sortByUpdated(edges) {
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/
+/*/ sortByKey (edges, key) {
+      if (edges) {
+        return edges.sort( (a,b) => {
+          let akey = a[key],
+              bkey = b[key];
+          if (akey<bkey) return -1*Number(this.sortDirection);
+          if (akey>bkey) return 1*Number(this.sortDirection);
+          if (akey===bkey) {
+            // Secondary sort on Source label
+            let source_a = a.source.label;
+            let source_b = b.source.label;
+            if (source_a<source_b) return -1*Number(this.sortDirection);
+            if (source_a>source_b) return 1*Number(this.sortDirection);
+          }
+          return 0;
+        });
+      }
+      return undefined;
+    }
+/// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/*/
+/*/ sortByUpdated(edges) {
       if (edges) {
         return edges.sort( (a,b) => {
           let akey = (a.meta.revision > 0 ? a.meta.updated : a.meta.created),
@@ -258,23 +279,23 @@ class EdgeTable extends UNISYS.Component {
           return this.sortByTargetLabel(edges);
           break;
         case 'Info':
-          return this.sortByAttribute(edges, 'Info');
+          return this.sortByKey(edges, 'info');
           break;
         case 'Notes':
-          return this.sortByAttribute(edges, 'Notes');
+          return this.sortByKey(edges, 'notes');
           break;
         case 'Category':
-          return this.sortByAttribute(edges, 'Category');
+          return this.sortByKey(edges, 'category');
           break;
         case 'Citations':
-          return this.sortByAttribute(edges, 'Citations');
+          return this.sortByKey(edges, 'citation');
           break;
         case 'Updated':
           return this.sortByUpdated(edges);
           break;
         case 'Relationship':
         default:
-          return this.sortByAttribute(edges, 'Relationship');
+          return this.sortByKey(edges, 'type');
           break;
       }
     }
@@ -472,16 +493,16 @@ class EdgeTable extends UNISYS.Component {
                 <td hidden={!DBG}>{edge.source.id}</td>
                 <td><a href="#" onClick={(e)=>this.selectNode(edge.source.id,e)}
                     >{edge.source.label || edge.source}</a></td>
-                <td>{edge.attributes["Relationship"]}</td>
+                <td>{edge.type}</td>
                 <td hidden={!DBG}>{edge.target.id}</td>
                 <td><a href="#" onClick={(e)=>this.selectNode(edge.target.id,e)}
                     >{edge.target.label || edge.target}</a></td>
-                <td hidden={edgeDefs.category.hidden}>{edge.attributes["Category"]}</td>
-                <td hidden={edgeDefs.citation.hidden}>{edge.attributes["Citations"]}</td>
+                <td hidden={edgeDefs.category.hidden}>{edge.category}</td>
+                <td hidden={edgeDefs.citation.hidden}>{edge.citation}</td>
                 <td hidden={edgeDefs.notes.hidden}>
-                  {edge.attributes["Notes"] ? <MarkdownNote text={edge.attributes["Notes"]} /> : "" }
+                  {edge.notes ? <MarkdownNote text={edge.notes} /> : "" }
                 </td>
-                <td hidden={edgeDefs.info.hidden}>{edge.attributes["Info"]}</td>
+                <td hidden={edgeDefs.info.hidden}>{edge.info}</td>
                 <td hidden={!isLocalHost}>{this.displayUpdated(edge)}</td>
               </tr>
             ))}

From 7f8646500b672499615a0817c8fb85144e5e0e38 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:27:45 -0800
Subject: [PATCH 47/54] flatten: lint/doc

---
 build/app/unisys/server-database.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index 7d1369753..a8a175c62 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -225,6 +225,10 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
       exportLabel: field.label,
       help: field.help,
       hidden: field.hidden || false // default to not hidden
+      // If necessary, user can edit template to hide it again.
+      // We want it visible by default, because of migrations
+      // the original field may not be defined.
+      // e.g. orig template uses "Relationship" not "type"
     }
     if (k === 'type') {
       // special handling for type options

From 7facf0fcb3fa48141ef8225177c194b5678d87ef Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:30:19 -0800
Subject: [PATCH 48/54] flatten: Remove deprecated flattening maps for filters.

---
 build/app/view/netcreate/filter-logic.js | 28 ++----------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/build/app/view/netcreate/filter-logic.js b/build/app/view/netcreate/filter-logic.js
index 8529ac6c6..fc5118100 100644
--- a/build/app/view/netcreate/filter-logic.js
+++ b/build/app/view/netcreate/filter-logic.js
@@ -106,20 +106,6 @@ const TEMPLATE_URL = `templates/${DATASET}.json`;
 const DBG = false;
 const PR = "filter-logic: ";
 
-
-const HACKMAP_NODES = { // Map to convert old 'attributes' data formats.
-  type: "Node_Type",    // Used in m_IsNodeMatchedByFilter
-  info: "Extra Info",
-  notes: "Notes"
-}
-const HACKMAP_EDGES = { // Map to convert old 'attributes' data formats.
-  type: "Relationship", // Used in m_IsEdgeMatchedByFilter
-  category: "Category",
-  citation: "Citations",
-  info: "Info",
-  notes: "Notes"
-}
-
 /// UNISYS HANDLERS ///////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 /*/ lifecycle INITIALIZE handler
@@ -485,18 +471,8 @@ function m_IsNodeMatchedByFilter(node, filter) {
     return false; // nothing to filter
   }
 
-  let nodeValue;
-  // HACK
-  // The old data model has secondary keys stuffed
-  // into an `attributes` object.  This is a
-  // holdover from the original pre-netcreate
-  // data import.  If we ever change the data format
-  // this HACKMAP should be removed.
-  if (['type', 'info', 'notes'].includes(filter.key)) {
-    nodeValue = node.attributes[HACKMAP_NODES[filter.key]];
-  } else {
-    nodeValue = node[filter.key];
-  }
+  const nodeValue = node[filter.key];
+
   switch (filter.operator) {
     case FILTER.OPERATORS.CONTAINS.key:
       return m_MatchString(filter.value, nodeValue, true);

From f1c0e57a1efc4b92917fdbe253af975fcf334156 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 14:34:49 -0800
Subject: [PATCH 49/54] flatten: Use TEMPLATE settings for export.  Deprecate
 attributes calls.  (Leave them in in case we need to process objects in the
 future)

---
 build/app/view/netcreate/export-logic.js | 60 ++++++++++--------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/build/app/view/netcreate/export-logic.js b/build/app/view/netcreate/export-logic.js
index 85c4c8b18..105d59387 100644
--- a/build/app/view/netcreate/export-logic.js
+++ b/build/app/view/netcreate/export-logic.js
@@ -18,36 +18,6 @@ var UDATA = UNISYS.NewDataLink(MOD);
 
 /// CONSTANTS /////////////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-/// Define Node KEYS to export
-/// Subkeys are mapped with a `:`, e.g. attributes:Node_Type
-/// REVIEW: Should this be defined in the Template?
-const NODEKEYS = [
-  'id',
-  'label',
-  { 'attributes': ['Node_Type', 'Extra Info', 'Notes'] },
-  'degrees',
-  { 'meta': ['created', 'updated']}
-];
-/// Export Labels -- Exported data uses these labels as headers
-/// During the export, we do a simple key lookup to match the label
-/// e.g. 'id' becomes 'ID' in the exported file
-const NODEKEY_LABELS = {
-  'id': 'ID',
-  'label': 'Label',
-  'attributes:Node_Type': 'Attributes:Node_Type',
-  'attributes:Extra Info': 'Attributes:Extra Info',
-  'attributes:Notes': 'Attributes:Notes',
-  'degrees': 'Degrees',
-  'meta:created': 'Meta:Created',
-  'meta:updated': 'Meta:Updated'
-}
-const EDGEKEYS = [
-  'id',
-  'source',
-  'target',
-  { 'attributes': ['Relationship', 'Info', 'Citations', 'Category', 'Notes'] },
-  { 'meta': ['created', 'updated']}
-];
 
 /// UTILITIES /////////////////////////////////////////////////////////////////
 /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -63,6 +33,8 @@ function m_encode(data) {
   return String(data).replace(/"/g, '""');
 }
 
+// DEPRECATED -- Used to flatten 'attributes'
+//    'attributes' have been removed, so this should not be needed anymore
 // Converts nested key definitions into a flat array, e.g.
 //     from ['id', { attributes: ['type', 'info'] } ]
 //     into ['id', 'attributes:type', 'attributes:info']
@@ -94,6 +66,7 @@ function m_getNodeValues(node, keys) {
     // If the key is an object, recurse
     // eslint-disable-next-line prefer-reflect
     if (Object.prototype.toString.call(key) === '[object Object]') {
+      // DEPRECATED -- 'attribute' handler.
       const subKeys = Object.keys(key); // can have multiple subKeys
       subKeys.forEach(k => {
         RESULT.push( m_getNodeValues(node[k], key[k]) );
@@ -132,6 +105,7 @@ function m_getEdgeValues(edge, keys) {
     // If the key is an object, recurse
     // eslint-disable-next-line prefer-reflect
     if (Object.prototype.toString.call(key) === '[object Object]') {
+      // DEPRECATED -- 'attribute' handler.
       const subKeys = Object.keys(key); // can have multiple subKeys
       subKeys.forEach(k => {
         RESULT.push( m_getNodeValues(edge[k], key[k]) );
@@ -175,26 +149,31 @@ function m_GenerateEdgesArray(edges, edgekeys) {
 /// Exports FILTERED data, not the full data set.
 MOD.ExportNodes = () => {
   const DATA = UDATA.AppState('FILTEREDD3DATA');
+  const TEMPLATE = UDATA.AppState('TEMPLATE');
   const { nodes } = DATA;
   let EXPORT = '';
 
   /// 1. Export Nodes
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   /// Define Node KEYS to export
-  const nodesArr = m_GenerateNodesArray(nodes, NODEKEYS);
+  /// Use nodekeys from TEMPLATE
+  const nodekeys = Object.keys(TEMPLATE.nodeDefs);
+  const nodesArr = m_GenerateNodesArray(nodes, nodekeys);
 
   /// 2. Expand to CSV
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   ///    3.1. NODES
   ///    3.1.1. Create headers
-  const nodeHeadersArr = NODEKEYS.map(key => {
+  const nodeHeadersArr = nodekeys.map(key => {
     // eslint-disable-next-line prefer-reflect
     if (Object.prototype.toString.call(key) === '[object Object]') {
+      // DEPRECATED -- 'attribute' handler.
       const subKeys = Object.keys(key); // can have multiple subKeys
       const internalkeys = subKeys.map(sk => key[sk].map(k => `${sk}:${k}`)).flat();
       return internalkeys.map(k => NODEKEY_LABELS[k]);
     } else {
-      return NODEKEY_LABELS[key];
+      // return NODEKEY_LABELS[key];
+      return TEMPLATE.nodeDefs[key].exportLabel;
     }
   });
   const nodeHeaders = nodeHeadersArr.flat();
@@ -224,25 +203,34 @@ MOD.ExportNodes = () => {
 /// Exports FILTERED data, not the full data set.
 MOD.ExportEdges = () => {
   const DATA = UDATA.AppState('FILTEREDD3DATA');
+  const TEMPLATE = UDATA.AppState('TEMPLATE');
   const { edges } = DATA;
   let EXPORT = '';
 
   /// 1. Export Edges
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   /// Define Edge KEYS
-  const edgesArr = m_GenerateEdgesArray(edges, EDGEKEYS);
+
+  // Old attributes method
+  // const edgesArr = m_GenerateEdgesArray(edges, EDGEKEYS);
+
+  // New Template method
+  // Use edgekeys from TEMPLATE
+  const edgekeys = Object.keys(TEMPLATE.edgeDefs);
+  const edgesArr = m_GenerateEdgesArray(edges, edgekeys);
 
   /// 3. Expand to CSV
   /// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   ///   3.1. EDGES
   ///   3.1.1. Create headers
-  const edgeHeadersArr = EDGEKEYS.map(key => {
+  const edgeHeadersArr = edgekeys.map(key => {
     // eslint-disable-next-line prefer-reflect
     if (Object.prototype.toString.call(key) === '[object Object]') {
+      // DEPRECATED -- 'attribute' handler.
       const subKeys = Object.keys(key); // can have multiple subKeys
       return subKeys.map(sk => key[sk].map(k => `${sk}:${k}`)).flat();
     } else {
-      return key;
+      return TEMPLATE.edgeDefs[key].exportLabel;
     }
   });
   const edgeHeaders = edgeHeadersArr.flat();

From da520dc1177c40b56995fc49745ce9be9f15a767 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 21:20:48 -0800
Subject: [PATCH 50/54] flatten: Fix JSONtoTOML migration: auto-set 'type'
 nodeDef and edgeDefs to be `type=select` with options.

---
 build/app/unisys/server-database.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/app/unisys/server-database.js b/build/app/unisys/server-database.js
index a8a175c62..38f979c48 100644
--- a/build/app/unisys/server-database.js
+++ b/build/app/unisys/server-database.js
@@ -185,7 +185,10 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
           label: o.label,
           color: o.color
         }
-      })
+      });
+      // make sure field type is set to "select" -- older templates do not set type
+      nodeDefs[k].type = 'select';
+      console.log(PR,'...migrating nodeDefs field', k,'with options, forcing type to "select"')
       nodeDefs[k].options = options;
     }
   })
@@ -238,6 +241,9 @@ function m_MigrateJSONtoTOML(JSONtemplate) {
           color: o.color
         }
       })
+      // make sure field type is set to "select" -- older templates do not set type
+      edgeDefs[k].type = 'select';
+      console.log(PR,'...migrating edgeDefs field', k,'with options, forcing type to "select"')
       edgeDefs[k].options = options;
     }
   })

From 02699bc6c4412d370045a09f5d09690bd76561a8 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 21:24:22 -0800
Subject: [PATCH 51/54] flatten: Fix default template label defautls.

---
 build/app/assets/templates/_default.template.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/app/assets/templates/_default.template.toml b/build/app/assets/templates/_default.template.toml
index 328b22102..fb49f790e 100644
--- a/build/app/assets/templates/_default.template.toml
+++ b/build/app/assets/templates/_default.template.toml
@@ -16,13 +16,13 @@ hidden = false
 
 [nodeDefs.id]
 type = "number"
-displayLabel = "id"
+displayLabel = "Id"
 exportLabel = "ID"
 help = "System-generated unique id number"
 
 [nodeDefs.label]
 type = "string"
-displayLabel = "label"
+displayLabel = "Label"
 exportLabel = "Label"
 help = "Display name of the node"
 includeInGraphTooltip = true
@@ -101,7 +101,7 @@ hidden = false
 
 [edgeDefs.id]
 type = "number"
-displayLabel = "id"
+displayLabel = "Id"
 exportLabel = "ID"
 help = "System-generated unique id number"
 

From 7a45819ad7b5f59de915322c176fd5b6afa95e17 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Thu, 27 Jan 2022 21:26:24 -0800
Subject: [PATCH 52/54] flatten: Fix filters to use flattened object key
 references (removed old 'attributes' processing).

---
 build/app/view/netcreate/filter-logic.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/build/app/view/netcreate/filter-logic.js b/build/app/view/netcreate/filter-logic.js
index fc5118100..861d42d86 100644
--- a/build/app/view/netcreate/filter-logic.js
+++ b/build/app/view/netcreate/filter-logic.js
@@ -585,17 +585,7 @@ function m_IsEdgeMatchedByFilter(edge, filter) {
     // point to node objects, not simple strings.
     edgeValue = edge[filter.key].label; // search on the source/target node label
   } else {
-    // HACK
-    // The old data model has secondary keys stuffed
-    // into an `attributes` object.  This is a
-    // holdover from the original pre-netcreate
-    // data import.  If we ever change the data format
-    // this HACKMAP should be removed.
-    if (['category','citation','info','notes','type'].includes(filter.key)) {
-      edgeValue = edge.attributes[HACKMAP_EDGES[filter.key]];
-    } else {
-      edgeValue = edge[filter.key];
-    }
+    edgeValue = edge[filter.key];
   }
 
   switch (filter.operator) {

From 08a914c0db5777df2a08c6409ca8d0f8392268b5 Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Fri, 28 Jan 2022 15:47:34 -0800
Subject: [PATCH 53/54] toml: Add description, examples, for Template Name

---
 build/app/view/netcreate/template-logic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index 8cd620487..af46f49ef 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -66,7 +66,7 @@ const SCHEMA = {
   properties: {
     "name": {
       type: 'string',
-      description: 'Template Name',
+      description: 'A short descriptive title for the project.  This is displayed on the graph view.  It can contain spaces.  e.g. "Alexander the Great"',
       default: 'Untitled Template'
     },
     "description": {

From a34e319048591400b9178ba4e25869f94774e19c Mon Sep 17 00:00:00 2001
From: Ben Loh <ben@inquirium.net>
Date: Fri, 28 Jan 2022 15:48:12 -0800
Subject: [PATCH 54/54] toml: Make 'hideDeleteNodeButton` a checkbox.

---
 build/app/view/netcreate/template-logic.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/app/view/netcreate/template-logic.js b/build/app/view/netcreate/template-logic.js
index af46f49ef..dfcdc6a2b 100644
--- a/build/app/view/netcreate/template-logic.js
+++ b/build/app/view/netcreate/template-logic.js
@@ -103,6 +103,7 @@ const SCHEMA = {
       // -- or has `?admin=true` GET parameter
       // This will force hide the delete button even if you're an admin
       type: 'boolean',
+      format: 'checkbox',
       description: 'Always hide Node delete button, even for admins.',
       default: false
     },