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

Jump to bottom

Removes duplicated maps in the delete warning dialog #3055

Merged
merged 2 commits into from
Apr 7, 2015
Merged

Removes duplicated maps in the delete warning dialog #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88911a1
Removed duplicates from affected visualizations
alonsogarciapablo Apr 7, 2015
83679b5
Better test
alonsogarciapablo Apr 7, 2015
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
6 changes: 5 additions & 1 deletion lib/assets/javascripts/cartodb/new_dashboard/dialogs/delete_items_view_model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,18 @@ module.exports = Backbone.Collection.extend({
},

affectedVisData: function() {
return this.chain()
var visData = this.chain()
.map(function(m) {
var metadata = m.tableMetadata();
return []
.concat(metadata.get('dependent_visualizations'))
.concat(metadata.get('non_dependent_visualizations'));
})
.flatten().compact().value();

return _.uniq(visData, function(metadata) {
return metadata.id;
});
},

deleteItems: function() {
Expand Down
51 changes: 43 additions & 8 deletions lib/assets/test/spec/cartodb/new_dashboard/dialogs/delete_items_view_model.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,21 +254,56 @@ describe('new_dashboard/dialogs/delete_items_view_model', function() {
});

describe('when there are affected vis', function() {
var vis1, vis2, vis3;
var fakeTableMetadata = function fakeTableMetadata(depVisualizations, nonDepVisualizations) {
var metadata = {
get: function(attr){
if (attr == 'dependent_visualizations') {
return depVisualizations;
}
if (attr == 'non_dependent_visualizations') {
return nonDepVisualizations;
}
}
}
return metadata;
};

beforeEach(function() {
var tableMetadata = jasmine.createSpyObj('Table metadata', ['get']);

this.visdata = [{}, {}];
vis1 = new cdb.admin.Visualization({ id: 'vis1' });
vis2 = new cdb.admin.Visualization({ id: 'vis2' });
vis3 = new cdb.admin.Visualization({ id: 'vis3' });

this.models = [vis1, vis2, vis3];
});

tableMetadata.get.and.returnValue(this.visdata);
spyOn(this.models[1], 'tableMetadata').and.returnValue(tableMetadata);
it('should return a list with the affected vis', function() {
spyOn(vis1, 'tableMetadata').and.returnValue(
fakeTableMetadata([{ id: 'vis2' }], [{ id: 'vis3'}])
);

this.createViewModel();
});

it('should return an list with the affected vis', function() {
var expectedList = this.visdata.concat(this.visdata);
expect(this.viewModel.affectedVisData()).toEqual(expectedList);
expect(this.viewModel.affectedVisData()).toEqual([
{ id: 'vis2' }, { id: 'vis3' }
]);
});

it('should NOT return duplicated visualizations', function() {
spyOn(vis1, 'tableMetadata').and.returnValue(
fakeTableMetadata([{ id: 'vis2' }], [{ id: 'vis3'}])
);
spyOn(vis2, 'tableMetadata').and.returnValue(
fakeTableMetadata([{ id: 'vis1' }], [{ id: 'vis3'}])
);

this.createViewModel();

expect(this.viewModel.affectedVisData()).toEqual([
{ id: 'vis2' }, { id: 'vis3' }, { id: 'vis1' }
]);
})
});
});

Expand Down