Skip to content

[ZEPPELIN-1003] Refactoring visualization #1529

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
Leemoonsoo wants to merge 12 commits into from
Closed

[ZEPPELIN-1003] Refactoring visualization #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
80e0376
Abstract built-in visualization via class
Leemoonsoo Sep 15, 2016
06c3e78
Table output
Leemoonsoo Oct 4, 2016
c76a92b
refactor barchart
Leemoonsoo Oct 5, 2016
5c8d4e3
Handle resize correclty.
Leemoonsoo Oct 9, 2016
4d27d33
Convert piechart
Leemoonsoo Oct 9, 2016
9e6e8db
Convert areachart
Leemoonsoo Oct 9, 2016
819c262
Convert linechart
Leemoonsoo Oct 9, 2016
4e84467
convert scatter chart
Leemoonsoo Oct 9, 2016
9367b78
Cleanup
Leemoonsoo Oct 17, 2016
7517447
Load zeppelin.Transformation before zeppelin.PivotTransformation on test
Leemoonsoo Oct 28, 2016
bf6505b
Render visualization more efficiently
Leemoonsoo Nov 3, 2016
40f1ce8
Fix style
Leemoonsoo Nov 3, 2016
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
3 changes: 2 additions & 1 deletion zeppelin-web/.eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"d3": false,
"BootstrapDialog": false,
"Handsontable": false,
"moment": false
"moment": false,
"zeppelin" : false
},
"rules": {
"no-bitwise": 2,
Expand Down
37 changes: 4 additions & 33 deletions zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,10 @@

<button type="button" class="btn btn-default btn-sm"
ng-if="paragraph.result.type == 'TABLE'"
ng-class="{'active': isGraphMode('table')}"
ng-click="setGraphMode('table', true)"
tooltip="Table" tooltip-placement="bottom"><i class="fa fa-table"></i>
</button>
<button type="button" class="btn btn-default btn-sm"
ng-if="paragraph.result.type == 'TABLE'"
ng-class="{'active': isGraphMode('multiBarChart')}"
ng-click="setGraphMode('multiBarChart', true)"
tooltip="Bar Chart" tooltip-placement="bottom"><i class="fa fa-bar-chart"></i>
</button>
<button type="button" class="btn btn-default btn-sm"
ng-if="paragraph.result.type == 'TABLE'"
ng-class="{'active': isGraphMode('pieChart')}"
ng-click="setGraphMode('pieChart', true)"
tooltip="Pie Chart" tooltip-placement="bottom"><i class="fa fa-pie-chart"></i>
</button>
<button type="button" class="btn btn-default btn-sm"
ng-if="paragraph.result.type == 'TABLE'"
ng-class="{'active': isGraphMode('stackedAreaChart')}"
ng-click="setGraphMode('stackedAreaChart', true)"
tooltip="Area Chart" tooltip-placement="bottom"><i class="fa fa-area-chart"></i>
</button>
<button type="button" class="btn btn-default btn-sm"
ng-if="paragraph.result.type == 'TABLE'"
ng-class="{'active': isGraphMode('lineChart') || isGraphMode('lineWithFocusChart')}"
ng-click="paragraph.config.graph.lineWithFocus ? setGraphMode('lineWithFocusChart', true) : setGraphMode('lineChart', true)"
tooltip="Line Chart" tooltip-placement="bottom"><i class="fa fa-line-chart"></i>
</button>
<button type="button" class="btn btn-default btn-sm"
ng-if="paragraph.result.type == 'TABLE'"
ng-class="{'active': isGraphMode('scatterChart')}"
ng-click="setGraphMode('scatterChart', true)"
tooltip="Scatter Chart" tooltip-placement="bottom"><i class="cf cf-scatter-chart"></i>
ng-repeat="viz in builtInTableDataVisualizationList track by $index"
ng-class="{'active' : isGraphMode(viz.id)}"
ng-click="setGraphMode(viz.id, true, false)"
tooltip="{{viz.name}}" tooltip-placement="bottom"><i ng-class="viz.icon"></i>
</button>

<button type="button"
Expand Down
38 changes: 4 additions & 34 deletions zeppelin-web/src/app/notebook/paragraph/paragraph-graph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,11 @@
<div id="p{{paragraph.id}}_graph"
class="graphContainer"
ng-class="{'noOverflow': getGraphMode()=='table'}"
ng-if="getResultType()=='TABLE'"
ng-show="getResultType()=='TABLE'"
>

<div ng-if="getGraphMode()=='table'"
id="p{{paragraph.id}}_table"
class="table">
</div>

<div ng-if="getGraphMode()=='multiBarChart'"
id="p{{paragraph.id}}_multiBarChart">
<svg></svg>
</div>

<div ng-if="getGraphMode()=='pieChart'"
id="p{{paragraph.id}}_pieChart">
<svg></svg>
</div>

<div ng-if="getGraphMode()=='stackedAreaChart'"
id="p{{paragraph.id}}_stackedAreaChart">
<svg></svg>
</div>

<div ng-if="getGraphMode()=='lineChart'"
id="p{{paragraph.id}}_lineChart">
<svg></svg>
</div>

<div ng-if="getGraphMode()=='lineWithFocusChart'"
id="p{{paragraph.id}}_lineWithFocusChart">
<svg></svg>
</div>

<div ng-if="getGraphMode()=='scatterChart'"
id="p{{paragraph.id}}_scatterChart">
<svg></svg>
<div ng-repeat="viz in builtInTableDataVisualizationList track by $index"
id="p{{paragraph.id}}_{{viz.id}}"
ng-show="getGraphMode()==viz.id">
</div>
</div>
2 changes: 1 addition & 1 deletion zeppelin-web/src/app/notebook/paragraph/paragraph-graphOptions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<label>
<input type="checkbox"
ng-model="paragraph.config.graph.lineWithFocus"
ng-click="toggleLineWithFocus()" />
ng-click="onGraphOptionChange()" />
show line chart with focus
</label>
</div>
Expand Down
4 changes: 2 additions & 2 deletions zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
All fields:
<div class="allFields row">
<ul class="noDot">
<li class="liVertical" ng-repeat="col in paragraph.result.columnNames">
<li class="liVertical" ng-repeat="col in tableDataColumns">
<div class="btn btn-default btn-xs"
data-drag="true"
data-jqyoui-options="{revert: 'invalid', helper: 'clone'}"
ng-model="paragraph.result.columnNames"
ng-model="tableDataColumns"
jqyoui-draggable="{index: {{$index}}, placeholder: 'keep'}">
{{col.name | limitTo: 30}}{{col.name.length > 30 ? '...' : ''}}
</div>
Expand Down
Loading