Release v1.6.3

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.2
+current_version = 1.6.3
 
 [bumpversion:file:VERSION]
 

CITATION.cff

@@ -1,4 +1,4 @@
-cff-version: 1.6.2
+cff-version: 1.6.3
 message: "If you use this software, please cite it using these metadata."
 authors:
   - family-names: "Hülk"
@@ -28,7 +28,7 @@ authors:
 title: "Open Energy Family - Open Energy Platform (OEP)"
 type: software
 license: AGPL-3.0-or-later
-version: 1.6.2
+version: 1.6.3
 doi:
-date-released: 2026-01-07
+date-released: 2026-02-06
 url: "https://github.com/OpenEnergyPlatform/oeplatform/"

VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

base/management/commands/check_links.py

@@ -36,7 +36,7 @@ def iter_links(url, parent_url=None, root_url=None, no_external=False):
     res = requests.get(
         url,
         stream=True,  # stream because sometimes we dont actually load all the content
-        verify=False,  # snyk:ignore this is ok here, because we just run it in development to test if urls still exist # noqa
+        verify=False,  # this is ok here, because we just run it in development to test if urls still exist # noqa
         headers={"User-Agent": "Mozilla/5.0"},
     )
     cache[url] = res.status_code

dataedit/management/commands/assign_users_admin_table_permission.py

@@ -0,0 +1,125 @@
+"""
+SPDX-FileCopyrightText: 2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut
+SPDX-License-Identifier: AGPL-3.0-or-later
+"""  # noqa: 501
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
+
+from dataedit.models import Table
+from login.models import myuser
+from login.utils import assign_table_holder
+
+
+class Command(BaseCommand):
+    help = "Patch table owners by assigning a user as permission"
+    "holder (via assign_table_holder)."
+
+    def add_arguments(self, parser):
+        user_group = parser.add_mutually_exclusive_group(required=True)
+        user_group.add_argument("--user-id", type=int, help="User id (myuser.pk)")
+        user_group.add_argument("--username", type=str, help="Username (myuser.name)")
+        user_group.add_argument("--email", type=str, help="Email (myuser.email)")
+
+        parser.add_argument(
+            "--from-file",
+            type=str,
+            default=None,
+            help="Read table names from file (one per line; blank lines"
+            "and #comments ignored).",
+        )
+        parser.add_argument(
+            "table_names",
+            nargs="*",
+            help="Table names (edut_00) or schema-qualified (data.edut_00).",
+        )
+        parser.add_argument(
+            "--dry-run",
+            action="store_true",
+            help="Don't write changes; only show what would happen.",
+        )
+
+    def _resolve_user(self, options) -> myuser:
+        if options["user_id"] is not None:
+            return myuser.objects.get(pk=options["user_id"])
+        if options["username"]:
+            return myuser.objects.get(name=options["username"])
+        if options["email"]:
+            return myuser.objects.get(email=options["email"])
+        raise CommandError("No user selector provided (should be unreachable).")
+
+    def _load_names(self, options) -> list[str]:
+        names = list(options["table_names"] or [])
+
+        if options["from_file"]:
+            p = Path(options["from_file"])
+            if not p.exists():
+                raise CommandError(f"--from-file path does not exist: {p}")
+            for line in p.read_text(encoding="utf-8").splitlines():
+                line = line.strip()
+                if not line or line.startswith("#"):
+                    continue
+                names.append(line)
+
+        if not names:
+            raise CommandError(
+                "No table names provided. Use positional names or --from-file."
+            )
+        return names
+
+    @staticmethod
+    def _normalize_table_name(raw: str) -> str:
+        raw = raw.strip()
+        # Accept `data.<name>` (schema is always data in your setup)
+        if raw.startswith("data."):
+            return raw.split(".", 1)[1]
+        return raw
+
+    def handle(self, *args, **options):
+        try:
+            user = self._resolve_user(options)
+        except myuser.DoesNotExist as e:
+            raise CommandError(f"User not found: {e}") from e
+
+        dry_run = options["dry_run"]
+        raw_names = self._load_names(options)
+        table_names = [self._normalize_table_name(n) for n in raw_names]
+
+        missing = []
+        changed = 0
+
+        with transaction.atomic():
+            for name in table_names:
+                table = Table.objects.filter(name=name).first()
+                if not table:
+                    missing.append(name)
+                    self.stdout.write(self.style.ERROR(f"missing: {name}"))
+                    continue
+
+                if dry_run:
+                    self.stdout.write(
+                        self.style.WARNING(
+                            f"[DRY] would assign holder {user} to {name}"
+                        )
+                    )
+                    continue
+
+                # This should create/update the proper UserPermission row(s)
+                # exactly like normal table creation does.
+                assign_table_holder(user=user, table=table)
+
+                changed += 1
+                self.stdout.write(self.style.SUCCESS(f"assigned: {user} -> {name}"))
+
+            if dry_run:
+                transaction.set_rollback(True)
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                f"Done. assigned={changed}, missing={len(missing)}, dry_run={dry_run}"
+            )
+        )

dataedit/static/wizard/wizard.js

@@ -972,3 +972,6 @@ window.Wizard = function (config) {
     $("#wizard-loading").hide();
   })();
 };
+
+/* notify inline code that Wizard is loaded */
+window.dispatchEvent(new Event("Wizard:ready"));

dataedit/templates/dataedit/meta_edit.html

@@ -128,15 +128,15 @@ <h5 class="modal-title" id="modalLabel">
   {% compress js %}
     <script src="{% static 'metaedit/vendor/json-editor-2.9.1/jsoneditor.min.js' %}"></script>
     <script src="{% static 'modelview/htmx.min.js' %}"></script>
-    <script src="{% static 'metaedit/metaedit.js' %}"></script>
   {% endcompress %}
+  {% vite_asset "dataedit/static/metaedit/metaedit.js" %}
   <!-- fix imports below - we dont use cdn anymore -->
   <script src="{{ EXTERNAL_URLS.unpkg__trevoreyre_autocomplete_js }}"></script>
   <link rel="stylesheet"
         href="{{ EXTERNAL_URLS.unpkg__trevoreyre_autocomplete_js_dist_style_css }}" />
   <script>
     /* only execute after MetaEdit is fully loaded */
-    // window.addEventListener("MetaEdit:ready", () => { /* TODO MetaEdit:ready */
+    window.addEventListener("MetaEdit:ready", () => {
 
     var createUrl = '{% url "oeo_ext:oeo-ext-plugin-ui-create" %}';
     var config = JSON.parse("{{ config|escapejs }}");
@@ -179,6 +179,6 @@ <h5 class="modal-title" id="modalLabel">
     // Set up tab filtering
     hideTabsFilter(["Meta Metadata", "Embargo Period", "Dialect", "Review"]);
 
-    // }); /* TODO MetaEdit:ready */
+    });
   </script>
 {% endblock after-body-bottom-js %}

dataedit/templates/dataedit/wizard.html

@@ -4,7 +4,9 @@
 {% load django_bootstrap5 %}
 {% load compress %}
 {% block after-head %}
-  <link href="{% static 'wizard/wizard.css' %}" rel="stylesheet" />
+  {% compress css %}
+    <link href="{% static 'wizard/wizard.css' %}" rel="stylesheet" />
+  {% endcompress %}
 {% endblock after-head %}
 {% block site-header %}
   <div class="main-header">
@@ -379,15 +381,16 @@ <h4>Preview and upload</h4>
     </div>
   </div>
   <script src="{% static 'wizard/vendor/papaparse-5.0.2/papaparse.min.js' %}"></script>
-  {% compress js %}
-    <script src="{% static 'wizard/wizard.js' %}"></script>
-  {% endcompress %}
+  {% vite_asset "dataedit/static/wizard/wizard.js" %}
   <script>
-    $(document).ready(function () {
-      var config = JSON.parse("{{ config|escapejs }}");
-      var wizard = Wizard(config);
-
-      $('[data-bs-toggle="tooltip"]').tooltip();
+    /* only execute after Wizard is fully loaded */
+    window.addEventListener("Wizard:ready", () => {
+      // also ensure jquery has been loaded
+      $(document).ready(function () {
+        var config = JSON.parse("{{ config|escapejs }}");
+        var wizard = Wizard(config);
+        $('[data-bs-toggle="tooltip"]').tooltip();
+      });
     });
   </script>
 {% endblock after-body-bottom-js %}

dataedit/views.py

@@ -365,7 +365,7 @@ def tag_table_add_view(request: HttpRequest) -> HttpResponse:
         # generic error message
         messages.error(request, "Something went wrong")
 
-    redirect_url = request.META.get("HTTP_REFERER") or reverse("dataedit:topic-list")
+    redirect_url = reverse("dataedit:view", kwargs={"table": table_obj.name})
     return redirect(redirect_url)
 
 

factsheet/frontend/src/components/customAutocomplete.jsx

@@ -12,7 +12,8 @@ import {
   DialogActions,
   Button
 } from '@mui/material';
-import { styled } from '@mui/material/styles';
+import styled from '@mui/material/styles/styled';
+
 import { createFilterOptions } from '@mui/material/Autocomplete';
 import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank';
 import CheckBoxIcon from '@mui/icons-material/CheckBox';

factsheet/frontend/src/components/customAutocompleteWithoutAddNew.jsx

@@ -8,7 +8,8 @@ import {
   Chip,
   Typography
 } from '@mui/material';
-import { styled } from '@mui/material/styles';
+import styled from '@mui/material/styles/styled';
+
 import { createFilterOptions } from '@mui/material/Autocomplete';
 import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank';
 import CheckBoxIcon from '@mui/icons-material/CheckBox';

factsheet/frontend/src/components/customSwapButton.jsx

@@ -7,61 +7,32 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import Button from '@mui/material/Button';
 import ButtonGroup from '@mui/material/ButtonGroup';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import RemoveRedEyeOutlinedIcon from '@mui/icons-material/RemoveRedEyeOutlined';
 import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import Tooltip from '@mui/material/Tooltip';
 import { Link } from 'react-router-dom';
-import axios from 'axios';
+
 
 import Snackbar from '@mui/material/Snackbar';
 import Alert from '@mui/material/Alert';
 import AlertTitle from '@mui/material/AlertTitle';
-import CSRFToken from './csrfToken';
 
-import conf from "../conf.json";
 
-const ColorToggleButton = (props) => {
-  const [isOwner, setIsOwner] = useState(false);
+const ColorToggleButton = ({ handleSwap, isOwner, isOwnerLoading }) => {
   const [snackbarOpen, setNotTheOwner] = useState(false);
 
-  const param_2 = String(window.location.href).split('/')[5];
-
-  useEffect(() => {
-    // Replace 'bundle_id' with the actual ID of the ScenarioBundle you want to check
-    const bundleId = param_2; // Assuming you pass the uid as a prop
-    // Make the API call to check if the user is the owner
-    axios.post(conf.toep + `scenario-bundles/check-owner/${bundleId}/`,
-      {
-        uid: bundleId
-      },
-      {
-        headers: { 'X-CSRFToken': CSRFToken() }
-      })
-      .then(response => {
-        // Assuming the response.data contains the ownership information
-        setIsOwner(response.data.isOwner);
-      })
-      .catch(error => {
-        console.error('Error checking ownership:', error);
-        // Handle errors if needed
-      });
-  }, [param_2]); // Dependency array includes props.uid to re-run the effect when it changes
-
   const handleChange = (event, mode) => {
-    // Only allow the 'edit' action if the user is the owner
-    if (mode === 'edit' && !isOwner) {
+    if (mode === "edit" && (isOwnerLoading || !isOwner)) {
       setNotTheOwner(true);
       return;
     }
-
-    props.handleSwap(mode);
+    handleSwap(mode);
   };
 
-
   const handleNotTheOwnerClose = (event, reason) => {
     if (reason === 'clickaway') {
       return;