Commit graph

7913 commits

Author SHA1 Message Date
Daniel Calviño Sánchez
203bf51543 Keep showing the working icon while there are pending operations
Before, whenever a pending operation (getting the suggestions,
confirming a share or selecting a recipient) finished the working icon
was hidden and the confirm button was shown again, even if there were
other pending operations (the most common case is typing slowly on the
input field, as several operations to get the suggestions could pile if
the server response is not received fast enough). Now, the working icon
is not hidden until the last pending operation finishes.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:35:26 +01:00
Daniel Calviño Sánchez
a2c52cd6a5 Extract code to restore the UI after confirming a share
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:35:23 +01:00
Daniel Calviño Sánchez
9a0fbe307d Discard cached suggestions when adding a share
The suggestions depend on the results returned by the server, but also
on the sharees already shared with. Due to that adding a share changes
the suggestions, so now the cached suggestions are discarded when a
share is added.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:34:14 +01:00
Daniel Calviño Sánchez
6eb5cc5412 Reuse last suggestions if the same parameters are used
When a share is confirmed the suggestions are got to check if there is
an exact match. Usually the suggestions were already got with the same
parameters in order to fill the autocomplete dropdown, so to avoid a
superfluous request now the last suggestions are reused when got again,
although only if the same parameters as the last time are used.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-21 04:31:08 +01:00
Daniel Calviño Sánchez
10a4f8e45e Confirm a share also by pressing enter on the input field
Besides confirming a share by clicking on the confirm button now it is
possible to do it by pressing enter on the input field.

Clicking on the confirm button implicitly hides the autocomplete
dropdown. On the other hand, pressing enter on the input field does not,
so the autocompletion must be disabled and closed when the confirmation
begins and then enabled again once it finishes. Otherwise the
autocomplete dropdown would be visible and it would be possible to
interact with it while the share is being confirmed.

The order in which the input field and the autompletion are disabled is
important. Internally, the autocompletion sets a timeout when the input
field is modified that requests the suggestions to the server and then
shows them in the dropdown. That timeout is not cancelled when the
autocompletion is disabled, but when the input field loses its focus and
the autocompletion is not disabled. Therefore, the input field has to be
disabled (which causes it to lose the focus) before the autocompletion
is disabled. Otherwise it could happen that while a share is being
confirmed the timeout ends, so an autocompletion request is sent and
then, once the share is successfully confirmed and thus the
autocompletion is enabled again, the request is received and the
autocomplete dropdown is shown with the old suggestions. Strange, but
possible nevertheless ;-)

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:05 +01:00
Daniel Calviño Sánchez
9371b61c4d Add a share when clicking on the confirm button
Clicking on the confirm button now adds a share, but only if there is
just a single exact match. If there are no exact matches or there is
more than one exact match no share is added, and the autocomplete
dropdown is shown again with all the suggestions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:05 +01:00
Daniel Calviño Sánchez
5e2a8cca1b Return also exact matches besides all suggestions
"_getSuggestions" returned all the suggestions from the server, which
are composed by exact matches and partial matches. Now the exact matches
are also returned on their own parameter. This will be used by the
button to confirm a share.

Note that until now the order of the suggestions was "exact users,
partial users, exact groups, partial groups, exact..."; this commit also
changes that order to become "exact users, exact groups, exact...,
partial users, partial groups, partial...". This is not a problem, as
the suggestions were used in the autocomplete dropdown, and this new
order is arguably better than the old one, as all exact matches appear
now at the beginning.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
89b0e34d9b Extract code to filter suggestions to its own function
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
1c440519c2 Show an error when getting the suggestions succeeds with failure content
Instead of silently failing now an error is shown to the user when the
ajax call to get the suggestions succeeds yet it returns failure content
(for example, if an "OCSBadRequestException" was thrown in the server).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
ed1452d7a0 Use "showTemporary" instead of explicitly hiding the notification
"OC.Notification.hide" expects the notification to be hidden to be
passed as an argument. As it was being used to show a temporary
notification the combination of "OC.Notification.show" and
"OC.Notification.hide" was replaced by a single call to
"OC.Notification.showTemporary".

The timeout could have been specified in the options of the call, but it
was left to the default value (7 seconds) for consistency with other
notifications.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
fcef15af80 Move stub setup outside the test method
Stubs should be restored outside the test method in which they are used
to ensure that they are properly restored no matter the result of the
test (for example, if an exception is thrown).

Besides that, this will make possible to reuse the stub in other sibling
tests without having to explicitly setup it in them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
d606219576 Extract code to get suggestions to its own method
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
3980364b6d Add autocompletion tests for each type of share
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
8af9c553e6 Add tests for exact search results already shared with
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
375eab9df3 Add tests for emails and circles already shared with
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:04 +01:00
Daniel Calviño Sánchez
6fef01c481 Adjust search term to test
As the server response is faked the search term is ignored in the tests.
However, it is clearer to use a search term that would make the server
return what the faked response contains.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:09:03 +01:00
Jan-Christoph Borchardt
ce7775acd0 Replace information icon with confirmation button in share input
The confirmation button right now is just an icon; its behaviour will be
added in the following commits.

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-03-20 19:09:03 +01:00
Roeland Jago Douma
16ae91330c
Merge pull request #8887 from nextcloud/fix-appmenu-min-width
Add min width of two icons to the app menu
2018-03-20 08:03:52 +01:00
Nextcloud bot
615258ba26
[tx-robot] updated from transifex 2018-03-20 01:11:33 +00:00
Julius Härtl
1699b119dd
Add min width of two icons to the app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-19 17:12:59 +01:00
Nextcloud bot
2fab6b2620
[tx-robot] updated from transifex 2018-03-19 01:11:34 +00:00
Nextcloud bot
d6bfc98df1
[tx-robot] updated from transifex 2018-03-18 01:11:46 +00:00
Nextcloud bot
3cac7911d5
[tx-robot] updated from transifex 2018-03-17 01:11:30 +00:00
Daniel Calviño Sánchez
ed4b4458eb Use the display name in the avatar for a circle share
Before, the avatar for a circle share was generated using the
"share_with" field as the seed for "imageplaceholder". Due to this, when
the "share_with" field is set to the circle ID the character shown in
the avatar was just a random character instead of the first character of
the display name. Now the "share_with" is still used as the seed for the
colour, but the display name is used as the text of the avatar.

This adds support for "share_with" fields set to the circle ID while
being backwards compatible with "share_with" fields set to the circle
name.

Note that when "share_with" fields is set to the circle name the colour
of the avatar is different in the list of suggested sharees and in the
list of current sharees, but that also happened before these changes
(due to a different seed being used in each place).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-16 04:58:25 +01:00
Nextcloud bot
b7e7ae5d6d
[tx-robot] updated from transifex 2018-03-16 01:11:31 +00:00
Nextcloud bot
055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Morris Jobke
990ca145d7
Remove "Alternative logins" title on login page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-14 11:38:57 +01:00
Roeland Jago Douma
2d5febd0b9
Merge pull request #8811 from nextcloud/remove_dep_util_link
Remove deprecated URL functions for OCP\Util
2018-03-14 09:49:51 +01:00
Nextcloud bot
7f00de841b
[tx-robot] updated from transifex 2018-03-14 01:11:29 +00:00
Roeland Jago Douma
83873e3da1
Remove deprecated URL functions for OCP\Util
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 22:04:08 +01:00
Nextcloud bot
3cae276149
[tx-robot] updated from transifex 2018-03-13 01:12:01 +00:00
Nextcloud bot
4e56a02450
[tx-robot] updated from transifex 2018-03-12 01:12:21 +00:00
Nextcloud bot
2c503ccdee
[tx-robot] updated from transifex 2018-03-11 01:12:13 +00:00
Nextcloud bot
f08bc1bc6f
[tx-robot] updated from transifex 2018-03-10 01:11:58 +00:00
Morris Jobke
f35c447525
Merge pull request #8757 from nextcloud/search_controller
Move search to proper Controller
2018-03-09 16:15:55 +01:00
Roeland Jago Douma
7674e591bd
Move search to proper Controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 14:36:48 +01:00
Nextcloud bot
20f1f757c4
[tx-robot] updated from transifex 2018-03-09 13:31:21 +00:00
Joas Schilling
81a3ac1226
Merge pull request #8736 from nextcloud/rakekniven-patch-1
Update login.php
2018-03-09 09:51:36 +01:00
Nextcloud bot
a20e9d7891
[tx-robot] updated from transifex 2018-03-09 01:12:12 +00:00
Roeland Jago Douma
1329061d31
Merge pull request #8648 from nextcloud/feature/csrf-token-controller
Use session heartbeat to update CSRF token
2018-03-08 21:15:24 +01:00
rakekniven
1046fb5111
Update login.php
Fixed grammar issue.
Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#af/$/124614533?issue=yes
2018-03-08 20:08:11 +01:00
Christoph Wurst
b9720703e8 Add CSRF token controller to retrieve the current CSRF token
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-03-08 16:48:50 +01:00
John Molakvoæ (skjnldsv)
5dbd09f07c
Align radio & checkboxes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 15:17:54 +01:00
John Molakvoæ (skjnldsv)
446a3a9d5a
Fixed ext share style and use varable for popover height
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 15:12:06 +01:00
John Molakvoæ (skjnldsv)
e2910e17b0
Default left margin for entries without icons
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 13:17:38 +01:00
John Molakvoæ (skjnldsv)
e77bddf56b
Css hack to add margin on first or last visible inputs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 13:17:38 +01:00
John Molakvoæ (skjnldsv)
966ceca8ea
Removed unwanted conflicting props
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 13:17:37 +01:00
John Molakvoæ (skjnldsv)
8d986160b8
Improved inline confirm icon with opacity and fixed ext share loading state
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 13:17:37 +01:00
John Molakvoæ (skjnldsv)
4e6043fd6b
Fixed tooltip positionning & error display
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 13:17:37 +01:00
John Molakvoæ (skjnldsv)
955c2ee1a7
PoC inline icon-confirm with inputs
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-07 13:17:37 +01:00