[ZEPPELIN-1629] Enable renaming folder from the main page by tae-jun · Pull Request #1630 · apache/zeppelin

tae-jun · 2016-11-14T18:01:31Z

What is this PR for?

This PR will enable renaming folder from the main page.

I wrote some codes. Hope this PR is the start of folder-based features. (e.g folder authorization, folder focused view)

Please check when you have some time!
Thanks 😄

What type of PR is it?

[Feature]

Todos

- Fix ConcurrentModificationException of FolderView

What is the Jira issue?

ZEPPELIN-1629

How should this be tested?

Change folder names!

Screenshots (if appropriate)

Questions:

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

tae-jun · 2016-11-15T12:51:52Z

Fixed error and CI is green!

Ready for review! 😄

AhyoungRyu · 2016-11-15T14:36:58Z

Awesome. Let me test this. Will ping you again :)

AhyoungRyu · 2016-11-18T00:48:50Z

@tae-jun Sorry for my late response.
I tested but can't edit the dir name in root dir level. The folder name can be modified only in below level. Please see the below attached gif img.

tae-jun · 2016-11-18T04:01:46Z

@AhyoungRyu Thanks for review 😄 Don't need to hurry! I will check and ping you :)

tae-jun · 2016-11-18T12:11:55Z

@AhyoungRyu ping ping~ I tested!

But it just works fine with me. I tested both running ZeppelinServer from IntelliJ and binary built from mvn clean package -DskipTests

I use macOS 10.12.1 and Chrome. Could you please share your test environment? 😄

AhyoungRyu · 2016-11-18T18:17:36Z

@tae-jun Build it again and tested, but It works well as you intended. It was my bad.
I tested two cases: \w & \wt Shiro. Both are working well.

Probably it's a nitpick,

when I try to rename the folder name at home screen, the above msg is shown up. Could you change renameFolder Notebook to rename folder? (I know renameFolder comes from op and notebook is hardcoded, but sounds a bit awkward ㅜ_ㅜ)

tae-jun · 2016-11-19T09:39:16Z

@AhyoungRyu Thanks for your kind review. I appreciate it.

Actually, I didn't test with Shiro ^^; and didn't know what op parameter means. So thanks very much.

I changed renameFolder to rename folder of you addressed and also renameNote to rename.

Now it looks like this:

I also included note name which needs permission 😄

What do you think?

AhyoungRyu · 2016-11-20T08:46:54Z

@tae-jun It works well when I tried to rename folder name. And I think It's good idea to let user know which notes that he don't have permission exactly. Thanks :)
But currently CI is failed with below compilation error. Could you take a look again?

[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] /home/travis/build/apache/zeppelin/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java:[774,5] cannot find symbol
  symbol:   class Folder
  location: class org.apache.zeppelin.socket.NotebookServer
[INFO] 1 error

AhyoungRyu · 2016-11-20T09:36:49Z

@tae-jun And one more thing, it would be better to keep consistency between Note and Notebook(combination of several notes). I pushed one commit to your branch, could you please take a look tae-jun#1?

It will be shown when user rename the folder(I removed notebook):

And then user rename the note:

And also when user create a note, I changed Example: NoteDir1/Notebook1 -> NoteDir1/Note1

tae-jun · 2016-11-20T11:42:32Z

@AhyoungRyu Thanks! I also think notebook is a little bit weird :) I merged your PR thanks.

This change will affect other insufficient privileges error messages as well:

Insufficient privileges to read ~~notebook~~
Insufficient privileges to update ~~notebook~~
Insufficient privileges to remove ~~notebook~~
Insufficient privileges to write ~~notebook~~
Insufficient privileges to clear output ~~notebook~~

I prefer removing notebook. What do you think guys? If anyone has a concern about this, please tell.

And about CI, I suffered from that error when I tried to compile only one project (e.g. zeppelin-server). Since zeppelin-server depends on zeppelin-interpreter and zeppelin-zengine, I had to build two dependencies and install them on local maven repo, which can be done with mvn clean package install -DskipTests. If not, when it tries to compile zeppelin-server, it cannot find symbols of zeppelin-zengine and goes to fail.

However, I'm not sure that CI only recompiles changed files. I will look into it, and tell you if I get some more information.
(CI was green before 😭)

AhyoungRyu · 2016-11-20T17:44:35Z

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

    NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization();
    if (!notebookAuthorization.isOwner(noteId, userAndRoles)) {
-      permissionError(conn, "rename", fromMessage.principal,
+      permissionError(conn, "rename the note", fromMessage.principal,


@tae-jun I didn't care about the other operations as you said. It was my bad. I just thought about the renaming.. How about just let this "rename the note" -> "rename" as before, and put note in here?

tae-jun · 2016-11-20T18:11:39Z

@AhyoungRyu I fixed what you mentioned 😄 Please review.

tae-jun · 2016-11-20T18:55:31Z

I guess CI fails because it only recompiles changed files. (since build time is too short)

It should be about 30min.

Is there any way to compile the whole project again? I ran CI on my own repository. It failed on some profiles because of Ignite interpreter. (what is relevance between Ignite interpreter and my PR? 😭) But it passed on other profiles whereas every profile failed on this repository.

This reverts commit 3ad2a2d.

tae-jun · 2016-11-29T02:22:37Z

CI failure is because of me. I will fix it :)

AhyoungRyu · 2016-11-29T03:05:06Z

@tae-jun Great work! Take your time and feel free to ping me again when you're ready.

tae-jun · 2016-11-29T12:25:34Z

@AhyoungRyu Yeah! CI is green 😄 Please review! Thanks

soralee · 2016-11-30T07:30:44Z

@tae-jun This is Cool! and It works well!
So, I suggest one thing. I think it would be nice to appear popup which is whether user will merge the folders or not before merging folders. In my case, It is familiar to me 😄

What do you think?

tae-jun · 2016-11-30T10:03:14Z

@soralee Thanks for the review! 😄 That's a great idea! I will give some effect on the front-end and ping you again. Thanks :)

tae-jun · 2016-11-30T11:33:40Z

@soralee Hi! I added the feature you suggested. What do you think? Is title or content of warning message appropriate? Thanks for the cool suggestion!

AhyoungRyu · 2016-11-30T11:37:16Z

@soralee What a nice suggestion! @tae-jun I think it's cool!!

tae-jun · 2016-11-30T11:50:53Z

@AhyoungRyu Always thanks for the review 😄

soralee · 2016-11-30T14:40:48Z

@tae-jun It is very AWESOME 👍 and thank you for the accept my suggestion.
Let me check again after CI is green 😄

…enaming

tae-jun · 2016-12-01T08:37:19Z

@AhyoungRyu @soralee Yeah! CI is green!

Leemoonsoo · 2016-12-02T05:55:37Z

Tested and working really nicely. Looks awesome to me!
Thanks @tae-jun for the great contribution!

tae-jun · 2016-12-02T09:16:06Z

Thanks @Leemoonsoo! I appreciate your review 😄

…hild of the parent

tae-jun · 2016-12-02T16:19:52Z

I've tested more and it was fine most times. But occasionally it doesn't work well. I think it should be tested more! I don't know why for now but I will figure it out and ping when it's ready :)

tae-jun · 2016-12-03T15:20:17Z

I found out bugs by adding loggers and fixed them!

CI is green and it seems to work perfectly. I think it's good to go now 😄

Please when you have some time. Thanks!

Leemoonsoo · 2016-12-03T15:35:53Z

Great work @tae-jun. LGTM!

Leemoonsoo · 2016-12-04T16:14:59Z

Merge to master if there're no more comments

AhyoungRyu · 2016-12-04T19:24:11Z

Tested and it's working nicely! LGTM 👍

tae-jun changed the title ~~[ZEPPELIN-1629] Enable renaming folder from the main page~~ [ZEPPELIN-1629] [WIP] Enable renaming folder from the main page Nov 15, 2016

tae-jun changed the title ~~[ZEPPELIN-1629] [WIP] Enable renaming folder from the main page~~ [WIP] [ZEPPELIN-1629] Enable renaming folder from the main page Nov 15, 2016

tae-jun changed the title ~~[WIP] [ZEPPELIN-1629] Enable renaming folder from the main page~~ [ZEPPELIN-1629] Enable renaming folder from the main page Nov 15, 2016

tae-jun closed this Nov 19, 2016

tae-jun reopened this Nov 19, 2016

AhyoungRyu reviewed Nov 20, 2016

View reviewed changes

tae-jun and others added 9 commits November 23, 2016 22:50

add renaming folder from the main page

ca4e160

Fix ConcurrentModificationException of FolderView, and add more comments

e7e41c4

Fix awkward insufficient privileges error message

4a3d722

Make permission error message more natural

cb0ec4f

Include note name in permission error message

e5cd770

Change notebook -> note

7f7e6bd

Install Zeppelin to local maven repo after building

90182a6

Revert "Install Zeppelin to local maven repo after building"

11b95eb

This reverts commit 3ad2a2d.

Address @AhyoungRyu's suggestions

757bb10

tae-jun force-pushed the ZEPPELIN-1629 branch from 06269e2 to 757bb10 Compare November 23, 2016 14:11

Fix cannot find symbol error

2f55d05

tae-jun closed this Nov 23, 2016

Fix the folder test error

27fe1ea

tae-jun added 2 commits November 30, 2016 19:41

Fix concurrent modification error

b719d63

Add warning sign if a renamed folder will be merged

af71edd

tae-jun closed this Nov 30, 2016

tae-jun reopened this Nov 30, 2016

Check permission of every notes under the folder which is target of r…

5dee99c

…enaming

tae-jun closed this Nov 30, 2016

tae-jun reopened this Nov 30, 2016

tae-jun closed this Dec 1, 2016

tae-jun reopened this Dec 1, 2016

Remove folder from a parent when folder is renamed only if it’s not c…

613b453

…hild of the parent

Add loggers & fix bugs

7d2dc57

asfgit closed this in fd7a3f8 Dec 5, 2016

Conversation

tae-jun commented Nov 14, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What is this PR for?

What type of PR is it?

Todos

What is the Jira issue?

How should this be tested?

Screenshots (if appropriate)

Questions:

Uh oh!

tae-jun commented Nov 15, 2016

Uh oh!

AhyoungRyu commented Nov 15, 2016

Uh oh!

AhyoungRyu commented Nov 18, 2016

Uh oh!

tae-jun commented Nov 18, 2016

Uh oh!

tae-jun commented Nov 18, 2016

Uh oh!

AhyoungRyu commented Nov 18, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tae-jun commented Nov 19, 2016

Uh oh!

AhyoungRyu commented Nov 20, 2016

Uh oh!

AhyoungRyu commented Nov 20, 2016

Uh oh!

tae-jun commented Nov 20, 2016

Uh oh!

AhyoungRyu Nov 20, 2016

Choose a reason for hiding this comment

Uh oh!

tae-jun commented Nov 20, 2016

Uh oh!

tae-jun commented Nov 20, 2016

Uh oh!

tae-jun commented Nov 29, 2016

Uh oh!

AhyoungRyu commented Nov 29, 2016

Uh oh!

tae-jun commented Nov 29, 2016

Uh oh!

soralee commented Nov 30, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tae-jun commented Nov 30, 2016

Uh oh!

tae-jun commented Nov 30, 2016

Uh oh!

AhyoungRyu commented Nov 30, 2016

Uh oh!

tae-jun commented Nov 30, 2016

Uh oh!

soralee commented Nov 30, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tae-jun commented Dec 1, 2016

Uh oh!

Leemoonsoo commented Dec 2, 2016

Uh oh!

tae-jun commented Dec 2, 2016

Uh oh!

tae-jun commented Dec 2, 2016

Uh oh!

tae-jun commented Dec 3, 2016

Uh oh!

Leemoonsoo commented Dec 3, 2016

Uh oh!

Leemoonsoo commented Dec 4, 2016

Uh oh!

AhyoungRyu commented Dec 4, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

tae-jun commented Nov 14, 2016 •

edited

Loading

AhyoungRyu commented Nov 18, 2016 •

edited

Loading

soralee commented Nov 30, 2016 •

edited

Loading

soralee commented Nov 30, 2016 •

edited

Loading