Merge pull request #1772 from OpenEnergyPlatform/master

Master into dev post release

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.3
+current_version = 0.21.4
 
 [bumpversion:file:VERSION]
 

CITATION.cff

@@ -28,7 +28,7 @@ authors:
 title: "Open Energy Family - Open Energy Platform (OEP)"
 type: software
 license: AGPL-3.0-or-later
-version: 0.20.3
+version: 0.21.4
 doi:
-date-released: 2024-06-20
+date-released: 2024-07-25
 url: "https://github.com/OpenEnergyPlatform/oeplatform/"

VERSION

@@ -1 +1 @@
-0.20.3
+0.21.4

docker/Dockerfile

@@ -14,7 +14,7 @@ COPY ./docker/apache2.conf /etc/apache2/conf-enabled/oeplatform.conf
 COPY . /app
 COPY ./docker/docker-entrypoint.sh /app/docker-entrypoint.sh
 
-RUN mkdir /app/ontologies && cd /app/ontologies && wget https://github.com/OpenEnergyPlatform/ontology/releases/latest/download/oeo.zip && unzip oeo.zip && rm oeo.zip
+RUN mkdir -p /app/ontologies/oeo/2.4.0 && cd /app/ontologies/oeo/2.4.0 && wget https://github.com/OpenEnergyPlatform/ontology/releases/download/v2.4.0/build-files.zip && unzip build-files.zip && rm build-files.zip
 
 RUN cp /app/oeplatform/securitysettings.py.default /app/oeplatform/securitysettings.py && python manage.py collectstatic --noinput && rm /app/oeplatform/securitysettings.py
 

factsheet/views.py

@@ -6,6 +6,7 @@
 from django.http import HttpResponse, HttpResponseForbidden, JsonResponse
 from django.shortcuts import render
 from django.utils.cache import patch_response_headers
+from django.views.decorators.cache import never_cache
 from rdflib import RDF, Graph, Literal, URIRef
 from rdflib.compare import graph_diff, to_isomorphic
 from SPARQLWrapper import JSON
@@ -2051,6 +2052,7 @@ def populate_factsheets_elements(request, *args, **kwargs):
     return response
 
 
+@never_cache
 def filter_scenario_bundles_view(request):
     # Get the table IRI from the request or any other source
     table_iri = request.GET.get("table_iri", "")

oeplatform/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.3"
+__version__ = "0.21.4"

versions/changelogs/0_21_0.md

@@ -0,0 +1,30 @@
+# Changes to the oeplatform code
+
+## Changes
+
+- All visitors can use metadata builder in standalone version [(#1746)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1746)
+
+- Scenario Bundle Comparison: Harmonize usage of scenario types & study descriptors on bundle & comparison pages. Additionally make all Chips clickable and provide link to oeo class description pages. [#1751](https://github.com/OpenEnergyPlatform/oeplatform/pull/1751)
+
+- The auto-select feature on the scenario bundle/scenario edit page now shows table resources from the scenario topic in the format of: "Metadata Table Title (table_name)" to harmonize the display of table resources also when displaying a bundle. Note: Existing resources must currently be updated manually. [(#1753)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1753)
+
+- Fix issues related to [(#1768)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1768):
+  - update functionality to select scenario input and output tables, to avoid duplicate selections within one category
+  - listing tables as input / output tables on the tables detail page (to link table and scenario bundle)
+  - Additional: Remove duplicated publication dates from overview
+
+## Features
+
+- Add new sparql query endpoint and GUI (using YASGUI) to query the OEKG. This feature is linked via the scenario bundle overview page [#1758](https://github.com/OpenEnergyPlatform/oeplatform/pull/1758)
+
+## Bugs
+
+- Open peer review: Fixed several bugs that hindered the user to submit a review, broke the indicators dots that show the review progress & showed badly formatted data on the summary tab [(#1762)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1762)
+
+- Fixed multiple scenario bundle bugs [(#1764)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1764)
+  - Fix incorrect rendering of multiple publication years and show None if no data available.
+  - Year of publication in scenario bundle detail view now renders only the year
+  - Model & framework factsheets are now rendered as clickable chip that links to the detail page of the factsheet. The chip now renders either the acronym or the
+    name of the factsheet.
+
+## Documentation updates

versions/changelogs/0_21_1.md

@@ -0,0 +1,11 @@
+# Changes to the oeplatform code
+
+## Changes
+
+## Features
+
+## Bugs
+
+- Fix docker image build workflow [#1773](https://github.com/OpenEnergyPlatform/oeplatform/pull/1773)
+
+## Documentation updates

versions/changelogs/0_21_2.md

@@ -0,0 +1,13 @@
+# Changes to the oeplatform code
+
+## Changes
+
+- Add never cache decorator to scenario bundle plugin view [#1774](https://github.com/OpenEnergyPlatform/oeplatform/pull/1774)
+
+## Features
+
+## Bugs
+
+- Fix docker image build workflow again [#1774](https://github.com/OpenEnergyPlatform/oeplatform/pull/1774)
+
+## Documentation updates

versions/changelogs/0_21_3.md

@@ -0,0 +1,11 @@
+# Changes to the oeplatform code
+
+## Changes
+
+## Features
+
+## Bugs
+
+- Fix docker image build workflow as oeo release files structure changed [#1775](https://github.com/OpenEnergyPlatform/oeplatform/pull/1775)
+
+## Documentation updates

versions/changelogs/0_21_4.md

@@ -0,0 +1,11 @@
+# Changes to the oeplatform code
+
+## Changes
+
+## Features
+
+## Bugs
+
+- Fix docker image build workflow [#1776](https://github.com/OpenEnergyPlatform/oeplatform/pull/1776)
+
+## Documentation updates

versions/changelogs/current.md

@@ -2,29 +2,8 @@
 
 ## Changes
 
-- All visitors can use metadata builder in standalone version [(#1746)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1746)
-
-- Scenario Bundle Comparison: Harmonize usage of scenario types & study descriptors on bundle & comparison pages. Additionally make all Chips clickable and provide link to oeo class description pages. [#1751](https://github.com/OpenEnergyPlatform/oeplatform/pull/1751)
-
-- The auto-select feature on the scenario bundle/scenario edit page now shows table resources from the scenario topic in the format of: "Metadata Table Title (table_name)" to harmonize the display of table resources also when displaying a bundle. Note: Existing resources must currently be updated manually. [(#1753)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1753)
-
-- Fix issues related to [(#1768)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1768):
-  - update functionality to select scenario input and output tables, to avoid duplicate selections within one category
-  - listing tables as input / output tables on the tables detail page (to link table and scenario bundle)
-  - Additional: Remove duplicated publication dates from overview
-
 ## Features
 
-- Add new sparql query endpoint and GUI (using YASGUI) to query the OEKG. This feature is linked via the scenario bundle overview page [#1758](https://github.com/OpenEnergyPlatform/oeplatform/pull/1758)
-
 ## Bugs
 
-- Open peer review: Fixed several bugs that hindered the user to submit a review, broke the indicators dots that show the review progress & showed badly formatted data on the summary tab [(#1762)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1762)
-
-- Fixed multiple scenario bundle bugs [(#1764)](https://github.com/OpenEnergyPlatform/oeplatform/pull/1764)
-  - Fix incorrect rendering of multiple publication years and show None if no data available.
-  - Year of publication in scenario bundle detail view now renders only the year
-  - Model & framework factsheets are now rendered as clickable chip that links to the detail page of the factsheet. The chip now renders either the acronym or the
-    name of the factsheet.
-
 ## Documentation updates