#7461 fix for displaying EasyForm in OutputContainer for JVM kernels

twosigma · Jul 16, 2018 · 9a2db3d · 9a2db3d
1 parent 0065909
commit 9a2db3d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/easyform/EasyForm.java b/kernel/base/src/main/java/com/twosigma/beakerx/easyform/EasyForm.java
@@ -25,9 +25,9 @@
 import com.twosigma.beakerx.easyform.formitem.widgets.ComboBoxWidget;
 import com.twosigma.beakerx.easyform.formitem.widgets.DatePickerComponentWidget;
 import com.twosigma.beakerx.easyform.formitem.widgets.PasswordWidget;
+import com.twosigma.beakerx.easyform.formitem.widgets.RadioButtonComponentWidget;
 import com.twosigma.beakerx.easyform.formitem.widgets.SelectMultipleSingleWidget;
 import com.twosigma.beakerx.easyform.formitem.widgets.SelectMultipleWidget;
-import com.twosigma.beakerx.easyform.formitem.widgets.RadioButtonComponentWidget;
 import com.twosigma.beakerx.easyform.formitem.widgets.TextAreaWidget;
 import com.twosigma.beakerx.easyform.formitem.widgets.TextFieldWidget;
 import com.twosigma.beakerx.widget.DOMWidget;
@@ -375,12 +375,16 @@ public void setNotReady() {
     this.ready = Boolean.FALSE;
   }
 
+  public EasyFormView getView(){
+    EasyFormView easyFormView = new EasyFormView(this.getCommFunctionalities());
+    easyFormView.setEasyFormName(this.getCaption());
+    return easyFormView;
+  }
+
   @Override
   public void display() {
     this.setReady();
-    EasyFormView easyFormView = new EasyFormView(this.getCommFunctionalities());
-    easyFormView.setEasyFormName(this.getCaption());
-    easyFormView.display();
+    this.getView().display();
   }
 
 }
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/jvm/object/OutputContainerLayoutManager.java b/kernel/base/src/main/java/com/twosigma/beakerx/jvm/object/OutputContainerLayoutManager.java
@@ -16,10 +16,11 @@
 package com.twosigma.beakerx.jvm.object;
 
 import com.twosigma.beakerx.MIMEContainerFactory;
+import com.twosigma.beakerx.easyform.EasyForm;
 import com.twosigma.beakerx.mimetype.MIMEContainer;
-import com.twosigma.beakerx.widget.Widget;
 import com.twosigma.beakerx.widget.HTML;
 import com.twosigma.beakerx.widget.HTMLPre;
+import com.twosigma.beakerx.widget.Widget;
 
 import java.util.List;
 import java.util.Optional;
@@ -54,6 +55,9 @@ private Optional<Widget> toWidget(Object item) {
     if (item == null) {
       return handleNull();
     }
+    if (item instanceof EasyForm) {
+      return of(((EasyForm) item).getView());
+    }
     Widget widget = MIMEContainerFactory.getTableDisplay(item);
     if (widget != null) {
       return of(widget);