Commit c811ff57 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merge branch 'v0.8.6' into 'master'

Added config switch for aitoolkit in gui.

See merge request !150
parents 1ee51449 73f2fdae
Pipeline #80747 passed with stages
in 37 minutes and 12 seconds
......@@ -14,5 +14,6 @@ window.nomadEnv = {
'officialUrl': 'https://nomad-lab.eu/prod/rae/gui'
},
'encyclopediaEnabled': true,
'aitoolkitEnabled': true,
'oasis': false
}
......@@ -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
......
......@@ -101,6 +101,7 @@ data:
"officialUrl": "{{ .Values.version.officialUrl }}"
},
"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