From 535da821fdc22b7f75d0f0d31dbed17105a0d979 Mon Sep 17 00:00:00 2001 From: lois Date: Wed, 2 Apr 2025 08:48:59 +0200 Subject: [PATCH] Display url after deployment (#287) closes #264 Added a clickable link to the services that deployed. Reviewed-on: https://git.fediversity.eu/Fediversity/Fediversity/pulls/287 Reviewed-by: kiara Grouwstra Co-authored-by: lois Co-committed-by: lois --- .../templates/partials/deployment_result.html | 12 ++++++---- panel/src/panel/views.py | 24 ++++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/panel/src/panel/templates/partials/deployment_result.html b/panel/src/panel/templates/partials/deployment_result.html index 0b6a62fc..d342ad18 100644 --- a/panel/src/panel/templates/partials/deployment_result.html +++ b/panel/src/panel/templates/partials/deployment_result.html @@ -1,13 +1,15 @@ -{% if deployment_status %} -

{{ deployment_status }}

+{% if deployment_succeeded %} +

Deployment Succeeded

    - {% for service, state in services.items %} - {% if state %} + {% for service_name, service_meta in services.items %} + {% if service_meta.enable %}
  • - ✓ {{ service }} + ✓ {{ service_name }}
  • {% endif %} {% endfor %}
+{% else %} +

Deployment Failed

{% endif %} diff --git a/panel/src/panel/views.py b/panel/src/panel/views.py index 76e68570..5c423fc6 100644 --- a/panel/src/panel/views.py +++ b/panel/src/panel/views.py @@ -102,18 +102,24 @@ class DeploymentStatus(ConfigurationForm): # Check for deploy button if "deploy" in self.request.POST.keys(): deployment_result, deployment_params = self.deployment(obj) - if deployment_result.returncode == 0: - deployment_status = "Deployment Succeeded" - else: - deployment_status = "Deployment Failed" + deployment_succeeded = deployment_result.returncode == 0 return render(self.request, "partials/deployment_result.html", { - "deployment_status": deployment_status, + "deployment_succeeded": deployment_succeeded, "services": { - "peertube": deployment_params['peertube']['enable'], - "pixelfed": deployment_params['pixelfed']['enable'], - "mastodon": deployment_params['mastodon']['enable'] - } + "peertube": { + "enable": deployment_params['peertube']['enable'], + "url": f"https://peertube.{deployment_params['domain']}", + }, + "pixelfed":{ + "enable": deployment_params['pixelfed']['enable'], + "url": f"https://pixelfed.{deployment_params['domain']}", + }, + "mastodon": { + "enable": deployment_params['mastodon']['enable'], + "url": f"https://mastodon.{deployment_params['domain']}", + }, + }, }) def deployment(self, obj):