Commit 7831c0d9 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '353-admin-panel-lag-in-loading-of-the-projects-list' into 'master'

Resolve "Admin panel: lag in loading of the projects list"

Closes #353

See merge request piotr.gawron/minerva!258
parents 1241bff2 cc6040ed
Pipeline #4372 passed with stage
in 1 minute and 37 seconds
......@@ -36,7 +36,7 @@
}
},
"MolStar": {
"version": "git://github.com/davidhoksza/MolStar.git#45c20d0ab3ed81bdb555349b953b8add61ae1c55",
"version": "git://github.com/davidhoksza/MolStar.git#702c7417cd3dffdb45554b54ce49e27bc881b109",
"dev": true,
"requires": {
"ProtVista": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
......@@ -45,38 +45,30 @@
"litemol": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b"
},
"dependencies": {
"ProtVista": {
"version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
"dev": true,
"requires": {
"d3": "3.5.17",
"file-saver": "1.3.3",
"jquery": "2.2.4",
"jszip": "3.1.4",
"underscore": "1.8.3"
},
"dependencies": {
"jquery": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
"dev": true
}
}
},
"jquery": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
"dev": true
},
"litemol": {
"version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b",
"dev": true,
"requires": {
"@types/react": "15.6.14",
"@types/react-dom": "15.5.7"
}
}
}
},
"ProtVista": {
"version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e",
"dev": true,
"requires": {
"d3": "3.5.17",
"file-saver": "1.3.3",
"jquery": "2.2.4",
"jszip": "3.1.4",
"underscore": "1.8.3"
},
"dependencies": {
"jquery": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
"dev": true
}
}
},
......@@ -2058,6 +2050,14 @@
"immediate": "3.0.6"
}
},
"litemol": {
"version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b",
"dev": true,
"requires": {
"@types/react": "15.6.14",
"@types/react-dom": "15.5.7"
}
},
"lodash": {
"version": "4.17.4",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
......
......@@ -971,10 +971,15 @@ ServerConnector.getLoggedUser = function () {
if (self._loggedUser !== undefined) {
return Promise.resolve(self._loggedUser);
} else {
return self.getUser(self.getSessionData().getLogin()).then(function (user) {
self._loggedUser = user;
return self._loggedUser;
self._loggedUser = self.getUser(self.getSessionData().getLogin()).then(function (user) {
if (user !== null) {
self._loggedUser = user;
return self._loggedUser;
} else {
return Promise.reject(new Error("User " + self.getSessionData().getLogin() + " doesn't exist"));
}
});
return self._loggedUser;
}
};
......@@ -983,7 +988,9 @@ ServerConnector.getUser = function (login) {
var queryParams = {
login: login
};
var filterParams = {};
var filterParams = {
columns: ["id", "login", "name", "surname", "email", "minColor", "maxColor", "neutralColor", "simpleColor", "removed", "privileges", "preferences"]
};
return self.sendGetRequest(self.getUserUrl(queryParams, filterParams)).then(function (content) {
var obj = JSON.parse(content);
......
......@@ -71,6 +71,7 @@ ServerConnectorMock._sendRequest = function (params) {
var fileName = urlToFileName(url + prefix + suffix);
fs.readFile(fileName, 'utf8', function (err, content) {
if (err) {
logger.warn("File doesn't exists: " + fileName);
reject(new NetworkError(err.message, {
content: content,
url: fileName,
......
......@@ -402,5 +402,22 @@ describe('ServerConnector', function () {
});
});
it('getLoggedUser called twice', function () {
var called = 0;
var orginalFunction = ServerConnector.getUser;
ServerConnector.getUser = function (login) {
called++;
return Promise.delay(20, orginalFunction.call(ServerConnector, login));
};
var promises = [ServerConnector.getLoggedUser(), ServerConnector.getLoggedUser()];
return Promise.all(promises).then(function (result) {
assert.ok(result[0] === result[1]);
assert.equal(1, called);
}).finally(function () {
ServerConnector.getUser = orginalFunction;
});
});
});
[{"id":345331,"modelId":16728,"type":"ALIAS"},{"id":345337,"modelId":16731,"type":"ALIAS"},{"id":345330,"modelId":16729,"type":"ALIAS"}]
\ No newline at end of file
[{"id":345331,"modelId":16728,"type":"ALIAS"},{"id":345330,"modelId":16729,"type":"ALIAS"},{"id":345337,"modelId":16731,"type":"ALIAS"}]
\ No newline at end of file
{"email":"","id":20185,"login":"noaccessuser","maxColor":null,"minColor":null,"name":"","neutralColor":null,"privileges":"Unknown column","removed":false,"simpleColor":null,"surname":""}
\ No newline at end of file
{"email":"","id":20185,"login":"noaccessuser","maxColor":null,"minColor":null,"name":"","neutralColor":null,"preferences":{"annotators-parameters":{},"element-annotators":{"lcsb.mapviewer.model.map.BioEntity":[],"lcsb.mapviewer.model.map.compartment.BottomSquareCompartment":["Gene Ontology"],"lcsb.mapviewer.model.map.compartment.Compartment":["Gene Ontology"],"lcsb.mapviewer.model.map.compartment.LeftSquareCompartment":["Gene Ontology"],"lcsb.mapviewer.model.map.compartment.OvalCompartment":["Gene Ontology"],"lcsb.mapviewer.model.map.compartment.PathwayCompartment":["Gene Ontology"],"lcsb.mapviewer.model.map.compartment.RightSquareCompartment":["Gene Ontology"],"lcsb.mapviewer.model.map.compartment.SquareCompartment":["Gene Ontology"],"lcsb.mapviewer.model.map.compartment.TopSquareCompartment":["Gene Ontology"],"lcsb.mapviewer.model.map.reaction.Reaction":[],"lcsb.mapviewer.model.map.reaction.type.BooleanLogicGateReaction":[],"lcsb.mapviewer.model.map.reaction.type.CatalysisReaction":[],"lcsb.mapviewer.model.map.reaction.type.DissociationReaction":[],"lcsb.mapviewer.model.map.reaction.type.HeterodimerAssociationReaction":[],"lcsb.mapviewer.model.map.reaction.type.InhibitionReaction":[],"lcsb.mapviewer.model.map.reaction.type.KnownTransitionOmittedReaction":[],"lcsb.mapviewer.model.map.reaction.type.ModulationReaction":[],"lcsb.mapviewer.model.map.reaction.type.NegativeInfluenceReaction":[],"lcsb.mapviewer.model.map.reaction.type.PhysicalStimulationReaction":[],"lcsb.mapviewer.model.map.reaction.type.PositiveInfluenceReaction":[],"lcsb.mapviewer.model.map.reaction.type.ReducedModulationReaction":[],"lcsb.mapviewer.model.map.reaction.type.ReducedPhysicalStimulationReaction":[],"lcsb.mapviewer.model.map.reaction.type.ReducedTriggerReaction":[],"lcsb.mapviewer.model.map.reaction.type.StateTransitionReaction":[],"lcsb.mapviewer.model.map.reaction.type.TranscriptionReaction":[],"lcsb.mapviewer.model.map.reaction.type.TranslationReaction":[],"lcsb.mapviewer.model.map.reaction.type.TransportReaction":[],"lcsb.mapviewer.model.map.reaction.type.TriggerReaction":[],"lcsb.mapviewer.model.map.reaction.type.TruncationReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownCatalysisReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownInhibitionReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownNegativeInfluenceReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownPositiveInfluenceReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownReducedModulationReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownReducedPhysicalStimulationReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownReducedTriggerReaction":[],"lcsb.mapviewer.model.map.reaction.type.UnknownTransitionReaction":[],"lcsb.mapviewer.model.map.species.AntisenseRna":[],"lcsb.mapviewer.model.map.species.Chemical":["Chebi"],"lcsb.mapviewer.model.map.species.Complex":["Gene Ontology"],"lcsb.mapviewer.model.map.species.Degraded":[],"lcsb.mapviewer.model.map.species.Drug":[],"lcsb.mapviewer.model.map.species.Element":[],"lcsb.mapviewer.model.map.species.Gene":["Biocompendium","HGNC"],"lcsb.mapviewer.model.map.species.GenericProtein":["Biocompendium","HGNC"],"lcsb.mapviewer.model.map.species.Ion":["Chebi"],"lcsb.mapviewer.model.map.species.IonChannelProtein":["Biocompendium","HGNC"],"lcsb.mapviewer.model.map.species.Phenotype":["Gene Ontology"],"lcsb.mapviewer.model.map.species.Protein":["Biocompendium","HGNC"],"lcsb.mapviewer.model.map.species.ReceptorProtein":["Biocompendium","HGNC"],"lcsb.mapviewer.model.map.species.Rna":["Biocompendium","HGNC"],"lcsb.mapviewer.model.map.species.SimpleMolecule":["Chebi"],"lcsb.mapviewer.model.map.species.Species":[],"lcsb.mapviewer.model.map.species.TruncatedProtein":["Biocompendium","HGNC"],"lcsb.mapviewer.model.map.species.Unknown":[]},"element-required-annotations":{"lcsb.mapviewer.model.map.BioEntity":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.BottomSquareCompartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.Compartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.LeftSquareCompartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.OvalCompartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.PathwayCompartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.RightSquareCompartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.SquareCompartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.compartment.TopSquareCompartment":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.reaction.Reaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.BooleanLogicGateReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.CatalysisReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.DissociationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.HeterodimerAssociationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.InhibitionReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.KnownTransitionOmittedReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.ModulationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.NegativeInfluenceReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.PhysicalStimulationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.PositiveInfluenceReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.ReducedModulationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.ReducedPhysicalStimulationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.ReducedTriggerReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.StateTransitionReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.TranscriptionReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.TranslationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.TransportReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.TriggerReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.TruncationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownCatalysisReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownInhibitionReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownNegativeInfluenceReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownPositiveInfluenceReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownReducedModulationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownReducedPhysicalStimulationReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownReducedTriggerReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.reaction.type.UnknownTransitionReaction":{"annotation-list":["PUBMED"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.AntisenseRna":{"annotation-list":[],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Chemical":{"annotation-list":["PUBCHEM_SUBSTANCE","CHEBI","PUBCHEM"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Complex":{"annotation-list":[],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Degraded":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.species.Drug":{"annotation-list":[],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Element":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.species.Gene":{"annotation-list":["HGNC_SYMBOL","HGNC"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.GenericProtein":{"annotation-list":["HGNC_SYMBOL","HGNC"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Ion":{"annotation-list":["PUBCHEM_SUBSTANCE","CHEBI","PUBCHEM"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.IonChannelProtein":{"annotation-list":["HGNC_SYMBOL","HGNC"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Phenotype":{"annotation-list":[],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Protein":{"annotation-list":["HGNC_SYMBOL","HGNC"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.ReceptorProtein":{"annotation-list":["HGNC_SYMBOL","HGNC"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Rna":{"annotation-list":["HGNC_SYMBOL","HGNC"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.SimpleMolecule":{"annotation-list":["PUBCHEM_SUBSTANCE","CHEBI","PUBCHEM"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Species":{"annotation-list":[],"require-at-least-one":false},"lcsb.mapviewer.model.map.species.TruncatedProtein":{"annotation-list":["HGNC_SYMBOL","HGNC"],"require-at-least-one":true},"lcsb.mapviewer.model.map.species.Unknown":{"annotation-list":[],"require-at-least-one":false}},"element-valid-annotations":{"lcsb.mapviewer.model.map.BioEntity":["PUBMED"],"lcsb.mapviewer.model.map.compartment.BottomSquareCompartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.compartment.Compartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.compartment.LeftSquareCompartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.compartment.OvalCompartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.compartment.PathwayCompartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.compartment.RightSquareCompartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.compartment.SquareCompartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.compartment.TopSquareCompartment":["PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.reaction.Reaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.BooleanLogicGateReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.CatalysisReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.DissociationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.HeterodimerAssociationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.InhibitionReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.KnownTransitionOmittedReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.ModulationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.NegativeInfluenceReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.PhysicalStimulationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.PositiveInfluenceReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.ReducedModulationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.ReducedPhysicalStimulationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.ReducedTriggerReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.StateTransitionReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.TranscriptionReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.TranslationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.TransportReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.TriggerReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.TruncationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownCatalysisReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownInhibitionReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownNegativeInfluenceReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownPositiveInfluenceReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownReducedModulationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownReducedPhysicalStimulationReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownReducedTriggerReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.reaction.type.UnknownTransitionReaction":["KEGG_PATHWAY","KEGG_REACTION","PUBMED","COG","REACTOME","DOI"],"lcsb.mapviewer.model.map.species.AntisenseRna":["PUBMED"],"lcsb.mapviewer.model.map.species.Chemical":["HMDB","PUBCHEM_SUBSTANCE","CHEBI","KEGG_COMPOUND","PUBMED","PUBCHEM"],"lcsb.mapviewer.model.map.species.Complex":["PUBMED","EC","CHEMBL_TARGET","MESH_2012","GO","INTERPRO"],"lcsb.mapviewer.model.map.species.Degraded":["PUBMED"],"lcsb.mapviewer.model.map.species.Drug":["HMDB","CHEBI","PUBMED","DRUGBANK","CHEMBL_COMPOUND"],"lcsb.mapviewer.model.map.species.Element":["PUBMED"],"lcsb.mapviewer.model.map.species.Gene":["PANTHER","KEGG_GENES","UNIPROT","PUBMED","ENTREZ","HGNC_SYMBOL","PDB","ENSEMBL","REFSEQ","HGNC","MGD"],"lcsb.mapviewer.model.map.species.GenericProtein":["KEGG_GENES","UNIPROT","UNIPROT_ISOFORM","ENTREZ","REFSEQ","HGNC","MGD","PANTHER","PUBMED","HGNC_SYMBOL","EC","PDB","CHEMBL_TARGET","ENSEMBL","INTERPRO"],"lcsb.mapviewer.model.map.species.Ion":["HMDB","PUBCHEM_SUBSTANCE","CHEBI","KEGG_COMPOUND","PUBMED","PUBCHEM"],"lcsb.mapviewer.model.map.species.IonChannelProtein":["KEGG_GENES","UNIPROT","UNIPROT_ISOFORM","ENTREZ","REFSEQ","HGNC","MGD","PANTHER","PUBMED","HGNC_SYMBOL","EC","PDB","CHEMBL_TARGET","ENSEMBL","INTERPRO"],"lcsb.mapviewer.model.map.species.Phenotype":["OMIM","PUBMED","MESH_2012","GO"],"lcsb.mapviewer.model.map.species.Protein":["KEGG_GENES","UNIPROT","UNIPROT_ISOFORM","ENTREZ","REFSEQ","HGNC","MGD","PANTHER","PUBMED","HGNC_SYMBOL","EC","PDB","CHEMBL_TARGET","ENSEMBL","INTERPRO"],"lcsb.mapviewer.model.map.species.ReceptorProtein":["KEGG_GENES","UNIPROT","UNIPROT_ISOFORM","ENTREZ","REFSEQ","HGNC","MGD","PANTHER","PUBMED","HGNC_SYMBOL","EC","PDB","CHEMBL_TARGET","ENSEMBL","INTERPRO"],"lcsb.mapviewer.model.map.species.Rna":["PANTHER","KEGG_GENES","UNIPROT","PUBMED","ENTREZ","HGNC_SYMBOL","PDB","ENSEMBL","REFSEQ","HGNC","MGD"],"lcsb.mapviewer.model.map.species.SimpleMolecule":["HMDB","PUBCHEM_SUBSTANCE","CHEBI","KEGG_COMPOUND","PUBMED","PUBCHEM"],"lcsb.mapviewer.model.map.species.Species":["PUBMED"],"lcsb.mapviewer.model.map.species.TruncatedProtein":["KEGG_GENES","UNIPROT","UNIPROT_ISOFORM","ENTREZ","REFSEQ","HGNC","MGD","PANTHER","PUBMED","HGNC_SYMBOL","EC","PDB","CHEMBL_TARGET","ENSEMBL","INTERPRO"],"lcsb.mapviewer.model.map.species.Unknown":["PUBMED"]},"project-upload":{"annotate-model":false,"auto-resize":true,"cache-data":false,"sbgn":false,"semantic-zooming":false,"validate-miriam":false}},"privileges":"Unknown column","removed":false,"simpleColor":null,"surname":""}
\ No newline at end of file
......@@ -80,7 +80,7 @@ public class UserRestImpl extends BaseRestImpl {
columnsSet.add("simpleColor");
columnsSet.add("removed");
columnsSet.add("privileges");
columnsSet.add("preferences");
// columnsSet.add("preferences");
} else {
for (String str : columns.split(",")) {
columnsSet.add(str);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment