Fix button activation, urls

5genesis · Apr 22, 2021 · 08d901e · 08d901e
1 parent 4f479e4
commit 08d901e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/execution/routes.py b/app/execution/routes.py
@@ -8,7 +8,7 @@
 from REST import DispatcherApi, ElcmApi, AnalyticsApi
 
 
-@bp.route('/<executionId>', methods=['GET'])
+@bp.route('/<int:executionId>', methods=['GET'])
 @login_required
 def execution(executionId: int):
     def _responseToLogList(response):
@@ -32,7 +32,7 @@ def _responseToLogList(response):
                 if status == 'Success':
                     localLogs = _responseToLogList(localResponse)
                     remoteLogs = None
-                    analyticsUrl = AnalyticsApi().GetUrl(experiment.id, current_user)
+                    analyticsUrl = AnalyticsApi().GetUrl(executionId, current_user)
 
                     if experiment.remoteDescriptor is not None:
                         success = False

diff --git a/app/experiment/routes.py b/app/experiment/routes.py
@@ -287,7 +287,7 @@ def experiment(experimentId: int):
                 analyticsApi = AnalyticsApi()
                 analyticsUrls = {}
                 for execution in executions:
-                    analyticsUrls[execution.id] = analyticsApi.GetToken(execution.id, current_user)
+                    analyticsUrls[execution.id] = analyticsApi.GetUrl(execution.id, current_user)
 
                 return render_template('experiment/experiment.html', title=f'Experiment: {exp.name}', experiment=exp,
                                        executions=executions, formRun=formRun, grafanaUrl=config.GrafanaUrl,

diff --git a/app/templates/execution/_execution.html b/app/templates/execution/_execution.html
@@ -38,7 +38,7 @@
         <a class="btn btn-blue btn-sm {{ "" if hasDashboard else "disabled"}}"
            href="{{ grafanaUrl }}{{ execution.dashboard_url }}" role="button" target="_blank">📊</a>
 
-        <a class="btn btn-blue btn-sm {{ "" if hasDashboard else "disabled"}}"
+        <a class="btn btn-blue btn-sm {{ "" if finished else "disabled"}}"
            href="{{ analyticsUrls[execution.id] }}" role="button" target="_blank">📈</a>
 
         <a class="btn btn-blue btn-sm {{ "" if finished else "disabled"}}"

diff --git a/app/templates/execution/execution.html b/app/templates/execution/execution.html
@@ -112,7 +112,7 @@ <h2>Execution {{ execution.id }}</h2>
             <a class="btn btn-blue btn-sm {{ "" if hasDashboard else "disabled"}}"
                href="{{ grafanaUrl }}{{ execution.dashboard_url }}" role="button" target="_blank">📊</a>
 
-            <a class="btn btn-blue btn-sm {{ "" if hasDashboard else "disabled"}}"
+            <a class="btn btn-blue btn-sm {{ "" if finished else "disabled"}}"
                 href="{{ analyticsUrl }}" role="button" target="_blank">📈</a>
 
             <a class="btn btn-blue btn-sm {{ "" if finished else "disabled"}}"