From dd0f7eaf050b621fb8ad88790eb76258dfbc587f Mon Sep 17 00:00:00 2001
From: Tim Lorsbach <tim@lorsba.ch>
Date: Tue, 14 Apr 2026 21:13:17 +0200
Subject: [PATCH] Prep configs, added Package Create Modal

---
 .../modals/collections/new_package_modal.html | 181 ++++++++++++++++++
 envipath/settings.py                          |  15 +-
 2 files changed, 194 insertions(+), 2 deletions(-)
 create mode 100644 bayer/templates/modals/collections/new_package_modal.html

diff --git a/bayer/templates/modals/collections/new_package_modal.html b/bayer/templates/modals/collections/new_package_modal.html
new file mode 100644
index 00000000..e22b3f77
--- /dev/null
+++ b/bayer/templates/modals/collections/new_package_modal.html
@@ -0,0 +1,181 @@
+{% load static %}
+
+<dialog
+  id="new_package_modal"
+  class="modal"
+  x-data="{
+    isSubmitting: false,
+    packageClassification: null,
+
+    reset() {
+      this.isSubmitting = false;
+      this.selectedType = '';
+      this.buildAppDomain = false;
+      this.requiresRulePackages = false;
+      this.requiresDataPackages = false;
+      this.additional_parameters = null;
+    },
+
+    setFormData(data) {
+      this.formData = data;
+    },
+
+    get isSecret() {
+      return this.packageClassification === '20';
+    },
+
+    submit(formId) {
+      const form = document.getElementById(formId);
+
+      // Remove previously injected inputs
+      form.querySelectorAll('.dynamic-param').forEach(el => el.remove());
+
+      // Add values from dynamic form into the html form
+      if (this.formData) {
+        Object.entries(this.formData).forEach(([key, value]) => {
+          const input = document.createElement('input');
+          input.type = 'hidden';
+          input.name = key;
+          input.value = value;
+          input.classList.add('dynamic-param');
+
+          form.appendChild(input);
+        });
+      }
+
+      if (form && form.checkValidity()) {
+        this.isSubmitting = true;
+        form.submit();
+      } else if (form) {
+        form.reportValidity();
+      }
+    }
+
+  }"
+  @close="reset()"
+>
+  <div class="modal-box max-w-3xl">
+    <!-- Header -->
+    <h3 class="text-lg font-bold">New Package</h3>
+
+    <!-- Close button (X) -->
+    <form method="dialog">
+      <button
+        class="btn btn-sm btn-circle btn-ghost absolute top-2 right-2"
+        :disabled="isSubmitting"
+      >
+        ✕
+      </button>
+    </form>
+
+    <!-- Body -->
+    <div class="py-4">
+     <form
+        id="new_package_form"
+        accept-charset="UTF-8"
+        action=""
+        method="post"
+      >
+       {% csrf_token %}
+
+       <!-- Name -->
+        <div class="form-control mb-3">
+          <label class="label" for="package-name">
+            <span class="label-text">Name</span>
+          </label>
+          <input
+            id="package-name"
+            class="input input-bordered w-full"
+            name="package-name"
+            placeholder="Name"
+            required
+          />
+        </div>
+
+       <!-- Description -->
+        <div class="form-control mb-3">
+          <label class="label" for="package-description">
+            <span class="label-text">Description</span>
+          </label>
+          <input
+            id="package-description"
+            type="text"
+            class="input input-bordered w-full"
+            placeholder="Description..."
+            name="package-description"
+          />
+        </div>
+
+       <!-- Classification Level -->
+        <div class="form-control mb-3">
+          <label class="label" for="package-classification">
+            <span class="label-text">Package Classification</span>
+          </label>
+          <select
+            id="package-classification"
+            name="package-classification"
+            class="select select-bordered w-full"
+            x-model="packageClassification"
+            required
+          >
+            <option value="null" disabled selected>Select Classification</option>
+            <option value="0">Internal</option>
+            <option value="10">Restricted</option>
+            <option value="20">Secret</option>
+          </select>
+        </div>
+
+       <!-- Secret Groups -->
+        <div class="form-control mb-3" x-show="isSecret" x-cloak>
+          <label class="label" for="package-data-pool">
+            <span class="label-text">Data Pool for SECRET Package</span>
+          </label>
+          <p>Only users with this role can be granted access to this package</p>
+          <select
+            id="package-data-pool"
+            name="package-data-pool"
+            class="select select-bordered w-full"
+          >
+            <option value="" disabled selected>Select Data Pool</option>
+              {% for obj in meta.available_groups %}
+                {% if obj.secret %}
+                  <option value="{{ obj.url }}">{{ obj.name|safe }}</option>
+                {% endif %}
+              {% endfor %}
+          </select>
+        </div>
+
+     </form>
+    </div>
+
+    <!-- Footer -->
+    <div class="modal-action">
+      <button
+        type="button"
+        class="btn"
+        onclick="this.closest('dialog').close()"
+        :disabled="isSubmitting"
+      >
+        Cancel
+      </button>
+      <button
+        type="button"
+        class="btn btn-primary"
+        @click="submit('new_package_form')"
+        :disabled="isSubmitting || !selectedType || loadingSchemas"
+      >
+        <span x-show="!isSubmitting">Submit</span>
+        <span
+          x-show="isSubmitting"
+          class="loading loading-spinner loading-sm"
+        ></span>
+        <span x-show="isSubmitting">Creating...</span>
+      </button>
+    </div>
+  </div>
+
+  <!-- Backdrop -->
+  <form method="dialog" class="modal-backdrop">
+    <button :disabled="isSubmitting">close</button>
+  </form>
+</dialog>
\ No newline at end of file
diff --git a/envipath/settings.py b/envipath/settings.py
index 29a7f694..ba3cbf49 100644
--- a/envipath/settings.py
+++ b/envipath/settings.py
@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/4.2/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.2/ref/settings/
 """
-
+import json
 import os
 from pathlib import Path
 
@@ -20,7 +20,7 @@ from sklearn.tree import DecisionTreeClassifier
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-ENV_PATH = os.environ.get("ENV_PATH", BASE_DIR / ".env")
+ENV_PATH = os.environ.get("ENV_PATH", BASE_DIR / ".env.dev")
 print(f"Loading env from {ENV_PATH}")
 load_dotenv(ENV_PATH, override=False)
 
@@ -442,3 +442,14 @@ BIOTRANSFORMER_ENABLED = os.environ.get("BIOTRANSFORMER_ENABLED", "False") == "T
 FLAGS["BIOTRANSFORMER"] = BIOTRANSFORMER_ENABLED
 if BIOTRANSFORMER_ENABLED:
     BIOTRANSFORMER_URL = os.environ.get("BIOTRANSFORMER_URL", None)
+
+# PES
+PES_API_MAPPING = os.environ.get("PES_API_MAPPING", None)
+if PES_API_MAPPING:
+    import json
+    PES_API_MAPPING = json.loads(PES_API_MAPPING)
+else:
+    PES_API_MAPPING = {}
+
+# AD Group Mapping
+