Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
18c89c6c
Commit
18c89c6c
authored
Mar 22, 2018
by
Piotr Gawron
Browse files
missing mock test data + fix on nested complexes
parent
1726a809
Pipeline
#4312
passed with stage
in 1 minute and 5 seconds
Changes
9
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
frontend-js/src/main/js/ServerConnector.js
View file @
18c89c6c
...
...
@@ -621,7 +621,6 @@ ServerConnector.getConfigurationOptionUrl = function (queryParams, filterParams)
ServerConnector
.
getSearchUrl
=
function
(
queryParams
,
filterParams
)
{
logger
.
warn
(
filterParams
);
return
this
.
getApiUrl
({
url
:
this
.
getModelsUrl
(
queryParams
)
+
"
bioEntities:search
"
,
params
:
filterParams
...
...
frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
View file @
18c89c6c
...
...
@@ -90,7 +90,7 @@ SearchDbOverlay.prototype._getFirstVisibleParentOrObject = function (identifiedE
if
(
fullElement
.
getHierarchyVisibilityLevel
()
<=
zoomLevel
)
{
if
(
fullElement
instanceof
Alias
)
{
//transparent compartments shouldn't be clickable
if
(
fullElement
.
getTransparencyLevel
()
<=
zoomLevel
)
{
if
(
fullElement
.
getTransparencyLevel
()
<=
zoomLevel
&&
fullElement
.
getType
()
===
"
Compartment
"
)
{
return
undefined
;
}
}
...
...
frontend-js/src/test/js/map/overlay/SearchDbOverlay-test.js
View file @
18c89c6c
...
...
@@ -179,7 +179,7 @@ describe('SearchDbOverlay', function () {
var
searchParams
=
{
modelId
:
map
.
getModel
().
getId
(),
coordinates
:
new
google
.
maps
.
Point
(
316.05
,
253.61
),
zoom
:
4
zoom
:
10
};
return
searchDb
.
searchByCoordinates
(
searchParams
);
}).
then
(
function
(
result
)
{
...
...
frontend-js/testFiles/apiCalls/projects/empty/models/20638/bioEntities.search/coordinates=553.10,479.18&count=1&type=Compartment&token=MOCK_TOKEN_ID&
0 → 100644
View file @
18c89c6c
[]
\ No newline at end of file
frontend-js/testFiles/apiCalls/projects/sample/drugs.search/query=NADH&token=MOCK_TOKEN_ID&
View file @
18c89c6c
This diff is collapsed.
Click to expand it.
frontend-js/testFiles/apiCalls/projects/sample/models/15781/bioEntities.search/coordinates=184.79,365.76&count=1&type=Compartment&token=MOCK_TOKEN_ID&
0 → 100644
View file @
18c89c6c
[]
\ No newline at end of file
frontend-js/testFiles/apiCalls/projects/sample/models/15781/bioEntities.search/coordinates=207.73,479.18&count=1&type=Compartment&token=MOCK_TOKEN_ID&
0 → 100644
View file @
18c89c6c
[]
\ No newline at end of file
frontend-js/testFiles/apiCalls/projects/sample/models/15781/bioEntities.search/coordinates=316.05,253.61&count=1&type=Compartment&token=MOCK_TOKEN_ID&
0 → 100644
View file @
18c89c6c
[]
\ No newline at end of file
frontend-js/testFiles/apiCalls/projects/sample/models/15781/bioEntities.search/coordinates=553.10,479.18&count=1&type=Compartment&token=MOCK_TOKEN_ID&
0 → 100644
View file @
18c89c6c
[]
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment