From 78a39b20f2ad455610260615765d5058825548bb Mon Sep 17 00:00:00 2001
From: 1ambda <1amb4a@gmail.com>
Date: Wed, 10 May 2017 07:19:34 +0900
Subject: [PATCH] fix: Remove sep desc for axis type

---
 .../app/tabledata/advanced-transformation-setting.html    | 8 ++------
 zeppelin-web/src/app/tabledata/advanced-transformation.js | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html b/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
index 8393bf39fa6..107580a9878 100644
--- a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
@@ -86,15 +86,11 @@
         <div class="columns lightBold">
           <!-- axis name -->
           <span class="label label-default"
-                uib-tooltip="{{axisSpec.description ? axisSpec.description : ''}}"
+                ng-style="getAxisAnnotationColor(axisSpec)"
+                uib-tooltip="{{axisSpec.description ? axisSpec.description + ' ' + getAxisTypeAnnotation(axisSpec) : ''}}"
                 style="font-weight: 300; font-size: 13px; margin-left: 1px;">
             {{getAxisAnnotation(axisSpec)}}
           </span>
-          <span class="label label-default"
-                ng-style="getAxisTypeAnnotationColor(axisSpec)"
-                style="font-weight: 300; font-size: 13px; margin-left: 3px;">
-            {{getAxisTypeAnnotation(axisSpec)}}
-          </span>
 
           <!-- axis box: in case of single dimension -->
           <ul data-drop="true"
diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation.js b/zeppelin-web/src/app/tabledata/advanced-transformation.js
index 051bb99f247..8650de53046 100644
--- a/zeppelin-web/src/app/tabledata/advanced-transformation.js
+++ b/zeppelin-web/src/app/tabledata/advanced-transformation.js
@@ -100,7 +100,7 @@ export default class AdvancedTransformation extends Transformation {
         },
 
         getAxisTypeAnnotation: (axisSpec) => {
-          let anno = `${axisSpec.axisType}`
+          let anno = ''
 
           let minAxisCount = axisSpec.minAxisCount
           let maxAxisCount = axisSpec.maxAxisCount
@@ -121,7 +121,7 @@ export default class AdvancedTransformation extends Transformation {
           return anno
         },
 
-        getAxisTypeAnnotationColor: (axisSpec) => {
+        getAxisAnnotationColor: (axisSpec) => {
           if (isAggregatorAxis(axisSpec)) {
             return { 'background-color': '#5782bd' }
           } else if (isGroupAxis(axisSpec)) {