Merge branch '299-remove-view-objects' into 'devel_12.1.x' (d3960c24) · Commits · minerva / core

Commit d3960c24 authored 7 years ago by Piotr Gawron

Merge branch '299-remove-view-objects' into 'devel_12.1.x'

Resolve "Remove View objects from service"

See merge request piotr.gawron/minerva!286

parents d7ee1c5d 4ee84a54

No related branches found

No related tags found

Checking pipeline status

Expand all Hide whitespace changes

Inline Side-by-side

Showing

frontend-js/src/main/js/gui/OverviewDialog.js 3 additions, 2 deletions

frontend-js/src/main/js/gui/OverviewDialog.js
frontend-js/src/test/js/gui/OverviewDialog-test.js 8 additions, 8 deletions

frontend-js/src/test/js/gui/OverviewDialog-test.js
frontend-js/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...-js/testFiles/apiCalls/configuration/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/complex_model_with_images/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...s/projects/complex_model_with_images/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/drug_target_sample/drugs.search/query=NADH&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...arget_sample/drugs.search/query=NADH&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/chemicals.search/query=rotenone&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...mple/chemicals.search/query=rotenone&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/drugs.search/query=NADH&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...jects/sample/drugs.search/query=NADH&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/drugs.search/query=aspirin&token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...ts/sample/drugs.search/query=aspirin&token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/sample/drugs/suggestedQueryList/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

...ects/sample/drugs/suggestedQueryList/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/token=ADMIN_TOKEN_ID& 1 addition, 1 deletion

...tend-js/testFiles/apiCalls/projects/token=ADMIN_TOKEN_ID&
frontend-js/testFiles/apiCalls/projects/token=MOCK_TOKEN_ID& 1 addition, 1 deletion

frontend-js/testFiles/apiCalls/projects/token=MOCK_TOKEN_ID&
frontend-js/testFiles/apiCalls/users/admin/columns=email,id,login,maxColor,minColor,name,neutralColor,preferences,privileges,removed,simpleColor,surname&token=ADMIN_TOKEN_ID& 1 addition, 1 deletion

...vileges,removed,simpleColor,surname&token=ADMIN_TOKEN_ID&
rest-api/src/main/java/lcsb/mapviewer/api/BaseRestImpl.java 1 addition, 26 deletions

rest-api/src/main/java/lcsb/mapviewer/api/BaseRestImpl.java
rest-api/src/main/java/lcsb/mapviewer/api/ElementIdentifierType.java 70 additions, 0 deletions

...c/main/java/lcsb/mapviewer/api/ElementIdentifierType.java
rest-api/src/main/java/lcsb/mapviewer/api/genomics/ReferenceGenomeController.java 15 additions, 13 deletions

...csb/mapviewer/api/genomics/ReferenceGenomeController.java
rest-api/src/main/java/lcsb/mapviewer/api/genomics/ReferenceGenomeRestImpl.java 61 additions, 8 deletions

.../lcsb/mapviewer/api/genomics/ReferenceGenomeRestImpl.java
rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java 12 additions, 14 deletions

...n/java/lcsb/mapviewer/api/projects/ProjectController.java
rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectMetaData.java 0 additions, 277 deletions

...ain/java/lcsb/mapviewer/api/projects/ProjectMetaData.java
rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java 112 additions, 73 deletions

...ain/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java
rest-api/src/main/java/lcsb/mapviewer/api/projects/chemicals/ChemicalRestImpl.java 4 additions, 4 deletions

...sb/mapviewer/api/projects/chemicals/ChemicalRestImpl.java

with 296 additions and 435 deletions

Please register or to comment