From 18978aef2097b2466f5c38441d64dd5441aa5778 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Tue, 9 May 2023 17:17:52 +0200
Subject: [PATCH] adapted deployment configs

---
 app-config/docker-compose.yml              | 4 ++--
 app-config/openshift/deploymentconfig.yaml | 2 +-
 caimira/apps/calculator/__init__.py        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-config/docker-compose.yml b/app-config/docker-compose.yml
index ca2f5e3b..c78cb131 100644
--- a/app-config/docker-compose.yml
+++ b/app-config/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - APPLICATION_ROOT=/
       - CAIMIRA_CALCULATOR_PREFIX=/calculator-cern
       - CAIMIRA_THEME=caimira/apps/templates/cern
-      - EXTRA_PAGES=[{"url":"/about","filename":"about", "is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}]
+      - EXTRA_PAGES=[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator/user-guide","filename":"userguide.html.j2"}]
     user: ${CURRENT_UID}
 
   calculator-open-app:
@@ -30,7 +30,7 @@ services:
       - APP_NAME=calculator-app
       - APPLICATION_ROOT=/
       - CAIMIRA_CALCULATOR_PREFIX=/calculator-open
-      - EXTRA_PAGES=[{"url":"/about","filename":"about", "is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}]
+      - EXTRA_PAGES=[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator/user-guide","filename":"userguide.html.j2"}]
     user: ${CURRENT_UID}
 
   auth-service:
diff --git a/app-config/openshift/deploymentconfig.yaml b/app-config/openshift/deploymentconfig.yaml
index 77f48c92..2a130971 100644
--- a/app-config/openshift/deploymentconfig.yaml
+++ b/app-config/openshift/deploymentconfig.yaml
@@ -284,7 +284,7 @@
                       key: ARVE_API_KEY
                       name: arve-api
                 - name: EXTRA_PAGES
-                  value: '[{"url":"/about","filename":"about","is_root":True},{"url":"/user-guide","filename":"userguide","is_root":False}]'
+                  value: '[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator/user-guide","filename":"userguide.html.j2"}]'
                 image: '${PROJECT_NAME}/calculator-app'
                 ports:
                   - containerPort: 8080
diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py
index dba1208e..3c71ad06 100644
--- a/caimira/apps/calculator/__init__.py
+++ b/caimira/apps/calculator/__init__.py
@@ -374,6 +374,7 @@ def make_app(
 
     # Any extra generic page must be declared in the env. variable "EXTRA_PAGES"
     extra_pages: typing.Union[str, typing.List] = os.environ.get('EXTRA_PAGES', [])
+    pages: typing.List = []
     try:
         pages = ast.literal_eval(extra_pages) # type: ignore
     except (SyntaxError, ValueError):