Skip to content

[ZEPPELIN-2521] fix: Confusing axis description in advanced-transformation #2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
1ambda wants to merge 1 commit into from
Closed

[ZEPPELIN-2521] fix: Confusing axis description in advanced-transformation #2328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions zeppelin-web/src/app/tabledata/advanced-transformation-setting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions zeppelin-web/src/app/tabledata/advanced-transformation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)) {
Expand Down