Merge branch '100-export-should-use-api' into 101-admin-panel-should-use-api (a6bcd928) · Commits · minerva / core

Commit a6bcd928 authored 7 years ago by Piotr Gawron

Browse files

Merge branch '100-export-should-use-api' into 101-admin-panel-should-use-api

parents f29d9765 d02be293

No related branches found

No related tags found

2 merge requests!115Resolve "admin panel should use API",!114Resolve "admin panel should use API"

Hide whitespace changes

Inline Side-by-side

Showing

converter-graphics/src/main/java/lcsb/mapviewer/converter/graphics/ImageGenerators.java 1 addition, 1 deletion

...va/lcsb/mapviewer/converter/graphics/ImageGenerators.java
frontend-js/package.json 2 additions, 1 deletion

frontend-js/package.json
frontend-js/src/main/js/Export.js 3 additions, 2 deletions

frontend-js/src/main/js/Export.js
frontend-js/src/main/js/GuiConnector.js 3 additions, 0 deletions

frontend-js/src/main/js/GuiConnector.js
frontend-js/src/main/js/ServerConnector.js 21 additions, 1 deletion

frontend-js/src/main/js/ServerConnector.js
frontend-js/src/main/js/gui/GuiMessageError.js 15 additions, 0 deletions

frontend-js/src/main/js/gui/GuiMessageError.js
frontend-js/src/main/js/gui/export/AbstractExportPanel.js 445 additions, 0 deletions

frontend-js/src/main/js/gui/export/AbstractExportPanel.js
frontend-js/src/main/js/gui/export/ElementExportPanel.js 58 additions, 433 deletions

frontend-js/src/main/js/gui/export/ElementExportPanel.js
frontend-js/src/main/js/gui/export/GraphicsExportPanel.js 140 additions, 5 deletions

frontend-js/src/main/js/gui/export/GraphicsExportPanel.js
frontend-js/src/main/js/gui/export/NetworkExportPanel.js 238 additions, 6 deletions

frontend-js/src/main/js/gui/export/NetworkExportPanel.js
frontend-js/src/main/js/map/data/MapModel.js 63 additions, 38 deletions

frontend-js/src/main/js/map/data/MapModel.js
frontend-js/src/main/js/map/data/ProjectStatistics.js 3 additions, 0 deletions

frontend-js/src/main/js/map/data/ProjectStatistics.js
frontend-js/src/test/js/gui/export/ElementExportPanel-test.js 60 additions, 0 deletions

...tend-js/src/test/js/gui/export/ElementExportPanel-test.js
frontend-js/src/test/js/gui/export/GraphicsExportPanel-test.js 68 additions, 0 deletions

...end-js/src/test/js/gui/export/GraphicsExportPanel-test.js
frontend-js/src/test/js/gui/export/NetworkExportPanel-test.js 32 additions, 0 deletions

...tend-js/src/test/js/gui/export/NetworkExportPanel-test.js
frontend-js/src/test/js/mocha-config.js 5 additions, 0 deletions

frontend-js/src/test/js/mocha-config.js
frontend-js/testFiles/apiCalls/projects/sample/models/15781/bioEntities/elements/columns=id,modelId&type=Drug,Complex,Phenotype,Gene,RNA,Unknown,Degraded,Antisense RNA,Ion,Simple molecule,Protein,Compartment&token=MOCK_TOKEN_ID& 1 addition, 0 deletions

...,Simple molecule,Protein,Compartment&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/models/all/bioEntities/elements/id=329167,329168,329169,329172,329173,329179&token=MOCK_TOKEN_ID& 1 addition, 0 deletions

...7,329168,329169,329172,329173,329179&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/models/all/bioEntities/reactions/participantId=329156,329157,329158,329159,329160,329161,329162,329163,329164,329165,329166,329167,329168,329169,329170,329171,329172,329173,329174,329175,329176,329177,329178,329179,329180,329181,329182,329183,329184,329185&token=MOCK_TOKEN_ID& 1 addition, 0 deletions

...0,329181,329182,329183,329184,329185&token=MOCK_TOKEN_ID&
model/src/main/java/lcsb/mapviewer/model/map/model/Model.java 1 addition, 1 deletion

...l/src/main/java/lcsb/mapviewer/model/map/model/Model.java

with 1161 additions and 488 deletions

Please register or to comment