Merge branch 'master' into 331-user-registration

Dockerfile

@@ -62,7 +62,7 @@ CMD ["/usr/local/bin/aleksis-docker-startup"]
 # Install assets
 FROM core as assets
 RUN eatmydata aleksis-admin yarn install; \
-    eatmydata aleksis-admin collectstatic; \
+    eatmydata aleksis-admin collectstatic --no-input; \
     rm -rf /usr/local/share/.cache
 
 # Clean up build dependencies
@@ -74,11 +74,9 @@ RUN set -e; \
         libpq-dev \
         libssl-dev \
         libldap2-dev \
-        libsasl2-dev \
-        yarnpkg; \
+        libsasl2-dev; \
     eatmydata apt-get autoremove --purge -y; \
     apt-get clean -y; \
-    rm -f /var/lib/apt/lists/*_*; \
     rm -rf /root/.cache
 
 # Drop privileges for runtime to www-data
@@ -89,3 +87,20 @@ RUN chown -R www-data:www-data \
      ${ALEKSIS_media__root} \
      ${ALEKSIS_backup__location}
 USER 33:33
+
+# Additional steps
+ONBUILD ARG APPS
+ONBUILD USER 0:0
+ONBUILD RUN set -e; \
+            if [ -n "$APPS" ]; then \
+                eatmydata pip install $APPS; \
+            fi; \
+            eatmydata aleksis-admin yarn install; \
+            eatmydata aleksis-admin collectstatic --no-input; \
+            rm -rf /usr/local/share/.cache; \
+            eatmydata apt-get remove --purge -y yarnpkg; \
+            eatmydata apt-get autoremove --purge -y; \
+            apt-get clean -y; \
+            rm -f /var/lib/apt/lists/*_*; \
+            rm -rf /root/.cache
+ONBUILD USER 33:33

aleksis/core/settings.py

@@ -216,11 +216,11 @@ merge_app_settings("DATABASES", DATABASES, False)
 REDIS_HOST = _settings.get("redis.host", "localhost")
 REDIS_PORT = _settings.get("redis.port", 6379)
 REDIS_DB = _settings.get("redis.database", 0)
-REDIS_USER = _settings.get("redis.user", "default")
 REDIS_PASSWORD = _settings.get("redis.password", None)
+REDIS_USER = _settings.get("redis.user", None if REDIS_PASSWORD is None else "default")
 
 REDIS_URL = (
-    f"redis://{REDIS_USER}{':'+REDIS_PASSWORD if REDIS_PASSWORD else ''}@"
+    f"redis://{REDIS_USER+':'+REDIS_PASSWORD+'@' if REDIS_USER else ''}"
     f"{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
 )
 

aleksis/core/static/js/main.js

@@ -63,12 +63,7 @@ $(document).ready(function () {
 
     // If JS is activated, the language form will be auto-submitted
     $('.language-field select').change(function () {
-
-        // Ugly bug fix to ensure correct value
-        const selectEl = $("select[name=language]");
-        selectEl.val(selectEl.val());
-
-        $(".language-form").submit();
+        $(this).parents(".language-form").submit();
     });
 
     // If auto-submit is activated (see above), the language submit must not be visible

aleksis/core/static/style.scss

@@ -400,7 +400,7 @@ th.orderable > a {
 }
 
 th.orderable > a::after {
-  @extend i.material-icons;
+  @extend .material-icons;
   font-family: 'Material Icons';
   font-weight: normal;
   font-style: normal;

aleksis/core/templates/core/partials/language_form.html

@@ -13,7 +13,7 @@
   {# Select #}
   <div class="input-field language-field">
     <span>{% trans "Language" %}</span>
-    <select name="language" id="language-select">
+    <select name="language">
       {% for language in languages %}
         <option value="{{ language.code }}" {% if language.code == LANGUAGE_CODE %}
                 selected {% endif %}>{{ language.name_local }}</option>

docker-startup.sh

@@ -52,17 +52,6 @@ prepare_database() {
 	aleksis-admin createinitialrevisions
 }
 
-if [ -z "$ALEKSIS_secret_key" ]; then
-	# Use a random session secret key if none was provided
-	# In K8s, should be provided from a K8s secret
-	if [ ! -e /var/lib/aleksis/secret_key ]; then
-		touch /var/lib/aleksis/secret_key
-		chmod 600 /var/lib/aleksis/secret_key
-		LC_ALL=C tr -dc 'A-Za-z0-9!"#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' </dev/urandom | head -c 64 >/var/lib/aleksis/secret_key
-	fi
-	ALEKSIS_secret_key=$(cat /var/lib/aleksis/secret_key)
-fi
-
 # Wait for database to be reachable under all conditions
 wait_database
 

pyproject.toml

@@ -38,7 +38,7 @@ Django = "^3.1.7"
 django-any-js = "^1.0"
 django-debug-toolbar = "^3.2"
 django-middleware-global-request = "^0.1.2"
-django-menu-generator-ng = "^1.2.0"
+django-menu-generator-ng = "^1.2.3"
 django-tables2 = "^2.1"
 Pillow = "^8.0"
 django-phonenumber-field = {version = "<5.1", extras = ["phonenumbers"]}
@@ -66,7 +66,7 @@ django-templated-email = "^2.3.0"
 html2text = "^2020.0.0"
 django-ckeditor = "^6.0.0"
 django-js-reverse = "^0.9.1"
-calendarweek = "^0.4.3"
+calendarweek = "^0.5.0"
 Celery = {version="^5.0.0", extras=["django", "redis"]}
 django-celery-results = "^2.0.1"
 django-celery-beat = "^2.2.0"
@@ -87,7 +87,7 @@ django-reversion = "^3.0.7"
 django-favicon-plus-reloaded = "^1.0.4"
 django-health-check = "^3.12.1"
 psutil = "^5.7.0"
-celery-progress = "^0.0.14"
+celery-progress = "^0.1.0"
 django-cachalot = "^2.3.2"
 django-prometheus = "^2.1.0"
 importlib-metadata = {version = "^3.0.0", python = "<3.9"}