Added Drozone to favorites quickaccess #12917

newhinton · 2018-12-07T17:37:49Z

closes #10908
This adds the ability to drop a folder on the quickaccess and add it to it

newhinton · 2018-12-21T14:31:47Z

CI is failing, but i think the errors are unrelated:

Scenario: create a new user with a custom display name                       # /drone/src/github.com/nextcloud/server/tests/acceptance/features/users.feature:12
    Given I am logged in as the admin                                          # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                               # SettingsMenuContext::iOpenTheUserSettings()
    When I click the New user button                                           # UsersSettingsContext::iClickTheNewUserButton()
    And I see that the new user form is shown                                  # UsersSettintestgsContext::iSeeThatTheNewUserFormIsShown()
    And I set the user name for the new user to "test"                         # UsersSettingsContext::iSetTheUserNameForTheNewUserTo()
    And I set the display name for the new user to "Test display name"         # UsersSettingsContext::iSetTheDisplayNameForTheNewUserTo()
    And I set the password for the new user to "123456acb"                     # UsersSettingsContext::iSetThePasswordForTheNewUserTo()
    And I create the new user                                                  # UsersSettingsContext::iCreateTheNewUser()
    Then I see that the list of users contains the user "test"                 # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I see that the display name for the user "test" is "Test display name" # UsersSettingsContext::iSeeThatTheDisplayNameForTheUserIs()
      Row for user test in Users Settings could not be found after 100 seconds
      displayName cell for user test in Users Settings could not be found after 100 seconds
      displayName input for user test in Users Settings could not be found after 100 seconds (NoSuchElementException)
sh: 1: kill: No such process

and


Enable an app bundle                                          # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:42
    Given I act as Jane                                                   # ActorContext::iActAs()
    And I am logged in as the admin                                       # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the Apps management                                        # SettingsMenuContext::iOpenTheAppsManagement()
    And I open the "App bundles" section                                  # AppNavigationContext::iOpenTheSection()
    When I enable all apps from the "Enterprise bundle"                   # AppsManagementContext::iEnableAllAppsFromThe()
    Then I see that the "Auditing / Logging" app has been enabled         # AppsManagementContext::iSeeThatTheAppHasBeenEnabled()
      Disable button in the app list for Auditing / Logging could not be found after 100 seconds (NoSuchElementException)
And I see that the "LDAP user and group backend" app has been enabled # AppsManagementContext::iSeeThatTheAppHasBeenEnabled()

danxuliu

Please rebase on current master :-) (then you will need to force push the branch again).

Tested and works, but it should be tested again once rebased ;-)

Maybe it would be good to not enable the favorite drop zone when dragging an already favorited folder, but that is a minor detail. In any case, a really nice feature, thanks :-D

danxuliu · 2018-12-22T11:24:54Z

apps/files/js/filelist.js

 			$.event.trigger({type: "droppedOnTrash"});

-			var self=this;
+			var _self=this;


Why the rename?

Initially i had problems with self, it would not work properly. I can look if it works now

danxuliu · 2018-12-22T11:41:17Z

apps/files/js/filelist.js

+				_self.do_delete(filename, directory);
+			});
+
+			$.event.trigger({type: "droppedOnFavorites"});


Why is this needed?

This deletes the folder when it is dropped on the trash

apps/files/js/filelist.js

danxuliu · 2018-12-22T11:50:20Z

CI is failing, but i think the errors are unrelated:

Yes, sh: 1: kill: No such process is a crash in the PHP built-in server (do not worry, you did not cause it :-P ), and the other failure was caused by an app not having been released yet in the app store when the tests were run (again, nothing that you need to worry about ;-) ).

newhinton · 2019-01-13T20:24:48Z

@danxuliu rebased

newhinton · 2019-01-13T20:25:09Z

oh, and removed the duplicate _self

Since 6ad7f32 SVG icons are directly embedded in "icons-vars.css", so the starred trash icon is now loaded along with the regular trash icon all at once. Therefore it is not needed to explicitly prefetch it using a hidden div. Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

The "droppedOnTrash" event was being triggered when the file list was initialized, but it should be triggered only when the user actually drops a file on the trash bin. Besides that, the event had no effect; only the file list handles it, but as it was not triggered on any element it ended being triggered on the document, and thus not handled. Moreover, even if it had been triggered on the file list it would have been done before the handler was set, so it would not have been handled anyway. And even if it had been handled no data was provided, so the handler would have failed. In conclusion, triggering the event there was not needed, and thus it was removed. Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

When a single file was dropped on the trash bin the file information was gotten from the original element in the file list. When several files were dropped on the trash bin the file information was gotten from the helper elements being dragged around. The helper element also contain the needed file information when a single file is being dragged, so the handling was unified to always get the file information from the helper elements. As the handling of several files is the same as before there is still the issue of only deleting those files shown in the drag helper instead of all the selected files. Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Signed-off-by: fnuesse <[email protected]>

danxuliu · 2019-02-01T01:13:54Z

@newhinton, sorry for the delay.

I have taken the liberty of rebasing again your pull request and do some cleaning of the drop zone feature and the pull request history. Please refer to each individual commit and its comment for further information.

Regarding the commit that adds the drop zone to the favorites I have removed .attr('data-favorite', elem.tags.includes("_$!<Favorite>!$_")) (which should have been .attr('data-favorite', elem.tags.includes(OC.TAG_FAVORITES)) ;-) ) because it was not needed with the current handling of the drop on the favorites and because, due to bugs in other parts of the Files code, elem may not always have a tags attribute (even if it should), which broke dragging rows in the file list (this could happen, for example, when using the Select all checkbox).

danxuliu

Tested and works 👍

Currently favoriting by dropping is limited to only one file or folder at a time due to some unrelated bugs in the Files app; I would merge this anyway in its current state.

Thanks again @newhinton!

MorrisJobke

Tested and works 👍

newhinton · 2019-02-01T09:17:11Z

I didn't know that there was an OC.Tag introduced, i wrote a majority of this back at the conf, so there may have been some changes which im not aware of ^^ but good to know :D

danxuliu · 2019-02-01T15:38:20Z

No problem at all about that @newhinton, you did not have to know it; I just mentioned it for your information :-)

newhinton mentioned this pull request Dec 7, 2018

Added Drozone to favorites quickaccess #10908

Closed

newhinton self-assigned this Dec 7, 2018

newhinton added enhancement design Design, UI, UX, etc. 3. to review Waiting for reviews labels Dec 7, 2018

newhinton added this to the Nextcloud 16 milestone Dec 7, 2018

newhinton requested review from MorrisJobke, danxuliu, jancborchardt and skjnldsv December 7, 2018 17:39

newhinton changed the title ~~Updated PR to nc16dev and fixed dropshadow~~ Added Drozone to favorites quickaccess Dec 7, 2018

danxuliu reviewed Dec 22, 2018

View reviewed changes

newhinton force-pushed the feature/noid/favorites-quickaccess-add-droppable-v3 branch 2 times, most recently from c4d4384 to 2c8a4b1 Compare January 13, 2019 20:24

danxuliu and others added 12 commits January 31, 2019 17:40

Remove leftover from a WIP

47937a5

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Remove duplicated variable declaration

dd91c4e

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Add missing trailing ";"

96bc139

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Replace double quotes with single quotes

75edcad

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Make code format more consistent with the rest of the file

3baa078

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Use full names instead of abbreviations in variable names

e46a67e

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

Fix drop zone shadow

ad407f6

Signed-off-by: fnuesse <[email protected]>

Extract variable for yellow color in icons

4b32e1c

Signed-off-by: fnuesse <[email protected]>

Add drop zone for favorites quick access in navigation

f13b3ab

Signed-off-by: fnuesse <[email protected]>

danxuliu force-pushed the feature/noid/favorites-quickaccess-add-droppable-v3 branch from 2c8a4b1 to f13b3ab Compare February 1, 2019 01:12

danxuliu approved these changes Feb 1, 2019

View reviewed changes

danxuliu mentioned this pull request Feb 1, 2019

Selected files metadata does not include the tags of files selected using the "Select all" checkbox #13964

Closed

MorrisJobke approved these changes Feb 1, 2019

View reviewed changes

MorrisJobke merged commit 30fb78c into master Feb 1, 2019

MorrisJobke deleted the feature/noid/favorites-quickaccess-add-droppable-v3 branch February 1, 2019 08:30

danxuliu mentioned this pull request Feb 1, 2019

[stable15] Clean code and fix drop zone shadow #13982

Merged

Uh oh!

Added Drozone to favorites quickaccess #12917

Added Drozone to favorites quickaccess #12917

Uh oh!

Conversation

newhinton commented Dec 7, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

newhinton commented Dec 21, 2018

Uh oh!

danxuliu left a comment

Choose a reason for hiding this comment

Uh oh!

danxuliu Dec 22, 2018

Choose a reason for hiding this comment

Uh oh!

newhinton Dec 28, 2018

Choose a reason for hiding this comment

Uh oh!

danxuliu Dec 22, 2018

Choose a reason for hiding this comment

Uh oh!

newhinton Dec 28, 2018

Choose a reason for hiding this comment

Uh oh!

Uh oh!

danxuliu commented Dec 22, 2018

Uh oh!

newhinton commented Jan 13, 2019

Uh oh!

newhinton commented Jan 13, 2019

Uh oh!

danxuliu commented Feb 1, 2019

Uh oh!

danxuliu left a comment

Choose a reason for hiding this comment

Uh oh!

MorrisJobke left a comment

Choose a reason for hiding this comment

Uh oh!

newhinton commented Feb 1, 2019

Uh oh!

danxuliu commented Feb 1, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

newhinton commented Dec 7, 2018 •

edited

Loading