resolve merge conflicts with origin/master

Author: twalen

.csslintrc

@@ -5,11 +5,5 @@
         "ids",
         "order-alphabetical",
         "overqualified-elements"
-    ],
-    "exclude-list": [
-        "oioioi/base/static/bootstrap-datetimepicker-oioioi",
-        "oioioi/base/static/bootstrap-markdown",
-        "oioioi/portals/static/portals/jqtree.css",
-        "oioioi/timeline/static/jquery-ui"
     ]
 }

.dockerignore

@@ -24,6 +24,10 @@
 /deployment/
 /venv*/
 /.idea/
+/.vscode/
+/.fleet/
+/dist_webpack/
+/node_modules/
 
 # docker specific
 

.github/workflows/cypress.yml

@@ -13,7 +13,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install `easy_toolbox.py` requirements
         run: |
           python -m pip install --upgrade pip

.github/workflows/doc.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/nightly.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/pytest.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/translations-download.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.github/workflows/translations-upload.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.11'
 
     - name: Install apt dependencies
       run: |

.gitignore

@@ -26,3 +26,5 @@
 /.idea/
 /.vscode/
 /.fleet/
+/dist_webpack/
+/node_modules/

.jshintignore

@@ -1,4 +1,4 @@
-FROM python:3.10 AS base
+FROM python:3.11 AS base
 
 ENV PYTHONUNBUFFERED 1
 
@@ -25,7 +25,9 @@ RUN apt-get update && \
         sox \
         flite \
         locales \
-        python3-pip && \
+        python3-pip \
+        nodejs \
+        npm && \
     apt-get clean
 
 # This is oioioi user linux uid. Setting it is useful in development.
@@ -54,7 +56,7 @@ USER oioioi
 ENV PATH $PATH:/home/oioioi/.local/bin/
 
 ENV BERKELEYDB_DIR /usr
-RUN pip3 install --user psycopg2-binary==2.8.6 twisted uwsgi
+RUN pip3 install --user psycopg2-binary twisted uwsgi
 RUN pip3 install --user bsddb3==6.2.7
 
 WORKDIR /sio2/oioioi
@@ -64,16 +66,23 @@ RUN pip3 install -r requirements.txt --user filetracker[server]
 COPY --chown=oioioi:oioioi requirements_static.txt ./
 RUN pip3 install -r requirements_static.txt --user
 
+# Installing node dependencies
+ENV PATH $PATH:/sio2/oioioi/node_modules/.bin
+
+COPY --chown=oioioi:oioioi package.json package-lock.json ./
+RUN npm ci
+
 COPY --chown=oioioi:oioioi . /sio2/oioioi
 
+RUN npm run build
 RUN oioioi-create-config /sio2/deployment
 
 WORKDIR /sio2/deployment
 
 RUN mkdir -p /sio2/deployment/logs/{supervisor,runserver}
 
 # The stage below is independent of base and can be built in parallel to optimize build time.
-FROM python:3.10 AS development-sandboxes
+FROM python:3.11 AS development-sandboxes
 
 ENV DOWNLOAD_DIR=/sio2/sandboxes
 ENV MANIFEST_URL=https://downloads.sio2project.mimuw.edu.pl/sandboxes/Manifest

.jshintrc

@@ -13,6 +13,7 @@ First, ensure that all dependencies are installed:
 * latex packages (*texlive-latex-extra*, *texlive-fonts-recommended*, *tex-gyre*,
   *texlive-pstricks*, *lmodern*),
 * Berkeley DB library (Ubuntu package: *libdb-dev*)
+* Node.js and npm (Ubuntu packages: *nodejs*, *npm*),
 
 It should be easier to begin with a separate folder at first::
 
@@ -29,7 +30,9 @@ Then OIOIOI and its dependencies can be installed using the following commands::
   git clone git://github.com/sio2project/oioioi.git
   cd oioioi
   pip install -r requirements.txt
-
+  npm install
+  npm run build
+  
 OIOIOI is a set of Django applications, therefore you need to create a folder with
 Django settings and other deployment configuration::
 

Dockerfile

@@ -12,6 +12,35 @@ Then run::
 
 and restart the judging machines.
 
+Fast Django Migration to 5.2 (Important for Large OIOIOI Instances)
+-----------------------------------
+
+The following migrations require removing an index (created by the deprecated ``index_together``) and creating a new one:
+
+* ``oi/migrations/0008_sync_indexes_state.py``
+* ``forum/migrations/0013_sync_indexes_state.py``
+* ``contests/migrations/0021_sync_indexes_state.py``
+
+Since dropping and then creating an index takes a long time for instances with a very large number of submissions, you can speed this up as follows:
+
+Because these indexes are in the database schema, you should mark these migrations (``0008_sync_indexes_state.py``, ``0021_sync_indexes_state.py``, ``0013_sync_indexes_state.py``) as fake.
+See the `django docs <https://docs.djangoproject.com/en/5.2/ref/django-admin/#cmdoption-migrate-fake>`_ for details.
+Then, rename the existing indexes created by ``IndexTogether`` to the corresponding names specified in these migrations.
+You can manually identify the indexes by checking which two fields they cover.
+
+For example, an index named ``forum_post_thread_id_add_date_6d8ec21d_idx`` should be renamed to ``forum_post_thread__54acb8_idx``.
+Similarly, rename the other indexes so that the database state is correct, i.e., the database contains indexes with the names specified in the migrations.
+
+After these steps, you will achieve a consistent database state without waiting a long time for the migrations to complete.
+
+::
+
+    python manage.py migrate oi 0008 --fake
+
+    python manage.py migrate forum 0021 --fake
+
+    python manage.py migrate contests 0013 --fake
+
 Changes in the deployment directory
 -----------------------------------
 

INSTALL.rst

@@ -38,12 +38,20 @@ def pytest_collection_modifyitems(config, items):
 
 
 # Removing links column from html report
-@pytest.mark.optionalhook
+@pytest.hookimpl(optionalhook=True)
 def pytest_html_results_table_header(cells):
     cells.pop()
 
 
 # Removing links column from html report
-@pytest.mark.optionalhook
+@pytest.hookimpl(optionalhook=True)
 def pytest_html_results_table_row(report, cells):
     cells.pop()
+
+@pytest.fixture()
+def require_migrations_flag(request):
+    config = request.config
+    nomigrations_enabled_flag = config.getoption("nomigrations")
+
+    if nomigrations_enabled_flag:
+        pytest.skip("Test requires the --migrations flag to run.")

UPGRADING.rst

@@ -5,7 +5,7 @@ x-common-envs: &common-envs
 
 services:
   db:
-    image: library/postgres:12.2
+    image: library/postgres:14.17
     environment:
       POSTGRES_USER: "oioioi"
       POSTGRES_PASSWORD: "password"
@@ -40,6 +40,9 @@ services:
     # - "7887:7887"
     volumes:
       - .:/sio2/oioioi
+      # use docker's node_modules and dist_webpack instead of the host ones
+      - node_modules-dev:/sio2/oioioi/node_modules
+      - dist_webpack-dev:/sio2/oioioi/dist_webpack
       - filetracker-data-dev:/sio2/deployment/media
 #      - ./deployment:/sio2/deployment
     stop_grace_period: 3m
@@ -68,3 +71,5 @@ services:
 volumes:
   postgress-data-dev:
   filetracker-data-dev:
+  node_modules-dev:
+  dist_webpack-dev:

conftest.py

@@ -5,7 +5,7 @@ x-common-envs: &common-envs
 
 services:
   db:
-    image: library/postgres:12.2
+    image: library/postgres:14.17
     environment:
       POSTGRES_USER: "oioioi"
       POSTGRES_PASSWORD: "password"

docker-compose-dev.yml

@@ -27,7 +27,8 @@
     ("up", "Run all SIO2 containers", "up -d"),
     ("down", "Stop and remove all SIO2 containers", "down"),
     ("wipe", "Stop all SIO2 containers and DESTROY all data", "down -v", True),
-    ("run", "Run server", "{exec} web python3 manage.py runserver 0.0.0.0:8000"),
+    ("run", "Run django server and webpack", 
+     '{exec} web conc -n js,py -c yellow,green -k "npm --prefix ../oioioi run -s watch" "python3 manage.py runserver 0.0.0.0:8000"'),
     ("stop", "Stop all SIO2 containers", "stop"),
     ("bash", "Open command prompt on web container.", "{exec} web bash"),
     ("exec", "Run a command in the web container.", "{exec} web {extra_args}"),
@@ -42,6 +43,8 @@
      "{exec} 'web' ../oioioi/test.sh oioioi/problems --cov-report term --cov-report xml:coverage.xml --cov=oioioi {extra_args}"),
     ("cypress-apply-settings", "Apply settings for CyPress.",
      '{exec} web bash -c "echo CAPTCHA_TEST_MODE=True >> settings.py"'),
+    ("npm", "Run npm command.", "{exec} web npm --prefix ../oioioi {extra_args}"),
+    ("eslint", "Run javascript linter.", "{exec} web npm --prefix ../oioioi run lint"),
 ]
 
 longest_command_arg = max([len(command[0]) for command in RAW_COMMANDS])

docker-compose.yml

@@ -0,0 +1,33 @@
+import { defineConfig } from "eslint/config";
+import globals from "globals";
+import js from "@eslint/js";
+
+
+export default defineConfig([
+  {
+    files: ["oioioi/**/*.js"],
+    ignores: [
+      "**/*.min.js",
+      "oioioi/liveranking/**",
+      "oioioi/notifications/server/**",
+    ],
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        $: "readonly",
+        jQuery: "readonly",
+        Cookies: "readonly",
+        Highcharts: "readonly",
+
+        django: "readonly",
+        gettext: "readonly",
+        ngettext: "readonly",
+        interpolate: "readonly",
+
+        oioioi_base_url: "readonly",
+      }
+    },
+    plugins: { js },
+    extends: ["js/recommended"]
+  },
+]);