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

create response row returns a promise

parent 2586c3ac
No related branches found
No related tags found
4 merge requests!488Merge 12.1.1 into master,!48712.1.1 into master,!484v12.1.1 release,!482Resolve "Corrections to Export functionality"
...@@ -585,7 +585,7 @@ AbstractExportPanel.prototype.createResponseHeader = function (columns, miriamTy ...@@ -585,7 +585,7 @@ AbstractExportPanel.prototype.createResponseHeader = function (columns, miriamTy
var miriamType = miriamTypes[i]; var miriamType = miriamTypes[i];
stringBuilder.push(miriamType.getCommonName()); stringBuilder.push(miriamType.getCommonName());
} }
return stringBuilder.join("\t"); return Promise.resolve(stringBuilder.join("\t"));
}; };
......
...@@ -237,11 +237,13 @@ NetworkExportPanel.prototype.createResponseString = function () { ...@@ -237,11 +237,13 @@ NetworkExportPanel.prototype.createResponseString = function () {
return Promise.reject(new GuiMessageError("You must select at least one column")); return Promise.reject(new GuiMessageError("You must select at least one column"));
} }
var rows = []; var rowPromises = [];
rows.push(self.createResponseHeader(selectedColumns, miriamTypes)); rowPromises.push(self.createResponseHeader(selectedColumns, miriamTypes));
for (var i = 0; i < reactions.length; i++) { for (var i = 0; i < reactions.length; i++) {
rows.push(self.createResponseRow(reactions[i], selectedColumns, miriamTypes, elementIds)); rowPromises.push(self.createResponseRow(reactions[i], selectedColumns, miriamTypes, elementIds));
} }
return Promise.all(rowPromises);
}).then(function (rows) {
return rows.join("\n"); return rows.join("\n");
}); });
}; };
...@@ -252,7 +254,7 @@ NetworkExportPanel.prototype.createResponseString = function () { ...@@ -252,7 +254,7 @@ NetworkExportPanel.prototype.createResponseString = function () {
* @param {Object} columns * @param {Object} columns
* @param {MiriamType[]} miriamTypes * @param {MiriamType[]} miriamTypes
* @param {Object<string,boolean>} elementIds * @param {Object<string,boolean>} elementIds
* @returns {string} * @returns {Promise<string>}
*/ */
NetworkExportPanel.prototype.createResponseRow = function (reaction, columns, miriamTypes, elementIds) { NetworkExportPanel.prototype.createResponseRow = function (reaction, columns, miriamTypes, elementIds) {
var stringBuilder = []; var stringBuilder = [];
...@@ -280,7 +282,7 @@ NetworkExportPanel.prototype.createResponseRow = function (reaction, columns, mi ...@@ -280,7 +282,7 @@ NetworkExportPanel.prototype.createResponseRow = function (reaction, columns, mi
} }
stringBuilder.push(value); stringBuilder.push(value);
} }
return stringBuilder.join("\t"); return Promise.resolve(stringBuilder.join("\t"));
}; };
module.exports = NetworkExportPanel; module.exports = NetworkExportPanel;
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