From 5d19753a1654c092f7c1ea1479d25de2e3c27be6 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 5 Nov 2018 10:13:48 +0100
Subject: [PATCH] direct calls to ServerConnector removed
---
.../main/js/gui/export/NetworkExportPanel.js | 21 +++++++----------
.../js/gui/export/NetworkExportPanel-test.js | 23 +++++++++----------
2 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js
index a64762b7f7..b681dad5c9 100644
--- a/frontend-js/src/main/js/gui/export/NetworkExportPanel.js
+++ b/frontend-js/src/main/js/gui/export/NetworkExportPanel.js
@@ -5,15 +5,15 @@
var AbstractExportPanel = require('./AbstractExportPanel');
var Promise = require("bluebird");
+// noinspection JSUnusedLocalSymbols
var logger = require('../../logger');
-var Functions = require('../../Functions');
var GuiMessageError = require('../GuiMessageError');
-var IdentifiedElement = require('../../map/data/IdentifiedElement');
var Alias = require('../../map/data/Alias');
/**
*
* @param {Configuration} [params.configuration]
+ * @param {ServerConnector} params.serverConnector
* @param {HTMLElement} params.element
* @param {Project} params.project
* @param {string} [params.helpTip]
@@ -23,7 +23,7 @@ var Alias = require('../../map/data/Alias');
* @extends AbstractExportPanel
*/
function NetworkExportPanel(params) {
- params.panelName = "networkExport";
+ params["panelName"] = "networkExport";
AbstractExportPanel.call(this, params);
}
@@ -38,14 +38,11 @@ NetworkExportPanel.prototype.init = function () {
var self = this;
var element = self.getElement();
- var configuration;
- return ServerConnector.getConfiguration().then(function (result) {
- configuration = result;
- var typeDiv = self._createSelectTypeDiv(configuration.getElementTypes());
- element.appendChild(typeDiv);
- element.appendChild(self._createSelectColumnDiv(self.getAllColumns()));
- return ServerConnector.getProjectStatistics(self.getProject().getProjectId());
- }).then(function (statistics) {
+ var configuration = self.getConfiguration();
+ var typeDiv = self._createSelectTypeDiv(configuration.getElementTypes());
+ element.appendChild(typeDiv);
+ element.appendChild(self._createSelectColumnDiv(self.getAllColumns()));
+ return self.getServerConnector().getProjectStatistics(self.getProject().getProjectId()).then(function (statistics) {
return self._createMiriamTypeDiv(statistics.getReactionAnnotations());
}).then(function (div) {
element.appendChild(div);
@@ -66,13 +63,11 @@ NetworkExportPanel.prototype.init = function () {
* @returns {*[]}
*/
NetworkExportPanel.prototype.getAllColumns = function () {
- var self = this;
return this.getBioEntityAllColumns().concat([{
"columnName": "elements",
"name": "Elements",
"method": function (reaction) {
var promises = [];
- var model = self.getProject().getModelById(reaction.getModelId());
/**
*
* @param {number|Alias} aliasId
diff --git a/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js b/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js
index eb0318e670..dabdbd9764 100644
--- a/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js
+++ b/frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js
@@ -11,18 +11,21 @@ var assert = chai.assert;
describe('NetworkExportPanel', function () {
+ function createExportPanel(project) {
+ return new NetworkExportPanel({
+ element: testDiv,
+ project: project,
+ serverConnector: ServerConnector,
+ configuration: helper.getConfiguration()
+ });
+ }
+
it('download file', function () {
var exportObject;
var project;
return ServerConnector.getProject().then(function (result) {
project = result;
- return ServerConnector.getConfiguration();
- }).then(function (configuration) {
- exportObject = new NetworkExportPanel({
- element: testDiv,
- project: project,
- configuration: configuration
- });
+ exportObject = createExportPanel(project);
return exportObject.init();
}).then(function () {
$("input[name='ALL']", $(testDiv)).each(function (index, element) {
@@ -38,11 +41,7 @@ describe('NetworkExportPanel', function () {
it('map name', function () {
var mapName = "map name2";
var project = helper.createProject();
- var exportObject = new NetworkExportPanel({
- element: testDiv,
- project: project,
- configuration: helper.getConfiguration()
- });
+ var exportObject = createExportPanel(project);
var alias = helper.createAlias(exportObject.getProject().getModels()[0]);
project.getModels()[0].setName(mapName);
var reaction = helper.createReaction(project.getModels()[0], true);
--
GitLab