Zeppelin-540: Notebook versioning control, commit from frontend notebook menu #577

khalidhuseynov · 2015-12-29T03:55:15Z

What is this PR for?

This PR improves the front-end experience to use git versioning on notebooks.
Any community feedback is welcome.

What type of PR is it?

Improvement

Todos

Is there a relevant Jira issue?

ZEPPELIN-540

How should this be tested?

Uncomment GitNotebookRepo as a storage in /conf/zeppelin-site.xml
Start Zeppelin
Make changes to some notebook
Use git menu to commit
To check whether successfully committed, do git log in /notebooks folder

Screenshots (if appropriate)

Questions:

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

Leemoonsoo · 2015-12-29T05:49:33Z

@khalidhuseynov Thanks for the contribution. I think the approach make sense, but the implementation need to be more generalized. We must not assume that user will use git notebook repo.

How about add one more interface to NotebookRepo?

public void checkpoint(String noteId, String checkPointName);

and let all notebookrepo implement this interface. This method can be invoked with proposed GUI.
Each different notebook storage can implement checkpoint() for their own purpose. GitNotebookRepo may use this method for making commit, for example.

What do you think?

khalidhuseynov · 2015-12-29T06:13:01Z

@Leemoonsoo yes that makes it more flexible and makes sense, I'll address it soon.

maaark11 · 2016-01-12T18:44:32Z

guys you have some communication channel, I enjoyed the project and want to help

Leemoonsoo · 2016-01-14T16:19:34Z

zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java

How about just setMessage(commitMessage) as a commit message? is there special reason adding "Updated " + pattern in front?

good point! Actually as I've checked now, pattern from setMessage isn't used anywhere else. addressed it in b0fa219

Leemoonsoo · 2016-01-14T16:23:42Z

@maaark11 Thanks for the interest : )
Mailing list here http://zeppelin.incubator.apache.org/community.html are official communication channel. You can subscribe and post message to the mailing list for any question, suggestion, feedback, discussion, etc.

Conflicts: zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java

khalidhuseynov · 2016-01-19T14:50:14Z

tests were added, ready for review

Leemoonsoo · 2016-01-20T02:29:10Z

zeppelin-web/src/components/websocketEvents/websocketMsg.service.js

Can we use just 'message' or 'commitMessage' instead of 'gitCommitMessage' for the field name?

khalidhuseynov · 2016-01-20T02:42:28Z

@Leemoonsoo yes exactly! I was going to change git related things, but also wanted to hear community on UI feedback. Thanks for the feedback, will be addressed!

Conflicts: zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java

khalidhuseynov · 2016-01-24T07:23:42Z

The code and screenshot has been updated. Currently the icon for version control was changed from git to file-code icon. However that's subject to change depending on the feedback. Other possible icons could be anchor, fork or any other suggested by community.

Conflicts: zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java

Leemoonsoo · 2016-02-04T04:33:38Z

zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java

    }
    git = new Git(localRepo);
-    maybeAddAndCommit(".");
+    checkpoint(".", "initialization commit");


I think this shouldn't be executed when Git repo already exists. Isn't it?

right, that's more friendly. Actually I changed it not to commit even at first start when initializing Git repo. So on first start all the notebooks will be unstaged, and user will explicitly commit whenever needed.

Leemoonsoo · 2016-02-10T22:09:02Z

Thanks for addressing comment.
It's great improvement.
LGTM

Leemoonsoo · 2016-02-11T04:20:46Z

Merge if there're no more discussions

Khalid Huseynov added 3 commits December 29, 2015 11:32

add button and git menu

2ebe628

add frontend handler via websocket

8069ccd

backend handling of git notebook commit

a1894c2

khalidhuseynov changed the title ~~Zeppelin-540: Notebook versioning control (git commit) from frontend notebook menu~~ Zeppelin-540: [WIP] Notebook versioning control (git commit) from frontend notebook menu Dec 29, 2015

Khalid Huseynov added 8 commits December 30, 2015 11:29

add checkpoint interface

de7bdd6

add checkpoint interface and propagate to backend

bdeb0ed

propagate changes to frontend

32e403c

fix formatting for checkstyle

39c8e00

change div to button

b69f2ff

temp fix for padding issue

c9192cb

empty input field after commit message is hit

b8fc035

use sinqle quotes

39c2873

Leemoonsoo reviewed Jan 14, 2016
View reviewed changes

Leemoonsoo mentioned this pull request Jan 16, 2016

add keyboard shortcut for toggling run paragraph #638

Closed

Merge 'master' into feat/git-commit-frontend-access

339c9fe

Conflicts: zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java

khalidhuseynov force-pushed the feat/git-commit-frontend-access branch from 31906bd to 339c9fe Compare January 19, 2016 02:30

only commit message

b0fa219

khalidhuseynov force-pushed the feat/git-commit-frontend-access branch from 99c7122 to b0fa219 Compare January 19, 2016 04:52

Khalid Huseynov added 2 commits January 19, 2016 17:27

add gitNotebookRepo checkpoint test

33f6e0f

add repoSync checkpoint test for 1 storage

a03a953

Leemoonsoo reviewed Jan 20, 2016
View reviewed changes

khalidhuseynov changed the title ~~Zeppelin-540: [WIP] Notebook versioning control (git commit) from frontend notebook menu~~ Zeppelin-540: [WIP] Notebook versioning control, commit from frontend notebook menu Jan 20, 2016

Khalid Huseynov added 4 commits January 24, 2016 02:27

remove git from wording

74db747

change icon git -> file-code-o

8b5766f

Merge branch 'master' into feat/commit-frontend-access

ef3a8fb

Conflicts: zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java

backend gitCommit -> commit

5f10b46

khalidhuseynov changed the title ~~Zeppelin-540: [WIP] Notebook versioning control, commit from frontend notebook menu~~ Zeppelin-540: Notebook versioning control, commit from frontend notebook menu Jan 24, 2016

Merge branch 'master' into feat/commit-frontend-access

64111e0

Conflicts: zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/NotebookRepoSyncTest.java

khalidhuseynov force-pushed the feat/git-commit-frontend-access branch from b5345df to 64111e0 Compare February 2, 2016 09:26

Leemoonsoo reviewed Feb 4, 2016
View reviewed changes

khalidhuseynov force-pushed the feat/git-commit-frontend-access branch 3 times, most recently from 3312ece to 3f510d1 Compare February 8, 2016 17:58

remove initial commit at start

4f04af0

khalidhuseynov force-pushed the feat/git-commit-frontend-access branch from 3f510d1 to 4f04af0 Compare February 8, 2016 20:01

asfgit closed this in 7a58d46 Feb 13, 2016

Zeppelin-540: Notebook versioning control, commit from frontend notebook menu #577

Zeppelin-540: Notebook versioning control, commit from frontend notebook menu #577

Uh oh!

Conversation

khalidhuseynov commented Dec 29, 2015

What is this PR for?

What type of PR is it?

Todos

Is there a relevant Jira issue?

How should this be tested?

Screenshots (if appropriate)

Questions:

Uh oh!

Leemoonsoo commented Dec 29, 2015

Uh oh!

khalidhuseynov commented Dec 29, 2015

Uh oh!

maaark11 commented Jan 12, 2016

Uh oh!

Leemoonsoo Jan 14, 2016

Choose a reason for hiding this comment

Uh oh!

khalidhuseynov Jan 19, 2016

Choose a reason for hiding this comment

Uh oh!

Leemoonsoo commented Jan 14, 2016

Uh oh!

khalidhuseynov commented Jan 19, 2016

Uh oh!

Leemoonsoo Jan 20, 2016

Choose a reason for hiding this comment

Uh oh!

khalidhuseynov commented Jan 20, 2016

Uh oh!

khalidhuseynov commented Jan 24, 2016

Uh oh!

Leemoonsoo Feb 4, 2016

Choose a reason for hiding this comment

Uh oh!

khalidhuseynov Feb 9, 2016

Choose a reason for hiding this comment

Uh oh!

Leemoonsoo commented Feb 10, 2016

Uh oh!

Leemoonsoo commented Feb 11, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants