From d5fdc35e753062b7cdd4e72936abff1eb942540a Mon Sep 17 00:00:00 2001
From: lois <lois@procolix.eu>
Date: Thu, 20 Mar 2025 15:01:01 +0100
Subject: [PATCH] Add seperate view and url for deploy
---
.../panel/templates/configuration_form.html | 2 +-
panel/src/panel/urls.py | 1 +
panel/src/panel/views.py | 61 ++++++++++++++++++-
3 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/panel/src/panel/templates/configuration_form.html b/panel/src/panel/templates/configuration_form.html
index bdd18984..7a21885f 100644
--- a/panel/src/panel/templates/configuration_form.html
+++ b/panel/src/panel/templates/configuration_form.html
@@ -5,7 +5,7 @@
{{ form.as_p }}
<button id="deploy-button" class="button"
- hx-post="{% url 'configuration_form' %}"
+ hx-post="{% url 'deployment_status' %}"
hx-trigger="click"
hx-indicator="#spinner-container"
hx-disabled-elt="this"
diff --git a/panel/src/panel/urls.py b/panel/src/panel/urls.py
index 2f0ba434..7865bad9 100644
--- a/panel/src/panel/urls.py
+++ b/panel/src/panel/urls.py
@@ -26,4 +26,5 @@ urlpatterns = [
path("account/", views.AccountDetail.as_view(), name='account_detail'),
path("services/", views.ServiceList.as_view(), name='service_list'),
path("configuration/", views.ConfigurationForm.as_view(), name='configuration_form'),
+ path("deployment/status/", views.DeploymentStatus.as_view(), name='deployment_status'),
]
diff --git a/panel/src/panel/views.py b/panel/src/panel/views.py
index c1a066b6..fa2de5d9 100644
--- a/panel/src/panel/views.py
+++ b/panel/src/panel/views.py
@@ -85,6 +85,64 @@ class ConfigurationForm(LoginRequiredMixin, FormView):
initial.update(self.convert_enums_to_names(config_dict))
return initial
+ def form_valid(self, form):
+ obj = self.get_object()
+ obj.value = form.to_python().model_dump_json()
+ obj.save()
+
+ return super().form_valid(form)
+
+class DeploymentStatus(LoginRequiredMixin, FormView):
+ template_name = 'configuration_form.html'
+ success_url = reverse_lazy('configuration_form')
+ form_class = forms.Form
+
+ def get_object(self):
+ """Get or create the configuration object for the current user"""
+ obj, created = models.Configuration.objects.get_or_create(
+ operator=self.request.user,
+ )
+
+ return obj
+
+ def convert_enums_to_names(self, data_dict):
+ """
+ Recursively convert all enum values in a dictionary to their string names.
+ This handles nested dictionaries and lists as well.
+
+ Needed for converting a Pydantic `BaseModel` instance to a `Form` input.
+ """
+ if isinstance(data_dict, dict):
+ result = {}
+ for key, value in data_dict.items():
+ if isinstance(value, Enum):
+ # Convert Enum to its name
+ result[key] = value.name
+ elif isinstance(value, (dict, list)):
+ # Recursively process nested structures
+ result[key] = self.convert_enums_to_names(value)
+ else:
+ # Keep other values as is
+ result[key] = value
+ return result
+ elif isinstance(data_dict, list):
+ # Process each item in the list
+ return [self.convert_enums_to_names(item) for item in data_dict]
+ elif isinstance(data_dict, Enum):
+ # Convert single Enum value
+ return data_dict.name
+ else:
+ # Return non-dict, non-list, non-Enum values as is
+ return data_dict
+
+ def get_initial(self):
+ initial = super().get_initial()
+ config = self.get_object()
+ config_dict = config.parsed_value.model_dump()
+
+ initial.update(self.convert_enums_to_names(config_dict))
+ return initial
+
def form_valid(self, form):
obj = self.get_object()
obj.value = form.to_python().model_dump_json()
@@ -112,7 +170,6 @@ class ConfigurationForm(LoginRequiredMixin, FormView):
cmd = [
"nix",
"develop",
- # workaround to pass in info to nixops4 thru env vars, tho impure :(
"--extra-experimental-features",
"configurable-impure-env",
"--command",
@@ -126,4 +183,4 @@ class ConfigurationForm(LoginRequiredMixin, FormView):
env=env,
)
- return super().form_valid(form)
+ return super().form_valid(form)
\ No newline at end of file