From c7da8b1261ed1d93b5391025b6df48b77b64b0ba Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Thu, 27 Sep 2018 14:53:36 +0200 Subject: [PATCH] rest api of the configuration doesn't return list of plugins (this was empty anyway) --- frontend-js/src/main/js/Configuration.js | 18 ---------------- .../ConfigurationController.java | 1 - .../configuration/ConfigurationRestImpl.java | 21 ------------------- 3 files changed, 40 deletions(-) diff --git a/frontend-js/src/main/js/Configuration.js b/frontend-js/src/main/js/Configuration.js index 3c423d1a4e..230456ab5f 100644 --- a/frontend-js/src/main/js/Configuration.js +++ b/frontend-js/src/main/js/Configuration.js @@ -106,7 +106,6 @@ function Configuration(json) { self.setVersion(json.version); self.setBuildDate(json.buildDate); self.setGitHash(json.gitHash); - self.setPluginsData(json.plugins); } } @@ -509,22 +508,6 @@ Configuration.prototype.setAnnotators = function (annotators) { } }; -/** - * - * @returns {Array} - */ -Configuration.prototype.getPluginsData = function () { - return this._pluginsData; -}; - -/** - * - * @param {Array} pluginsData - */ -Configuration.prototype.setPluginsData = function (pluginsData) { - this._pluginsData = pluginsData; -}; - /** * * @returns {Annotator[]} @@ -624,7 +607,6 @@ Configuration.prototype.update = function (original) { self.setMapTypes(createCopy(original.getMapTypes())); self.setModificationStateTypes(createCopy(original.getModificationStateTypes())); self.setPrivilegeTypes(createCopy(original.getPrivilegeTypes())); - self.setPluginsData(createCopy(original.getPluginsData())); self._annotators = []; for (i = 0; i < original.getAnnotators(); i++) { self._annotators.push(new Annotator(original.getAnnotators()[i])); diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java index faf0b5f30b..9c231fdbc3 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java @@ -59,7 +59,6 @@ public class ConfigurationController extends BaseController { result.put("buildDate", configurationService.getSystemBuild(context.getRealPath("/"))); result.put("gitHash", configurationService.getSystemGitVersion(context.getRealPath("/"))); result.put("annotators", configurationController.getAnnotators(token)); - result.put("plugins", configurationController.getPlugins(token, context.getRealPath("/"))); return result; } diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java index f39bc6d4b6..b14634baa4 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java @@ -283,27 +283,6 @@ public class ConfigurationRestImpl extends BaseRestImpl { return optionToMap(configurationService.getValue(type)); } - public List<Map<String, Object>> getPlugins(String token, String rootPath) { - String path = rootPath + "/resources/js/plugins/"; - File folder = new File(path); - List<Map<String, Object>> result = new ArrayList<>(); - if (folder.exists()) { - File[] listOfFiles = folder.listFiles(); - Arrays.sort(listOfFiles); - - for (int i = 0; i < listOfFiles.length; i++) { - if (listOfFiles[i].isFile()) { - Map<String, Object> row = new TreeMap<>(); - row.put("url", "resources/js/plugins/" + listOfFiles[i].getName()); - row.put("load-on-start", false); - result.add(row); - } - } - - } - return result; - } - public List<Map<String, Object>> getUnitTypes(String token) { List<Map<String, Object>> result = new ArrayList<>(); for (SbmlUnitType type : SbmlUnitType.values()) { -- GitLab