Skip to content

Add OCA.Files.Sidebar and migrate sharing #15719

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

Merged
skjnldsv merged 14 commits into from
Oct 29, 2019
Merged

Add OCA.Files.Sidebar and migrate sharing #15719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ea6f423
Extend data returned when searching remote shares
skjnldsv May 23, 2019
fd90af5
Add OCA.Files.Sidebar
skjnldsv May 23, 2019
515171a
Transpile also dependencies in node_modules
skjnldsv May 23, 2019
adb163b
Add projects view to sidebar
juliusknorr Jul 9, 2019
ae59edc
Add ShareTabSections service to register sections in the share tab
juliusknorr Jul 9, 2019
1c13c52
Systemtags and external actions update
skjnldsv Oct 9, 2019
d88b93c
Add LoadSidebar event
skjnldsv Oct 10, 2019
480691a
Prevent multiple systemtags views
skjnldsv Oct 14, 2019
a48359a
Adjust unit tests to new OCA.Sidebar
skjnldsv Oct 16, 2019
12eba18
Adjust acceptance tests to new OCA.Sidebar
skjnldsv Oct 16, 2019
51960cb
Fix triggering favorite file actions on the file list
skjnldsv Oct 23, 2019
3331cdd
Fix legacy tab backbone fileinfo change
skjnldsv Oct 23, 2019
2fd0575
Fix current user edit/delete permissions
skjnldsv Oct 24, 2019
85730de
Compile assets
npmbuildbot[bot] Oct 28, 2019
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
Adjust unit tests to new OCA.Sidebar 
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
@skjnldsv @danxuliu
skjnldsv authored and danxuliu committed Oct 29, 2019
commit a48359ac024b1b0dbfea2dc3deb93607b0dbf329
2 changes: 1 addition & 1 deletion apps/comments/tests/js/filespluginSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('OCA.Comments.FilesPlugin tests', function() {

expect(sidebarStub.calledOnce).toEqual(true);
expect(sidebarStub.lastCall.args[0]).toEqual('One.txt');
expect(sidebarStub.lastCall.args[1]).toEqual('commentsTabView');
expect(sidebarStub.lastCall.args[1]).toEqual('comments');
});
});
describe('elementToFile', function() {
Expand Down
208 changes: 0 additions & 208 deletions apps/files/tests/js/filelistSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,36 +748,6 @@ describe('OCA.Files.FileList tests', function() {

expect(notificationStub.calledOnce).toEqual(true);
});
it('Shows renamed file details if rename ajax call suceeded', function() {
fileList.showDetailsView('One.txt');

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
expect(fileList._detailsView.getFileInfo().get('id')).toEqual(1);
expect(fileList._detailsView.getFileInfo().get('name')).toEqual('One.txt');

doRename();

deferredRename.resolve(201);

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
expect(fileList._detailsView.getFileInfo().get('id')).toEqual(1);
expect(fileList._detailsView.getFileInfo().get('name')).toEqual('Tu_after_three.txt');
});
it('Shows again file details if rename ajax call failed', function() {
fileList.showDetailsView('One.txt');

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
expect(fileList._detailsView.getFileInfo().get('id')).toEqual(1);
expect(fileList._detailsView.getFileInfo().get('name')).toEqual('One.txt');

doRename();

deferredRename.reject(403);

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
expect(fileList._detailsView.getFileInfo().get('id')).toEqual(1);
expect(fileList._detailsView.getFileInfo().get('name')).toEqual('One.txt');
});
it('Correctly updates file link after rename', function() {
var $tr;
doRename();
Expand Down Expand Up @@ -2460,184 +2430,6 @@ describe('OCA.Files.FileList tests', function() {
});
});
});
describe('Details sidebar', function() {
beforeEach(function() {
fileList.setFiles(testFiles);
fileList.showDetailsView('Two.jpg');
});
describe('registering', function() {
var addTabStub;
var addDetailStub;

beforeEach(function() {
addTabStub = sinon.stub(OCA.Files.DetailsView.prototype, 'addTabView');
addDetailStub = sinon.stub(OCA.Files.DetailsView.prototype, 'addDetailView');
getDetailsStub = sinon.stub(OCA.Files.DetailsView.prototype, 'getDetailViews');
});
afterEach(function() {
addTabStub.restore();
addDetailStub.restore();
getDetailsStub.restore();
});
it('forward the registered views to the underlying DetailsView', function() {
fileList.destroy();
fileList = new OCA.Files.FileList($('#app-content-files'), {
detailsViewEnabled: true
});
fileList.registerTabView(new OCA.Files.DetailTabView());
fileList.registerDetailView(new OCA.Files.DetailFileInfoView());

expect(addTabStub.calledOnce).toEqual(true);
// twice because the filelist already registers one by default
expect(addDetailStub.calledTwice).toEqual(true);
});
it('forward getting the registered views to the underlying DetailsView', function() {
fileList.destroy();
fileList = new OCA.Files.FileList($('#app-content-files'), {
detailsViewEnabled: true
});
var expectedRegisteredDetailsView = [];
getDetailsStub.returns(expectedRegisteredDetailsView);

var registeredDetailViews = fileList.getRegisteredDetailViews();

expect(getDetailsStub.calledOnce).toEqual(true);
expect(registeredDetailViews).toEqual(expectedRegisteredDetailsView);
});
it('does not error when registering panels when not details view configured', function() {
fileList.destroy();
fileList = new OCA.Files.FileList($('#app-content-files'), {
detailsViewEnabled: false
});
fileList.registerTabView(new OCA.Files.DetailTabView());
fileList.registerDetailView(new OCA.Files.DetailFileInfoView());

expect(addTabStub.notCalled).toEqual(true);
expect(addDetailStub.notCalled).toEqual(true);
});
it('returns null when getting the registered views when not details view configured', function() {
fileList.destroy();
fileList = new OCA.Files.FileList($('#app-content-files'), {
detailsViewEnabled: false
});

var registeredDetailViews = fileList.getRegisteredDetailViews();

expect(getDetailsStub.notCalled).toEqual(true);
expect(registeredDetailViews).toBeNull();
});
});
it('triggers file action when clicking on row if no details view configured', function() {
fileList.destroy();
fileList = new OCA.Files.FileList($('#app-content-files'), {
detailsViewEnabled: false
});
var updateDetailsViewStub = sinon.stub(fileList, '_updateDetailsView');
var actionStub = sinon.stub();
fileList.setFiles(testFiles);
fileList.fileActions.register(
'text/plain',
'Test',
OC.PERMISSION_ALL,
function() {
// Specify icon for hitory button
return OC.imagePath('core','actions/history');
},
actionStub
);
fileList.fileActions.setDefault('text/plain', 'Test');
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filesize').click();
expect(actionStub.calledOnce).toEqual(true);
expect(updateDetailsViewStub.notCalled).toEqual(true);
updateDetailsViewStub.restore();
});
it('highlights current file when clicked and updates sidebar', function() {
fileList.fileActions.setDefault('text/plain', 'Test');
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filesize').click();
expect($tr.hasClass('highlighted')).toEqual(true);

expect(fileList._detailsView.getFileInfo().id).toEqual(1);
});
it('keeps the last highlighted file when clicking outside', function() {
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filesize').click();

fileList.$el.find('tfoot').click();

expect($tr.hasClass('highlighted')).toEqual(true);
expect(fileList._detailsView.getFileInfo().id).toEqual(1);
});
it('removes last highlighted file when selecting via checkbox', function() {
var $tr = fileList.findFileEl('One.txt');

// select
$tr.find('td.filesize').click();
$tr.find('input:checkbox').click();
expect($tr.hasClass('highlighted')).toEqual(false);

// deselect
$tr.find('td.filesize').click();
$tr.find('input:checkbox').click();
expect($tr.hasClass('highlighted')).toEqual(false);

expect(fileList._detailsView.getFileInfo()).toEqual(null);
});
it('removes last highlighted file when selecting all files via checkbox', function() {
var $tr = fileList.findFileEl('One.txt');

// select
$tr.find('td.filesize').click();
fileList.$el.find('.select-all.checkbox').click();
expect($tr.hasClass('highlighted')).toEqual(false);

// deselect
$tr.find('td.filesize').click();
fileList.$el.find('.select-all.checkbox').click();
expect($tr.hasClass('highlighted')).toEqual(false);

expect(fileList._detailsView.getFileInfo()).toEqual(null);
});
it('closes sidebar whenever the currently highlighted file was removed from the list', function() {
jQuery.fx.off = true;
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filesize').click();
expect($tr.hasClass('highlighted')).toEqual(true);

expect(fileList._detailsView.getFileInfo().id).toEqual(1);

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
fileList.remove('One.txt');
// sidebar is removed on close before being
expect($('#app-sidebar').length).toEqual(0);
jQuery.fx.off = false;
});
it('returns the currently selected model instance when calling getModelForFile', function() {
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filesize').click();

var model1 = fileList.getModelForFile('One.txt');
var model2 = fileList.getModelForFile('One.txt');
model1.set('test', true);

// it's the same model
expect(model2).toEqual(model1);

var model3 = fileList.getModelForFile($tr);
expect(model3).toEqual(model1);
});
it('closes the sidebar when switching folders', function() {
jQuery.fx.off = true;
var $tr = fileList.findFileEl('One.txt');
$tr.find('td.filesize').click();

expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
fileList.changeDirectory('/another');
expect($('#app-sidebar').length).toEqual(0);
jQuery.fx.off = false;
});
});
describe('File actions', function() {
it('Clicking on a file name will trigger default action', function() {
var actionStub = sinon.stub();
Expand Down
Loading