SS-1327 Add upload size in admin panel (#285)

Co-authored-by: Mahbub Ul Alam <mahbub.ul.alam@scilifelab.se>
ScilifelabDataCentre · Feb 26, 2025 · 4027832 · 4027832
1 parent 7e2c4cd
commit 4027832
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/apps/admin.py b/apps/admin.py
@@ -64,8 +64,16 @@ class K8sUserAppStatusAdmin(admin.ModelAdmin):
 
 
 class BaseAppAdmin(admin.ModelAdmin):
+    list_display = (
+        "name",
+        "display_owner",
+        "display_project",
+        "display_status",
+        "display_subdomain",
+        "chart",
+        "upload_size",
+    )
     # TODO: Test new status properties in admin
-    list_display = ("name", "display_owner", "display_project", "display_status", "display_subdomain", "chart")
     readonly_fields = ("id", "created_on")
     list_filter = ["owner", "project", "k8s_user_app_status__status", "chart"]
     actions = ["redeploy_apps", "deploy_resources", "delete_resources"]

diff --git a/apps/migrations/0028_baseappinstance_upload_size.py b/apps/migrations/0028_baseappinstance_upload_size.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.1.1 on 2025-02-26 13:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("apps", "0027_remove_baseappinstance_app_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="baseappinstance",
+            name="upload_size",
+            field=models.PositiveIntegerField(default=100, help_text="Max upload size in MB"),
+        ),
+    ]
diff --git a/apps/models/base/base.py b/apps/models/base/base.py
@@ -223,6 +223,7 @@ def get_status_group(self) -> str:
 
     url = models.URLField(blank=True, null=True)
     updated_on = models.DateTimeField(auto_now=True)
+    upload_size = models.PositiveIntegerField(default=100, help_text="Max upload size in MB")
 
     class Meta:
         permissions = [("can_access_app", "Can access app service")]
@@ -245,6 +246,7 @@ def get_k8s_values(self):
             storageClass=settings.STORAGECLASS,
             namespace=settings.NAMESPACE,
             release=self.subdomain.subdomain if self.subdomain else "deleted",  # This is legacy and should be changed
+            ingress=dict(clientMaxBodySize=f"{self.upload_size}M"),
         )
 
         # Add global values

diff --git a/cypress/e2e/ui-tests/test-superuser-functionality.cy.js b/cypress/e2e/ui-tests/test-superuser-functionality.cy.js
@@ -356,7 +356,7 @@ describe("Test superuser access", () => {
             [
                 'Jupyter Lab Minimal (Default)',
                 'Jupyter Lab Data Science',
-                'Jupyter Lab Pytorch',
+                'Jupyter Lab PyTorch',
                 'Jupyter Lab Tensorflow'
             ].forEach((name) => {
             cy.get('@envSelect').contains('option', name);

diff --git a/fixtures/projects_templates.json b/fixtures/projects_templates.json
@@ -35,7 +35,7 @@
             "image": "serve-jupyterlab-datascience:250213-1352",
             "repository": "ghcr.io/scilifelabdatacentre"
           },
-          "Jupyter Lab Pytorch": {
+          "Jupyter Lab PyTorch": {
             "app": "jupyter-lab",
             "image": "serve-jupyterlab-pytorch:250213-1119",
             "repository": "ghcr.io/scilifelabdatacentre"