Skip to content

Add force layout visualization in paragraphs for SQL queries #1024

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

Add force layout visualization in paragraphs for SQL queries #1024

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
619376b
add force layout button
Jun 16, 2016
ea6c346
add div and svg tags that will contain the force layout object
Jun 16, 2016
7048e8e
add column drop boxes for column selection for source and destination…
Jun 16, 2016
c9a11c6
add force layout rendering and column selection handling methods
Jun 16, 2016
045251e
add force layout and tooltip CSS
Jun 16, 2016
048e432
[ZEPPELIN-997] Export data to csv
minahlee Jun 14, 2016
869bfc4
add force layout button
Jun 16, 2016
e778eb4
add div and svg tags that will contain the force layout object
Jun 16, 2016
dc4abe5
add column drop boxes for column selection for source and destination…
Jun 16, 2016
ca92187
add force layout rendering and column selection handling methods
Jun 16, 2016
d34dad2
add force layout and tooltip CSS
Jun 16, 2016
64d82e9
fix conflict
Jun 16, 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
6 changes: 3 additions & 3 deletions zeppelin-server/src/test/java/org/apache/zeppelin/integration/SparkParagraphIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ public void testSqlSpark() throws Exception {
}

WebElement paragraph1Result = driver.findElement(By.xpath(
getParagraphXPath(1) + "//div[@class=\"tableDisplay\"]"));
getParagraphXPath(1) + "//div[@class=\"tableDisplay\"]//table"));
collector.checkThat("Paragraph from SparkParagraphIT of testSqlSpark result: ",
paragraph1Result.getText().toString(), CoreMatchers.equalTo("age\njob\nmarital\neducation\nbalance\n30" +
" unemployed married primary 1,787\nage\njob\nmarital\neducation\nbalance"));
paragraph1Result.getText().toString(), CoreMatchers.equalTo("age\njob\nmarital\neducation\nbalance\n" +
"30 unemployed married primary 1,787"));
} catch (Exception e) {
handleException("Exception in SparkParagraphIT while testSqlSpark", e);
}
Expand Down
23 changes: 19 additions & 4 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 @@ -40,12 +40,27 @@
ng-class="{'active': isGraphMode('scatterChart')}"
ng-click="setGraphMode('scatterChart', true)"><i class="cf cf-scatter-chart"></i>
</button>
<button type="button" class="btn btn-default btn-sm"
ng-class="{'active': isGraphMode('forceLayout')}"
ng-click="setGraphMode('forceLayout', true)"><i class="fa fa-share-alt"></i>
</button>
</div>
<span>
<button type="button" class="btn btn-default btn-sm" style="margin-left:10px"
tooltip="Download Data as TSV" tooltip-placement="bottom"
ng-click="exportToTSV()"><i class="fa fa-download"></i>
<span class="btn-group">
<button type="button" class="btn btn-default btn-sm"
style="margin-left:10px"
ng-click="exportToDSV(',')"
tooltip="Download Data as CSV" tooltip-placement="bottom">
<i class="fa fa-download"></i>
</button>
<button type="button" class="btn btn-default btn-sm dropdown-toggle caretBtn"
data-toggle="dropdown">
<span class="caret" style="margin: 0px;"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu" style="min-width: 70px;">
<li ng-click="exportToDSV(',')"><a>CSV</a></li>
<li ng-click="exportToDSV('\t')"><a>TSV</a></li>
</ul>
</span>
<span ng-if="getGraphMode()!='table'"
style="margin-left:5px; cursor:pointer; display: inline-block; vertical-align:top; position: relative; line-height:30px;">
Expand Down
6 changes: 6 additions & 0 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 @@ -51,4 +51,10 @@
id="p{{paragraph.id}}_scatterChart">
<svg></svg>
</div>

<div ng-if="getGraphMode()=='forceLayout'"
id="p{{paragraph.id}}_forceLayout"
class="forceLayout">
<svg></svg>
</div>
</div>
69 changes: 68 additions & 1 deletion 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 @@ -32,7 +32,7 @@
</ul>
</div>

<div class="row" ng-if="getGraphMode()!='scatterChart'">
<div class="row" ng-if="getGraphMode()!='scatterChart' && getGraphMode()!='forceLayout'">
<div class="col-md-4">
<span class="columns lightBold">
Keys
Expand Down Expand Up @@ -165,4 +165,71 @@
</span>
</div>
</div>

<div class="row" ng-if="getGraphMode()=='forceLayout'">
<div class="col-md-3">
<span class="columns lightBold">
Source
<ul data-drop="true"
ng-model="paragraph.config.graph.forceLayout.source"
jqyoui-droppable="{onDrop:'onGraphOptionChange()'}"
class="list-unstyled"
style="height:36px">
<li ng-if="paragraph.config.graph.forceLayout.source">
<div class="btn btn-primary btn-xs">
{{paragraph.config.graph.forceLayout.source.name}} <span class="fa fa-close" ng-click="removeForceLayoutOptionSource($index)"></span>
</div>
</li>
</ul>
</span>
</div>
<div class="col-md-3">
<span class="columns lightBold">
Source Group
<ul data-drop="true"
ng-model="paragraph.config.graph.forceLayout.sourceGroup"
jqyoui-droppable="{onDrop:'onGraphOptionChange()'}"
class="list-unstyled"
style="height:36px">
<li ng-if="paragraph.config.graph.forceLayout.sourceGroup">
<div class="btn btn-success btn-xs">
{{paragraph.config.graph.forceLayout.sourceGroup.name}} <span class="fa fa-close" ng-click="removeForceLayoutOptionSourceGroup($index)"></span>
</div>
</li>
</ul>
</span>
</div>
<div class="col-md-3">
<span class="columns lightBold">
Destination
<ul data-drop="true"
ng-model="paragraph.config.graph.forceLayout.dest"
jqyoui-droppable="{onDrop:'onGraphOptionChange()'}"
class="list-unstyled"
style="height:36px">
<li ng-if="paragraph.config.graph.forceLayout.dest">
<div class="btn btn-info btn-xs">
{{paragraph.config.graph.forceLayout.dest.name}} <span class="fa fa-close" ng-click="removeForceLayoutOptionDest($index)"></span>
</div>
</li>
</ul>
</span>
</div>
<div class="col-md-3">
<span class="columns lightBold">
Destination Group
<ul data-drop="true"
ng-model="paragraph.config.graph.forceLayout.destGroup"
jqyoui-droppable="{onDrop:'onGraphOptionChange()'}"
class="list-unstyled"
style="height:36px">
<li ng-if="paragraph.config.graph.forceLayout.destGroup">
<div class="btn btn-warning btn-xs">
{{paragraph.config.graph.forceLayout.destGroup.name}} <span class="fa fa-close" ng-click="removeForceLayoutOptionDestGroup($index)"></span>
</div>
</li>
</ul>
</span>
</div>
</div>
</div>
Loading