pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/default_cern_urls' into 'master'

Browse source 
Remove unused URLs for other themes other than CERN/base

See merge request caimira/caimira!445
This commit is contained in:
Luis Aleixo 2023-05-12 17:15:15 +02:00
commit dad34cdef6
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app-config/docker-compose.yml
View file

@ -20,7 +20,6 @@ services:
- APPLICATION_ROOT=/
- CAIMIRA_CALCULATOR_PREFIX=/calculator-cern
- CAIMIRA_THEME=caimira/apps/templates/cern
- EXTRA_PAGES=[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator-cern/user-guide","filename":"userguide.html.j2"}]
user: ${CURRENT_UID}
calculator-open-app:
@ -30,7 +29,6 @@ services:
- APP_NAME=calculator-app
- APPLICATION_ROOT=/
- CAIMIRA_CALCULATOR_PREFIX=/calculator-open
- EXTRA_PAGES=[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator-open/user-guide","filename":"userguide.html.j2"}]
user: ${CURRENT_UID}
auth-service:

4
app-config/openshift/deploymentconfig.yaml
View file

@ -283,8 +283,6 @@
secretKeyRef:
key: ARVE_API_KEY
name: arve-api
- name: EXTRA_PAGES
value: '[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator-cern/user-guide","filename":"userguide.html.j2"}]'
image: '${PROJECT_NAME}/calculator-app'
ports:
- containerPort: 8080
@ -362,8 +360,6 @@
value: /
- name: CAIMIRA_CALCULATOR_PREFIX
value: /calculator-open
- name: EXTRA_PAGES
value: '[{"url_path":"/about","filename":"about.html.j2"},{"url_path":"/calculator-open/user-guide","filename":"userguide.html.j2"}]'
image: '${PROJECT_NAME}/calculator-app'
ports:
- containerPort: 8080

23
caimira/apps/calculator/__init__.py
View file

@ -359,18 +359,31 @@ def make_app(
get_root_url = functools.partial(get_url, APPLICATION_ROOT)
get_root_calculator_url = functools.partial(get_calculator_url, APPLICATION_ROOT, calculator_prefix)
urls: typing.List = [
base_urls: typing.List = [
(get_root_url(r'/?'), LandingPage),
(get_root_url(r'/_c/(.*)'), CompressedCalculatorFormInputs),
(get_root_url(r'/static/(.*)'), StaticFileHandler, {'path': static_dir}),
(get_root_calculator_url(r'/?'), CalculatorForm),
(get_root_calculator_url(r'/report'), ConcentrationModel),
(get_root_calculator_url(r'/static/(.*)'), StaticFileHandler, {'path': calculator_static_dir}),
]
urls: typing.List = base_urls + [
(get_root_url(r'/_c/(.*)'), CompressedCalculatorFormInputs),
(get_root_url(r'/static/(.*)'), StaticFileHandler, {'path': static_dir}),
(get_root_calculator_url(r'/report-json'), ConcentrationModelJsonResponse),
(get_root_calculator_url(r'/baseline-model/result'), StaticModel),
(get_root_calculator_url(r'/api/arve/v1/(.*)/(.*)'), ArveData),
(get_root_calculator_url(r'/cases/(.*)'), CasesData),
(get_root_calculator_url(r'/static/(.*)'), StaticFileHandler, {'path': calculator_static_dir}),
# Generic Pages
(get_root_url(r'/about'), GenericExtraPage, {
'active_page': 'about',
'filename': 'about.html.j2'}),
(get_root_calculator_url(r'/user-guide'), GenericExtraPage, {
'active_page': 'calculator/user-guide',
'filename': 'userguide.html.j2'}),
]
interface: str = os.environ.get('CAIMIRA_THEME', '<undefined>')
if interface != '<undefined>' and (interface != '<undefined>' or 'cern' not in interface): urls = list(filter(lambda i: i in base_urls, urls))
# 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', [])
@ -378,7 +391,7 @@ def make_app(
try:
pages = ast.literal_eval(extra_pages) # type: ignore
except (SyntaxError, ValueError):
LOG.warning('Warning: There was a problem with the extra pages. Is the "EXTRA_PAGES" environment variable correctly defined?')
LOG.warning('Warning: There was a problem with the extra pages. Is the "EXTRA_PAGES" environment variable defined?')
pass
for extra in pages: