From c818464c709719bfae8bd7a4e69250924d9e58a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mitusi=C5=84ski?=
 <33416713+lmitusinski@users.noreply.github.com>
Date: Wed, 20 Jun 2018 15:42:35 +0200
Subject: [PATCH] #7549 displaying additional sparkUI form properties above add
 button (#7556)

* #7549 displaying additional sparkUI form properties above add button

* #7549 changed available properties link position

* #7549 fix available properties alignment
---
 js/notebook/src/shared/style/spark.scss               | 11 +++++++++--
 .../twosigma/beakerx/widget/SparkConfiguration.java   |  9 +++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/js/notebook/src/shared/style/spark.scss b/js/notebook/src/shared/style/spark.scss
index 5915823989..7d01d94454 100644
--- a/js/notebook/src/shared/style/spark.scss
+++ b/js/notebook/src/shared/style/spark.scss
@@ -201,11 +201,18 @@
   .bx-spark-connect-error {
     margin-left: 20px;
   }
+
+  .bx-spark-configuration {
+    .bx-properties-add-label {
+      width: 298px;
+      text-align: right;
+    }
+  }
 }
 
 .bx-spark-save-button {
-    margin-left: 10px;
-    width: 80px;
+  margin-left: 10px;
+  width: 80px;
 }
 
 .bx-toolbar-spark-widget {
diff --git a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java
index 2c294831eb..de8b359e1b 100644
--- a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java
+++ b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java
@@ -35,10 +35,10 @@ public class SparkConfiguration extends VBox {
   SparkConfiguration(Map<String, String> advancedSettings, String sparkVersion) {
     super(new ArrayList<>());
     this.add = createAddButton();
-    this.header = new HBox(asList(this.add, sparkVersionWidget(sparkVersion)));
+    this.header = new HBox(asList(sparkVersionWidget(sparkVersion), this.add));
     List<PropertyItem> propertyItems = createPropertyItems(advancedSettings);
     this.properties = new PropertiesWidget(propertyItems);
-    VBox configuration = new VBox(asList(this.header, this.properties.getWidget()));
+    VBox configuration = new VBox(asList(this.properties.getWidget(), this.header));
     configuration.setDomClasses(new ArrayList<>(asList("bx-spark-configuration")));
     add(configuration);
   }
@@ -47,6 +47,7 @@ private HTML sparkVersionWidget(String version) {
     HTML html = new HTML();
     String ap = String.format("https://spark.apache.org/docs/%s/configuration.html#available-properties", version);
     html.setValue("<a target=\"_blank\" href=\"" + ap + "\">Available properties" + "</a>");
+    html.setDomClasses(new ArrayList<>(asList("bx-properties-add-label")));
     return html;
   }
 
@@ -59,7 +60,7 @@ private List<PropertyItem> createPropertyItems(Map<String, String> advancedSetti
   private Button createAddButton() {
     Button add = new Button();
     add.setTooltip("Add property");
-    add.setDomClasses(new ArrayList<>(asList("bx-button", "icon-add")));
+    add.setDomClasses(new ArrayList<>(asList("bx-button", "icon-add", "bx-properties-add-button")));
     add.registerOnClick((content, message) -> addProperty());
     return add;
   }
@@ -122,7 +123,7 @@ public void setConfiguration(Map<String, String> advancedSettings) {
     List<PropertyItem> propertyItems = createPropertyItems(advancedSettings);
     this.properties = new PropertiesWidget(propertyItems);
     this.remove(this.getChildren().get(0));
-    add(new VBox(asList(this.header, this.properties.getWidget())));
+    add(new VBox(asList(this.properties.getWidget(), this.header)));
   }
 
   public void setDisabledToAll() {