mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adjust tests and apply sorting 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2017-11-21 11:29:42 +01:00
parent 3a1d8fa45f
commit 9d95391ff1
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
5 changed files with 144 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_sharing/js/share.js
View File

@ -220,9 +220,14 @@
// note: we only update the data attribute because updateIcon()
if (recipients.length) {
$tr.attr('data-share-recipients', OCA.Sharing.Util.formatRecipients(recipients));
var recipientData = _.mapObject(shareModel.get('shares'), function (share) {
return {shareWith: share.share_with, shareWithDisplayName: share.share_with_displayname};
});
$tr.attr('data-share-recipient-data', JSON.stringify(recipientData));
}
else {
$tr.removeAttr('data-share-recipients');
$tr.removeAttr('data-share-recipient-data');
}
},

5
apps/files_sharing/js/sharedfilelist.js
View File

@ -355,7 +355,10 @@
// only store the first ones, they will be the only ones
// displayed
data.recipients[recipient] = true;
data.recipientData[recipientId] = recipient;
data.recipientData[data.recipientsCount] = {
'shareWith': recipientId,
'shareWithDisplayName': recipient
};
}
data.recipientsCount++;
}

32
apps/files_sharing/tests/js/shareSpec.js
View File

@ -140,6 +140,7 @@ describe('OCA.Sharing.Util tests', function() {
size: 12,
permissions: OC.PERMISSION_ALL,
shareOwner: 'User One',
shareOwnerId: 'User One',
etag: 'abc',
shareTypes: []
}]);
@ -161,6 +162,16 @@ describe('OCA.Sharing.Util tests', function() {
size: 12,
permissions: OC.PERMISSION_ALL,
recipientsDisplayName: 'User One, User Two',
recipientData: {
0: {
shareWith: 'User One',
shareWithDisplayName: 'User One'
},
1: {
shareWith: 'User Two',
shareWithDisplayName: 'User Two'
}
},
etag: 'abc',
shareTypes: [OC.Share.SHARE_TYPE_USER]
}]);
@ -264,10 +275,10 @@ describe('OCA.Sharing.Util tests', function() {
// simulate updating shares
shareTab._dialog.model.set({
shares: [
{share_with_displayname: 'User One'},
{share_with_displayname: 'User Two'},
{share_with_displayname: 'Group One'},
{share_with_displayname: 'Group Two'}
{share_with_displayname: 'User One', share_with: 'User One'},
{share_with_displayname: 'User Two', share_with: 'User Two'},
{share_with_displayname: 'Group One', share_with: 'Group One'},
{share_with_displayname: 'Group Two', share_with: 'Group Two'}
]
});
@ -298,9 +309,9 @@ describe('OCA.Sharing.Util tests', function() {
// simulate updating shares
shareTab._dialog.model.set({
shares: [
{share_with_displayname: 'User One'},
{share_with_displayname: 'User Two'},
{share_with_displayname: 'User Three'}
{share_with_displayname: 'User One', share_with: 'User One'},
{share_with_displayname: 'User Two', share_with: 'User Two'},
{share_with_displayname: 'User Three', share_with: 'User Three'}
]
});
@ -348,7 +359,8 @@ describe('OCA.Sharing.Util tests', function() {
size: 12,
permissions: OC.PERMISSION_ALL,
etag: 'abc',
shareOwner: 'User One'
shareOwner: 'User One',
shareOwnerId: 'User One'
}]);
$action = fileList.$el.find('tbody tr:first .action-share');
$tr = fileList.$el.find('tr:first');
@ -379,7 +391,9 @@ describe('OCA.Sharing.Util tests', function() {
permissions: OC.PERMISSION_ALL,
etag: 'abc',
shareOwner: 'User One',
recipients: 'User Two'
shareOwnerId: 'User One',
recipients: 'User Two',
recipientData: {'User Two': 'User Two'}
}]);
$action = fileList.$el.find('tbody tr:first .action-share');
$tr = fileList.$el.find('tr:first');

7
core/js/share.js
View File

@ -240,13 +240,14 @@ OC.Share = _.extend(OC.Share || {}, {
* Loop over all recipients in the list and format them using
* all kind of fancy magic.
*
* @param {String[]} recipients array of all the recipients
* @param {Object} recipients array of all the recipients
* @return {String[]} modified list of recipients
*/
_formatShareList: function(recipients) {
var _parent = this;
return $.map(recipients, function(shareWithDisplayName, shareWith) {
return _parent._formatRemoteShare(shareWith, shareWithDisplayName, t('core', 'Shared with'));
recipients = _.sortBy(_.toArray(recipients), 'shareWithDisplayName');
return $.map(recipients, function(recipient) {
return _parent._formatRemoteShare(recipient.shareWith, recipient.shareWithDisplayName, t('core', 'Shared with'));
});
},
/**

132
core/js/tests/specs/shareSpec.js
View File

@ -181,64 +181,133 @@ describe('OC.Share tests', function() {
}
it('displays the local share owner as is', function() {
checkRecipients({'User One': 'User One'}, 'Shared with User One', null);
var input = {
0: {
shareWith: 'User One',
shareWithDisplayName: 'User One'
}
};
checkRecipients(input, 'Shared with User One', null);
});
it('displays the user name part of a remote recipient', function() {
var input = {
0: {
shareWith: 'User One@someserver.com',
shareWithDisplayName: 'User One@someserver.com'
}
};
checkRecipients(
{'User One@someserver.com': 'User One@someserver.com'},
input,
'User One@…',
'Shared with User One@someserver.com'
);
input = {
0: {
shareWith: 'User One@someserver.com/',
shareWithDisplayName: 'User One@someserver.com/'
}
};
checkRecipients(
'{User One@someserver.com/: User One@someserver.com/}',
input,
'User One@…',
'Shared with User One@someserver.com'
);
input = {
0: {
shareWith: 'User One@someserver.com/root/of/nextcloud',
shareWithDisplayName: 'User One@someserver.com/root/of/nextcloud'
}
};
checkRecipients(
{'User One@someserver.com/root/of/owncloud': 'User One@someserver.com/root/of/owncloud'},
input,
'User One@…',
'Shared with User One@someserver.com'
);
});
it('displays the user name part with domain of a remote share owner', function() {
var input = {
0: {
shareWith: 'User One@example.com@someserver.com',
shareWithDisplayName: 'User One@example.com@someserver.com'
}
};
checkRecipients(
{'User One@example.com@someserver.com': 'User One@example.com@someserver.com'},
input,
'User One@example.com',
'Shared with User One@example.com@someserver.com'
);
input = {
0: {
shareWith: 'User One@example.com@someserver.com/',
shareWithDisplayName: 'User One@example.com@someserver.com/'
}
};
checkRecipients(
{'User One@example.com@someserver.com/': 'User One@example.com@someserver.com/'},
input,
'User One@example.com',
'Shared with User One@example.com@someserver.com'
);
input = {
0: {
shareWith: 'User One@example.com@someserver.com/root/of/nextcloud',
shareWithDisplayName: 'User One@example.com@someserver.com/root/of/nextcloud'
}
};
checkRecipients(
{'User One@example.com@someserver.com/root/of/nextcloud': 'User One@example.com@someserver.com/root/of/nextcloud'},
input,
'User One@example.com',
'Shared with User One@example.com@someserver.com'
);
});
it('display multiple remote recipients', function() {
checkRecipients(
{
'One@someserver.com': 'One@someserver.com',
'two@otherserver.com': 'two@otherserver.com'
var input = {
0: {
shareWith: 'One@someserver.com',
shareWithDisplayName: 'One@someserver.com'
},
1: {
shareWith: 'two@someserver.com',
shareWithDisplayName: 'two@someserver.com'
}
};
checkRecipients(
input,
'One@… two@…',
['Shared with One@someserver.com', 'Shared with two@otherserver.com']
);
checkRecipients(
{
'One@someserver.com/': 'One@someserver.com/',
'two@otherserver.com': 'two@otherserver.com'
input = {
0: {
shareWith: 'One@someserver.com/',
shareWithDisplayName: 'One@someserver.com/'
},
1: {
shareWith: 'two@someserver.com',
shareWithDisplayName: 'two@someserver.com'
}
};
checkRecipients(
input,
'One@… two@…',
['Shared with One@someserver.com', 'Shared with two@otherserver.com']
);
checkRecipients(
{
'One@someserver.com/root/of/owncloud': 'One@someserver.com/root/of/owncloud',
'two@otherserver.com': 'two@otherserver.com'
input = {
0: {
shareWith: 'One@someserver.com/root/of/nextcloud',
shareWithDisplayName: 'One@someserver.com/root/of/nextcloud'
},
1: {
shareWith: 'two@someserver.com',
shareWithDisplayName: 'two@someserver.com'
}
};
checkRecipients(
input,
'One@… two@…',
['Shared with One@someserver.com', 'Shared with two@otherserver.com']
);
@ -246,8 +315,14 @@ describe('OC.Share tests', function() {
it('display mixed recipients', function() {
checkRecipients(
{
'One': 'One',
'two@otherserver.com': 'two@otherserver.com'
0: {
shareWith: 'One',
shareWithDisplayName: 'One'
},
1: {
shareWith: 'two@someserver.com',
shareWithDisplayName: 'two@someserver.com'
}
},
'Shared with One two@…',
['Shared with two@otherserver.com']
@ -256,9 +331,18 @@ describe('OC.Share tests', function() {
it('display multiple with divergent displaynames', function() {
checkRecipients(
{
'One': 'Yoko Ono',
'two@otherserver.com': 'two@otherserver.com',
'Three': 'Green, Mina'
0: {
shareWith: 'One',
shareWithDisplayName: 'Yoko Ono'
},
1: {
shareWith: 'two@someserver.com',
shareWithDisplayName: 'two@someserver.com'
},
2: {
shareWith: 'Three',
shareWithDisplayName: 'Green, Mina'
}
},
'Shared with Yoko Ono two@… Shared with Green, Mina',
['Shared with two@otherserver.com']