You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/05/15 15:16:41 UTC
zeppelin git commit: [ZEPPELIN-2521] fix: Confusing axis description
in advanced-transformation
Repository: zeppelin
Updated Branches:
refs/heads/master 164db0794 -> 56cee76a7
[ZEPPELIN-2521] fix: Confusing axis description in advanced-transformation
### What is this PR for?
Fixed confusing axis descriptions in advanced-transformation.
### What type of PR is it?
[Improvement]
### Todos
NONE
### What is the Jira issue?
[ZEPPELIN-2521](https://issues.apache.org/jira/browse/ZEPPELIN-2521)
### How should this be tested?
1. Install any helium visualization package written with advanced-transformation. For example ultimate-heatmap-chart.
2. Open the `setting` menu.
### Screenshots (if appropriate)
#### Before
<img width="797" alt="2521_before" src="https://cloud.githubusercontent.com/assets/4968473/25875376/0c327874-3552-11e7-883e-3667e198e180.png">
#### After
<img width="793" alt="2521_after" src="https://cloud.githubusercontent.com/assets/4968473/25875379/0f603de2-3552-11e7-8c50-2ac0b783b704.png">
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - NO
* Does this needs documentation? - NO
Author: 1ambda <1a...@gmail.com>
Closes #2328 from 1ambda/ZEPPELIN-2521/confusing-desc-for-axis-in-adtr and squashes the following commits:
78a39b2 [1ambda] fix: Remove sep desc for axis type
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/56cee76a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/56cee76a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/56cee76a
Branch: refs/heads/master
Commit: 56cee76a7468d6a6f90fb3c2e4f6c0028dcd91ab
Parents: 164db07
Author: 1ambda <1a...@gmail.com>
Authored: Wed May 10 07:19:34 2017 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Mon May 15 08:16:36 2017 -0700
----------------------------------------------------------------------
.../src/app/tabledata/advanced-transformation-setting.html | 8 ++------
zeppelin-web/src/app/tabledata/advanced-transformation.js | 4 ++--
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/56cee76a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html b/zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
index 8393bf3..107580a 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 @@ limitations under the License.
<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"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/56cee76a/zeppelin-web/src/app/tabledata/advanced-transformation.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/tabledata/advanced-transformation.js b/zeppelin-web/src/app/tabledata/advanced-transformation.js
index 051bb99..8650de5 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)) {