Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
encyclopedia-gui
Commits
bc872242
Commit
bc872242
authored
Apr 01, 2021
by
Lauri Himanen
Browse files
Fixed issue with query syntax popup not showing and material name query not working.
parent
2e801e69
Pipeline
#97478
skipped with stage
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
client/bundle.js
View file @
bc872242
This diff is collapsed.
Click to expand it.
client/conf.js
View file @
bc872242
window
.
nomadEnv
=
{
//apiRoot: "https://nomad-lab.eu/dev/nomad/enc-search/api/encyclopedia/",
apiRoot
:
"
https://nomad-lab.eu/dev/rae/enc-search/api/encyclopedia/
"
,
//apiRoot: "https://nomad-lab.eu/prod/rae/beta/api/encyclopedia/",
//apiRoot: "https://nomad-lab.eu/prod/rae/api/encyclopedia/",
...
...
client/css/styles.css
View file @
bc872242
...
...
@@ -399,8 +399,6 @@ div.title span.unfolded::before{
background-color
:
white
;
border
:
2px
solid
#E56400
;
padding
:
8px
6px
;
overflow-y
:
hidden
;
overflow-x
:
hidden
;
box-sizing
:
border-box
;
min-height
:
50px
;
}
...
...
client/src/search-mod/MaterialList.view.js
View file @
bc872242
...
...
@@ -95,9 +95,8 @@ class MaterialList {
if
(
page
)
reqJson
.
search_by
=
{
page
:
page
}
// Add the restricted option from the checkbox
//let restrictedEl = document.getElementById('restricted-search');
//reqJson.search_by.restricted = (restrictedEl.checked ? '1' : '0');
reqJson
.
search_by
.
restricted
=
'
0
'
;
let
restrictedEl
=
document
.
getElementById
(
'
restricted-search
'
);
reqJson
.
search_by
.
restricted
=
(
restrictedEl
.
checked
?
'
1
'
:
'
0
'
);
console
.
log
(
'
SEARCHING:
'
,
reqJson
);
const
timestamp
=
Date
.
now
();
this
.
newestQuery
=
timestamp
;
...
...
@@ -124,6 +123,7 @@ class MaterialList {
}
})
.
catch
(
error
=>
{
console
.
log
(
"
Error
"
)
document
.
querySelector
(
'
#syntax-error
'
).
style
.
visibility
=
'
visible
'
;
})
.
finally
(()
=>
{
...
...
client/src/search-mod/NewSearchMod.js
View file @
bc872242
...
...
@@ -270,7 +270,11 @@ class NewSearchMod {
sendQuery
()
{
//**** The optimade query must be formed from the search box and the properties selected
const
allowOtherElements
=
document
.
getElementById
(
'
allow-other-elements
'
).
checked
;
const
elementCheckbox
=
document
.
getElementById
(
'
allow-other-elements
'
);
let
allowOtherElements
=
true
if
(
elementCheckbox
)
{
allowOtherElements
=
elementCheckbox
.
checked
}
const
searchBoxOptimadeQuery
=
this
.
searchBox
.
getOptimadeQuery
(
allowOtherElements
);
const
propsOptimadeQuery
=
getOptimadeQueryFromProps
(
this
.
filterPanel
.
getValues
());
const
sep
=
(
searchBoxOptimadeQuery
!==
''
&&
propsOptimadeQuery
!==
''
?
'
AND
'
:
''
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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