Commit 3c265f0d authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Merge branch 'v0.8.6' into encyclopedia-gui-integration

parents c2ad4f7a d8f4385d
Pipeline #80777 passed with stages
in 38 minutes and 47 seconds
......@@ -178,3 +178,22 @@ release_version:
- docker push $STABLE_IMAGE
only:
- tags
release_pypi:
stage: release
image: python:3.7
before_script:
- git submodule sync
- git submodule update --init --jobs=4
script:
- pip install --upgrade pip
- pip install fastentrypoints
- pip install pyyaml
- pip install numpy
- pip install twine
- python setup.py compile
- python setup.py sdist
- python -m twine upload -u $CI_TWINE_USER -p $CI_TWINE_PASSWORD dist/*
when: manual
only:
- tags
......@@ -14,5 +14,6 @@ window.nomadEnv = {
'officialUrl': 'https://nomad-lab.eu/prod/rae/gui'
},
'encyclopediaEnabled': true,
'aitoolkitEnabled': true,
'oasis': false
}
......@@ -32,7 +32,7 @@
<!-- fonts needed by material-ui -->
<!-- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,500"> -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Titillium+Web:400,700">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Titillium+Web:400,600">
<!-- icon fonts for the meta-info browser -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
......
......@@ -25,7 +25,7 @@ import { ErrorSnacks, withErrors } from './errors'
import { help as entryHelp, default as EntryPage } from './entry/EntryPage'
import About from './About'
import LoginLogout from './LoginLogout'
import { guiBase, consent, nomadTheme, appBase, version, oasis } from '../config'
import { guiBase, consent, nomadTheme, appBase, version, oasis, aitoolkitEnabled } from '../config'
import packageJson from '../../package.json'
import {help as uploadHelp, default as UploadPage} from './uploads/UploadPage'
import ResolvePID from './entry/ResolvePID'
......@@ -278,7 +278,7 @@ function MainMenu() {
tooltip="Manage your data"
icon={<UserDataIcon/>}
/>
{!oasis && <MainMenuItem
{!oasis && aitoolkitEnabled && <MainMenuItem
title="Analytics"
path="/analytics"
tooltip="NOMAD's analytics (AI) toolkit tutorial jupyter notebooks"
......
......@@ -15,6 +15,7 @@ export const keycloakClientId = window.nomadEnv.keycloakClientId
export const debug = window.nomadEnv.debug || false
export const matomoEnabled = window.nomadEnv.matomoEnabled || false
export const encyclopediaEnabled = window.nomadEnv.encyclopediaEnabled || false
export const aitoolkitEnabled = window.nomadEnv.aitoolkitEnabled || false
export const oasis = window.nomadEnv.oasis || false
export const email = 'support@nomad-lab.eu'
export const maxLogsToShow = 50
......
......@@ -1221,7 +1221,7 @@ class section_dos_fingerprint(MSection):
indices = Quantity(
type=np.dtype(np.int16),
shape=['first_index_of_DOS_grid', 'last_index_of_DOS_grid'],
shape=[2],
description='''
Indices used to compare DOS fingerprints of different energy ranges.
''',
......
......@@ -100,7 +100,8 @@ data:
"usesBetaData": {{ .Values.version.usesBetaData }},
"officialUrl": "{{ .Values.version.officialUrl }}"
},
"encyclopediaEnabled": {{ .Values.gui.encyclopediaEnabled }}
"encyclopediaEnabled": {{ .Values.gui.encyclopediaEnabled }},
"aitoolkitEnabled": {{ .Values.gui.aitoolkitEnabled }}
};
---
apiVersion: v1
......
......@@ -89,6 +89,8 @@ gui:
gzip: true
## enable links to the 'new' encyclopedia
encyclopediaEnabled: true
## enable aitoolkit references
aitoolkitEnabled: true
## Everything concerning the nginx that serves the gui, proxies the api
# It is run via NodePort service
......
Supports Markdown
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