Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.

Add confirmation button to share input #326

Merged
MorrisJobke merged 14 commits into from
Apr 4, 2018
Merged

Add confirmation button to share input #326

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cb61a6b
Replace information icon with confirmation button in share input
jancborchardt Nov 16, 2017
7504926
Extract code to get suggestions to its own method
danxuliu Mar 22, 2018
d003793
Use "showTemporary" instead of explicitly hiding the notification
danxuliu Mar 22, 2018
54306a3
Show an error when getting the suggestions succeeds with failure content
danxuliu Mar 22, 2018
509e60d
Extract code to filter suggestions to its own function
danxuliu Mar 23, 2018
b47e809
Return also exact matches besides all suggestions
danxuliu Mar 23, 2018
79a8192
Extract code to get the permissions to its own method
danxuliu Mar 23, 2018
f422262
Trigger autocompletion when the input field is focused
danxuliu Mar 23, 2018
8c1e5c6
Add a share when clicking on the confirm button
danxuliu Mar 23, 2018
ec9a270
Confirm a share also by pressing enter on the input field
danxuliu Mar 26, 2018
c4a46d2
Reuse last suggestions if the same parameters are used
danxuliu Mar 26, 2018
f5c1a45
Discard cached suggestions when adding a share
danxuliu Mar 26, 2018
6eeb230
Extract code to restore the UI after confirming a share
danxuliu Mar 26, 2018
a010c69
Keep showing the working icon while there are pending operations
danxuliu Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extract code to get suggestions to its own method 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Apr 3, 2018
commit 7504926422f836d03d33a1ef1da21ce5568d1f59
152 changes: 87 additions & 65 deletions js/vendor/nextcloud/share.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,63 @@
t('gallery', 'Error'));
});
},
/**
*
* @param {String} searchTerm
* @param {String} itemType
*/
_getSuggestions: function (searchTerm, itemType) {
var deferred = $.Deferred();

$.get(OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees', {
format: 'json',
search: searchTerm,
perPage: 200,
itemType: itemType
}, function (result) {
if (result.ocs.meta.statuscode === 100) {
var users = result.ocs.data.exact.users.concat(result.ocs.data.users);
var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
var remotes = result.ocs.data.exact.remotes.concat(result.ocs.data.remotes);
var lookup = result.ocs.data.lookup;
var emails = [],
circles = [];
if (typeof(result.ocs.data.emails) !== 'undefined') {
emails = result.ocs.data.exact.emails.concat(result.ocs.data.emails);
}
if (typeof(result.ocs.data.circles) !== 'undefined') {
circles = result.ocs.data.exact.circles.concat(result.ocs.data.circles);
}

var usersLength;
var groupsLength;
var remotesLength;
var emailsLength;
var circlesLength;

var i, j;

//Filter out the current user
usersLength = users.length;
for (i = 0; i < usersLength; i++) {
if (users[i].value.shareWith === OC.currentUser) {
users.splice(i, 1);
break;
}
}

var suggestions = users.concat(groups).concat(remotes).concat(emails).concat(circles).concat(lookup);

deferred.resolve(suggestions);
} else {
deferred.resolve(null);
}
}).fail(function () {
deferred.reject();
});

return deferred.promise();
},
/**
*
* @param {String} itemType
Expand Down Expand Up @@ -337,79 +394,44 @@
$shareWithField.removeClass('error')
.tooltip('hide');

$.get(OC.linkToOCS('apps/files_sharing/api/v1') + 'sharees', {
format: 'json',
search: search.term.trim(),
perPage: 200,
itemType: itemType
}, function (result) {
self._getSuggestions(
search.term.trim(),
itemType
).done(function(suggestions) {
$loading.addClass('hidden');
$confirm.removeClass('hidden');
if (result.ocs.meta.statuscode === 100) {
var users = result.ocs.data.exact.users.concat(result.ocs.data.users);
var groups = result.ocs.data.exact.groups.concat(result.ocs.data.groups);
var remotes = result.ocs.data.exact.remotes.concat(result.ocs.data.remotes);
var lookup = result.ocs.data.lookup;
var emails = [],
circles = [];
if (typeof(result.ocs.data.emails) !== 'undefined') {
emails = result.ocs.data.exact.emails.concat(result.ocs.data.emails);
}
if (typeof(result.ocs.data.circles) !== 'undefined') {
circles = result.ocs.data.exact.circles.concat(result.ocs.data.circles);
}

var usersLength;
var groupsLength;
var remotesLength;
var emailsLength;
var circlesLength;

var i, j;

//Filter out the current user
usersLength = users.length;
for (i = 0; i < usersLength; i++) {
if (users[i].value.shareWith === OC.currentUser) {
users.splice(i, 1);
break;
}
}

var suggestions = users.concat(groups).concat(remotes).concat(emails).concat(circles).concat(lookup);

if (suggestions.length > 0) {
$('#shareWith')
.autocomplete("option", "autoFocus", true);
if (suggestions && suggestions.length > 0) {
$('#shareWith')
.autocomplete("option", "autoFocus", true);

response(suggestions);
response(suggestions);

// show a notice that the list is truncated
// this is the case if one of the search results is at least as long as the max result config option
if (oc_config['sharing.maxAutocompleteResults'] > 0 &&
Math.min(perPage, oc_config['sharing.maxAutocompleteResults'])
<= Math.max(users.length, groups.length, remotes.length, emails.length, lookup.length)) {
// show a notice that the list is truncated
// this is the case if one of the search results is at least as long as the max result config option
if (oc_config['sharing.maxAutocompleteResults'] > 0 &&
Math.min(perPage, oc_config['sharing.maxAutocompleteResults'])
<= Math.max(users.length, groups.length, remotes.length, emails.length, lookup.length)) {

var message = t('gallery', 'This list is maybe truncated - please refine your search term to see more results.');
$('.ui-autocomplete').append('<li class="autocomplete-note">' + message + '</li>');
}
var message = t('gallery', 'This list is maybe truncated - please refine your search term to see more results.');
$('.ui-autocomplete').append('<li class="autocomplete-note">' + message + '</li>');
}

} else {
var title = t('gallery', 'No users or groups found for {search}', {search: $('#shareWith').val()});
if (!oc_appconfig.core.allowGroupSharing) {
title = t('gallery', 'No users found for {search}', {search: $('#shareWith').val()});
}
$('#shareWith').addClass('error')
.attr('data-original-title', title)
.tooltip('hide')
.tooltip({
placement: 'bottom',
trigger: 'manual'
})
.tooltip('fixTitle')
.tooltip('show');
response();
} else if (suggestions) {
var title = t('gallery', 'No users or groups found for {search}', {search: $('#shareWith').val()});
if (!oc_appconfig.core.allowGroupSharing) {
title = t('gallery', 'No users found for {search}', {search: $('#shareWith').val()});
}
$('#shareWith').addClass('error')
.attr('data-original-title', title)
.tooltip('hide')
.tooltip({
placement: 'bottom',
trigger: 'manual'
})
.tooltip('fixTitle')
.tooltip('show');
response();
} else {
response();
}
Expand Down