Skip to content
Snippets Groups Projects
Commit ed3d5961 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

on saveexisting genemo test added

parent 276c8efc
No related branches found
No related tags found
2 merge requests!345Resolve "Genes annotations don't show",!344Resolve "Genome browser in submaps not working"
...@@ -189,7 +189,7 @@ EditGenomeDialog.prototype.createGeneralTabContent = function () { ...@@ -189,7 +189,7 @@ EditGenomeDialog.prototype.createGeneralTabContent = function () {
onclick: function () { onclick: function () {
return self.onSaveClicked().then(function () { return self.onSaveClicked().then(function () {
return self.close(); return self.close();
}, GuiConnector.alert); }).catch(GuiConnector.alert);
}, },
xss: false xss: false
}); });
...@@ -208,6 +208,20 @@ EditGenomeDialog.prototype.createGeneralTabContent = function () { ...@@ -208,6 +208,20 @@ EditGenomeDialog.prototype.createGeneralTabContent = function () {
return result; return result;
}; };
/**
*
* @returns {Promise|PromiseLike}
*/
EditGenomeDialog.prototype.onSaveClicked = function () {
var self = this;
if (!self.isNew()) {
return self.callListeners("onSave");
} else {
return self.getServerConnector().updateReferenceGenome(self.getReferenceGenome()).then(function () {
return self.callListeners("onSave");
});
}
};
/** /**
* *
* @param {ReferenceGenome} genome * @param {ReferenceGenome} genome
...@@ -289,7 +303,10 @@ EditGenomeDialog.prototype._fillTypeSelect = function (genome, selectedOrganism) ...@@ -289,7 +303,10 @@ EditGenomeDialog.prototype._fillTypeSelect = function (genome, selectedOrganism)
*/ */
EditGenomeDialog.prototype._fillVersionSelect = function (genome, selectedOrganism, selectedType) { EditGenomeDialog.prototype._fillVersionSelect = function (genome, selectedOrganism, selectedType) {
var self = this; var self = this;
return self.getServerConnector().getReferenceGenomeVersions({organism: selectedOrganism, type:selectedType}).then(function (versions) { return self.getServerConnector().getReferenceGenomeVersions({
organism: selectedOrganism,
type: selectedType
}).then(function (versions) {
var genomeVersionSelect = $("[name=genomeVersionSelect]", self.getElement()); var genomeVersionSelect = $("[name=genomeVersionSelect]", self.getElement());
var selectedVersion; var selectedVersion;
......
...@@ -61,4 +61,25 @@ describe('EditGenomeDialog', function () { ...@@ -61,4 +61,25 @@ describe('EditGenomeDialog', function () {
}); });
}); });
describe('click save', function () {
it('existing genome', function () {
var dialog;
return ServerConnector.getReferenceGenome({organism:"9606", type:"UCSC",version:"hg38"}).then(function (genome) {
dialog = new EditGenomeDialog({
element: testDiv,
referenceGenome: genome,
customMap: null,
serverConnector: ServerConnector
});
return dialog.init();
}).then(function () {
return dialog.open();
}).then(function () {
return $("[name=saveGenome]", testDiv)[0].onclick();
}).then(function () {
dialog.destroy();
});
});
});
}); });
...@@ -505,8 +505,6 @@ Helper.prototype.triggerJqueryEvent = function (element, eventType) { ...@@ -505,8 +505,6 @@ Helper.prototype.triggerJqueryEvent = function (element, eventType) {
var event = events[j]; var event = events[j];
var eventTargets = $(event.selector, domElement); var eventTargets = $(event.selector, domElement);
for (var k = 0; k < eventTargets.length; k++) { for (var k = 0; k < eventTargets.length; k++) {
console.log(element);
console.log(eventTargets[k]);
if (element === eventTargets[k]) { if (element === eventTargets[k]) {
promises.push(event.handler.call(element)) promises.push(event.handler.call(element))
} }
......
{"downloadProgress":100.0,"geneMapping":[],"idObject":1563,"localUrl":"../minerva-big//5280/hg38.2bit","organism":{"annotatorClassName":"","descriptionByType":"","descriptionByTypeRelation":"","id":927074,"link":"http://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606","resource":"9606","type":"TAXONOMY"},"sourceUrl":"ftp://hgdownload.cse.ucsc.edu/goldenPath/hg38/bigZips/hg38.2bit","type":"UCSC","version":"hg38"}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment