complex name column implemented

frontend-js/src/main/js/gui/export/ElementExportPanel.js

@@ -3,8 +3,9 @@
 /* exported logger */
 
 var AbstractExportPanel = require('./AbstractExportPanel');
-var GuiMessageError = require('../GuiMessageError');
 var Functions = require('../../Functions');
+var GuiMessageError = require('../GuiMessageError');
+var IdentifiedElement = require('../../map/data/IdentifiedElement');
 
 var logger = require('../../logger');
 
@@ -217,7 +218,30 @@ ElementExportPanel.prototype.getAllColumns = function () {
   }, {
     "columnName": "complexId",
     "method": "getComplexId",
-    "name": "Complex"
+    "name": "Complex id"
+  }, {
+    /**
+     *
+     * @param {Alias} bioEntity
+     * @param {Project} project
+     * @returns {Promise<string>}
+     */
+    "method": function (bioEntity, project) {
+      var modelId = bioEntity.getModelId();
+      var complexId = bioEntity.getComplexId();
+      if (complexId !== undefined) {
+        return project.getModelById(modelId).getByIdentifiedElement(new IdentifiedElement({
+          id: complexId,
+          modelId: modelId,
+          type: "ALIAS"
+        }), true).then(function(complex){
+          return complex.getName();
+        });
+      } else {
+        return Promise.resolve("");
+      }
+    },
+    "name": "Complex name"
   }, {
     "columnName": "compartmentId",
     "method": "getCompartmentId",

frontend-js/src/main/js/map/data/MapModel.js

@@ -142,7 +142,7 @@ MapModel.prototype.getAliasById = function (id, complete) {
 /**
  * Returns {@link Alias} by identifier.
  *
-* @param {number} id
+ * @param {number} id
  *          identifier of the {@link Alias}
  * @returns {Promise<Alias>} by identifier
  */
@@ -638,7 +638,7 @@ MapModel.prototype.setTileSize = function (tileSize) {
  *
  * @param {IdentifiedElement} ie
  * @param {boolean} complete
- * @returns {Promise}
+ * @returns {Promise<BioEntity|PointData>}
  */
 MapModel.prototype.getByIdentifiedElement = function (ie, complete) {
   var self = this;

frontend-js/src/test/js/gui/export/ElementExportPanel-test.js

@@ -284,7 +284,22 @@ describe('ElementExportPanel', function () {
       var desc = "test\ntest2\n";
       alias.setDescription(desc);
       return exportObject.createResponseRow(alias, exportObject.getAllColumns(), []).then(function (rowString) {
-        assert.ok(rowString.indexOf("test\ntest2\n") === -1);
+        assert.ok(rowString.indexOf(desc) === -1);
+      });
+    });
+    it('complex name', function () {
+      var complexName = "Complex name2";
+      var exportObject = new ElementExportPanel({
+        element: testDiv,
+        project: helper.createProject(),
+        configuration: helper.getConfiguration()
+      });
+      var alias = helper.createAlias(exportObject.getProject().getModels()[0]);
+      var complex = helper.createAlias(exportObject.getProject().getModels()[0]);
+      complex.setName(complexName);
+      alias.setComplexId(complex.getId());
+      return exportObject.createResponseRow(alias, exportObject.getAllColumns(), []).then(function (rowString) {
+        assert.ok(rowString.indexOf(complexName) >= 0);
       });
     });
     it('column with function manipulating data', function () {