Commit 335008d7 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merge branch 'v0.10.4' into 'master'

Merge for release

See merge request !357
parents 0bde4980 6919ccf6
Pipeline #103569 passed with stage
in 4 minutes and 55 seconds
Subproject commit 342c83c8a935d02ff74e4479df05eac5562cf237
Subproject commit 22c5bfdb3cab1a414b1365b1469bee5e17493a65
Subproject commit 1cd31deb8c043df3f72067b5b566e19796cec2aa
Subproject commit af95941987808122e9ba5d3c4d734fc06cee9749
Subproject commit 2200fb39f9d9211eeb05114a31f69f93398212bd
Subproject commit 91c9f0a853a2168f0ca59dcf7f88c041695b781b
Subproject commit 82322068adfdd96579fd2bde341923c132926f6d
Subproject commit 4f4c2e74b736ef45c03cec3a8e0d575de8975c2d
Subproject commit 55f1c7ad339e6b8bf16d1020ceb9d46cd106c029
Subproject commit cdf5497196373ceab8cf07a9ae0b21e4a07b7177
Subproject commit 227fcd59d283579f90aadc8dccecb8ac186ad465
Subproject commit 25362db6dc24fc106596fedc043c6ad564bc160f
Subproject commit c9e2bd0c179e85d881594c68cc2c0d53f3e59bf4
Subproject commit d8e2986420f101011eddf3571f5bd6d076f972fd
Subproject commit eae5d87390863b72875087b1e69cfe15a516a5b9
Subproject commit ba8dd1a8f5b4a976e84c31fd9a69bbcaf309d0f1
Subproject commit 2e3447c0d0b054fc916bbb8824073099c3085ca4
Subproject commit 9ae092655dfbc13a1c7e8dd644db3a43452c3505
Subproject commit cbdce6c1287f186924e91c7d6ba2ff14e23f81ae
Subproject commit 61d85dd12f60c23310c6959ea39a297ed70ba82f
Subproject commit c140f8c0765f4c5c1dbefe6b8c9803ea17018ede
Subproject commit 0895a300a5e2a1fa8f071639b001ccfece41b56b
Subproject commit 725217b401a130b34260f29334e353c9548cd1fa
This diff is collapsed.
{
"name": "nomad-fair-gui",
"version": "0.10.3",
"version": "0.10.4",
"commit": "e98694e",
"private": true,
"workspaces": [
......
......@@ -9,7 +9,7 @@ window.nomadEnv = {
'matomoUrl': 'https://nomad-lab.eu/fairdi/stat',
'matomoSiteId': '2',
'version': {
'label': '0.10.3',
'label': '0.10.4',
'isBeta': false,
'isTest': true,
'usesBetaData': true,
......
......@@ -257,28 +257,25 @@ function Markdown(props) {
// - turn metainfo names into links into the metainfo
let word = ''
content = children.replace(/^ +/gm, '').split('').map((c, i) => {
if (c === '$') {
if (state[state.length - 1] === 'math') {
if (c === '`' || c === '$') {
if (state.peek === c) {
state.pop()
} else {
state.push('math')
}
} else if (c === '`' || c === '(' || c === ')') {
if (state[state.length - 1] === 'code') {
state.pop()
} else {
state.push('code')
}
} else {
if (state.peek === 'escape') {
state.pop()
state.push(c)
}
}
if (!state[state.length - 1] && c.match(/[a-zA-Z0-9_]/)) {
if (c === '[') {
state.push(c)
}
if (c === ']' && state.peek === '[') {
state.pop()
}
if (c.match(/[a-zA-Z0-9_]/)) {
word += c
} else {
if (word.match(/_/g)) {
if (state.length === 0 && (word.match(/_/g) || word.match(/[a-z]+[A-Z]/g)) && word.match(/^[a-zA-Z0-9_]+$/g) && c !== ']') {
const path = metainfoPath(word)
if (path) {
word = `[\`${word}\`](/metainfo/${metainfoPath(word)})`
......
......@@ -156,7 +156,7 @@ ArchiveConfigForm.propTypes = ({
})
function archiveAdaptorFactory(data, sectionDef) {
return new SectionAdaptor(data, sectionDef || rootSections.find(def => def.name === 'EntryArchive'), {archive: data})
return new SectionAdaptor(data, sectionDef || rootSections.find(def => def.name === 'EntryArchive'), undefined, {archive: data})
}
function archiveSearchOptions(data) {
......@@ -585,7 +585,7 @@ function Section({section, def, parent}) {
Section.propTypes = ({
section: PropTypes.object.isRequired,
def: PropTypes.object.isRequired,
parent: PropTypes.object.isRequired
parent: PropTypes.any
})
function Quantity({value, def}) {
......
......@@ -133,13 +133,12 @@ Browser.propTypes = ({
export const laneContext = React.createContext()
const useLaneStyles = makeStyles(theme => ({
root: {
minWidth: 200,
maxWidth: 512,
width: 'min-content',
borderRight: `solid 1px ${grey[500]}`,
display: 'block'
display: 'inline-block'
},
container: {
display: 'block',
display: 'inline-block',
height: '100%',
overflowY: 'scroll'
},
......
......@@ -156,7 +156,7 @@ export function isReference(property) {
export function path(nameOrDef) {
let def
if (typeof nameOrDef === 'string') {
def = defsByName[nameOrDef] && defsByName[nameOrDef].find(def => def.m_def !== 'SubSection')
def = defsByName[nameOrDef] && defsByName[nameOrDef].find(def => true)
} else {
def = nameOrDef
}
......@@ -165,6 +165,10 @@ export function path(nameOrDef) {
return null
}
if (def.m_def === 'SubSection') {
def = resolveRef(def.sub_section)
}
if (def.m_def === 'Category') {
return `${def._package.name.split('.')[0]}/category_definitions@${def._qualifiedName}`
}
......
......@@ -301,7 +301,7 @@ export default function DFTEntryOverview({data}) {
const scc = resolveRef(scc_ref, archive)
let v_dos = null
let v_bs = null
if (scc) {
if (scc && scc.section_k_band && scc.section_dos) {
v_bs = {
section_system: scc.single_configuration_calculation_to_system_ref,
section_method: scc.single_configuration_calculation_to_system_ref,
......
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