Merge pull request #10 from samply/develop

Release Version 0.2.1
samply · Jun 30, 2023 · b73e1c3 · b73e1c3
2 parents 5a94f0e + a8f504f
commit b73e1c3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
       BEAM_URL: http://beam-proxy:8081
       BEAM_PROXY_ID: ${LOCAL_BEAM_ID}
       BEAM_BROKER_ID: ${BROKER_HOST}
-      BEAM_APP_ID: ${SITES_APP_ID}
+      BEAM_APP_ID: "focus"
     depends_on:
       - "beam-proxy"
     labels:
@@ -73,8 +73,7 @@ services:
     environment:
       BROKER_URL: https://${BROKER_HOST}
       PROXY_ID: ${LOCAL_BEAM_ID}.${BROKER_HOST}
-      APP_0_ID: ${SITES_APP_ID}
-      APP_0_KEY: ${LOCAL_BEAM_SECRET}
+      APP_focus_KEY: ${LOCAL_BEAM_SECRET}
       PRIVKEY_FILE: /run/secrets/proxy.pem
       ALL_PROXY: ${http_proxy}
     secrets:
@@ -89,7 +88,7 @@ services:
       BEAM_URL: http://beam-proxy-test:8081
       BEAM_PROXY_ID: ${LOCAL_BEAM_ID}
       BEAM_BROKER_ID: ${BROKER_HOST_TEST}
-      BEAM_APP_ID: ${SITES_APP_ID}
+      BEAM_APP_ID: "focus"
     depends_on:
       - "beam-proxy"
     labels:
@@ -107,8 +106,7 @@ services:
     environment:
       BROKER_URL: https://${BROKER_HOST_TEST}
       PROXY_ID: ${LOCAL_BEAM_ID}.${BROKER_HOST_TEST}
-      APP_0_ID: ${SITES_APP_ID}
-      APP_0_KEY: ${LOCAL_BEAM_SECRET_TEST}
+      APP_focus_KEY: ${LOCAL_BEAM_SECRET_TEST}
       PRIVKEY_FILE: /run/secrets/proxy.pem
       ROOTCERT_FILE: /run/secrets/root-test.crt.pem
       ALL_PROXY: ${http_proxy}

diff --git a/example.env b/example.env
@@ -11,7 +11,6 @@ GUI_HOST="data.dktk.dkfz.de|demo.lens.samply.de";
 BROKER_HOST="broker.ccp-it.dktk.dkfz.de "
 LOCAL_BEAM_ID="your-proxy-id"
 LOCAL_BEAM_SECRET="insert-a-random-passphrase-here"
-SITES_APP_ID="spot"
 
 # Uncomment this for the development system
 # COMPOSE_PROFILES=":develop"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lens-demo",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "SEE LICENSE IN LICENSE.md",
   "scripts": {
     "ng": "ng",

diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
@@ -24,6 +24,7 @@ export class MainComponent {
     .set('frankfurt', 'Frankfurt')
     .set('freiburg', 'Freiburg')
     .set('hannover', 'Hannover')
+    .set('hamburg', 'Hamburg')
     .set('mainz', 'Mainz')
     .set('mannheim', 'Mannheim')
     .set('muenchen-lmu', 'München(LMU)')

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -15,7 +15,7 @@ export const environment = {
       new Beam(
         'broker.ccp-it.dktk.dkfz.de',
         new URL('https://backend.data.dktk.dkfz.de/prod/'),
-        ['mannheim', 'freiburg', 'muenchen-tum']
+        ['mannheim', 'freiburg', 'muenchen-tum', 'hamburg']
       ),
     ],
     [

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -36,7 +36,7 @@ export const environment = {
       new Beam(
         'broker.ccp-it.dktk.dkfz.de',
         new URL('https://backend.demo.lens.samply.de/prod/'),
-        ['mannheim', 'freiburg', 'muenchen-tum']
+        ['mannheim', 'freiburg', 'muenchen-tum', 'hamburg']
       ),
     ],
     [