From 1bb216114dd2a84d86de7b8cab3b7723533a8716 Mon Sep 17 00:00:00 2001 From: Markus Scheidgen <markus.scheidgen@gmail.com> Date: Mon, 23 Mar 2020 20:33:51 +0100 Subject: [PATCH] Adapted metainfo browser to domain refactoring. --- gui/src/components/metaInfoBrowser/MetaInfoBrowser.js | 8 ++++---- nomad/app/api/info.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/src/components/metaInfoBrowser/MetaInfoBrowser.js b/gui/src/components/metaInfoBrowser/MetaInfoBrowser.js index f6b61bafed..716a39c018 100644 --- a/gui/src/components/metaInfoBrowser/MetaInfoBrowser.js +++ b/gui/src/components/metaInfoBrowser/MetaInfoBrowser.js @@ -91,10 +91,10 @@ class MetaInfoBrowser extends Component { this.props.api.getInfo().then(info => { const domain = info.domains.find(domain => domain.name === 'dft') // TODO deal with domains this.props.api.getMetaInfo(pkg || domain.metainfo.all_package).then(metainfos => { - const metainfoName = this.props.metainfo || domain.metainfo.root_sections[0] + const metainfoName = this.props.metainfo || domain.metainfo.root_section const definition = metainfos.get(metainfoName) if (!definition) { - this.props.history.push(`/metainfo/${domain.metainfo.root_sections[0]}`) + this.props.history.push(`/metainfo/${domain.metainfo.root_section}`) } else { this.setState({loadedPackage: pkg, metainfos: metainfos}) } @@ -110,10 +110,10 @@ class MetaInfoBrowser extends Component { this.props.api.getInfo().then(info => { const domain = info.domains.find(domain => domain.name === 'dft') // TODO deal with domains this.props.api.getMetaInfo(domain.metainfo.all_package).then(metainfos => { - const metainfoName = this.props.metainfo || domain.metainfo.root_sections[0] + const metainfoName = this.props.metainfo || domain.metainfo.root_section const definition = metainfos.get(metainfoName) this.setState({ - domainRootSection: domain.metainfo.root_sections[0], + domainRootSection: domain.metainfo.root_section, allMetainfos: metainfos, selectedPackage: definition.package.name}) this.update(definition.package.name) diff --git a/nomad/app/api/info.py b/nomad/app/api/info.py index 0630498d38..cd51dbe6f6 100644 --- a/nomad/app/api/info.py +++ b/nomad/app/api/info.py @@ -34,7 +34,7 @@ domain_quantity_model = api.model('DomainQuantity', { metainfo_model = api.model('Metainfo', { 'all_package': fields.String(description='Name of the metainfo package that references all available packages, i.e. the complete metainfo.'), - 'root_sections': fields.List(fields.String, description='Name of the topmost section, e.g. section_run for computational material science data.') + 'root_section': fields.String(description='Name of the topmost section, e.g. section_run for computational material science data.') }) domain_model = api.model('Domain', { -- GitLab