diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js index 9bc936224b762a96baee7c8ca7338199bd5fdc9f..ffdb7c9bb9650877f5fd27d8bdfc40b82f447376 100644 --- a/frontend-js/src/main/js/ServerConnector.js +++ b/frontend-js/src/main/js/ServerConnector.js @@ -50,7 +50,7 @@ ServerConnector.init = function() { self._sessionData = undefined; self._configuration = undefined; self._loggedUser = undefined; - self._serverBaseUrl= undefined; + self._serverBaseUrl = undefined; }; ServerConnector.registerListenerType("onDataLoadStart"); @@ -538,25 +538,25 @@ ServerConnector.getImageUrl = function(queryParams, filterParams) { }); }; -ServerConnector.getModelPartUrl = function (queryParams, filterParams) { +ServerConnector.getModelPartUrl = function(queryParams, filterParams) { return this.getApiUrl({ url : this.getProjectUrl(queryParams) + "models/" + queryParams.modelId + ":downloadModel", params : filterParams, }); }; -ServerConnector.getProjectSourceUrl = function (queryParams, filterParams) { +ServerConnector.getProjectSourceUrl = function(queryParams, filterParams) { return this.getApiUrl({ - type: "projects/" + queryParams.projectId + ":downloadSource", - params: filterParams + type : "projects/" + queryParams.projectId + ":downloadSource", + params : filterParams }); }; -ServerConnector.getUserUrl = function (queryParams, filterParams) { +ServerConnector.getUserUrl = function(queryParams, filterParams) { return this.getApiUrl({ - type: "users/", - method: queryParams.login, - params: filterParams, + type : "users/", + method : queryParams.login, + params : filterParams, }); }; @@ -674,27 +674,27 @@ ServerConnector.getProjectStatistics = function(projectId) { }).then(function(result) { content = JSON.parse(result); return self.getConfiguration(); - }).then(function (configuration) { + }).then(function(configuration) { return new ProjectStatistics(content, configuration); }); }; -ServerConnector.getLoggedUser = function () { +ServerConnector.getLoggedUser = function() { var self = this; if (self._loggedUser !== undefined) { return Promise.resolve(self._loggedUser); } else { - return self.getUser(self.getSessionData().getLogin()).then(function (user) { + return self.getUser(self.getSessionData().getLogin()).then(function(user) { self._loggedUser = user; return self._loggedUser; }); } }; -ServerConnector.getUser = function (login) { +ServerConnector.getUser = function(login) { var self = this; var queryParams = { - login: login, + login : login, }; var filterParams = {}; @@ -704,12 +704,12 @@ ServerConnector.getUser = function (login) { }); }; -ServerConnector.getOverlays = function (projectId) { +ServerConnector.getOverlays = function(projectId) { var self = this; var queryParams = {}; var filterParams = {}; - return new Promise(function (resolve, reject) { - self.getProjectId(projectId).then(function (result) { + return new Promise(function(resolve, reject) { + self.getProjectId(projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getOverlaysUrl(queryParams, filterParams)); }).then(function(content) { @@ -724,17 +724,17 @@ ServerConnector.getOverlays = function (projectId) { }); }; -ServerConnector.getOverlayElements = function (overlayId, projectId) { +ServerConnector.getOverlayElements = function(overlayId, projectId) { var self = this; if (overlayId === undefined) { throw new Error("Layout id must be defined"); } var queryParams = { - overlayId: overlayId, - modelId: "*", + overlayId : overlayId, + modelId : "*", }; var filterParams = {}; - return self.getProjectId(projectId).then(function (result) { + return self.getProjectId(projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getOverlayElementsUrl(queryParams, filterParams)); }).then(function(content) { @@ -754,17 +754,17 @@ ServerConnector.getOverlayElements = function (overlayId, projectId) { }); }; -ServerConnector.getFullOverlayElement = function (params) { +ServerConnector.getFullOverlayElement = function(params) { var self = this; var queryParams = { - overlayId: params.overlay.getId(), - modelId: params.element.getModelId(), - id: params.element.getId(), + overlayId : params.overlay.getId(), + modelId : params.element.getModelId(), + id : params.element.getId(), }; var filterParams = {}; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getFullOverlayElementUrl(queryParams, filterParams)); }).then(function(content) { @@ -781,7 +781,7 @@ ServerConnector.getFullOverlayElement = function (params) { }); }; -ServerConnector.getProjectId = function (projectId) { +ServerConnector.getProjectId = function(projectId) { var self = this; if (projectId !== undefined && projectId !== null && projectId !== "") { return Promise.resolve(projectId); @@ -792,25 +792,25 @@ ServerConnector.getProjectId = function (projectId) { } }; -ServerConnector.getLogoImg = function () { +ServerConnector.getLogoImg = function() { return this.getConfigurationParam(ConfigurationType.LOGO_IMG); }; -ServerConnector.getLogoLink = function () { +ServerConnector.getLogoLink = function() { return this.getConfigurationParam(ConfigurationType.LOGO_LINK); }; -ServerConnector.getMaxSearchDistance = function () { +ServerConnector.getMaxSearchDistance = function() { return this.getConfigurationParam(ConfigurationType.SEARCH_DISTANCE); }; -ServerConnector.getOverlayById = function (overlayId, projectId) { +ServerConnector.getOverlayById = function(overlayId, projectId) { var self = this; var queryParams = { - overlayId: overlayId + overlayId : overlayId }; var filterParams = {}; - return self.getProjectId(projectId).then(function (data) { + return self.getProjectId(projectId).then(function(data) { queryParams.projectId = data; return self.sendGetRequest(self.getOverlayByIdUrl(queryParams, filterParams)); }).then(function(content) { @@ -818,7 +818,7 @@ ServerConnector.getOverlayById = function (overlayId, projectId) { }); }; -ServerConnector.getReactions = function (params) { +ServerConnector.getReactions = function(params) { var self = this; var queryParams = {}; if (params.ids === undefined) { @@ -828,11 +828,11 @@ ServerConnector.getReactions = function (params) { params.participantId = []; } var filterParams = { - id: params.ids, - columns: params.columns, - participantId: params.participantId, + id : params.ids, + columns : params.columns, + participantId : params.participantId, }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; if (filterParams.id.length > 100 || filterParams.participantId.length > 100) { return self.sendPostRequest(self.getReactionsUrl(queryParams), filterParams); @@ -840,7 +840,7 @@ ServerConnector.getReactions = function (params) { return self.sendGetRequest(self.getReactionsUrl(queryParams, filterParams)); } - }).then(function (content) { + }).then(function(content) { var array = JSON.parse(content); var result = []; for (var i = 0; i < array.length; i++) { @@ -850,10 +850,10 @@ ServerConnector.getReactions = function (params) { }); }; -ServerConnector.getAliases = function (params) { +ServerConnector.getAliases = function(params) { var self = this; var queryParams = { - modelId: params.modelId, + modelId : params.modelId, }; if (params.ids === undefined) { params.ids = []; @@ -1001,13 +1001,13 @@ ServerConnector.getElementsByQuery = function(params) { }); }; -ServerConnector.getDrugsByQuery = function (params) { +ServerConnector.getDrugsByQuery = function(params) { var self = this; var queryParams = {}; var filterParams = { - query: params.query + query : params.query }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getSearchDrugsUrl(queryParams, filterParams)); }).then(function(content) { @@ -1020,13 +1020,13 @@ ServerConnector.getDrugsByQuery = function (params) { }); }; -ServerConnector.getMiRnasByQuery = function (params) { +ServerConnector.getMiRnasByQuery = function(params) { var self = this; var queryParams = {}; var filterParams = { - query: params.query + query : params.query }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getSearchMiRnasUrl(queryParams, filterParams)); }).then(function(content) { @@ -1039,13 +1039,13 @@ ServerConnector.getMiRnasByQuery = function (params) { }); }; -ServerConnector.getChemicalsByQuery = function (params) { +ServerConnector.getChemicalsByQuery = function(params) { var self = this; var queryParams = {}; var filterParams = { - query: params.query + query : params.query }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getSearchChemicalsUrl(queryParams, filterParams)); }).then(function(content) { @@ -1058,93 +1058,93 @@ ServerConnector.getChemicalsByQuery = function (params) { }); }; -ServerConnector.getOverlaySourceDownloadUrl = function (params) { +ServerConnector.getOverlaySourceDownloadUrl = function(params) { var self = this; var queryParams = { - overlayId: params.overlayId + overlayId : params.overlayId }; var filterParams = {}; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.getOverlaySourceUrl(queryParams, filterParams); }); }; -ServerConnector.getImageDownloadUrl = function (params) { +ServerConnector.getImageDownloadUrl = function(params) { var self = this; var queryParams = { - projectId: params.projectId, - modelId: params.modelId, + projectId : params.projectId, + modelId : params.modelId, }; var filterParams = { - token: params.token, - polygonString: params.polygonString, - handlerClass: params.handlerClass, - backgroundOverlayId: params.backgroundOverlayId, - zoomLevel: params.zoomLevel, - overlayIds: this.idsToString(params.overlayIds), + token : params.token, + polygonString : params.polygonString, + handlerClass : params.handlerClass, + backgroundOverlayId : params.backgroundOverlayId, + zoomLevel : params.zoomLevel, + overlayIds : this.idsToString(params.overlayIds), }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.getImageUrl(queryParams, filterParams); }); }; -ServerConnector.getModelDownloadUrl = function (params) { +ServerConnector.getModelDownloadUrl = function(params) { var self = this; var queryParams = { - projectId: params.projectId, - modelId: params.modelId, + projectId : params.projectId, + modelId : params.modelId, }; var filterParams = { - token: params.token, - polygonString: params.polygonString, - handlerClass: params.handlerClass, - backgroundOverlayId: params.backgroundOverlayId, - zoomLevel: params.zoomLevel, - overlayIds: this.idsToString(params.overlayIds), + token : params.token, + polygonString : params.polygonString, + handlerClass : params.handlerClass, + backgroundOverlayId : params.backgroundOverlayId, + zoomLevel : params.zoomLevel, + overlayIds : this.idsToString(params.overlayIds), }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.getModelPartUrl(queryParams, filterParams); }); }; -ServerConnector.getImageConverters = function () { +ServerConnector.getImageConverters = function() { var self = this; - return self.getConfiguration().then(function (configuration) { + return self.getConfiguration().then(function(configuration) { return configuration.getImageConverters(); }); }; -ServerConnector.getModelConverters = function () { +ServerConnector.getModelConverters = function() { var self = this; - return self.getConfiguration().then(function (configuration) { + return self.getConfiguration().then(function(configuration) { return configuration.getModelConverters(); }); }; -ServerConnector.getProjectSourceDownloadUrl = function (params) { +ServerConnector.getProjectSourceDownloadUrl = function(params) { if (params === undefined) { params = {}; } var queryParams = {}; var filterParams = {}; var self = this; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.getProjectSourceUrl(queryParams, filterParams); }); }; -ServerConnector.getDrugNamesByTarget = function (params) { +ServerConnector.getDrugNamesByTarget = function(params) { var self = this; var queryParams = {}; var filterParams = { - columns: ["name"], - target: params.target.getType() + ":" + params.target.getId() + columns : [ "name" ], + target : params.target.getType() + ":" + params.target.getId() }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getSearchDrugsUrl(queryParams, filterParams)); }).then(function(content) { @@ -1157,14 +1157,14 @@ ServerConnector.getDrugNamesByTarget = function (params) { }); }; -ServerConnector.getMiRnaNamesByTarget = function (params) { +ServerConnector.getMiRnaNamesByTarget = function(params) { var self = this; var queryParams = {}; var filterParams = { - columns: ["name"], - target: params.target.getType() + ":" + params.target.getId() + columns : [ "name" ], + target : params.target.getType() + ":" + params.target.getId() }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getSearchMiRnasUrl(queryParams, filterParams)); }).then(function(content) { @@ -1177,14 +1177,14 @@ ServerConnector.getMiRnaNamesByTarget = function (params) { }); }; -ServerConnector.getChemicalNamesByTarget = function (params) { +ServerConnector.getChemicalNamesByTarget = function(params) { var self = this; var queryParams = {}; var filterParams = { - columns: ["name"], - target: params.target.getType() + ":" + params.target.getId() + columns : [ "name" ], + target : params.target.getType() + ":" + params.target.getId() }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getSearchChemicalsUrl(queryParams, filterParams)); }).then(function(content) { @@ -1197,13 +1197,13 @@ ServerConnector.getChemicalNamesByTarget = function (params) { }); }; -ServerConnector.addComment = function (params) { +ServerConnector.addComment = function(params) { var self = this; var queryParams = { - elementId: params.elementId, - elementType: params.elementType, - coordinates: self.pointToString(params.coordinates), - modelId: params.modelId, + elementId : params.elementId, + elementType : params.elementType, + coordinates : self.pointToString(params.coordinates), + modelId : params.modelId, }; var filterParams = params; delete filterParams.elementId; @@ -1214,33 +1214,33 @@ ServerConnector.addComment = function (params) { filterParams.coordinates = self.pointToString(params.coordinates); } delete filterParams.modelId; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendPostRequest(self.addCommentUrl(queryParams), filterParams); - }).then(function (content) { + }).then(function(content) { var response = JSON.parse(content); return new Comment(response); }); }; -ServerConnector.addOverlay = function (params) { +ServerConnector.addOverlay = function(params) { var self = this; var queryParams = {}; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendPostRequest(self.addOverlayUrl(queryParams), params); - }).then(function (content) { + }).then(function(content) { return new LayoutData(JSON.parse(content)); }); }; -ServerConnector.updateOverlay = function (params) { +ServerConnector.updateOverlay = function(params) { var self = this; var queryParams = { - overlayId: params.overlayId + overlayId : params.overlayId }; var filterParams = { - overlay: {} + overlay : {} }; if (params.name !== undefined) { filterParams.overlay.name = params.name; @@ -1248,19 +1248,19 @@ ServerConnector.updateOverlay = function (params) { if (params.description !== undefined) { filterParams.overlay.description = params.description; } - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendPatchRequest(self.updateOverlayUrl(queryParams), filterParams); }); }; -ServerConnector.removeOverlay = function (params) { +ServerConnector.removeOverlay = function(params) { var self = this; var queryParams = { - overlayId: params.overlayId + overlayId : params.overlayId }; var filterParams = {}; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendDeleteRequest(self.deleteOverlayUrl(queryParams), filterParams); }); @@ -1280,24 +1280,24 @@ ServerConnector.removeComment = function(params) { ServerConnector.getSuggestedQueryList = function(projectId) { var self = this; - return self.getProjectId(projectId).then(function (result) { + return self.getProjectId(projectId).then(function(result) { projectId = result; return self.sendGetRequest(self.getSuggestedQueryListUrl({ projectId : projectId })); - }).then(function (content) { + }).then(function(content) { return JSON.parse(content); }); }; -ServerConnector.getOverlayTypes = function () { +ServerConnector.getOverlayTypes = function() { var self = this; - return self.getConfiguration().then(function (configuration) { + return self.getConfiguration().then(function(configuration) { return configuration.getOverlayTypes(); }); }; -ServerConnector.getPublications = function (params) { +ServerConnector.getPublications = function(params) { var self = this; if (params === undefined) { params = {}; @@ -1305,13 +1305,13 @@ ServerConnector.getPublications = function (params) { var queryParams = {}; var filterParams = { - start: params.start, - length: params.length, - sortColumn: params.sortColumn, - sortOrder: params.sortOrder, - search: params.search, + start : params.start, + length : params.length, + sortColumn : params.sortColumn, + sortOrder : params.sortOrder, + search : params.search, }; - return self.getProjectId(params.projectId).then(function (result) { + return self.getProjectId(params.projectId).then(function(result) { queryParams.projectId = result; return self.sendGetRequest(self.getPublicationsUrl(queryParams, filterParams)); }).then(function(content) { @@ -1319,7 +1319,7 @@ ServerConnector.getPublications = function (params) { }); }; -ServerConnector.getReferenceGenome = function (params) { +ServerConnector.getReferenceGenome = function(params) { var self = this; var filterParams = {}; return self.sendGetRequest(self.getReferenceGenomeUrl(params, filterParams)).then(function(content) {