Merge branch 'develop' of https://github.com/MatsJohansen87/lens-web-…

…components into develop

.github/workflows/docker-develop.yml

@@ -0,0 +1,22 @@
+name: Build and Push Develop Image samply/lens-web-components
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    branches:
+      - develop
+jobs:
+  build:
+    # This workflow defines how a samply docker image is built, tested and published.
+    # Visit: https://github.com/samply/github-workflows/blob/main/.github/workflows/docker-ci.yml, for more information
+    uses: samply/github-workflows/.github/workflows/docker-ci.yml@main
+    with:
+      image-name: "samply/lens-web-components"
+      build-args: |
+        TARGET_ENVIRONMENT=staging
+    # This passes the secrets from calling workflow to the called workflow
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/docker.yml

@@ -20,6 +20,8 @@ jobs:
     uses: samply/github-workflows/.github/workflows/docker-ci.yml@main
     with:
       image-name: "samply/lens-web-components"
+      build-args: |
+        TARGET_ENVIRONMENT=production
     # This passes the secrets from calling workflow to the called workflow
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

Dockerfile

@@ -1,12 +1,13 @@
 FROM node:lts as build
+ARG TARGET_ENVIRONMENT="staging"
 WORKDIR /usr/src/app
 RUN sh -c '[ -z "$http_proxy" ] || ( npm config set proxy $http_proxy; npm config set https-proxy $http_proxy )'
 COPY package.json package-lock.json ./
 RUN npm install
 COPY ./vite.config.ts ./vite.demo.config.ts ./extensions.json ./tsconfig.json ./tsconfig.node.json ./
 COPY ./packages ./packages
-RUN npm run build
-RUN npm run build:demo
+RUN VITE_TARGET_ENVIRONMENT=${TARGET_ENVIRONMENT} npm run build
+RUN VITE_TARGET_ENVIRONMENT=${TARGET_ENVIRONMENT} npm run build:demo
 
 FROM nginx:stable-alpine
 COPY --from=build /usr/src/app/dist/demo /usr/share/nginx/html

packages/demo/src/AppCCP.svelte

@@ -112,9 +112,13 @@
     ["hamburg", "Hamburg"],
   ];
 
+  // VITE_TARGET_ENVIRONMENT should be set by the ci pipeline
+  const backendUrl = (import.meta.env.VITE_TARGET_ENVIRONMENT === "production")
+               ? "https://backend.data.dktk.dkfz.de/prod/"
+               : "https://backend.demo.lens.samply.de/prod/"
+
   const backendConfig = {
-    // url: "https://backend.demo.lens.samply.de/prod/",
-    url: "http://localhost:8080",
+    url: (import.meta.env.PROD) ? backendUrl : "http://localhost:8080",
     backends: [
       "mannheim",
       "freiburg",

packages/lib/src/classes/spot.ts

@@ -34,7 +34,7 @@ export class Spot {
                 `${this.url}tasks?sites=${this.sites.toString()}`,
                 {
                     method: 'POST',
-                    credentials: 'include',
+                    credentials: (import.meta.env.PROD) ? "include" : "omit",
                     body: query,
                     signal: controller.signal
                 }
@@ -54,7 +54,7 @@ export class Spot {
                 const beamResponses: Response = await fetch(
                     `${this.url}tasks/${this.currentTask}?wait_count=${responseCount + 1}`,
                     {
-                        credentials: 'include',
+                        credentials: (import.meta.env.PROD) ? "include" : "omit",
                         signal: controller.signal
                     }
                 )