diff --git a/dbrepo-search-db/README.md b/dbrepo-search-db/README.md index c80ca169e98b28d6c97a09c14b4c1f4996ed48c2..5b7e1d92f22f36515a9a8de5126fc88f2fff8861 100644 --- a/dbrepo-search-db/README.md +++ b/dbrepo-search-db/README.md @@ -3,4 +3,14 @@ ## REST -View all indices [http://localhost:9200/_cat/indices](http://localhost:9200/_cat/indices) \ No newline at end of file +### Indices + +* View all [http://localhost:9200/_cat/indices](http://localhost:9200/_cat/indices) + +### Nodes + +* View all [http://localhost:9200/_cat/nodes](http://localhost:9200/_cat/nodes) + +### Health + +* View all [http://localhost:9200/_plugins/_security/health](http://localhost:9200/_plugins/_security/health) \ No newline at end of file diff --git a/dbrepo-search-db/opensearch.yml b/dbrepo-search-db/opensearch.yml index f0333feb0ff7906be6c08a70b3f333df14427053..00989303f920a81a4d65e85db9a2870ef678093c 100644 --- a/dbrepo-search-db/opensearch.yml +++ b/dbrepo-search-db/opensearch.yml @@ -7,6 +7,8 @@ network.host: 0.0.0.0 # Setting network.host to a non-loopback address enables the annoying bootstrap checks. "Single-node" mode disables them again. discovery.type: single-node +bootstrap.memory_lock: true + plugins.security.ssl.transport.pemcert_filepath: /usr/share/opensearch/config/node1.pem plugins.security.ssl.transport.pemkey_filepath: /usr/share/opensearch/config/node1-key.pem plugins.security.ssl.transport.pemtrustedcas_filepath: /usr/share/opensearch/config/root-ca.pem diff --git a/dbrepo-ui/.env.example b/dbrepo-ui/.env.example deleted file mode 100644 index 9c25ca7155d77aed50961a2b893d1c5dbb28ee84..0000000000000000000000000000000000000000 --- a/dbrepo-ui/.env.example +++ /dev/null @@ -1,12 +0,0 @@ -BROKER_USERNAME="fda" -BROKER_PASSWORD="fda" -DBREPO_CLIENT_SECRET="MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG" -DEFAULT_PID_PUBLISHER="Technische Universität Wien" -DOI_URL="https://doi.org" -SEARCH_USERNAME="admin" -SEARCH_PASSWORD="admin" -LOGO="/logo.png" -SHARED_FILESYSTEM="/tmp" -TITLE="Database Repository" -VERSION="latest" -FORCE_SSL="false" diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile index be7719b76c8793ea47819f71fd3d48764a9cf73a..30e19027276b70680d1b5f8cd1cfd3c95660919c 100644 --- a/dbrepo-ui/Dockerfile +++ b/dbrepo-ui/Dockerfile @@ -44,7 +44,6 @@ ENV BROKER_PASSWORD="fda" ENV BROKER_LOGIN_URL="/admin/broker/" ENV KEYCLOAK_LOGIN_URL="/api/auth/" ENV OPENSEARCH_LOGIN_URL="/admin/dashboard/" -ENV SHARED_FILESYSTEM="/tmp" ENV LOGO="/logo.png" ENV SEARCH_USERNAME="admin" ENV SEARCH_PASSWORD="admin" @@ -53,6 +52,7 @@ ENV TITLE="Database Repository" ENV ICON="/favicon.ico" ENV DBREPO_CLIENT_ID="dbrepo-client" ENV DBREPO_CLIENT_SECRET="MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG" +ENV DEFAULT_PID_PUBLISHER="" ENV UPLOAD_PATH="/tmp/" ENV FORCE_SSL="false" diff --git a/dbrepo-ui/components/query/Raw.vue b/dbrepo-ui/components/query/Raw.vue index 5cad541c147e3fa6469c2cdbdde3432a3bf6c33d..0d6ef7b175471c6ad30a1ff871088b9be01d1a59 100644 --- a/dbrepo-ui/components/query/Raw.vue +++ b/dbrepo-ui/components/query/Raw.vue @@ -6,8 +6,7 @@ :value="value || content" lang="sql" theme="xcode" - width="600" - :height="height" + width="100%" @init="editorInit" /> </div> </template> @@ -33,12 +32,6 @@ export default { } }, computed: { - height () { - return 150 - // if (!this.disabled) { return 150 } - // const numLines = this.value.split('\n').length - // return numLines * 25 - }, is_dark () { return this.$vuetify.theme.dark } @@ -56,9 +49,11 @@ export default { methods: { editorInit (editor) { editor.setOptions({ - fontSize: '12pt', + fontSize: '14pt', readOnly: this.disabled, - behavioursEnabled: !this.disabled + behavioursEnabled: !this.disabled, + maxLines: 28, + minLines: 16 }) require('brace/ext/language_tools') // language extension prerequsite... require('brace/mode/html') diff --git a/dbrepo-ui/config.js b/dbrepo-ui/config.js index 998950b9bce6c7ff83ec4a20f0d2c902347249f0..f7b64d2f2fe60579cb428697581e64b09d212be1 100644 --- a/dbrepo-ui/config.js +++ b/dbrepo-ui/config.js @@ -1,22 +1,20 @@ const config = {} -config.title = process.env.TITLE -config.icon = process.env.ICON -config.brokerUsername = process.env.BROKER_USERNAME -config.brokerPassword = process.env.BROKER_PASSWORD -config.brokerLoginUrl = process.env.BROKER_LOGIN_URL -config.keycloakLoginUrl = process.env.KEYCLOAK_LOGIN_URL -config.openSearchUrl = process.env.OPENSEARCH_LOGIN_URL -config.sharedFilesystem = process.env.SHARED_FILESYSTEM -config.version = process.env.VERSION -config.logo = process.env.LOGO -config.tokenMax = process.env.TOKEN_MAX -config.searchUsername = process.env.SEARCH_USERNAME -config.searchPassword = process.env.SEARCH_PASSWORD -config.clientId = process.env.DBREPO_CLIENT_ID -config.clientSecret = process.env.DBREPO_CLIENT_SECRET -config.defaultPublisher = process.env.DEFAULT_PID_PUBLISHER -config.doiUrl = process.env.DOI_URL -config.uploadPath = process.env.UPLOAD_PATH +config.title = process.env.NODE_ENV !== 'development' ? process.env.TITLE : 'Database Repository' +config.icon = process.env.NODE_ENV !== 'development' ? process.env.ICON : '/favicon.ico' +config.brokerUsername = process.env.NODE_ENV !== 'development' ? process.env.BROKER_USERNAME : 'fda' +config.brokerPassword = process.env.NODE_ENV !== 'development' ? process.env.BROKER_PASSWORD : 'fda' +config.brokerLoginUrl = process.env.NODE_ENV !== 'development' ? process.env.BROKER_LOGIN_URL : '/admin/broker/' +config.keycloakLoginUrl = process.env.NODE_ENV !== 'development' ? process.env.KEYCLOAK_LOGIN_URL : '/api/auth/' +config.openSearchUrl = process.env.NODE_ENV !== 'development' ? process.env.OPENSEARCH_LOGIN_URL : '/admin/dashboard/' +config.version = process.env.NODE_ENV !== 'development' ? process.env.VERSION : 'vue-dev' +config.logo = process.env.NODE_ENV !== 'development' ? process.env.LOGO : '/logo.png' +config.searchUsername = process.env.NODE_ENV !== 'development' ? process.env.SEARCH_USERNAME : 'admin' +config.searchPassword = process.env.NODE_ENV !== 'development' ? process.env.SEARCH_PASSWORD : 'admin' +config.clientId = process.env.NODE_ENV !== 'development' ? process.env.DBREPO_CLIENT_ID : 'dbrepo-client' +config.clientSecret = process.env.NODE_ENV !== 'development' ? process.env.DBREPO_CLIENT_SECRET : 'MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG' +config.defaultPublisher = process.env.NODE_ENV !== 'development' ? process.env.DEFAULT_PID_PUBLISHER : '' +config.doiUrl = process.env.NODE_ENV !== 'development' ? process.env.DOI_URL : '' +config.uploadPath = process.env.NODE_ENV !== 'development' ? process.env.UPLOAD_PATH : '/tmp/' module.exports = config diff --git a/dbrepo-ui/package.json b/dbrepo-ui/package.json index d9fc5ed0314786876d03ee1fe8f4fb74fcd94f64..61548c8c365411c283009ea84c387b58ec219161 100644 --- a/dbrepo-ui/package.json +++ b/dbrepo-ui/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": true, "scripts": { - "dev": "NODE_ENV=development nuxt --dotenv ../.env --port 3001", + "dev": "NODE_ENV=development nuxt --port 3001", "docker": "nuxt > /dev/null", "build": "nuxt build", "start": "nuxt start",