From d9d693caff19f077b88fb66be842a51cd33e4593 Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Wed, 20 Apr 2022 17:00:17 +0200
Subject: [PATCH] [UI] logs for clusters where teamId has dash

---
 ui/operator_ui/main.py |  9 +++++++--
 ui/requirements.txt    | 11 +++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ui/operator_ui/main.py b/ui/operator_ui/main.py
index 3e1e54969..579f0e7d8 100644
--- a/ui/operator_ui/main.py
+++ b/ui/operator_ui/main.py
@@ -961,8 +961,13 @@ def get_operator_get_logs(worker: int):
 @app.route('/operator/clusters/<namespace>/<cluster>/logs')
 @authorize
 def get_operator_get_logs_per_cluster(namespace: str, cluster: str):
-    team, clustername = cluster.split('-', 1)
-    return proxy_operator(f'/clusters/{team}/{namespace}/{clustername}/logs/')
+    user_teams = get_teams_for_user(session.get('user_name', ''))
+    for user_team in user_teams:
+        if cluster.find(user_team) == 0:
+            team = cluster[:len(user_team)]
+            cluster_name = cluster[len(user_team)+1:]
+            break
+    return proxy_operator(f'/clusters/{team}/{namespace}/{cluster_name}/logs/')
 
 
 @app.route('/login')
diff --git a/ui/requirements.txt b/ui/requirements.txt
index 8f612d554..cef911317 100644
--- a/ui/requirements.txt
+++ b/ui/requirements.txt
@@ -1,15 +1,14 @@
-Flask-OAuthlib==0.9.5
-Flask==1.1.2
+Flask-OAuthlib==0.9.6
+Flask==2.1.0
 backoff==1.10.0
 boto3==1.16.52
 boto==2.49.0
-click==7.1.2
+click==8.1.2
 furl==2.1.0
 gevent==20.12.1
-jq==1.1.1
+jq==1.2.2
 json_delta>=2.0
 kubernetes==3.0.0
 requests==2.25.1
 stups-tokens>=1.1.19
-wal_e==1.1.1
-werkzeug==0.16.1
+werkzeug==2.1.1