Skip to content

Conversation

@davidtzoor
Copy link

What is this PR for?

Add force layout (graph) visualization to the existing set of visualizations in Zeppelin Web notp.

What type of PR is it?

[Feature]

What is the Jira issue?

[ZEPPELIN-1011]

How should this be tested?

The testes are incorporated within the existing test suite.

Screenshots (if appropriate)

eeffbb58-3238-11e6-92ea-148a4063d353

Questions:

  • Does the licenses files need update?
    No.
  • Is there breaking changes for older versions?
    No.
  • Does this needs documentation?
    We can add some documentation explaining about the different fields that need to be selected in order to generate the force layout component.

@davidtzoor
Copy link
Author

@corneadoug I recreated the PR after doing the rebasing from scratch and it now has no conflict. Hope it works out this time.

@corneadoug
Copy link
Contributor

@davidtzoor Thank you.
You might have the problem again considering you made your PR based on your master branch.
Using a custom branch is usually safer, for example right now until this PR is merged, you should not add any changes that differ from Apache Zeppelin source code and is non-related to this PR.

If you do have to do a rebase again, try doing this while in your master:

  • git fetch zeppelinOriginalRepo
  • git rebase zeppelinOrignalRepo/master
  • resolve conflicts
  • git pushor git push -f

minahlee and others added 7 commits June 16, 2016 21:51
### What is this PR for?
Add csv download from front-end leveraging #714

### What type of PR is it?
Improvement

### What is the Jira issue?
[ZEPPELIN-997](https://issues.apache.org/jira/browse/ZEPPELIN-997)

### Screenshots (if appropriate)
**Before**
<img width="347" alt="screen shot 2016-06-13 at 4 55 02 pm" src="https://cloud.githubusercontent.com/assets/8503346/16027024/acb80824-3187-11e6-8535-090b06e4807e.png">

**After**
<img width="354" alt="screen shot 2016-06-14 at 12 42 01 am" src="https://cloud.githubusercontent.com/assets/8503346/16034849/dd6f48c4-31c8-11e6-92b8-809b3f27d429.png">

<img width="357" alt="screen shot 2016-06-14 at 12 41 49 am" src="https://cloud.githubusercontent.com/assets/8503346/16034844/da6cef46-31c8-11e6-8ef2-d11c460eaa02.png">

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Mina Lee <[email protected]>

Closes #1008 from minahlee/ZEPPELIN-997 and squashes the following commits:

dabb603 [Mina Lee] Add tooltip and change style for dropdown button
e48c303 [Mina Lee] Fix integration test after adding csv download button
5437c4f [Mina Lee] Use split button dropdowns for downloading data
2ad6f47 [Mina Lee] Export data to csv
@corneadoug
Copy link
Contributor

@davidtzoor Seems it is really not working, please create a branch for your PR
(git checkout -b nameOfMyBranch)

@bzz
Copy link
Member

bzz commented Jun 17, 2016

Now this PR contains some commits that do not belong here, and it either needs to be re-created from a separate branch as @corneadoug points out, or interactively rebased with keeping only good commits here

@davidtzoor
Copy link
Author

Sorry for the mess. I will create a new branch with the commits and reopen a new pull request. Thank you for your help

@davidtzoor
Copy link
Author

@corneadoug I created a new pull request (#1044) from a different branch (not master).
I am closing this issue. Thank you for your patience and help 😸

@davidtzoor davidtzoor closed this Jun 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants