Commit 972071db authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merge branch 'v0.9.3' into 'master'

Merge for release

See merge request !205
parents 430583a0 b84647e5
Pipeline #85688 passed with stages
in 53 seconds
......@@ -46,6 +46,9 @@ contributing, and API reference.
Omitted versions are plain bugfix releases with only minor changes and fixes.
### v0.9.3
- Encyclopedia with dedicated materials search index.
### v0.9.0
- The encyclopedia runs on top of the new infrastructure. The GUIs are integrated via
bi-lateral navigation between entries.
......
......@@ -18,7 +18,7 @@ export default function DFTEntryOverview(props) {
} catch {}
name = name || 'unnamed'
if (encyclopediaEnabled && data.encyclopedia && data.encyclopedia.material && data.published && !data.with_embargo) {
if (encyclopediaEnabled && data?.encyclopedia?.material?.material_id && data.published && !data.with_embargo) {
const url = `${appBase}/encyclopedia/#/material/${data.encyclopedia.material.material_id}`
return (
<Tooltip title="Show the material of this entry in the NOMAD Encyclopedia.">
......
......@@ -21,10 +21,6 @@ import threading
from nomad import processing as proc, search, datamodel, infrastructure, utils, config
from nomad.cli.cli import cli
from nomad.datamodel.material import Material, Calculation
from nomad.datamodel.encyclopedia import EncyclopediaMetadata
from nomad.search import material_document
from nomad.datamodel.material import Material, Calculation, Method, Properties, IdealizedStructure, Energies, Workflow, Bulk
def __run_parallel(
......@@ -244,6 +240,11 @@ def index_materials(threads, code, dry, in_place, n, source):
built from the material metainfo stored in MongoDB. The materials index can
be used normally during the reindexing.
"""
from nomad.datamodel.material import Material, Calculation
from nomad.datamodel.encyclopedia import EncyclopediaMetadata
from nomad.search import material_document
from nomad.datamodel.material import Material, Calculation, Method, Properties, IdealizedStructure, Energies, Workflow, Bulk
chunk_size = 500
infrastructure.setup_mongo()
client = infrastructure.setup_elastic()
......
......@@ -117,11 +117,8 @@ metadata:
data:
conf.js: |
window.nomadEnv = {
apiRoot: "https://{{ .Values.proxy.external.host }}{{ .Values.proxy.external.path }}/api/encyclopedia/",
guiRoot: "https://{{ .Values.proxy.external.host }}{{ .Values.proxy.external.path }}/encyclopedia/",
userCookieDomain: ".{{ .Values.proxy.external.host }}",
guestUserToken: 'eyJhbGciOiJIUzI1NiIsImlhdCI6MTUyMzg4MDE1OSwiZXhwIjoxNjgxNTYwMTU5fQ.ey'+
'JpZCI6ImVuY2d1aSJ9.MsMWQa3IklH7cQTxRaIRSF9q8D_2LD5Fs2-irpWPTp4',
apiRoot: "{{ .Values.proxy.external.path }}/api/encyclopedia/",
guiRoot: "{{ .Values.proxy.external.path }}/encyclopedia/",
keycloakBase: "{{ .Values.keycloak.serverExternalUrl }}",
keycloakRealm: "{{ .Values.keycloak.realmName }}",
keycloakClientId: "{{ .Values.keycloak.guiClientId }}"
......
......@@ -38,6 +38,7 @@ data:
host: "{{ .Values.elastic.host }}"
port: {{ .Values.elastic.port }}
index_name: "{{ .Values.dbname }}"
materials_index_name: "{{ .Values.dbname }}_materials"
mongo:
host: "{{ .Values.mongo.host }}"
port: {{ .Values.mongo.port }}
......
Markdown is supported
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