Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable10] Fix version previews when no provider available #32474

Merged
merged 1 commit into from
Aug 31, 2018
Merged

[stable10] Fix version previews when no provider available #32474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions apps/files_versions/css/versions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@

.versionsTabView img.preview {
cursor: default;
background-size: 32px;
width: 32px;
height: 32px;
}

.versionsTabView .version-container {
Expand Down
3 changes: 3 additions & 0 deletions apps/files_versions/js/versioncollection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
*
*/

/* global moment */

(function() {
/**
* @memberof OCA.Versions
Expand Down Expand Up @@ -46,6 +48,7 @@
fullPath: fullPath,
timestamp: moment(new Date(version['{DAV:}getlastmodified'])).format('X'),
size: version['{DAV:}getcontentlength'],
mimetype: version['{DAV:}getcontenttype'],
fileId: fileId
};
});
Expand Down
18 changes: 17 additions & 1 deletion apps/files_versions/js/versionstabview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
*/

(function() {

function getPreviewUrl(model) {
var mime = model.get('mimetype');

var enabledPreviewProviders = OC.appConfig.core.enabledPreviewProviders || [];
if (enabledPreviewProviders.length > 0) {
var allMimesPattern = new RegExp(enabledPreviewProviders.join('|'));
if (OC.appConfig.core.previewsEnabled && allMimesPattern.test(mime)) {
return model.getPreviewUrl();
}
}

return OC.MimeType.getIconUrl(mime);
}

var TEMPLATE_ITEM =
'<li data-revision="{{versionId}}">' +
'<div>' +
Expand Down Expand Up @@ -185,6 +200,7 @@
_formatItem: function(version) {
var timestamp = version.get('timestamp') * 1000;
var size = version.has('size') ? version.get('size') : 0;

return _.extend({
versionId: version.get('id'),
formattedTimestamp: OC.Util.formatDate(timestamp),
Expand All @@ -195,7 +211,7 @@
downloadUrl: version.getDownloadUrl(),
downloadIconUrl: OC.imagePath('core', 'actions/download'),
revertIconUrl: OC.imagePath('core', 'actions/history'),
previewUrl: version.getPreviewUrl(),
previewUrl: getPreviewUrl(version),
revertLabel: t('files_versions', 'Restore'),
canRevert: (this.collection.getFileInfo().get('permissions') & OC.PERMISSION_UPDATE) !== 0
}, version.attributes);
Expand Down
65 changes: 59 additions & 6 deletions apps/files_versions/tests/js/versionstabviewSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ describe('OCA.Versions.VersionsTabView', function() {
timestamp: time1,
name: 'some file.txt',
size: 140,
fullPath: '/subdir/some file.txt'
fullPath: '/subdir/some file.txt',
mimetype: 'text/plain'
});
var version2 = new VersionModel({
id: time2,
timestamp: time2,
name: 'some file.txt',
size: 150,
fullPath: '/subdir/some file.txt'
fullPath: '/subdir/some file.txt',
mimetype: 'text/plain'
});

testVersions = [version1, version2];
Expand Down Expand Up @@ -80,14 +82,12 @@ describe('OCA.Versions.VersionsTabView', function() {
expect($item.find('.versiondate').text()).toEqual('seconds ago');
expect($item.find('.size').text()).toEqual('< 1 KB');
expect($item.find('.revertVersion').length).toEqual(1);
expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());

$item = $versions.eq(1);
expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('2 days ago');
expect($item.find('.size').text()).toEqual('< 1 KB');
expect($item.find('.revertVersion').length).toEqual(1);
expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
});

it('does not render revert button when no update permissions', function() {
Expand All @@ -104,13 +104,66 @@ describe('OCA.Versions.VersionsTabView', function() {
expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('seconds ago');
expect($item.find('.revertVersion').length).toEqual(0);
expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());

$item = $versions.eq(1);
expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
expect($item.find('.versiondate').text()).toEqual('2 days ago');
expect($item.find('.revertVersion').length).toEqual(0);
expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
});

describe('version file previews', function() {
var oldCoreConfig;
var getIconUrlStub;
var textIconUrl;

beforeEach(function() {
// backup core config
oldCoreConfig = OC.appConfig.core;
OC.appConfig.core = _.extend({}, OC.appConfig.core)

textIconUrl = OC.TestUtil.buildAbsoluteUrl(OC.imagePath('core', 'filetypes/text.svg'))
getIconUrlStub = sinon.stub(OC.MimeType, 'getIconUrl').returns(textIconUrl);
});
afterEach(function() {
OC.appConfig.core = oldCoreConfig;
getIconUrlStub.restore();
});

it('renders actual file preview when preview mime type is supported', function() {
OC.appConfig.core.previewsEnabled = true;
OC.appConfig.core.enabledPreviewProviders = ['text/plain'];

tabView.setFileInfo(fileInfoModel);
tabView.collection.set([testVersions[0]]);

expect(getIconUrlStub.notCalled).toEqual(true);

expect(tabView.$el.find('.versions>li:eq(0) .preview').attr('src')).toEqual(testVersions[0].getPreviewUrl());
});
it('renders mime type icon as preview when preview mime type is not supported', function() {
OC.appConfig.core.previewsEnabled = true;
OC.appConfig.core.enabledPreviewProviders = ['something/else'];

tabView.setFileInfo(fileInfoModel);
tabView.collection.set([testVersions[0]]);

expect(getIconUrlStub.calledOnce).toEqual(true);
expect(getIconUrlStub.getCall(0).args[0]).toEqual('text/plain');

expect(tabView.$el.find('.versions>li:eq(0) .preview').attr('src')).toEqual(textIconUrl);
});
it('renders mime type icon as preview when previews are disabled', function() {
OC.appConfig.core.previewsEnabled = false;
OC.appConfig.core.enabledPreviewProviders = ['text/plain'];

tabView.setFileInfo(fileInfoModel);
tabView.collection.set([testVersions[0]]);

expect(getIconUrlStub.calledOnce).toEqual(true);
expect(getIconUrlStub.getCall(0).args[0]).toEqual('text/plain');

expect(tabView.$el.find('.versions>li:eq(0) .preview').attr('src')).toEqual(textIconUrl);
});
});
});
describe('Reverting', function() {
Expand Down