Added 'Create Class' node in OperationEditor. Fixes #171

WIP #171 Adding support for new classes WIP #171. Fixed "New Class" tooltip WIP #171 Fixed eslint error
deepforge-dev · Jun 29, 2016 · 5fba36b · 5fba36b
1 parent e30ebf3
commit 5fba36b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 15 deletions.
diff --git a/src/decorators/OpIntDecorator/EasyDAG/OpIntDecorator.EasyDAGWidget.js b/src/decorators/OpIntDecorator/EasyDAG/OpIntDecorator.EasyDAGWidget.js
@@ -33,7 +33,7 @@ define([
     OpIntDecorator.prototype.initialize = function() {
         if (this._node.baseName === 'Operation') {
             this.color = '#2196f3';
-        } else {
+        } else if (this._node.baseName) {
             // On hover, show the type
             this.enableTooltip(this._node.baseName, 'dark');
         }

diff --git a/...ualizers/panels/OperationInterfaceEditor/OperationInterfaceEditorControl.EventHandlers.js b/...ualizers/panels/OperationInterfaceEditor/OperationInterfaceEditorControl.EventHandlers.js
@@ -9,6 +9,22 @@ define([
         this._widget.addRefTo = this.addRefTo.bind(this);
         this._widget.changePtrName = this.changePtrName.bind(this);
         this._widget.removePtr = this.removePtr.bind(this);
+        this._widget.getNewClassNode = this.getNewClassNode.bind(this);
+    };
+
+    OperationInterfaceEditorEvents.prototype.getNewClassNode = function(id) {
+        var Decorator = this._client.decoratorManager.getDecoratorForWidget(
+            this.DEFAULT_DECORATOR, 'EasyDAG');
+
+        return {
+            node: {
+                id: id,
+                class: 'create-node',
+                name: 'New Class...',
+                Decorator: Decorator,
+                attributes: {}
+            }
+        };
     };
 
     OperationInterfaceEditorEvents.prototype.allValidReferences = function() {

diff --git a/src/visualizers/widgets/OperationInterfaceEditor/OperationInterfaceEditorWidget.js b/src/visualizers/widgets/OperationInterfaceEditor/OperationInterfaceEditorWidget.js
@@ -6,13 +6,15 @@
  */
 
 define([
+    'deepforge/globals',
     'widgets/EasyDAG/EasyDAGWidget',
     'widgets/EasyDAG/AddNodeDialog',
     './SelectionManager',
     './Item',
     'underscore',
     'css!./styles/OperationInterfaceEditorWidget.css'
 ], function (
+    DeepForge,
     EasyDAG,
     AddNodeDialog,
     SelectionManager,
@@ -22,7 +24,8 @@ define([
     'use strict';
 
     var OperationInterfaceEditorWidget,
-        WIDGET_CLASS = 'operation-interface-editor';
+        WIDGET_CLASS = 'operation-interface-editor',
+        NEW_CLASS_ID = '__NEW_CLASS__';
 
     OperationInterfaceEditorWidget = function (logger, container) {
         EasyDAG.call(this, logger, container);
@@ -45,22 +48,19 @@ define([
 
     OperationInterfaceEditorWidget.prototype.onAddButtonClicked = function(item, isInput) {
         var successorPairs = this.getValidSuccessorNodes(item.id),
-            successor = successorPairs[0];
+            newClass = this.getNewClassNode(NEW_CLASS_ID);
 
-        if (successorPairs.length > 1) {
-            // Create the modal view with all possible subsequent nodes
-            var dialog = new AddNodeDialog(),
-                title = this._getAddSuccessorTitle(item);
+        // Add the 'Create Class' node
+        successorPairs.push(newClass);
 
-            dialog.show(title, successorPairs);
-            dialog.onSelect = pair => {
-                if (pair) {
-                    this.onAddItemSelected(pair, isInput);
+        AddNodeDialog.prompt(successorPairs)
+            .then(selected => {
+                if (selected.node.id === NEW_CLASS_ID) {
+                    DeepForge.create.Complex();
+                } else {
+                    this.onAddItemSelected(selected, isInput);
                 }
-            };
-        } else if (successor) {
-            this.onAddItemSelected(successor, isInput);
-        }
+            });
     };
 
     OperationInterfaceEditorWidget.prototype.onDeactivate = function() {