Uploaded image for project: 'Zeppelin'
  1. Zeppelin
  2. ZEPPELIN-1736

Introduce trash & enable removing folder

    Details

      Description

      I would like to add a new feature that removes a folder from the main page. But, removing entire folder is too risky since there is no trash. Also, I should have to think a lot when I remove a note since it cannot be restored after removing.

      Therefore, I would like to introduce a trash to Zeppelin based on [ZEPPELIN-1629] Enable renaming the folder from the main page. The trash will be just a special folder of which name is "~Trash". (I chose ~ as prefix because of sorting order of the main page. The trash folder should be shown at the end)

      I will open a PR after merging ZEPPELIN-1629 mentioned above.

        Issue Links

          Activity

          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun opened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun opened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 8d53a1347028b09588027fa8715ea99d23abb65b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 8d53a1347028b09588027fa8715ea99d23abb65b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user 1ambda commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Let me review and give some feedbacks Thanks for implementing the useful feature!

          Show
          githubbot ASF GitHub Bot added a comment - Github user 1ambda commented on the issue: https://github.com/apache/zeppelin/pull/1730 Let me review and give some feedbacks Thanks for implementing the useful feature!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks, @1ambda 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks, @1ambda 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          ![image](https://cloud.githubusercontent.com/assets/8201019/20929471/8897948a-bc0d-11e6-941b-4123bc09c8a7.png)
          It failed only at Selenium test twice. I guess it's because I *changed the action of remove note button* of notebook view to moving to trash.

          But I have no idea where to fix! 😢 Please help!

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20929471/8897948a-bc0d-11e6-941b-4123bc09c8a7.png ) It failed only at Selenium test twice. I guess it's because I * changed the action of remove note button * of notebook view to moving to trash. But I have no idea where to fix! 😢 Please help!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks for the review @cuspymd! I think so, but I used HashSet because of consistency. Other methods used HashSet.

          I think if we want to change to 'Set', wouldn't it be better to open new refactoring PR that change all other 'HashSet' to 'Set' for consistency? 😄

          What do you think?

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks for the review @cuspymd! I think so, but I used HashSet because of consistency. Other methods used HashSet. I think if we want to change to 'Set', wouldn't it be better to open new refactoring PR that change all other 'HashSet' to 'Set' for consistency? 😄 What do you think?
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user cuspymd commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun Yes. Good Idea~!!

          Show
          githubbot ASF GitHub Bot added a comment - Github user cuspymd commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun Yes. Good Idea~!!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks @cuspymd 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks @cuspymd 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @marchpig Sorry for my late response! I changed what you addressed except one thing.

              1. Korean note order
                ![image](https://cloud.githubusercontent.com/assets/8201019/21017141/b8b797e2-bdab-11e6-94db-7e1bac10389b.png)
              2. Remove date string when restore
                ![remove_date](https://cloud.githubusercontent.com/assets/8201019/21017265/16fa00d8-bdac-11e6-876f-c4c403f2192d.gif)

          The one thing is about hiding `~Trash` prefix. I definitely agree with you but I think it's not good to make a PR huge. So if you think that feature is essential, I will include it to this PR. But if it's not, I would like to leave that as a future work

          Actually, I planned to add features related to the trash on notebook view in the future. There are many features need to be implemented!

          • Hide `~Trash` prefix
          • Notice a note is in the trash
          • Disable edit note in the trash (I'm not sure that this is needed, maybe limiting user's behavior)
          • Disable renaming note in the trash (not sure as well)

          The first and second features are needed in my opinion, so I would like to handle those on next PR!

          Please tell me your opinion.
          Thanks for the review again. It looks better than before thanks to your comments 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 @marchpig Sorry for my late response! I changed what you addressed except one thing. Korean note order ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21017141/b8b797e2-bdab-11e6-94db-7e1bac10389b.png ) Remove date string when restore ! [remove_date] ( https://cloud.githubusercontent.com/assets/8201019/21017265/16fa00d8-bdac-11e6-876f-c4c403f2192d.gif ) The one thing is about hiding `~Trash` prefix. I definitely agree with you but I think it's not good to make a PR huge. So if you think that feature is essential, I will include it to this PR. But if it's not, I would like to leave that as a future work Actually, I planned to add features related to the trash on notebook view in the future. There are many features need to be implemented! Hide `~Trash` prefix Notice a note is in the trash Disable edit note in the trash (I'm not sure that this is needed, maybe limiting user's behavior) Disable renaming note in the trash (not sure as well) The first and second features are needed in my opinion, so I would like to handle those on next PR! Please tell me your opinion. Thanks for the review again. It looks better than before thanks to your comments 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user marchpig commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun It works well! Thank you very much for accepting my opinions. :smiley:
          I think that handling `~Trash` prefix in the future is fine to me because it is not a bug but just my opinion

          However, I found a minor problem.
          When a folder name has a trailing space, it is not moved to trash. For example, "My folder /My note".
          I think that you can handle this corner case in the future work!

          Thanks again for considering my opinions. :+1:

          Show
          githubbot ASF GitHub Bot added a comment - Github user marchpig commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun It works well! Thank you very much for accepting my opinions. :smiley: I think that handling `~Trash` prefix in the future is fine to me because it is not a bug but just my opinion However, I found a minor problem. When a folder name has a trailing space, it is not moved to trash. For example, "My folder /My note". I think that you can handle this corner case in the future work! Thanks again for considering my opinions. :+1:
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks for your careful review @marchpig 😄 I fixed the bug you found!

          It turns out that I didn't normalize folder ID when creating a folder. It could be a serious bug if you didn't find it.

          Thanks 👍

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks for your careful review @marchpig 😄 I fixed the bug you found! It turns out that I didn't normalize folder ID when creating a folder. It could be a serious bug if you didn't find it. Thanks 👍
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 8d53a1347028b09588027fa8715ea99d23abb65b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 87722747798f908da78752a48cca693f6ac34469
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit d97718c9e74afe41372ec904b0f6744027f21b8c
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3c16e09f42204bb784140cceb7946c7140f9e12d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit c69b9e32290d2b16d558967721be5fac95ad9f64
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 2167c86c5d72b5cbef431c79a51848ef1790781b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit 1558ba52d31832ba6f006fb623c3d74421e42c61
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit d58517c33a212555aca5cdd12cb743de9fbd7ea7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 6568bf2c71bb90511b590d437e0ac0accc6d7384
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 8d53a1347028b09588027fa8715ea99d23abb65b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 87722747798f908da78752a48cca693f6ac34469 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit d97718c9e74afe41372ec904b0f6744027f21b8c Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3c16e09f42204bb784140cceb7946c7140f9e12d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit c69b9e32290d2b16d558967721be5fac95ad9f64 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 2167c86c5d72b5cbef431c79a51848ef1790781b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit 1558ba52d31832ba6f006fb623c3d74421e42c61 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit d58517c33a212555aca5cdd12cb743de9fbd7ea7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 6568bf2c71bb90511b590d437e0ac0accc6d7384 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 8d53a1347028b09588027fa8715ea99d23abb65b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 87722747798f908da78752a48cca693f6ac34469
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit d97718c9e74afe41372ec904b0f6744027f21b8c
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3c16e09f42204bb784140cceb7946c7140f9e12d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit c69b9e32290d2b16d558967721be5fac95ad9f64
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 2167c86c5d72b5cbef431c79a51848ef1790781b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit 1558ba52d31832ba6f006fb623c3d74421e42c61
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit d58517c33a212555aca5cdd12cb743de9fbd7ea7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 6568bf2c71bb90511b590d437e0ac0accc6d7384
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 8d53a1347028b09588027fa8715ea99d23abb65b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 87722747798f908da78752a48cca693f6ac34469 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit d97718c9e74afe41372ec904b0f6744027f21b8c Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3c16e09f42204bb784140cceb7946c7140f9e12d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit c69b9e32290d2b16d558967721be5fac95ad9f64 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 2167c86c5d72b5cbef431c79a51848ef1790781b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit 1558ba52d31832ba6f006fb623c3d74421e42c61 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit d58517c33a212555aca5cdd12cb743de9fbd7ea7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 6568bf2c71bb90511b590d437e0ac0accc6d7384 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

              1. CI is green! 😄
                I *changed Selenium test codes* affected by my PR and it works now.
                1. Failed reason
                  `remove note` button changed to `move to trash` but test code still wanted to click `remove note`. So I made it click `move to trash` button and now it works

          Please review!
          Thanks

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 CI is green! 😄 I * changed Selenium test codes * affected by my PR and it works now. Failed reason `remove note` button changed to `move to trash` but test code still wanted to click `remove note`. So I made it click `move to trash` button and now it works Please review! Thanks
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user Leemoonsoo commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun thanks for the great contribution!
          LGTM and merge to master if there're no further discussions.

          Show
          githubbot ASF GitHub Bot added a comment - Github user Leemoonsoo commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun thanks for the great contribution! LGTM and merge to master if there're no further discussions.
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks @Leemoonsoo 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks @Leemoonsoo 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun Nice feature indeed!
          Most of cases are working like a charm.
          But as @marchpig said above,
          ![screen shot 2016-12-14 at 12 28 46 pm](https://cloud.githubusercontent.com/assets/10060731/21168719/bff892d4-c1f9-11e6-8644-9ced7a81d955.png)
          is this intended result? I removed the `note1` and `note2` separately, and the time stamped only for latter one: `NoteDirB/note2`.

          And another really minor thing is
          ![screen shot 2016-12-14 at 12 41 20 pm](https://cloud.githubusercontent.com/assets/10060731/21168885/dd423fb0-c1fa-11e6-8b7f-2a5337497a79.png)

          As you can see there are two trash can icons and their sizes are different now. Hmm.. so I would suggest you to use another icon for `Empty trash`(not sure which one will be proper for this..kk) since the trash can icon is already used for `Move note to trash` / `Move folder to trash` / `Remove note permanently` / `Remove folder permanently`.

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun Nice feature indeed! Most of cases are working like a charm. But as @marchpig said above, ! [screen shot 2016-12-14 at 12 28 46 pm] ( https://cloud.githubusercontent.com/assets/10060731/21168719/bff892d4-c1f9-11e6-8644-9ced7a81d955.png ) is this intended result? I removed the `note1` and `note2` separately, and the time stamped only for latter one: `NoteDirB/note2`. And another really minor thing is ! [screen shot 2016-12-14 at 12 41 20 pm] ( https://cloud.githubusercontent.com/assets/10060731/21168885/dd423fb0-c1fa-11e6-8b7f-2a5337497a79.png ) As you can see there are two trash can icons and their sizes are different now. Hmm.. so I would suggest you to use another icon for `Empty trash`(not sure which one will be proper for this..kk) since the trash can icon is already used for `Move note to trash` / `Move folder to trash` / `Remove note permanently` / `Remove folder permanently`.
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @AhyoungRyu Always thanks for your nice review 😄

          Yes, it's intended. A time stamp is generated only if a `folder` already exists in the trash. But it's not generated when moving a `note` to the trash.

          I made this feature because of a *use case* like this:

              1. A use case needs time stamp
                1. A user moves "NoteDirA" folder to the trash
                2. And the user create a folder which has the same name ("NoteDirA")
                3. After a month from then, the user forgot the existence of the folder already exists in the trash, and moves the folder to the trash which created later
                4. But it was a mistake and the user wants to restore the folder created later
              1. Necessity of the time stamp for the use case above

          *If there is no time stamp:*
          The folder created later will be merged into old one and the folder "NoteDirA" will be messy.

                1. If there is a time stamp:
                  The folder created later will be moved to the trash with a time stamp postfix. There will be two folders which are "NoteDirA" (old one) and "NoteDirA removed at 2016-12-14 xx:xx:xx" (new one). In this case, the user can restore the folder successfully.

          This is why I added time stamp! Please tell me if there is any other idea.

              1. Remove permanently icon candidates
                I agree with you so I searched Font Awesome and found some candidates for the icon. I think not only `empty trash` but also `Remove note permanently` and `Remove folder permanently` should be replaced together.

          ![image](https://cloud.githubusercontent.com/assets/8201019/21180874/543a32b0-c23e-11e6-9f5f-25a0fa25bb84.png)
          ![image](https://cloud.githubusercontent.com/assets/8201019/21180952/c8ce421a-c23e-11e6-9297-f7df93a36ef5.png)
          ![image](https://cloud.githubusercontent.com/assets/8201019/21180965/e9a051ea-c23e-11e6-96b8-7df5469a87cf.png)
          ![image](https://cloud.githubusercontent.com/assets/8201019/21181004/179fe736-c23f-11e6-9e58-36ade60959c4.png)

          The icons above are the candidates I found, but please let me know if you have a better one!

          Which icon do you prefer? 😄

          Thanks for the review again 👍

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 @AhyoungRyu Always thanks for your nice review 😄 Yes, it's intended. A time stamp is generated only if a `folder` already exists in the trash. But it's not generated when moving a `note` to the trash. I made this feature because of a * use case * like this: A use case needs time stamp 1. A user moves "NoteDirA" folder to the trash 2. And the user create a folder which has the same name ("NoteDirA") 3. After a month from then, the user forgot the existence of the folder already exists in the trash, and moves the folder to the trash which created later 4. But it was a mistake and the user wants to restore the folder created later Necessity of the time stamp for the use case above * If there is no time stamp: * The folder created later will be merged into old one and the folder "NoteDirA" will be messy. If there is a time stamp: The folder created later will be moved to the trash with a time stamp postfix. There will be two folders which are "NoteDirA" (old one) and "NoteDirA removed at 2016-12-14 xx:xx:xx" (new one). In this case, the user can restore the folder successfully. This is why I added time stamp! Please tell me if there is any other idea. Remove permanently icon candidates I agree with you so I searched Font Awesome and found some candidates for the icon. I think not only `empty trash` but also `Remove note permanently` and `Remove folder permanently` should be replaced together. ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21180874/543a32b0-c23e-11e6-9f5f-25a0fa25bb84.png ) ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21180952/c8ce421a-c23e-11e6-9297-f7df93a36ef5.png ) ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21180965/e9a051ea-c23e-11e6-96b8-7df5469a87cf.png ) ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21181004/179fe736-c23f-11e6-9e58-36ade60959c4.png ) The icons above are the candidates I found, but please let me know if you have a better one! Which icon do you prefer? 😄 Thanks for the review again 👍
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun Appreciate for your precise explanation and picking proper candidates as well Tested again to check the time stamp, it makes sense. Then how about attaching the time stamp for every cases to keep consistency? Currently the firstly removed one doesn't show the stamp. Surely It's just my opinion.
          And regarding the icon, I couldn't find the better icon that has meaning "Clear" either. So you can use anything that you suggested!

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun Appreciate for your precise explanation and picking proper candidates as well Tested again to check the time stamp, it makes sense. Then how about attaching the time stamp for every cases to keep consistency? Currently the firstly removed one doesn't show the stamp. Surely It's just my opinion. And regarding the icon, I couldn't find the better icon that has meaning "Clear" either. So you can use anything that you suggested!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          I changed `empty trash`, `remove folder permanently`, and `remove note permanently` icons to `X`. I'm not sure this is the best icon for it ^^; but we can change later when we find a suitable icon.

                1. Empty trash icon:
                  ![image](https://cloud.githubusercontent.com/assets/8201019/21286529/11d306dc-c49a-11e6-9960-a87f7c4d2f1c.png)
                2. Remove folder permanently icon:
                  ![image](https://cloud.githubusercontent.com/assets/8201019/21286535/21cb26a0-c49a-11e6-87d0-1e592484af1f.png)
                3. Remove note permanently icon:
                  ![image](https://cloud.githubusercontent.com/assets/8201019/21286537/2b29c4fe-c49a-11e6-96b8-ec9cc771aa55.png)

          And I've been thinking about attaching the time stamp to all, but there are some reasons I worry about:

          • It makes folder name too long. It's not good to see. So, I also removed infix ` removed at `.
          • MacOS also only attaches the time stamp to duplicated folder names. So, only attaching the time stamp to duplicated ones is more familiar to users, I think.

          Now, a duplicated folder name looks like this:
          ![image](https://cloud.githubusercontent.com/assets/8201019/21286783/b912dca0-c4a0-11e6-8ce9-04b4c9d3c40e.png)

          What do you think @AhyoungRyu?
          Thanks for the review 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 I changed `empty trash`, `remove folder permanently`, and `remove note permanently` icons to `X`. I'm not sure this is the best icon for it ^^; but we can change later when we find a suitable icon. Empty trash icon: ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21286529/11d306dc-c49a-11e6-9960-a87f7c4d2f1c.png ) Remove folder permanently icon: ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21286535/21cb26a0-c49a-11e6-87d0-1e592484af1f.png ) Remove note permanently icon: ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21286537/2b29c4fe-c49a-11e6-96b8-ec9cc771aa55.png ) And I've been thinking about attaching the time stamp to all, but there are some reasons I worry about: It makes folder name too long. It's not good to see. So, I also removed infix ` removed at `. MacOS also only attaches the time stamp to duplicated folder names. So, only attaching the time stamp to duplicated ones is more familiar to users, I think. Now, a duplicated folder name looks like this: ! [image] ( https://cloud.githubusercontent.com/assets/8201019/21286783/b912dca0-c4a0-11e6-8ce9-04b4c9d3c40e.png ) What do you think @AhyoungRyu? Thanks for the review 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 8d53a1347028b09588027fa8715ea99d23abb65b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 87722747798f908da78752a48cca693f6ac34469
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit d97718c9e74afe41372ec904b0f6744027f21b8c
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3c16e09f42204bb784140cceb7946c7140f9e12d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit c69b9e32290d2b16d558967721be5fac95ad9f64
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 2167c86c5d72b5cbef431c79a51848ef1790781b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit 1558ba52d31832ba6f006fb623c3d74421e42c61
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit d58517c33a212555aca5cdd12cb743de9fbd7ea7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 6568bf2c71bb90511b590d437e0ac0accc6d7384
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 4d074b4a831c97b65746e8205681aa6d44ae4683
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 8d53a1347028b09588027fa8715ea99d23abb65b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 87722747798f908da78752a48cca693f6ac34469 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit d97718c9e74afe41372ec904b0f6744027f21b8c Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3c16e09f42204bb784140cceb7946c7140f9e12d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit c69b9e32290d2b16d558967721be5fac95ad9f64 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 2167c86c5d72b5cbef431c79a51848ef1790781b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit 1558ba52d31832ba6f006fb623c3d74421e42c61 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit d58517c33a212555aca5cdd12cb743de9fbd7ea7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 6568bf2c71bb90511b590d437e0ac0accc6d7384 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 4d074b4a831c97b65746e8205681aa6d44ae4683 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user 1ambda commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Hi all, This PR looks like unpopular from the point of view design. I will close this issue.

          Show
          githubbot ASF GitHub Bot added a comment - Github user 1ambda commented on the issue: https://github.com/apache/zeppelin/pull/1730 Hi all, This PR looks like unpopular from the point of view design. I will close this issue.
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user 1ambda commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun

          It works well as described and here are two things to consider.

          1. Trash is represented in `~Trash` in the Navbar.

          <img width="149" alt="screen shot 2016-12-19 at 1 48 36 pm" src="https://cloud.githubusercontent.com/assets/4968473/21301739/91cfc5dc-c5f3-11e6-92c4-4d1010024aae.png">

          2. Do we really need rename, clear output button on notes in Trash? IMO, we need only 2 options. *remove* or *restore* for that notes.

          <img width="223" alt="screen shot 2016-12-19 at 1 47 39 pm" src="https://cloud.githubusercontent.com/assets/4968473/21301709/5901b012-c5f3-11e6-9699-f036fc3de694.png">

          Show
          githubbot ASF GitHub Bot added a comment - Github user 1ambda commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun It works well as described and here are two things to consider. 1. Trash is represented in `~Trash` in the Navbar. <img width="149" alt="screen shot 2016-12-19 at 1 48 36 pm" src="https://cloud.githubusercontent.com/assets/4968473/21301739/91cfc5dc-c5f3-11e6-92c4-4d1010024aae.png"> 2. Do we really need rename , clear output button on notes in Trash? IMO, we need only 2 options. * remove * or * restore * for that notes. <img width="223" alt="screen shot 2016-12-19 at 1 47 39 pm" src="https://cloud.githubusercontent.com/assets/4968473/21301709/5901b012-c5f3-11e6-9699-f036fc3de694.png">
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun Thanks for your precise explanation. Yeah it makes sense. And tested again and it looks good for what we talked about

          It'll be nice to be merged after addressing @1ambda's feedback as well!

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun Thanks for your precise explanation. Yeah it makes sense. And tested again and it looks good for what we talked about It'll be nice to be merged after addressing @1ambda's feedback as well!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @AhyoungRyu Always thanks for the review Also thanks for your understanding.

          @1ambda Thanks for the review! I appreciate it and sorry for my late response.
          That was a really nice point. I fixed it as you see below:

          <img src="https://cloud.githubusercontent.com/assets/8201019/21429799/b678e794-c8a3-11e6-851f-04d1ad55998e.png" alt="image" width=200>
          I tested on Chrome and Firefox. Please check!

          As to the second point that you mentioned, I thought a lot of about it as well
          My opinion is same with you, but I think maybe other users can feel limited.
          So I would like to make it configurable as three levels on other PR:
          1. super strict: not even open note
          2. read only: only can open note and read it
          3. unlimited access: able to rename, read, write, and run note

          Would you mind if I do that? Please let me know 😄
          Thanks for the review again.

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 @AhyoungRyu Always thanks for the review Also thanks for your understanding. @1ambda Thanks for the review! I appreciate it and sorry for my late response. That was a really nice point. I fixed it as you see below: <img src="https://cloud.githubusercontent.com/assets/8201019/21429799/b678e794-c8a3-11e6-851f-04d1ad55998e.png" alt="image" width=200> I tested on Chrome and Firefox. Please check! As to the second point that you mentioned, I thought a lot of about it as well My opinion is same with you, but I think maybe other users can feel limited. So I would like to make it configurable as three levels on other PR: 1. super strict: not even open note 2. read only: only can open note and read it 3. unlimited access: able to rename, read, write, and run note Would you mind if I do that? Please let me know 😄 Thanks for the review again.
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user 1ambda commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Hi @tae-jun

          It's good idea to introduce limitation when notes are in trash. Let me comment

          (1) what you mentioned is about restricting modification of archived notes (i mean, notes are in trash)
          (2) Removing `rename` and `clear output` *does not* mean disabling those functionality. It's just about hiding the menus. We can rename and clear output in the trashed notes. It's not about (1)

          So I I think removing `rename` and `clear output` can be handled in this PR.

          Show
          githubbot ASF GitHub Bot added a comment - Github user 1ambda commented on the issue: https://github.com/apache/zeppelin/pull/1730 Hi @tae-jun It's good idea to introduce limitation when notes are in trash. Let me comment (1) what you mentioned is about restricting modification of archived notes (i mean, notes are in trash) (2) Removing `rename` and `clear output` * does not * mean disabling those functionality. It's just about hiding the menus. We can rename and clear output in the trashed notes. It's not about (1) So I I think removing `rename` and `clear output` can be handled in this PR.
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @1ambda Thanks for your prompt response!
          I see what you mean now. Thanks for the explanation

          Now, only `remove permanently` and `restore` buttons are shown.
          <img src="https://cloud.githubusercontent.com/assets/8201019/21433976/7c735306-c8b5-11e6-92a2-8f09ab84e823.png" width=200>
          <img src="https://cloud.githubusercontent.com/assets/8201019/21433985/8334b02c-c8b5-11e6-87bf-ada0f978d69b.png" width=200>

          How does it look? 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 @1ambda Thanks for your prompt response! I see what you mean now. Thanks for the explanation Now, only `remove permanently` and `restore` buttons are shown. <img src="https://cloud.githubusercontent.com/assets/8201019/21433976/7c735306-c8b5-11e6-92a2-8f09ab84e823.png" width=200> <img src="https://cloud.githubusercontent.com/assets/8201019/21433985/8334b02c-c8b5-11e6-87bf-ada0f978d69b.png" width=200> How does it look? 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 8d53a1347028b09588027fa8715ea99d23abb65b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 87722747798f908da78752a48cca693f6ac34469
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit d97718c9e74afe41372ec904b0f6744027f21b8c
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3c16e09f42204bb784140cceb7946c7140f9e12d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit c69b9e32290d2b16d558967721be5fac95ad9f64
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 2167c86c5d72b5cbef431c79a51848ef1790781b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit 1558ba52d31832ba6f006fb623c3d74421e42c61
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit d58517c33a212555aca5cdd12cb743de9fbd7ea7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 6568bf2c71bb90511b590d437e0ac0accc6d7384
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 4d074b4a831c97b65746e8205681aa6d44ae4683
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 5be1b10d6022b70d84495e4477bb9845cdd31494
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit 9166f1b77f01be5959b3cf2461209fa5bcfb93bb
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 8d53a1347028b09588027fa8715ea99d23abb65b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 87722747798f908da78752a48cca693f6ac34469 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit d97718c9e74afe41372ec904b0f6744027f21b8c Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3c16e09f42204bb784140cceb7946c7140f9e12d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit c69b9e32290d2b16d558967721be5fac95ad9f64 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 2167c86c5d72b5cbef431c79a51848ef1790781b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit 1558ba52d31832ba6f006fb623c3d74421e42c61 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit d58517c33a212555aca5cdd12cb743de9fbd7ea7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 6568bf2c71bb90511b590d437e0ac0accc6d7384 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 4d074b4a831c97b65746e8205681aa6d44ae4683 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 5be1b10d6022b70d84495e4477bb9845cdd31494 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit 9166f1b77f01be5959b3cf2461209fa5bcfb93bb Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 8d53a1347028b09588027fa8715ea99d23abb65b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 87722747798f908da78752a48cca693f6ac34469
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit d97718c9e74afe41372ec904b0f6744027f21b8c
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3c16e09f42204bb784140cceb7946c7140f9e12d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit c69b9e32290d2b16d558967721be5fac95ad9f64
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 2167c86c5d72b5cbef431c79a51848ef1790781b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit 1558ba52d31832ba6f006fb623c3d74421e42c61
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit d58517c33a212555aca5cdd12cb743de9fbd7ea7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 6568bf2c71bb90511b590d437e0ac0accc6d7384
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 4d074b4a831c97b65746e8205681aa6d44ae4683
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 5be1b10d6022b70d84495e4477bb9845cdd31494
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit 9166f1b77f01be5959b3cf2461209fa5bcfb93bb
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 8d53a1347028b09588027fa8715ea99d23abb65b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 87722747798f908da78752a48cca693f6ac34469 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit d97718c9e74afe41372ec904b0f6744027f21b8c Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3c16e09f42204bb784140cceb7946c7140f9e12d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit c69b9e32290d2b16d558967721be5fac95ad9f64 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 2167c86c5d72b5cbef431c79a51848ef1790781b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit 1558ba52d31832ba6f006fb623c3d74421e42c61 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit d58517c33a212555aca5cdd12cb743de9fbd7ea7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 6568bf2c71bb90511b590d437e0ac0accc6d7384 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 4d074b4a831c97b65746e8205681aa6d44ae4683 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 5be1b10d6022b70d84495e4477bb9845cdd31494 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit 9166f1b77f01be5959b3cf2461209fa5bcfb93bb Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 665e30227a903b067b9b3d4e887f603bedf61698
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 8d53a1347028b09588027fa8715ea99d23abb65b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 87722747798f908da78752a48cca693f6ac34469
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit d97718c9e74afe41372ec904b0f6744027f21b8c
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3c16e09f42204bb784140cceb7946c7140f9e12d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit c69b9e32290d2b16d558967721be5fac95ad9f64
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 2167c86c5d72b5cbef431c79a51848ef1790781b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit 1558ba52d31832ba6f006fb623c3d74421e42c61
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit d58517c33a212555aca5cdd12cb743de9fbd7ea7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 6568bf2c71bb90511b590d437e0ac0accc6d7384
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 4d074b4a831c97b65746e8205681aa6d44ae4683
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 5be1b10d6022b70d84495e4477bb9845cdd31494
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit 9166f1b77f01be5959b3cf2461209fa5bcfb93bb
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 665e30227a903b067b9b3d4e887f603bedf61698 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 8d53a1347028b09588027fa8715ea99d23abb65b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 7caebdaee036a3276d6c116aaa0307466fe3c1d0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 87722747798f908da78752a48cca693f6ac34469 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 04954ac33c2d9cf96dd331abb5a8b1eb09f05e54 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit d97718c9e74afe41372ec904b0f6744027f21b8c Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3c16e09f42204bb784140cceb7946c7140f9e12d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit c69b9e32290d2b16d558967721be5fac95ad9f64 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 2167c86c5d72b5cbef431c79a51848ef1790781b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit 1558ba52d31832ba6f006fb623c3d74421e42c61 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit d58517c33a212555aca5cdd12cb743de9fbd7ea7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 6568bf2c71bb90511b590d437e0ac0accc6d7384 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 4d074b4a831c97b65746e8205681aa6d44ae4683 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 5be1b10d6022b70d84495e4477bb9845cdd31494 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit 9166f1b77f01be5959b3cf2461209fa5bcfb93bb Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user 1ambda commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun great!

          Show
          githubbot ASF GitHub Bot added a comment - Github user 1ambda commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun great!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks @1ambda 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks @1ambda 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Finally CI is green now! LGTM 🎅🏼

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 Finally CI is green now! LGTM 🎅🏼
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @AhyoungRyu Yeah! Thanks Merry Christmas~

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 @AhyoungRyu Yeah! Thanks Merry Christmas~
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Conflict resolved 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Conflict resolved 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user Leemoonsoo commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          LGTM!

          Show
          githubbot ASF GitHub Bot added a comment - Github user Leemoonsoo commented on the issue: https://github.com/apache/zeppelin/pull/1730 LGTM!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit a010f8724329efe198bcb9406c8ed5892deea7d7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 6fc1846a044cc27ef5e5c69519b54cead25034a2
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit bf4641007ea209a44278514f0c5251b4a5732ac1
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 7ab945fbfef0da222e2291d32863931a81933edd
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit b4f42b26f781c341a1d035e685024bef229370ba
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit 43cf08bac15f1e979a2ff6f1e1b7d21f9e07c62a
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3490494a087f16e6d4b12101e829da571756e27f
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit d7131799c9f614a986400e8d9ee7830fb3d602a7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 25d7b8f633639b9335b7eefd22e53e7b9b8a9070
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit cb84473046b40e229e5f95f00608805b676f6e06
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit 2407844911184e6cd750d20b7ad76d5dd9c11a8e
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 5a33b176fc4d79fb47e033e438ed49c2c6b728dc
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 1381727174d38cd5103b63131bd26b2c7b2705c3
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 35131b39307e25b024f86b1f71d403dbc7a69b34
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit 3b77c579e8555d5948a074188b2fb38c464f7104
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit a010f8724329efe198bcb9406c8ed5892deea7d7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 6fc1846a044cc27ef5e5c69519b54cead25034a2 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit bf4641007ea209a44278514f0c5251b4a5732ac1 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 7ab945fbfef0da222e2291d32863931a81933edd Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit b4f42b26f781c341a1d035e685024bef229370ba Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit 43cf08bac15f1e979a2ff6f1e1b7d21f9e07c62a Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3490494a087f16e6d4b12101e829da571756e27f Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit d7131799c9f614a986400e8d9ee7830fb3d602a7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 25d7b8f633639b9335b7eefd22e53e7b9b8a9070 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit cb84473046b40e229e5f95f00608805b676f6e06 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit 2407844911184e6cd750d20b7ad76d5dd9c11a8e Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 5a33b176fc4d79fb47e033e438ed49c2c6b728dc Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 1381727174d38cd5103b63131bd26b2c7b2705c3 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 35131b39307e25b024f86b1f71d403dbc7a69b34 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit 3b77c579e8555d5948a074188b2fb38c464f7104 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun Thanks for your great work! Merge if there are no more discussions

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun Thanks for your great work! Merge if there are no more discussions
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user soralee commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun It's great feature! So, I would like to suggest one thing.
          Currently, the filter function in Zeppelin homepage doesn't work as expected and this issue is handled in ZEPPELIN-1864(https://issues.apache.org/jira/browse/ZEPPELIN-1864).

          But, when using filter function, all icon is disappeared like below.
          ![z1736](https://cloud.githubusercontent.com/assets/8110458/21514983/d335bf50-cd0e-11e6-8297-a48bbacdf308.gif)
          At this time, I think It would be nice to show some icon next to note or folder if you don't mind.
          What do you think?

          Show
          githubbot ASF GitHub Bot added a comment - Github user soralee commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun It's great feature! So, I would like to suggest one thing. Currently, the filter function in Zeppelin homepage doesn't work as expected and this issue is handled in ZEPPELIN-1864 ( https://issues.apache.org/jira/browse/ZEPPELIN-1864 ). But, when using filter function, all icon is disappeared like below. ! [z1736] ( https://cloud.githubusercontent.com/assets/8110458/21514983/d335bf50-cd0e-11e6-8297-a48bbacdf308.gif ) At this time, I think It would be nice to show some icon next to note or folder if you don't mind. What do you think?
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks for the review, @soralee! That was a big deal.

          I pushed a commit and now it looks like this:
          <img src="https://cloud.githubusercontent.com/assets/8201019/21564175/bc5fc4c2-cecd-11e6-88dd-d981659fb63e.png" width="400">
          I just made it show trash icon if it's in the trash.

          And it looks like that the search result only shows notes, not folders.
          It would be great if it's handled on the issue that you said

          After resolving the issue, the trash folder should show trash icon.
          I can do that if you want! Please assign that issue to me if you want

          What do you think? 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks for the review, @soralee! That was a big deal. I pushed a commit and now it looks like this: <img src="https://cloud.githubusercontent.com/assets/8201019/21564175/bc5fc4c2-cecd-11e6-88dd-d981659fb63e.png" width="400"> I just made it show trash icon if it's in the trash. And it looks like that the search result only shows notes, not folders. It would be great if it's handled on the issue that you said After resolving the issue, the trash folder should show trash icon. I can do that if you want! Please assign that issue to me if you want What do you think? 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit a010f8724329efe198bcb9406c8ed5892deea7d7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 6fc1846a044cc27ef5e5c69519b54cead25034a2
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit bf4641007ea209a44278514f0c5251b4a5732ac1
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 7ab945fbfef0da222e2291d32863931a81933edd
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit b4f42b26f781c341a1d035e685024bef229370ba
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit 43cf08bac15f1e979a2ff6f1e1b7d21f9e07c62a
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 3490494a087f16e6d4b12101e829da571756e27f
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit d7131799c9f614a986400e8d9ee7830fb3d602a7
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 25d7b8f633639b9335b7eefd22e53e7b9b8a9070
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit cb84473046b40e229e5f95f00608805b676f6e06
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit 2407844911184e6cd750d20b7ad76d5dd9c11a8e
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 5a33b176fc4d79fb47e033e438ed49c2c6b728dc
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 1381727174d38cd5103b63131bd26b2c7b2705c3
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 35131b39307e25b024f86b1f71d403dbc7a69b34
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit 3b77c579e8555d5948a074188b2fb38c464f7104
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons

          commit 9e25b3172b2a9a6b2195ce7e8e7b920dfb93726b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-30T11:20:21Z

          show trash icon after searching notes


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit a010f8724329efe198bcb9406c8ed5892deea7d7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 6fc1846a044cc27ef5e5c69519b54cead25034a2 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit bf4641007ea209a44278514f0c5251b4a5732ac1 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 7ab945fbfef0da222e2291d32863931a81933edd Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit b4f42b26f781c341a1d035e685024bef229370ba Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit 43cf08bac15f1e979a2ff6f1e1b7d21f9e07c62a Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 3490494a087f16e6d4b12101e829da571756e27f Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit d7131799c9f614a986400e8d9ee7830fb3d602a7 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 25d7b8f633639b9335b7eefd22e53e7b9b8a9070 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit cb84473046b40e229e5f95f00608805b676f6e06 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit 2407844911184e6cd750d20b7ad76d5dd9c11a8e Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 5a33b176fc4d79fb47e033e438ed49c2c6b728dc Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 1381727174d38cd5103b63131bd26b2c7b2705c3 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 35131b39307e25b024f86b1f71d403dbc7a69b34 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit 3b77c579e8555d5948a074188b2fb38c464f7104 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons commit 9e25b3172b2a9a6b2195ce7e8e7b920dfb93726b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-30T11:20:21Z show trash icon after searching notes
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user soralee commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks for considering my suggestion, @tae-jun 😄
          It is good idea and I agree with you!
          I think this problem is a little too hard to solve.
          So, anyway, I will test again!

          Show
          githubbot ASF GitHub Bot added a comment - Github user soralee commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks for considering my suggestion, @tae-jun 😄 It is good idea and I agree with you! I think this problem is a little too hard to solve. So, anyway, I will test again!
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 94407574e4182f93dfd9dce39e7e63fde824e461
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit 1a2a7c5a719a3127720c40cdbafe054008200988
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 423748811b1a56f4ed4df0950aa8b30f89cd7927
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 51cc60de3c709a2c7bc45cd8713521c87738d5aa
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit eb2d64b82afb260933f6f1d0ee59388eeece47bf
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit da00e3cc0db8ef896706f9a2263c929bc1cd929a
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit 6ddeeb729e97f8408504627f26caa2ffdcbeee59
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit beaf265ac1eef802588d42cc5967323bfdbe96ff
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit 35aca48d83ec971068aab63a8e222feb269ab5e2
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit e627ae7eee7cfc93585c0d438d5822daa11e6d1d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit dd1f506ae8e7617ec257b52634540a44e4f0159f
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 0f10bb59384c81bfd0b2c73122d1188dd670e776
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 8b9068db9833f4e5cb5a77ad7c092d9d90cefdb9
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 44bea67293ec81ddbf3b5b673524e468ec5df5da
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit 91745f3ea89a9a35e5d67d5a3e76ce672e9f6d58
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons

          commit 650797e5afe15c29b22939e55cddc112c33e0b9b
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-30T11:20:21Z

          show trash icon after searching notes


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 94407574e4182f93dfd9dce39e7e63fde824e461 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit 1a2a7c5a719a3127720c40cdbafe054008200988 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 423748811b1a56f4ed4df0950aa8b30f89cd7927 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 51cc60de3c709a2c7bc45cd8713521c87738d5aa Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit eb2d64b82afb260933f6f1d0ee59388eeece47bf Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit da00e3cc0db8ef896706f9a2263c929bc1cd929a Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit 6ddeeb729e97f8408504627f26caa2ffdcbeee59 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit beaf265ac1eef802588d42cc5967323bfdbe96ff Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit 35aca48d83ec971068aab63a8e222feb269ab5e2 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit e627ae7eee7cfc93585c0d438d5822daa11e6d1d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit dd1f506ae8e7617ec257b52634540a44e4f0159f Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 0f10bb59384c81bfd0b2c73122d1188dd670e776 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 8b9068db9833f4e5cb5a77ad7c092d9d90cefdb9 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 44bea67293ec81ddbf3b5b673524e468ec5df5da Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit 91745f3ea89a9a35e5d67d5a3e76ce672e9f6d58 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons commit 650797e5afe15c29b22939e55cddc112c33e0b9b Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-30T11:20:21Z show trash icon after searching notes
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          I think it's good to merge. So let's improve after then!
          Will merge this one if there are no further discussions. @tae-jun Appreciate for this AWESOME feature 👍

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 I think it's good to merge. So let's improve after then! Will merge this one if there are no further discussions. @tae-jun Appreciate for this AWESOME feature 👍
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          Thanks @AhyoungRyu 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 Thanks @AhyoungRyu 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun Can you try to rebase from master and push again? I guess it would be help to make CI all green. Seems it's because of #1805.

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun Can you try to rebase from master and push again? I guess it would be help to make CI all green. Seems it's because of #1805.
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @tae-jun I tried to run `npm run test` under `zeppelin-web` in my local, but it failed with below error.
          ```
          PhantomJS 2.1.1 (Mac OS X 0.0.0) Factory: NoteList should generate both flat list and folder-based list properly FAILED
          TypeError: undefined is not an object (evaluating 'note.name.split') in src/index.js (line 8407)
          src/index.js:8407:36
          arrayMap@bower_components/lodash/lodash.js:1431:33
          map@bower_components/lodash/lodash.js:6693:18
          setNotes@src/index.js:8406:32
          test/spec/factory/noteList.js:78:23
          PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 69 of 71 (1 FAILED) (0 secs / 0.4LOG: function (columns, rows, comment)

          { ... }
          PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 69 of 71 (1 FAILED) (0 secs / 0.4PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 70 of 71 (1 FAILED) (0 secs / 0.4LOG: function (columns, rows, comment) { ... }

          PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 70 of 71 (1 FAILED) (0 secs / 0.4PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 71 of 71 (1 FAILED) (0 secs / 0.4PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 71 of 71 (1 FAILED) (0.334 secs / 0.424 secs)
          ```

          Can you take a look again?

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 @tae-jun I tried to run `npm run test` under `zeppelin-web` in my local, but it failed with below error. ``` PhantomJS 2.1.1 (Mac OS X 0.0.0) Factory: NoteList should generate both flat list and folder-based list properly FAILED TypeError: undefined is not an object (evaluating 'note.name.split') in src/index.js (line 8407) src/index.js:8407:36 arrayMap@bower_components/lodash/lodash.js:1431:33 map@bower_components/lodash/lodash.js:6693:18 setNotes@src/index.js:8406:32 test/spec/factory/noteList.js:78:23 PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 69 of 71 (1 FAILED) (0 secs / 0.4LOG: function (columns, rows, comment) { ... } PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 69 of 71 (1 FAILED) (0 secs / 0.4PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 70 of 71 (1 FAILED) (0 secs / 0.4LOG: function (columns, rows, comment) { ... } PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 70 of 71 (1 FAILED) (0 secs / 0.4PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 71 of 71 (1 FAILED) (0 secs / 0.4PhantomJS 2.1.1 (Mac OS X 0.0.0): Executed 71 of 71 (1 FAILED) (0.334 secs / 0.424 secs) ``` Can you take a look again?
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @AhyoungRyu Thanks!!! I fixed the test error thanks to you 👍

          I guess CI will be green this time 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 @AhyoungRyu Thanks!!! I fixed the test error thanks to you 👍 I guess CI will be green this time 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user AhyoungRyu commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          1 build failed with below error, but it's irrelevant to this change.

          ```
          [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.17:test (default-test) on project zeppelin-pig: Execution default-test of goal org.apache.maven.plugins:maven-surefire-plugin:2.17:test failed: The forked VM terminated without properly saying goodbye. VM crash or System.exit called?
          [ERROR] Command was /bin/sh -c cd /home/travis/build/apache/zeppelin/pig && /usr/lib/jvm/java-7-oracle/jre/bin/java -Xmx2g -Xms1g -Dfile.encoding=UTF-8 -jar /home/travis/build/apache/zeppelin/pig/target/surefire/surefirebooter300784690996837886.jar /home/travis/build/apache/zeppelin/pig/target/surefire/surefire6525093842604398164tmp /home/travis/build/apache/zeppelin/pig/target/surefire/surefire_327671988278855013716tmp
          [ERROR] -> [Help 1]
          [ERROR]
          [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
          [ERROR] Re-run Maven using the -X switch to enable full debug logging.
          [ERROR]
          [ERROR] For more information about the errors and possible solutions, please read the following articles:
          [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/PluginExecutionException
          [ERROR]
          [ERROR] After correcting the problems, you can resume the build with the command
          [ERROR] mvn <goals> -rf :zeppelin-pig
          ```

          So let me merge into master in this time. Thanks for your long long patience and effort @tae-jun 🌄

          Show
          githubbot ASF GitHub Bot added a comment - Github user AhyoungRyu commented on the issue: https://github.com/apache/zeppelin/pull/1730 1 build failed with below error, but it's irrelevant to this change. ``` [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.17:test (default-test) on project zeppelin-pig: Execution default-test of goal org.apache.maven.plugins:maven-surefire-plugin:2.17:test failed: The forked VM terminated without properly saying goodbye. VM crash or System.exit called? [ERROR] Command was /bin/sh -c cd /home/travis/build/apache/zeppelin/pig && /usr/lib/jvm/java-7-oracle/jre/bin/java -Xmx2g -Xms1g -Dfile.encoding=UTF-8 -jar /home/travis/build/apache/zeppelin/pig/target/surefire/surefirebooter300784690996837886.jar /home/travis/build/apache/zeppelin/pig/target/surefire/surefire6525093842604398164tmp /home/travis/build/apache/zeppelin/pig/target/surefire/surefire_327671988278855013716tmp [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/PluginExecutionException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :zeppelin-pig ``` So let me merge into master in this time. Thanks for your long long patience and effort @tae-jun 🌄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 3b861ee85b93805ec6298f5d17d88f211ef4b8a3
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit e2b2902f4aa4b6456643ec13105928e3afc409b0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 77d79499f83923f07f8a2451fdb9f2a0e448528d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 1d597ee152e62e03aa9645284478507821a315ef
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 710c474c022b010ab5ed8038862dbdbbf44f58e3
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit f40e763f33158b82bc4be1cdb08657a248f12baf
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit d5389c016fc018d2c70125429e00836a8d107dd2
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit 731a2da29c41b8d3602c105bfa5fab3f7b70ef7d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit b1c459da81d61c131f997150d8644a0f05701c03
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit ab28178a0e818dd1f269969489ec87520ef0e14d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit ecaed2e5740e8cdd5cec1beecee65b9486a8a2dc
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 7afdc886ac0113f5123ef032fe6847a3d8d2fd65
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 678eb936a6e83a97c7921bf4a5c134ef335e39ae
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 414df5f8ec756e0213ab12b76a649f1e06459a5f
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit d74bf397a1604ed3e0e27532dfa5666b6b6ab852
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons

          commit 83e2fed7ebe27ac6cc761e8f00e721fe5245d580
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-30T11:20:21Z

          show trash icon after searching notes

          commit 2b5dc93631b80fcdb5ba5e54a743cef9dc3c245f
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2017-01-01T07:29:13Z

          copy notesList one time.
          _.map() is immutable

          commit 6bf0a7011c6e55ee6ebd73d13d7ccb6b2dabdee2
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2017-01-01T07:30:34Z

          Fix factory/noteList test error


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 3b861ee85b93805ec6298f5d17d88f211ef4b8a3 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit e2b2902f4aa4b6456643ec13105928e3afc409b0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 77d79499f83923f07f8a2451fdb9f2a0e448528d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 1d597ee152e62e03aa9645284478507821a315ef Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 710c474c022b010ab5ed8038862dbdbbf44f58e3 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit f40e763f33158b82bc4be1cdb08657a248f12baf Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit d5389c016fc018d2c70125429e00836a8d107dd2 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit 731a2da29c41b8d3602c105bfa5fab3f7b70ef7d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit b1c459da81d61c131f997150d8644a0f05701c03 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit ab28178a0e818dd1f269969489ec87520ef0e14d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit ecaed2e5740e8cdd5cec1beecee65b9486a8a2dc Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 7afdc886ac0113f5123ef032fe6847a3d8d2fd65 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 678eb936a6e83a97c7921bf4a5c134ef335e39ae Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 414df5f8ec756e0213ab12b76a649f1e06459a5f Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit d74bf397a1604ed3e0e27532dfa5666b6b6ab852 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons commit 83e2fed7ebe27ac6cc761e8f00e721fe5245d580 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-30T11:20:21Z show trash icon after searching notes commit 2b5dc93631b80fcdb5ba5e54a743cef9dc3c245f Author: Jun Kim <i2r.jun@gmail.com> Date: 2017-01-01T07:29:13Z copy notesList one time. _.map() is immutable commit 6bf0a7011c6e55ee6ebd73d13d7ccb6b2dabdee2 Author: Jun Kim <i2r.jun@gmail.com> Date: 2017-01-01T07:30:34Z Fix factory/noteList test error
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun closed the pull request at: https://github.com/apache/zeppelin/pull/1730
          Hide
          githubbot ASF GitHub Bot added a comment -

          GitHub user tae-jun reopened a pull request:

          https://github.com/apache/zeppelin/pull/1730

          ZEPPELIN-1736 Introduce trash & enable removing folder

              1. What is this PR for?
                ![image](https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png)
                This PR introduces the trash! (which is essential, I think ^^

          I added basic operations of the trash:

                1. Added operations of trash
          • `Move` a folder to the trash
          • `Move` a note to the trash
          • `Restore` a folder
          • `Restore` a note
          • `Remove` a folder in the trash for good
          • `Remove` a note in the trash for good
          • `Empty` the trash
          • `Restore all` in the trash
          • `Move` a note to the trash from the notebook view
          • `Remove` a note to the trash for good from the notebook view
          • If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!)
              1. What type of PR is it?
                [Feature]
              1. Future work
                Maybe it would be better if notebook view notices that a note is in the trash.
              1. What is the Jira issue?
                ZEPPELIN-1736(https://issues.apache.org/jira/browse/ZEPPELIN-1736)
              1. How should this be tested?
          • Build this PR
          • Move some folders or notes to the trash
          • Restore them
          • Empty the trash
          • Restore all notes in the trash
          • Remove folders or notes in the trash
          • Remove a folder which has the same folder name in the trash
              1. Screenshots (if appropriate)
            1. Move, restore, remove a note from the main page
              ![note_from_main](https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif)
            1. Move, restore, remove a folder from the main page
              ![folder_test](https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif)
            1. Move, remove a note from the notebook view
              ![noteview_test](https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif)
            1. Restore, empty the trash
              ![restore_empty_trash](https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif)
            1. Suffix current date if the folder exists in the trash
              ![same_folder_name_test](https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif)
              1. Questions:
          • Does the licenses files need update? NO
          • Is there breaking changes for older versions? NO
          • Does this needs documentation? NO

          You can merge this pull request into a Git repository by running:

          $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736

          Alternatively you can review and apply these changes as the patch at:

          https://github.com/apache/zeppelin/pull/1730.patch

          To close this pull request, make a commit to your master/trunk branch
          with (at least) the following in the commit message:

          This closes #1730


          commit 3b861ee85b93805ec6298f5d17d88f211ef4b8a3
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T11:21:38Z

          Introduce trash & removing folder

          commit e2b2902f4aa4b6456643ec13105928e3afc409b0
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:54:54Z

          Satisfy style check

          commit 77d79499f83923f07f8a2451fdb9f2a0e448528d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-06T12:55:19Z

          Remove if note is in the trash from the notebook view

          commit 1d597ee152e62e03aa9645284478507821a315ef
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:12:51Z

          Use trash folder id provided by constant service

          commit 710c474c022b010ab5ed8038862dbdbbf44f58e3
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:14:00Z

          Change “for good” -> “permanently”

          commit f40e763f33158b82bc4be1cdb08657a248f12baf
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-07T17:15:51Z

          Make the order of the trash folder last

          commit d5389c016fc018d2c70125429e00836a8d107dd2
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:28:15Z

          Restore a folder without removed date

          commit 731a2da29c41b8d3602c105bfa5fab3f7b70ef7d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:42:26Z

          Define isTrash function on notebook controller

          commit b1c459da81d61c131f997150d8644a0f05701c03
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T15:59:10Z

          Define notebook list button style

          commit ab28178a0e818dd1f269969489ec87520ef0e14d
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-08T16:03:39Z

          Fix stylecheck issue

          commit ecaed2e5740e8cdd5cec1beecee65b9486a8a2dc
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T13:52:14Z

          Fix white space bug @marchpig addressed

          commit 7afdc886ac0113f5123ef032fe6847a3d8d2fd65
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-11T14:07:37Z

          Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’

          commit 678eb936a6e83a97c7921bf4a5c134ef335e39ae
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-17T12:38:45Z

          Change remove permanently icons, remove folder conflict infix

          commit 414df5f8ec756e0213ab12b76a649f1e06459a5f
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T15:04:59Z

          Show trash folder icon at navbar

          commit d74bf397a1604ed3e0e27532dfa5666b6b6ab852
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-22T17:18:41Z

          Hide rename, clear output buttons

          commit 83e2fed7ebe27ac6cc761e8f00e721fe5245d580
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2016-12-30T11:20:21Z

          show trash icon after searching notes

          commit 2b5dc93631b80fcdb5ba5e54a743cef9dc3c245f
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2017-01-01T07:29:13Z

          copy notesList one time.
          _.map() is immutable

          commit 6bf0a7011c6e55ee6ebd73d13d7ccb6b2dabdee2
          Author: Jun Kim <i2r.jun@gmail.com>
          Date: 2017-01-01T07:30:34Z

          Fix factory/noteList test error


          Show
          githubbot ASF GitHub Bot added a comment - GitHub user tae-jun reopened a pull request: https://github.com/apache/zeppelin/pull/1730 ZEPPELIN-1736 Introduce trash & enable removing folder What is this PR for? ! [image] ( https://cloud.githubusercontent.com/assets/8201019/20925378/03a722f8-bbfa-11e6-9afc-c62cfe6b0e2a.png ) This PR introduces the trash! (which is essential, I think ^^ I added basic operations of the trash: Added operations of trash `Move` a folder to the trash `Move` a note to the trash `Restore` a folder `Restore` a note `Remove` a folder in the trash for good `Remove` a note in the trash for good `Empty` the trash `Restore all` in the trash `Move` a note to the trash from the notebook view `Remove` a note to the trash for good from the notebook view If there is a folder that has the same name, suffix current data rather than just merging(please see screenshot below!) What type of PR is it? [Feature] Future work Maybe it would be better if notebook view notices that a note is in the trash. What is the Jira issue? ZEPPELIN-1736 ( https://issues.apache.org/jira/browse/ZEPPELIN-1736 ) How should this be tested? Build this PR Move some folders or notes to the trash Restore them Empty the trash Restore all notes in the trash Remove folders or notes in the trash Remove a folder which has the same folder name in the trash Screenshots (if appropriate) Move, restore, remove a note from the main page ! [note_from_main] ( https://cloud.githubusercontent.com/assets/8201019/20925760/13b0d91c-bbfc-11e6-94c5-2211c9d9a282.gif ) Move, restore, remove a folder from the main page ! [folder_test] ( https://cloud.githubusercontent.com/assets/8201019/20925774/2884abde-bbfc-11e6-9ba9-7b1f8a935a41.gif ) Move, remove a note from the notebook view ! [noteview_test] ( https://cloud.githubusercontent.com/assets/8201019/20925837/83564162-bbfc-11e6-9a92-c6bc1984b30d.gif ) Restore, empty the trash ! [restore_empty_trash] ( https://cloud.githubusercontent.com/assets/8201019/20925841/8f6d78d0-bbfc-11e6-90a9-6f67c95371a5.gif ) Suffix current date if the folder exists in the trash ! [same_folder_name_test] ( https://cloud.githubusercontent.com/assets/8201019/20926085/e8cb6954-bbfd-11e6-9cdf-acf9b785d833.gif ) Questions: Does the licenses files need update? NO Is there breaking changes for older versions? NO Does this needs documentation? NO You can merge this pull request into a Git repository by running: $ git pull https://github.com/tae-jun/zeppelin ZEPPELIN-1736 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zeppelin/pull/1730.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #1730 commit 3b861ee85b93805ec6298f5d17d88f211ef4b8a3 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T11:21:38Z Introduce trash & removing folder commit e2b2902f4aa4b6456643ec13105928e3afc409b0 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:54:54Z Satisfy style check commit 77d79499f83923f07f8a2451fdb9f2a0e448528d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-06T12:55:19Z Remove if note is in the trash from the notebook view commit 1d597ee152e62e03aa9645284478507821a315ef Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:12:51Z Use trash folder id provided by constant service commit 710c474c022b010ab5ed8038862dbdbbf44f58e3 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:14:00Z Change “for good” -> “permanently” commit f40e763f33158b82bc4be1cdb08657a248f12baf Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-07T17:15:51Z Make the order of the trash folder last commit d5389c016fc018d2c70125429e00836a8d107dd2 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:28:15Z Restore a folder without removed date commit 731a2da29c41b8d3602c105bfa5fab3f7b70ef7d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:42:26Z Define isTrash function on notebook controller commit b1c459da81d61c131f997150d8644a0f05701c03 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T15:59:10Z Define notebook list button style commit ab28178a0e818dd1f269969489ec87520ef0e14d Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-08T16:03:39Z Fix stylecheck issue commit ecaed2e5740e8cdd5cec1beecee65b9486a8a2dc Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T13:52:14Z Fix white space bug @marchpig addressed commit 7afdc886ac0113f5123ef032fe6847a3d8d2fd65 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-11T14:07:37Z Change selenium test codes affected by chaging ‘removeNote’ button to ‘moveToTrash’ commit 678eb936a6e83a97c7921bf4a5c134ef335e39ae Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-17T12:38:45Z Change remove permanently icons, remove folder conflict infix commit 414df5f8ec756e0213ab12b76a649f1e06459a5f Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T15:04:59Z Show trash folder icon at navbar commit d74bf397a1604ed3e0e27532dfa5666b6b6ab852 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-22T17:18:41Z Hide rename, clear output buttons commit 83e2fed7ebe27ac6cc761e8f00e721fe5245d580 Author: Jun Kim <i2r.jun@gmail.com> Date: 2016-12-30T11:20:21Z show trash icon after searching notes commit 2b5dc93631b80fcdb5ba5e54a743cef9dc3c245f Author: Jun Kim <i2r.jun@gmail.com> Date: 2017-01-01T07:29:13Z copy notesList one time. _.map() is immutable commit 6bf0a7011c6e55ee6ebd73d13d7ccb6b2dabdee2 Author: Jun Kim <i2r.jun@gmail.com> Date: 2017-01-01T07:30:34Z Fix factory/noteList test error
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user tae-jun commented on the issue:

          https://github.com/apache/zeppelin/pull/1730

          @AhyoungRyu Finally, it's green!!! Thanks for your care 😄

          Show
          githubbot ASF GitHub Bot added a comment - Github user tae-jun commented on the issue: https://github.com/apache/zeppelin/pull/1730 @AhyoungRyu Finally, it's green!!! Thanks for your care 😄
          Hide
          githubbot ASF GitHub Bot added a comment -

          Github user asfgit closed the pull request at:

          https://github.com/apache/zeppelin/pull/1730

          Show
          githubbot ASF GitHub Bot added a comment - Github user asfgit closed the pull request at: https://github.com/apache/zeppelin/pull/1730

            People

            • Assignee:
              JunKim Tae Jun Kim
              Reporter:
              JunKim Tae Jun Kim
            • Votes:
              1 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development