From a8a4fb1ac53ca106830fa7b460032775baa0ea8f Mon Sep 17 00:00:00 2001
From: 1ambda <1amb4a@gmail.com>
Date: Sun, 12 Mar 2017 16:55:12 +0900
Subject: [PATCH] refactor: Add getAxisInSingleDimension func

---
 .../tabledata/advanced-transformation-setting.html  | 13 ++++++++-----
 .../src/app/tabledata/advanced-transformation.js    |  8 ++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html b/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
index 3689a99c80..351b78f6ae 100644
--- a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
@@ -20,6 +20,10 @@ limitations under the License.
         <span style="vertical-align: middle; display: inline-block; margin-top: 3px;">Configured Columns</span>
         <span style="float: right;">
           <div class="btn-group" role="group" aria-label="...">
+            <div type="button" ng-click="parameterChanged()"
+                 class="btn btn-default" style="padding: 2px 5px 2px 5px;">
+              <i class="fa fa-floppy-o" aria-hidden="true"></i>
+            </div>
             <div type="button" ng-if="config.panel.columnPanelOpened"
                  ng-click="toggleColumnPanel()"
                  class="btn btn-default" style="padding: 2px 5px 2px 5px;">
@@ -74,7 +78,7 @@ limitations under the License.
               <div ng-if="!isAggregatorAxis(axisSpec)"
                    class="btn btn-default btn-xs"
                    style="background-color: #EFEFEF;">
-                {{config.axis[axisSpec.name].name}}
+                {{ getAxisInSingleDimension(axisSpec).name }}
                 <span class="fa fa-close" ng-click="removeFromSingleDimension(axisSpec.name)"></span>
               </div>
 
@@ -84,9 +88,9 @@ limitations under the License.
                      class="btn btn-default btn-xs dropdown-toggle"
                      style="background-color: #EFEFEF; "
                      type="button" data-toggle="dropdown">
-                  {{config.axis[axisSpec.name].name | limitTo: 30}}{{config.axis[axisSpec.name].name > 30 ? '...' : ''}}
+                  {{getAxisInSingleDimension(axisSpec).name | limitTo: 30}}{{getAxisInSingleDimension(axisSpec).name > 30 ? '...' : ''}}
                   <span style="color:#717171;">
-                    <span class="lightBold" style="text-transform: uppercase;">{{config.axis[axisSpec.name].aggr}}</span>
+                    <span class="lightBold" style="text-transform: uppercase;">{{getAxisInSingleDimension(axisSpec).aggr}}</span>
                   </span>
                   <span class="fa fa-close" ng-click="removeFromSingleDimension(axisSpec.name)"></span>
                 </div>
@@ -177,8 +181,7 @@ limitations under the License.
         <span style="vertical-align: middle; display: inline-block; margin-top: 3px;">Dynamic Parameters</span>
         <span style="float: right;">
           <div class="btn-group" role="group" aria-label="...">
-            <div type="button"
-                 ng-click="parameterChanged()"
+            <div type="button" ng-click="parameterChanged()"
                  class="btn btn-default" style="padding: 2px 5px 2px 5px;">
               <i class="fa fa-floppy-o" aria-hidden="true"></i>
             </div>
diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation.js b/zeppelin-web/src/app/tabledata/advanced-transformation.js
index 3140b72aea..d5c0f83c5d 100644
--- a/zeppelin-web/src/app/tabledata/advanced-transformation.js
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation.js
@@ -99,12 +99,20 @@ class AdvancedTransformation extends Transformation {
           return `${axisSpec.name} (${axisSpec.type})`
         },
 
+        getAxisInSingleDimension: (axisSpec) => {
+          return configInstance.axis[axisSpec.name]
+        },
+
         toggleColumnPanel: () => {
           configInstance.panel.columnPanelOpened =
             !configInstance.panel.columnPanelOpened
           self.emitConfig(configInstance)
         },
 
+        clearConfig: () => {
+
+        },
+
         toggleParameterPanel: () => {
           configInstance.panel.parameterPanelOpened =
             !configInstance.panel.parameterPanelOpened